summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-04-11 13:14:15 +0200
committerRemi Collet <remi@remirepo.net>2018-04-11 13:14:15 +0200
commite8450bba4f439aa0f53f1f25ec5a1339a25e8d1e (patch)
tree4ef574fae0ee071e5b08729075db2d52fb37db8f
parent9a195f12b3d4251a57a4f4e4719a37426fb11ccb (diff)
only phpunit6
-rw-r--r--php-zendframework-zend-db.spec13
1 files changed, 1 insertions, 12 deletions
diff --git a/php-zendframework-zend-db.spec b/php-zendframework-zend-db.spec
index f063b0f..09d0a63 100644
--- a/php-zendframework-zend-db.spec
+++ b/php-zendframework-zend-db.spec
@@ -19,16 +19,11 @@
%global with_tests 0%{!?_without_tests:1}
%endif
-# TODO: cannot use phpunit6 for now
-# PHP Fatal error: Declaration of ZendTest\Db\IntegrationTestListener::addError(PHPUnit_Framework_Test $test, Exception $e, $time)
-# must be compatible with PHPUnit\Framework\TestListener::addError(PHPUnit\Framework\Test $test, Exception $e, $time) ...
-
Name: php-%{gh_owner}-%{gh_project}
Version: 2.9.3
Release: 2%{?dist}
Summary: Zend Framework %{library} component
-Group: Development/Libraries
License: BSD
URL: https://zendframework.github.io/%{gh_project}/
Source0: %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz
@@ -52,13 +47,8 @@ BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7
BuildRequires: php-autoloader(%{gh_owner}/zend-eventmanager) >= 2.6.2
BuildRequires: php-autoloader(%{gh_owner}/zend-hydrator) >= 1.1
BuildRequires: php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5
-%if 0%{?fedora} >= 26
%global phpunit %{_bindir}/phpunit6
BuildRequires: phpunit6 >= 6.4.4
-%else
-%global phpunit %{_bindir}/phpunit
-BuildRequires: php-phpunit-PHPUnit >= 5.7.25
-%endif
%endif
# Autoloader
BuildRequires: php-fedora-autoloader-devel
@@ -73,12 +63,10 @@ Requires: php-autoloader(%{gh_owner}/zend-stdlib) < 4
# From composer, "suggest": {
# "zendframework/zend-eventmanager": "Zend\\EventManager component",
# "zendframework/zend-servicemanager": "Zend\\ServiceManager component"
-%if 0%{?fedora} >= 21
Suggests: php-autoloader(%{gh_owner}/zend-eventmanager)
Suggests: php-autoloader(%{gh_owner}/zend-hydrator)
Suggests: php-autoloader(%{gh_owner}/zend-servicemanager)
%endif
-%endif
# Autoloader
Requires: php-composer(fedora/autoloader)
# From phpcompatinfo report for version 2.6.2
@@ -164,6 +152,7 @@ exit $ret
%changelog
* Wed Apr 11 2018 Remi Collet <remi@remirepo.net> - 2.9.3-2
- update to 2.9.3
+- only use phpunit6
* Tue Dec 12 2017 Remi Collet <remi@remirepo.net> - 2.9.2-1
- Update to 2.9.2