summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-03-23 12:37:04 +0100
committerRemi Collet <remi@remirepo.net>2018-03-23 12:37:04 +0100
commitc622703d84b241249ac0eec20bfa7e6f90a08cba (patch)
treecd5e7e1ecb443927c89a7c212310a95fc052bc15
parent1d7c14e406819591e3b4bd6253a74b1f33912a9f (diff)
switch to phpunit6 and php-mock2
-rw-r--r--php-zendframework-zend-session.spec19
1 files changed, 9 insertions, 10 deletions
diff --git a/php-zendframework-zend-session.spec b/php-zendframework-zend-session.spec
index 07d8583..961bf78 100644
--- a/php-zendframework-zend-session.spec
+++ b/php-zendframework-zend-session.spec
@@ -21,7 +21,7 @@
Name: php-%{gh_owner}-%{gh_project}
Version: 2.8.5
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Zend Framework %{library} component
License: BSD
@@ -59,10 +59,7 @@ BuildRequires: (php-autoloader(%{gh_owner}/zend-db) >= 2.7 wit
BuildRequires: (php-autoloader(%{gh_owner}/zend-http) >= 2.5.4 with php-autoloader(%{gh_owner}/zend-http) < 3)
BuildRequires: (php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5 with php-autoloader(%{gh_owner}/zend-servicemanager) < 4)
BuildRequires: (php-autoloader(%{gh_owner}/zend-validator) >= 2.6 with php-autoloader(%{gh_owner}/zend-validator) < 3)
-# 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) >= 1.1.2 with php-composer(php-mock/php-mock-phpunit) < 2)
-# remirepo:11
+# remirepo:9
%else
BuildRequires: php-composer(container-interop/container-interop) < 2
BuildRequires: php-composer(container-interop/container-interop) >= 1.1
@@ -71,10 +68,9 @@ BuildRequires: php-autoloader(%{gh_owner}/zend-db) >= 2.7
BuildRequires: php-autoloader(%{gh_owner}/zend-http) >= 2.5.4
BuildRequires: php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5
BuildRequires: php-autoloader(%{gh_owner}/zend-validator) >= 2.6
-BuildRequires: php-composer(php-mock/php-mock-phpunit) < 2
-BuildRequires: php-composer(php-mock/php-mock-phpunit) >= 1.1.2
%endif
-BuildRequires: php-phpunit-PHPUnit >= 5.7.15
+BuildRequires: phpunit6
+BuildRequires: php-mock-phpunit2 >= 2.1.0
%endif
# Autoloader
BuildRequires: php-fedora-autoloader-devel
@@ -174,7 +170,7 @@ cat << 'EOF' | tee vendor/autoload.php
<?php
require_once '%{buildroot}%{php_home}/Zend/%{library}/autoload.php';
\Fedora\Autoloader\Dependencies::required([
- '%{php_home}/phpmock/autoload.php',
+ '%{php_home}/phpmock2/phpunit/autoload.php',
]);
\Fedora\Autoloader\Autoload::addPsr4('ZendTest\\%{library}\\', dirname(__DIR__) . '/test');
require_once __DIR__ . '/../test/autoload.php';
@@ -183,7 +179,7 @@ EOF
ret=0
for cmd in php php70 php71 php72; do
if which $cmd; then
- $cmd %{_bindir}/phpunit --verbose || ret=1
+ $cmd %{_bindir}/phpunit6 --verbose || ret=1
fi
done
exit $ret
@@ -201,6 +197,9 @@ exit $ret
%changelog
+* Fri Mar 23 2018 Remi Collet <remi@remirepo.net> - 2.8.5-2
+- switch to phpunit6 and php-mock2
+
* Fri Feb 23 2018 Remi Collet <remi@remirepo.net> - 2.8.5-1
- Update to 2.8.5 (no change)
- use range dependencies on F27+