diff --git a/.gitignore b/.gitignore index ef2c6c0..f34aa03 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ clog /php-doctrine-instantiator-1.1.0-185b886.tgz /php-doctrine-instantiator-1.2.0-a2c5901.tgz /php-doctrine-instantiator-1.3.0-ae466f7.tgz +/php-doctrine-instantiator-1.3.1-f350df0.tgz diff --git a/php-doctrine-instantiator.spec b/php-doctrine-instantiator.spec index 2bc6656..e813d76 100644 --- a/php-doctrine-instantiator.spec +++ b/php-doctrine-instantiator.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-doctrine-instantiator # -# Copyright (c) 2014-2019 Remi Collet +# Copyright (c) 2014-2020 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -9,10 +9,11 @@ # bootstrap needed when rebuilding PHPUnit for new major version %global bootstrap 0 -%global gh_commit ae466f726242e637cebdd526a7d991b9433bacf1 +%global gh_commit f350df0268e904597e3bd9c4685c53e0e333feea %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner doctrine %global gh_project instantiator +%global major %nil %if %{bootstrap} %global with_tests 0%{?_with_tests:1} %else @@ -20,9 +21,8 @@ %endif Name: php-doctrine-instantiator +Version: 1.3.1 Release: 1%{?dist} -%global major %nil -Version: 1.3.0 Summary: Instantiate objects in PHP without invoking their constructors License: MIT @@ -38,11 +38,11 @@ BuildRequires: php-phar BuildRequires: php-pdo BuildRequires: php-reflection BuildRequires: php-spl -BuildRequires: phpunit6 +BuildRequires: phpunit8 %endif # From composer.json -# "php": "^7.1" +# "php": "^7.1 || ^8.0" Requires: php(language) >= 7.1 # From phpcompatinfo report for version 1.1.0 Requires: php-reflection @@ -91,10 +91,10 @@ EOF : Run test suite ret=0 -for cmd in php php71 php72 php73 php74; do +for cmd in php php73 php74 php80; do if which $cmd; then $cmd -d include_path=".:%{buildroot}%{_datadir}/php:%{_datadir}/php" \ - %{_bindir}/phpunit6 \ + %{_bindir}/phpunit8 \ --verbose || ret=1 fi done @@ -112,6 +112,10 @@ exit $ret %changelog +* Tue Jun 2 2020 Remi Collet - 1.3.1-1 +- update to 1.3.1 (no change) +- switch to phpunit8 + * Wed Nov 13 2019 Remi Collet - 1.3.0-1 - update to 1.3.0 @@ -160,4 +164,4 @@ exit $ret - update to 1.0.3 * Mon Aug 25 2014 Remi Collet - 1.0.2-1 -- initial package, version 1.0.2 \ No newline at end of file +- initial package, version 1.0.2 diff --git a/sources b/sources index 5469180..ef6ac57 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-doctrine-instantiator-1.3.0-ae466f7.tgz) = 880ae286ea0895f1ccc96f0fd8756f50bd8c4dfce35ec331aa3158250cd1168366e877dd32a8c849a0aeabc495465de1d8e5a880ba49f62811f21dd17f334424 +SHA512 (php-doctrine-instantiator-1.3.1-f350df0.tgz) = 27c7d77c3af4c03a8e9be93e3835baa2e3343d88ca1baedd44eba294725dcc69bf92a9b2b0013d9ccce75599302f2b698f2dac28beae86ba04215b37898ca2d0