diff options
| -rw-r--r-- | composer.json | 1 | ||||
| -rw-r--r-- | php-zendframework-zend-session.spec | 28 |
2 files changed, 18 insertions, 11 deletions
diff --git a/composer.json b/composer.json index 253ddb2..41700bf 100644 --- a/composer.json +++ b/composer.json @@ -23,6 +23,7 @@ "require-dev": { "container-interop/container-interop": "^1.1", "mongodb/mongodb": "^1.0.1", + "php-mock/php-mock-phpunit": "^1.1.2 || ^2.0", "phpunit/phpunit": "^5.7.15 || ^6.0.8", "zendframework/zend-cache": "^2.6.1", "zendframework/zend-coding-standard": "~1.0.0", diff --git a/php-zendframework-zend-session.spec b/php-zendframework-zend-session.spec index 93c84e7..265f51c 100644 --- a/php-zendframework-zend-session.spec +++ b/php-zendframework-zend-session.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 99e46960126cff4054916b6d339f562363e12367 +%global gh_commit 8552a165624cf3f9bda768e5a1d69c42cc471c4f %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-session @@ -20,7 +20,7 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 2.8.1 +Version: 2.8.2 Release: 1%{?dist} Summary: Zend Framework %{library} component @@ -44,6 +44,7 @@ BuildRequires: php-composer(%{gh_owner}/zend-stdlib) >= 2.5 # From composer, "require-dev": { # "container-interop/container-interop": "^1.1", # "mongodb/mongodb": "^1.0.1", +# "php-mock/php-mock-phpunit": "^1.1.2 || ^2.0", # "phpunit/phpunit": "^5.7.15 || ^6.0.8", # "zendframework/zend-cache": "^2.6.1", # "zendframework/zend-coding-standard": "~1.0.0", @@ -51,18 +52,18 @@ BuildRequires: php-composer(%{gh_owner}/zend-stdlib) >= 2.5 # "zendframework/zend-http": "^2.5.4", # "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", # "zendframework/zend-validator": "^2.6" +BuildRequires: php-composer(container-interop/container-interop) < 2 BuildRequires: php-composer(container-interop/container-interop) >= 1.1 +# v2 doesn't exist yet in repository +# TODO only PHPUnit 5 as php-mock v2 required by PHPUnit 6 +BuildRequires: php-composer(php-mock/php-mock-phpunit) < 2 +BuildRequires: php-composer(php-mock/php-mock-phpunit) >= 1.1.2 +BuildRequires: php-composer(phpunit/phpunit) >= 5.7.15 BuildRequires: php-composer(%{gh_owner}/zend-cache) >= 2.6.1 BuildRequires: php-composer(%{gh_owner}/zend-db) >= 2.7 BuildRequires: php-composer(%{gh_owner}/zend-http) >= 2.5.4 BuildRequires: php-composer(%{gh_owner}/zend-servicemanager) >= 2.7.5 BuildRequires: php-composer(%{gh_owner}/zend-validator) >= 2.6 -%if 0%{?fedora} >= 26 -%global phpunit %{_bindir}/phpunit6 -%else -%global phpunit %{_bindir}/phpunit -%endif -BuildRequires: %{phpunit} # Autoloader BuildRequires: php-composer(%{gh_owner}/zend-loader) >= 2.5 %endif @@ -135,6 +136,7 @@ rm test/SaveHandler/MongoDBTest.php mkdir vendor cat << 'EOF' | tee vendor/autoload.php <?php +# TODO php-mock found by PSR-0 rules require_once '%{php_home}/Zend/Loader/AutoloaderFactory.php'; Zend\Loader\AutoloaderFactory::factory(array( 'Zend\Loader\StandardAutoloader' => array( @@ -147,10 +149,9 @@ require_once __DIR__ . '/../test/autoload.php'; EOF ret=0 -for cmd in "php %{phpunit}" "php56 %{_bindir}/phpunit" php70 php71 php72; do +for cmd in php php56 php70 php71 php72; do if which $cmd; then - set $cmd - $1 ${2:-%{_bindir}/phpunit6} --verbose || ret=1 + $cmd %{_bindir}/phpunit --verbose || ret=1 fi done exit $ret @@ -168,6 +169,11 @@ exit $ret %changelog +* Thu Nov 30 2017 Remi Collet <remi@remirepo.net> - 2.8.2-1 +- Update to 2.8.2 +- only use PHPUnit 5 and php-mock-phpunit v1 + as PHPUnit 6 requires php-mock-phpunit v2 not available + * Wed Nov 29 2017 Remi Collet <remi@remirepo.net> - 2.8.1-1 - Update to 2.8.1 |