summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-01-18 08:13:39 +0100
committerRemi Collet <remi@remirepo.net>2018-01-18 08:13:39 +0100
commita9574f1dba8d5b6bbd0100198af1d9e09605815f (patch)
treefd125af6d61a55c834f60a418e92afe57d49be66
parente896d233f103cf5d0158023a5ae664dc0c4b5125 (diff)
Update to 2.10.0
only use phpunit6
-rw-r--r--composer.json14
-rw-r--r--php-zendframework-zend-view.spec31
2 files changed, 24 insertions, 21 deletions
diff --git a/composer.json b/composer.json
index cca4a7b..a8da6d8 100644
--- a/composer.json
+++ b/composer.json
@@ -39,8 +39,8 @@
"zendframework/zend-permissions-acl": "^2.6",
"zendframework/zend-router": "^3.0.1",
"zendframework/zend-serializer": "^2.6.1",
- "zendframework/zend-session": "^2.6.2",
"zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
+ "zendframework/zend-session": "^2.8.1",
"zendframework/zend-uri": "^2.5"
},
"suggest": {
@@ -61,15 +61,18 @@
"minimum-stability": "dev",
"prefer-stable": true,
"config": {
- "sort-packages": "true"
+ "sort-packages": true
},
"extra": {
"branch-alias": {
- "dev-master": "2.9-dev",
- "dev-develop": "3.0-dev"
+ "dev-master": "2.10.x-dev",
+ "dev-develop": "2.11.x-dev"
}
},
"autoload-dev": {
+ "files": [
+ "test/autoload.php"
+ ],
"psr-4": {
"ZendTest\\View\\": "test/"
}
@@ -85,7 +88,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-view.spec b/php-zendframework-zend-view.spec
index 674be21..feaa80a 100644
--- a/php-zendframework-zend-view.spec
+++ b/php-zendframework-zend-view.spec
@@ -1,13 +1,13 @@
# remirepo/Fedora spec file for php-zendframework-zend-view
#
-# 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 3b6342c381c4437a03fc81d0064c0bb8924914d3
+%global gh_commit 4478cc5dd960e2339d88b363ef99fa278700e80e
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner zendframework
%global gh_project zend-view
@@ -20,8 +20,8 @@
%endif
Name: php-%{gh_owner}-%{gh_project}
-Version: 2.9.0
-Release: 3%{?dist}
+Version: 2.10.0
+Release: 1%{?dist}
Summary: Zend Framework %{library} component
Group: Development/Libraries
@@ -63,8 +63,8 @@ BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.5
# "zendframework/zend-permissions-acl": "^2.6",
# "zendframework/zend-router": "^3.0.1",
# "zendframework/zend-serializer": "^2.6.1",
-# "zendframework/zend-session": "^2.6.2",
# "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
+# "zendframework/zend-session": "^2.8.1",
# "zendframework/zend-uri": "^2.5"
BuildRequires: php-composer(%{gh_owner}/zend-authentication) >= 2.5
BuildRequires: php-composer(%{gh_owner}/zend-cache) >= 2.6.1
@@ -84,15 +84,10 @@ BuildRequires: php-composer(%{gh_owner}/zend-paginator) >= 2.5
BuildRequires: php-composer(%{gh_owner}/zend-permissions-acl) >= 2.6
BuildRequires: php-composer(%{gh_owner}/zend-router) >= 3.0.1
BuildRequires: php-composer(%{gh_owner}/zend-serializer) >= 2.6.1
-BuildRequires: php-composer(%{gh_owner}/zend-session) >= 2.6.2
BuildRequires: php-composer(%{gh_owner}/zend-servicemanager) >= 2.7.5
+BuildRequires: php-composer(%{gh_owner}/zend-session) >= 2.8.1
BuildRequires: php-composer(%{gh_owner}/zend-uri) >= 2.5
-%if 0%{?fedora} >= 26
-%global phpunit %{_bindir}/phpunit6
-%else
-%global phpunit %{_bindir}/phpunit
-%endif
-BuildRequires: %{phpunit}
+BuildRequires: phpunit6
# Not in composer.json
%if 0%{?fedora} >= 26
BuildRequires: php-composer(%{gh_owner}/zend-mvc-plugin-flashmessenger)
@@ -243,14 +238,16 @@ require_once '%{buildroot}%{php_home}/Zend/%{library}/autoload.php';
'%{php_home}/Zend/Session/autoload.php',
'%{php_home}/Zend/autoload.php',
]);
+\Fedora\Autoloader\Dependencies::optional([
+ dirname(__DIR__) . '/test/autoload.php',
+]);
\Fedora\Autoloader\Autoload::addPsr4('ZendTest\\%{library}\\', dirname(__DIR__) . '/test');
EOF
ret=0
-for cmd in "php %{phpunit}" "php56 %{_bindir}/phpunit" php70 php71 php72; do
+for cmd in php php70 php71 php72; do
if which $cmd; then
- set $cmd
- $1 ${2:-%{_bindir}/phpunit6} --verbose || ret=1
+ $cmd %{_bindir}/phpunit6 --verbose || ret=1
fi
done
exit $ret
@@ -269,6 +266,10 @@ exit $ret
%changelog
+* Thu Jan 18 2018 Remi Collet <remi@remirepo.net> - 2.10.0-1
+- Update to 2.10.0
+- only use phpunit6
+
* Tue Dec 12 2017 Remi Collet <remi@remirepo.net> - 2.9.0-3
- switch from zend-loader to fedora/autoloader