summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-05-03 13:02:33 +0200
committerRemi Collet <remi@remirepo.net>2018-05-03 13:02:33 +0200
commit2585760220f460c1d6662f6607efb67463f5cba6 (patch)
tree35c7d73cf12751ce1a55f7281c7997cc035e4f31
parentc54e94d87910e59bb5138293f19f9067103bd8fa (diff)
update to 1.1.0HEADmaster
raise dependency on zend-session 2.8.5 add dependency on zend-view use range dependencies on F27+ switch to phpunit6 or phpunit7
-rw-r--r--composer.json62
-rw-r--r--php-zendframework-zend-mvc-plugin-flashmessenger.spec77
2 files changed, 101 insertions, 38 deletions
diff --git a/composer.json b/composer.json
index ec50175..2329b34 100644
--- a/composer.json
+++ b/composer.json
@@ -1,19 +1,34 @@
{
"name": "zendframework/zend-mvc-plugin-flashmessenger",
- "description": " ",
+ "description": "Plugin for creating and exposing flash messages via zend-mvc controllers",
"license": "BSD-3-Clause",
"keywords": [
- "zf2",
+ "zf",
+ "zendframework",
"mvc"
],
- "homepage": "https://github.com/zendframework/zend-mvc-plugin-flashmessenger",
- "extra": {
- "branch-alias": {
- "dev-master": "1.0-dev"
- },
- "zf": {
- "component": "Zend\\Mvc\\Plugin\\FlashMessenger"
- }
+ "support": {
+ "docs": "https://docs.zendframework.com/zend-mvc-plugin-flashmessenger/",
+ "issues": "https://github.com/zendframework/zend-mvc-plugin-flashmessenger/issues",
+ "source": "https://github.com/zendframework/zend-mvc-plugin-flashmessenger",
+ "rss": "https://github.com/zendframework/zend-mvc-plugin-flashmessenger/releases.atom",
+ "chat": "https://zendframework-slack.herokuapp.com",
+ "forum": "https://discourse.zendframework.com/c/questions/components"
+ },
+ "require": {
+ "php": "^5.6 || ^7.0",
+ "zendframework/zend-mvc": "^3.0",
+ "zendframework/zend-session": "^2.8.5",
+ "zendframework/zend-stdlib": "^2.7 || ^3.0",
+ "zendframework/zend-view": "^2.10"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
+ "zendframework/zend-coding-standard": "~1.0.0",
+ "zendframework/zend-i18n": "^2.8"
+ },
+ "conflict": {
+ "zendframework/zend-mvc": "<3.0.0"
},
"autoload": {
"psr-4": {
@@ -25,28 +40,29 @@
"ZendTest\\Mvc\\Plugin\\FlashMessenger\\": "test/"
}
},
- "require": {
- "php": "^5.6 || ^7.0",
- "zendframework/zend-mvc": "^3.0",
- "zendframework/zend-session": "^2.6.2",
- "zendframework/zend-stdlib": "^2.7 || ^3.0"
+ "config": {
+ "sort-packages": true
},
- "require-dev": {
- "phpunit/PHPUnit": "^4.5",
- "squizlabs/php_codesniffer": "^2.3.1"
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.1.x-dev",
+ "dev-develop": "1.2.x-dev"
+ },
+ "zf": {
+ "component": "Zend\\Mvc\\Plugin\\FlashMessenger"
+ }
},
- "conflict": {
- "zendframework/zend-mvc": "<3.0.0"
+ "suggests": {
+ "zendframework/zend-i18n": "Zend\\I18n component"
},
"scripts": {
"check": [
"@cs-check",
"@test"
],
- "upload-coverage": "coveralls",
"cs-check": "phpcs",
"cs-fix": "phpcbf",
- "test": "phpunit",
- "test-coverage": "phpunit --coverage-clover clover.xml"
+ "test": "phpunit --colors=always",
+ "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
}
}
diff --git a/php-zendframework-zend-mvc-plugin-flashmessenger.spec b/php-zendframework-zend-mvc-plugin-flashmessenger.spec
index d1c481c..77fa3f0 100644
--- a/php-zendframework-zend-mvc-plugin-flashmessenger.spec
+++ b/php-zendframework-zend-mvc-plugin-flashmessenger.spec
@@ -1,13 +1,13 @@
# remirepo/Fedora spec file for php-zendframework-zend-mvc-plugin-flashmessenger
#
-# Copyright (c) 2016-2017 Remi Collet
+# Copyright (c) 2016-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 712bffa12c955a06d1e4303ab90026486b5b8586
+%global gh_commit 1af2e2d69500da5ca31868c4817b6b7eb7e1cf47
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner zendframework
%global gh_project zend-mvc-plugin-flashmessenger
@@ -20,8 +20,8 @@
%endif
Name: php-%{gh_owner}-%{gh_project}
-Version: 1.0.0
-Release: 4%{?dist}
+Version: 1.1.0
+Release: 1%{?dist}
Summary: Zend Framework Mvc-Plugin-%{library} component
Group: Development/Libraries
@@ -39,9 +39,33 @@ BuildRequires: php-autoloader(%{gh_owner}/zend-session) >= 2.6.2
BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7.5
BuildRequires: php-spl
# From composer, "require-dev": {
-# "phpunit/PHPUnit": "^4.5",
-# "squizlabs/php_codesniffer": "^2.3.1"
-BuildRequires: php-composer(phpunit/phpunit) >= 4.5
+# "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
+# "zendframework/zend-coding-standard": "~1.0.0",
+# "zendframework/zend-i18n": "^2.8"
+# remirepo:1
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+BuildRequires: (php-autoloader(%{gh_owner}/zend-mvc) >= 3.0 with php-autoloader(%{gh_owner}/zend-mvc) < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/zend-session) >= 2.8.5 with php-autoloader(%{gh_owner}/zend-session) < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 with php-autoloader(%{gh_owner}/zend-stdlib) < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/zend-view) >= 2.10 with php-autoloader(%{gh_owner}/zend-view) < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/zend-i18n) >= 2.8 with php-autoloader(%{gh_owner}/zend-i18n) < 3)
+%global phpunit %{_bindir}/phpunit7
+BuildRequires: phpunit7 >= 7.1.4
+# remirepo:14
+%else
+BuildRequires: php-autoloader(%{gh_owner}/zend-mvc) < 4
+BuildRequires: php-autoloader(%{gh_owner}/zend-mvc) >= 3.0
+BuildRequires: php-autoloader(%{gh_owner}/zend-session) < 3
+BuildRequires: php-autoloader(%{gh_owner}/zend-session) >= 2.8.5
+BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) < 4
+BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7
+BuildRequires: php-autoloader(%{gh_owner}/zend-view) < 3
+BuildRequires: php-autoloader(%{gh_owner}/zend-view) >= 2.10
+BuildRequires: php-autoloader(%{gh_owner}/zend-i18n) < 3
+BuildRequires: php-autoloader(%{gh_owner}/zend-i18n) >= 2.8
+%global phpunit %{_bindir}/phpunit6
+BuildRequires: phpunit6 >= 6.5.8
+%endif
%endif
# Autoloader
BuildRequires: php-fedora-autoloader-devel
@@ -49,15 +73,30 @@ BuildRequires: php-fedora-autoloader-devel
# From composer, "require": {
# "php": "^5.6 || ^7.0",
# "zendframework/zend-mvc": "^3.0",
-# "zendframework/zend-session": "^2.6.2",
-# "zendframework/zend-stdlib": "^2.7 || ^3.0"
+# "zendframework/zend-session": "^2.8.5",
+# "zendframework/zend-stdlib": "^2.7 || ^3.0",
+# "zendframework/zend-view": "^2.10"
Requires: php(language) >= 5.6
-Requires: php-autoloader(%{gh_owner}/zend-mvc) >= 3.0
+# remirepo:1
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+Requires: (php-autoloader(%{gh_owner}/zend-mvc) >= 3.0 with php-autoloader(%{gh_owner}/zend-mvc) < 4)
+Requires: (php-autoloader(%{gh_owner}/zend-session) >= 2.8.5 with php-autoloader(%{gh_owner}/zend-session) < 3)
+Requires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 with php-autoloader(%{gh_owner}/zend-stdlib) < 4)
+Requires: (php-autoloader(%{gh_owner}/zend-view) >= 2.10 with php-autoloader(%{gh_owner}/zend-view) < 3)
+# remirepo:10
+%else
Requires: php-autoloader(%{gh_owner}/zend-mvc) < 4
-Requires: php-autoloader(%{gh_owner}/zend-session) >= 2.6.2
+Requires: php-autoloader(%{gh_owner}/zend-mvc) >= 3.0
Requires: php-autoloader(%{gh_owner}/zend-session) < 3
-Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7
+Requires: php-autoloader(%{gh_owner}/zend-session) >= 2.8.5
Requires: php-autoloader(%{gh_owner}/zend-stdlib) < 4
+Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7
+Requires: php-autoloader(%{gh_owner}/zend-view) < 3
+Requires: php-autoloader(%{gh_owner}/zend-view) >= 2.10
+%endif
+# From composer, "suggests": {
+# "zendframework/zend-i18n": "Zend\\I18n component"
+Suggests: php-autoloader(%{gh_owner}/zend-i18n)
# Autoloader
Requires: php-composer(fedora/autoloader)
# From phpcompatinfo report for version 1.0.0
@@ -113,9 +152,10 @@ require_once '%{buildroot}%{php_home}/Zend/Mvc/Plugin/%{library}/autoload.php';
EOF
ret=0
-for cmd in php php56 php70 php71 php72; do
- if which $cmd; then
- $cmd %{_bindir}/phpunit || ret=1
+for cmdarg in "php %{phpunit}" "php70 %{_bindir}/phpunit6" php71 php72; do
+ if which $cmdarg; then
+ set $cmdarg
+ $1 ${2:-%{_bindir}/phpunit7} --verbose || ret=1
fi
done
exit $ret
@@ -133,6 +173,13 @@ exit $ret
%changelog
+* Thu May 3 2018 Remi Collet <remi@remirepo.net> - 1.1.0-1
+- update to 1.1.0
+- raise dependency on zend-session 2.8.5
+- add dependency on zend-view
+- use range dependencies on F27+
+- switch to phpunit6 or phpunit7
+
* Wed Dec 13 2017 Remi Collet <remi@remirepo.net> - 1.0.0-4
- switch from zend-loader to fedora/autoloader