diff options
| -rw-r--r-- | composer.json | 7 | ||||
| l--------- | makesrc.sh | 1 | ||||
| -rw-r--r-- | php-mnapoli-phpunit-easymock.spec | 72 |
3 files changed, 50 insertions, 30 deletions
diff --git a/composer.json b/composer.json index dedd68e..8088333 100644 --- a/composer.json +++ b/composer.json @@ -16,10 +16,7 @@ } }, "require": { - "php": "~5.4|~7.0", - "phpunit/phpunit-mock-objects": "~2.0|~3.0" - }, - "require-dev": { - "phpunit/phpunit": "~4.0|~5.0" + "php": "^7.3", + "phpunit/phpunit": "^8.5|^9.0" } } diff --git a/makesrc.sh b/makesrc.sh new file mode 120000 index 0000000..e285f9b --- /dev/null +++ b/makesrc.sh @@ -0,0 +1 @@ +php-mnapoli-phpunit-easymock-get-source.sh
\ No newline at end of file diff --git a/php-mnapoli-phpunit-easymock.spec b/php-mnapoli-phpunit-easymock.spec index 74c9c7a..0ac4afa 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-2017 Shawn Iwinski <shawn@iwin.ski> +# Copyright (c) 2016-2020 Shawn Iwinski <shawn@iwin.ski> # # License: MIT # http://opensource.org/licenses/MIT @@ -12,34 +12,40 @@ %global github_owner mnapoli %global github_name phpunit-easymock -%global github_version 0.2.3 -%global github_commit 023279dbe33f6e6eaace7c76d1fef9adf3f7cf4c +%global github_version 1.3.0 +%global github_commit 3620599d773e9c4924acc7e40061047c75bac574 %global composer_vendor mnapoli %global composer_project phpunit-easymock -# "php": "~5.4|~7.0" -%global php_min_ver 5.4 -# "phpunit/phpunit-mock-objects": "~2.0|~3.0" -%global phpunit_mock_objects_min_ver 2.0 -%global phpunit_mock_objects_max_ver 4.0 +# "php": "^7.3" +%global php_min_ver 7.3 +# "phpunit/phpunit": "^8.5|^9.0" +%global phpunit8_min_ver 8.5 +%global phpunit9_min_ver 9.0 # Build using "--without tests" to disable tests %global with_tests 0%{!?_without_tests:1} +# Rich dependencies supported? +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +%global with_rich_dependencies 1 +%else +%global with_rich_dependencies 0 +%endif + %{!?phpdir: %global phpdir %{_datadir}/php} Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 3%{?github_release}%{?dist} +Release: 2%{?github_release}%{?dist} Summary: Helpers to build PHPUnit mocks -Group: Development/Libraries 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,10 +54,10 @@ BuildArch: noarch %if %{with_tests} ## composer.json BuildRequires: php(language) >= %{php_min_ver} -BuildRequires: php-composer(phpunit/phpunit-mock-objects) < %{phpunit_mock_objects_max_ver} -BuildRequires: php-composer(phpunit/phpunit-mock-objects) >= %{phpunit_mock_objects_min_ver} -BuildRequires: php-composer(phpunit/phpunit) -## phpcompatinfo (computed from version 0.2.3) +# test suite run with all allowed versions +BuildRequires: phpunit8 >= %{phpunit8_min_ver} +BuildRequires: phpunit9 >= %{phpunit9_min_ver} +## phpcompatinfo (computed from version 1.3.0) BuildRequires: php-reflection ## Autoloader BuildRequires: php-composer(fedora/autoloader) @@ -59,9 +65,12 @@ BuildRequires: php-composer(fedora/autoloader) # composer.json Requires: php(language) >= %{php_min_ver} -Requires: php-composer(phpunit/phpunit-mock-objects) < %{phpunit_mock_objects_max_ver} -Requires: php-composer(phpunit/phpunit-mock-objects) >= %{phpunit_mock_objects_min_ver} -# phpcompatinfo (computed from version 0.2.3) +# +%if %{with_rich_dependencies} +# Single version required at runtime +Requires: (phpunit8 >= %{phpunit8_min_ver} or phpunit9 >= %{phpunit9_min_ver}) +%endif +# phpcompatinfo (computed from version 1.3.0) # <none> # Autoloader Requires: php-composer(fedora/autoloader) @@ -91,10 +100,6 @@ cat <<'AUTOLOAD' | tee src/autoload.php require_once '%{phpdir}/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('EasyMock\\', __DIR__); - -\Fedora\Autoloader\Dependencies::required(array( - '%{phpdir}/PHPUnit/Framework/MockObject/Autoload.php', -)); AUTOLOAD @@ -114,8 +119,15 @@ BOOTSTRAP : Upstream tests RETURN_CODE=0 -PHPUNIT=$(which phpunit) -for PHP_EXEC in "" %{?rhel:php55} php56 php70 php71 php72; do +PHPUNIT=$(which phpunit8) +for PHP_EXEC in "" php73 php74; do + if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then + $PHP_EXEC $PHPUNIT --verbose --bootstrap bootstrap.php \ + || RETURN_CODE=1 + fi +done +PHPUNIT=$(which phpunit9) +for PHP_EXEC in "" php73 php74 php80; do if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then $PHP_EXEC $PHPUNIT --verbose --bootstrap bootstrap.php \ || RETURN_CODE=1 @@ -136,6 +148,16 @@ exit $RETURN_CODE %changelog +* Mon Aug 24 2020 Remi Collet <remirepo.net> -1.3.0-2 +- allow phpunit8 and phpunit9 + +* 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 + * Mon May 15 2017 Shawn Iwinski <shawn.iwinski@gmail.com> - 0.2.3-3 - Switch autoloader to php-composer(fedora/autoloader) - Add max versions to build dependencies |