summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-01-23 08:27:59 +0100
committerRemi Collet <remi@remirepo.net>2018-01-23 08:27:59 +0100
commit3dad83101cecd5d4aa46853c898990680cac6e2f (patch)
treeea49de9c4e2e5c9580453757fbccb5dc134dc3e5
parent2a652359a2338e205660c2b7bde8d9a4c95a95ee (diff)
Update to 2.8.1
add dependency on zend-servicemanager only use phpunit6
-rw-r--r--composer.json16
-rw-r--r--php-zendframework-zend-inputfilter.spec40
2 files changed, 23 insertions, 33 deletions
diff --git a/composer.json b/composer.json
index a2a3e68..0a78d1c 100644
--- a/composer.json
+++ b/composer.json
@@ -12,8 +12,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.8-dev",
- "dev-develop": "2.9-dev"
+ "dev-master": "2.8.x-dev",
+ "dev-develop": "2.9.x-dev"
},
"zf": {
"component": "Zend\\InputFilter",
@@ -32,15 +32,12 @@
"php": "^5.6 || ^7.0",
"zendframework/zend-filter": "^2.6",
"zendframework/zend-stdlib": "^2.7 || ^3.0",
- "zendframework/zend-validator": "^2.10.1"
+ "zendframework/zend-validator": "^2.10.1",
+ "zendframework/zend-servicemanager": "^2.7.10 || ^3.3.1"
},
"require-dev": {
"phpunit/phpunit": "^5.7.23 || ^6.4.3",
- "zendframework/zend-coding-standard": "~1.0.0",
- "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
- },
- "suggest": {
- "zendframework/zend-servicemanager": "To support plugin manager support"
+ "zendframework/zend-coding-standard": "~1.0.0"
},
"autoload": {
"psr-4": {
@@ -60,7 +57,6 @@
"cs-check": "phpcs",
"cs-fix": "phpcbf",
"test": "phpunit --colors=always",
- "test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
- "upload-coverage": "coveralls -v"
+ "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
}
}
diff --git a/php-zendframework-zend-inputfilter.spec b/php-zendframework-zend-inputfilter.spec
index fbc9322..eba1262 100644
--- a/php-zendframework-zend-inputfilter.spec
+++ b/php-zendframework-zend-inputfilter.spec
@@ -1,13 +1,13 @@
# remirepo/Fedora spec file for php-zendframework-zend-inputfilter
#
-# Copyright (c) 2015-2017 Remi Collet
+# Copyright (c) 2015-2018 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
# Please, preserve the changelog entries
#
%global bootstrap 0
-%global gh_commit e7edd625f2fcdd72a719a7023114c5f4b4f38488
+%global gh_commit 55d1430db559e9781b147e73c2c0ce6635d8efe2
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner zendframework
%global gh_project zend-inputfilter
@@ -20,7 +20,7 @@
%endif
Name: php-%{gh_owner}-%{gh_project}
-Version: 2.8.0
+Version: 2.8.1
Release: 2%{?dist}
Summary: Zend Framework %{library} component
@@ -38,17 +38,11 @@ BuildRequires: php-spl
BuildRequires: php-autoloader(%{gh_owner}/zend-filter) >= 2.5
BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.5
BuildRequires: php-autoloader(%{gh_owner}/zend-validator) >= 2.10.1
+BuildRequires: php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.10
# From composer, "require-dev": {
# "phpunit/phpunit": "^5.7.23 || ^6.4.3",
-# "zendframework/zend-coding-standard": "~1.0.0",
-# "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
-BuildRequires: php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5
-%if 0%{?fedora} >= 26
-%global phpunit %{_bindir}/phpunit6
-%else
-%global phpunit %{_bindir}/phpunit
-%endif
-BuildRequires: %{phpunit}
+# "zendframework/zend-coding-standard": "~1.0.0"
+BuildRequires: phpunit6 >= 6.4.3
%endif
# Autoloader
BuildRequires: php-fedora-autoloader-devel
@@ -58,6 +52,7 @@ BuildRequires: php-fedora-autoloader-devel
# "zendframework/zend-filter": "^2.6",
# "zendframework/zend-stdlib": "^2.7 || ^3.0"
# "zendframework/zend-validator": "^2.10.1",
+# "zendframework/zend-servicemanager": "^2.7.10 || ^3.3.1"
Requires: php(language) >= 5.6
%if ! %{bootstrap}
Requires: php-autoloader(%{gh_owner}/zend-filter) >= 2.6
@@ -66,11 +61,8 @@ Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7
Requires: php-autoloader(%{gh_owner}/zend-stdlib) < 4
Requires: php-autoloader(%{gh_owner}/zend-validator) >= 2.10.1
Requires: php-autoloader(%{gh_owner}/zend-validator) < 3
-# From composer, "suggest": {
-# "zendframework/zend-servicemanager": "To support plugin manager support"
-%if 0%{?fedora} >= 21
-Suggests: php-autoloader(%{gh_owner}/zend-servicemanager)
-%endif
+Requires: php-autoloader(%{gh_owner}/zend-servicemanager) < 4
+Requires: php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.10
%endif
# Autoloader
Requires: php-composer(fedora/autoloader)
@@ -125,13 +117,10 @@ require_once '%{buildroot}%{php_home}/Zend/%{library}/autoload.php';
\Fedora\Autoloader\Autoload::addPsr4('ZendTest\\%{library}\\', dirname(__DIR__) . '/test');
EOF
-# https://github.com/zendframework/zend-inputfilter/pull/141
-sed -e 's/PHPUnit_Framework_TestCase/PHPUnit\\Framework\\TestCase/' -i test/ConfigProviderTest.php
ret=0
-for cmdarg in "php %{phpunit}" "php56 %{_bindir}/phpunit" php70 php71 php72; do
- if which $cmdarg; then
- set $cmdarg
- $1 ${2:-%{_bindir}/phpunit6} --verbose || ret=1
+for cmd in php php70 php71 php72; do
+ if which $cmd; then
+ $cmd %{_bindir}/phpunit6 --verbose || ret=1
fi
done
exit $ret
@@ -149,6 +138,11 @@ exit $ret
%changelog
+* Tue Jan 23 2018 Remi Collet <remi@remirepo.net> - 2.8.1-2
+- Update to 2.8.1
+- add dependency on zend-servicemanager
+- only use phpunit6
+
* Thu Dec 7 2017 Remi Collet <remi@remirepo.net> - 2.8.0-2
- switch from zend-loader to fedora/autoloader