diff options
| -rw-r--r-- | composer.json | 22 | ||||
| -rw-r--r-- | php-doctrine-instantiator.spec | 23 |
2 files changed, 22 insertions, 23 deletions
diff --git a/composer.json b/composer.json index a84baa7..1ce3473 100644 --- a/composer.json +++ b/composer.json @@ -12,25 +12,20 @@ { "name": "Marco Pivetta", "email": "ocramius@gmail.com", - "homepage": "http://ocramius.github.com/" + "homepage": "https://ocramius.github.io/" } ], - "config": { - "platform": { - "php": "7.1.27" - } - }, "require": { "php": "^7.1 || ^8.0" }, "require-dev": { "ext-phar": "*", "ext-pdo": "*", - "doctrine/coding-standard": "^6.0", - "phpbench/phpbench": "^0.13", - "phpstan/phpstan-phpunit": "^0.11", - "phpstan/phpstan-shim": "^0.11", - "phpunit/phpunit": "^7.0" + "doctrine/coding-standard": "^8.0", + "phpbench/phpbench": "^0.13 || 1.0.0-alpha2", + "phpstan/phpstan": "^0.12", + "phpstan/phpstan-phpunit": "^0.12", + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" }, "autoload": { "psr-4": { @@ -43,10 +38,5 @@ "DoctrineTest\\InstantiatorTest\\": "tests", "DoctrineTest\\InstantiatorTestAsset\\": "tests" } - }, - "extra": { - "branch-alias": { - "dev-master": "1.2.x-dev" - } } } diff --git a/php-doctrine-instantiator.spec b/php-doctrine-instantiator.spec index f6a2688..b373f86 100644 --- a/php-doctrine-instantiator.spec +++ b/php-doctrine-instantiator.spec @@ -9,7 +9,7 @@ # bootstrap needed when rebuilding PHPUnit for new major version %global bootstrap 0 -%global gh_commit f350df0268e904597e3bd9c4685c53e0e333feea +%global gh_commit d56bf6102915de5702778fe20f2de3b2fe570b5b %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner doctrine %global gh_project instantiator @@ -21,7 +21,7 @@ %endif Name: php-doctrine-instantiator -Version: 1.3.1 +Version: 1.4.0 Release: 1%{?dist} Summary: Instantiate objects in PHP without invoking their constructors @@ -38,7 +38,12 @@ BuildRequires: php-phar BuildRequires: php-pdo BuildRequires: php-reflection BuildRequires: php-spl -BuildRequires: phpunit8 +%if 0%{?fedora} >=31 || 0%{?rhel} >= 9 +%global phpunit %{_bindir}/phpunit9 +%else +%global phpunit %{_bindir}/phpunit8 +%endif +BuildRequires: %{phpunit} %endif # From composer.json @@ -91,10 +96,11 @@ EOF : Run test suite ret=0 -for cmd in php php73 php74 php80; do - if which $cmd; then - $cmd -d include_path=".:%{buildroot}%{_datadir}/php:%{_datadir}/php" \ - %{_bindir}/phpunit8 \ +for cmdarg in "php %{phpunit}" "php72 %{_bindir}/phpunit8" php73 php74 php80; do + if which $cmdarg; then + set $cmdarg + $1 -d include_path=".:%{buildroot}%{_datadir}/php:%{_datadir}/php" \ + ${2:-%{_bindir}/phpunit9} \ --verbose || ret=1 fi done @@ -114,6 +120,9 @@ exit $ret %changelog +* Thu Nov 12 2020 Remi Collet <remi@remirepo.net> - 1.4.0-1 +- update to 1.4.0 + * Tue Jun 2 2020 Remi Collet <remi@remirepo.net> - 1.3.1-1 - update to 1.3.1 (no change) - switch to phpunit8 |