diff options
| -rw-r--r-- | composer.json | 7 | ||||
| -rw-r--r-- | php-mnapoli-phpunit-easymock.spec | 47 |
2 files changed, 21 insertions, 33 deletions
diff --git a/composer.json b/composer.json index 0a41051..8088333 100644 --- a/composer.json +++ b/composer.json @@ -16,10 +16,7 @@ } }, "require": { - "php": "~7.0", - "phpunit/phpunit-mock-objects": "~5.0|~6.0" - }, - "require-dev": { - "phpunit/phpunit": "~6.4|~7.0" + "php": "^7.3", + "phpunit/phpunit": "^8.5|^9.0" } } diff --git a/php-mnapoli-phpunit-easymock.spec b/php-mnapoli-phpunit-easymock.spec index 0ebe90b..21ed952 100644 --- a/php-mnapoli-phpunit-easymock.spec +++ b/php-mnapoli-phpunit-easymock.spec @@ -2,7 +2,7 @@ # # Fedora spec file for php-mnapoli-phpunit-easymock # -# Copyright (c) 2016-2019 Shawn Iwinski <shawn@iwin.ski> +# Copyright (c) 2016-2020 Shawn Iwinski <shawn@iwin.ski> # # License: MIT # http://opensource.org/licenses/MIT @@ -12,18 +12,16 @@ %global github_owner mnapoli %global github_name phpunit-easymock -%global github_version 1.1.0 -%global github_commit cd71d4d897bab9cba02afd01af7701caf54e8b03 +%global github_version 1.3.0 +%global github_commit 3620599d773e9c4924acc7e40061047c75bac574 %global composer_vendor mnapoli %global composer_project phpunit-easymock -# "php": "~7.0" -%global php_min_ver 7.0 -# "phpunit/phpunit-mock-objects": "~5.0|~6.0" -# NOTE: Max version 6 instead of 7 to force single major version -%global phpunit_mock_objects_min_ver 5.0 -%global phpunit_mock_objects_max_ver 6.0 +# "php": "^7.3" +%global php_min_ver 7.3 +# "phpunit/phpunit": "^8.5|^9.0" +%global phpunit8_min_ver 8.5 # Build using "--without tests" to disable tests %global with_tests 0%{!?_without_tests:1} @@ -38,8 +36,8 @@ Summary: Helpers to build PHPUnit mocks License: MIT URL: https://github.com/%{github_owner}/%{github_name} -# GitHub export does not include tests. -# Run php-mnapoli-phpunit-easymock-get-source.sh to create full source. +# GitHub export does not include tests +# Run php-mnapoli-phpunit-easymock-get-source.sh to create full source Source0: %{name}-%{github_version}-%{github_commit}.tar.gz Source1: %{name}-get-source.sh @@ -48,13 +46,8 @@ BuildArch: noarch %if %{with_tests} ## composer.json BuildRequires: php(language) >= %{php_min_ver} -BuildRequires: phpunit6 -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-composer(phpunit/phpunit-mock-objects) >= %{phpunit_mock_objects_min_ver} with php-composer(phpunit/phpunit-mock-objects) < %{phpunit_mock_objects_max_ver}) -%else -BuildRequires: php-phpunit-mock-objects5 -%endif -## phpcompatinfo (computed from version 1.1.0) +BuildRequires: phpunit8 >= %{phpunit8_min_ver} +## phpcompatinfo (computed from version 1.3.0) BuildRequires: php-reflection ## Autoloader BuildRequires: php-composer(fedora/autoloader) @@ -62,13 +55,8 @@ BuildRequires: php-composer(fedora/autoloader) # composer.json Requires: php(language) >= %{php_min_ver} -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-composer(phpunit/phpunit-mock-objects) >= %{phpunit_mock_objects_min_ver} with php-composer(phpunit/phpunit-mock-objects) < %{phpunit_mock_objects_max_ver}) -%else -Requires: php-composer(phpunit/phpunit-mock-objects) < %{phpunit_mock_objects_max_ver} -Requires: php-composer(phpunit/phpunit-mock-objects) >= %{phpunit_mock_objects_min_ver} -%endif -# phpcompatinfo (computed from version 1.1.0) +Requires: phpunit8 >= %{phpunit8_min_ver} +# phpcompatinfo (computed from version 1.3.0) # <none> # Autoloader Requires: php-composer(fedora/autoloader) @@ -100,7 +88,7 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('EasyMock\\', __DIR__); \Fedora\Autoloader\Dependencies::required([ - '%{phpdir}/PHPUnit6/Framework/MockObject5/autoload.php', + '%{phpdir}/PHPUnit8/autoload.php', ]); AUTOLOAD @@ -121,8 +109,8 @@ BOOTSTRAP : Upstream tests RETURN_CODE=0 -PHPUNIT=$(which phpunit6) -for PHP_EXEC in "" php71 php72 php73 php74; do +PHPUNIT=$(which phpunit8) +for PHP_EXEC in "" php74; do if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then $PHP_EXEC $PHPUNIT --verbose --bootstrap bootstrap.php \ || RETURN_CODE=1 @@ -143,6 +131,9 @@ exit $RETURN_CODE %changelog +* Fri Aug 21 2020 Shawn Iwinski <shawn@iwin.ski> - 1.3.0-1 +- Update to 1.3.0 (RHBZ #1784948) + * Sun May 26 2019 Shawn Iwinski <shawn@iwin.ski> - 1.1.0-1 - Update to 1.1.0 (RHBZ #1512241) - Add range version dependencies for Fedora >= 27 || RHEL >= 8 |