diff options
| -rw-r--r-- | composer.json | 59 | ||||
| -rw-r--r-- | php-zendframework-zend-mvc-plugin-prg.spec | 63 |
2 files changed, 81 insertions, 41 deletions
diff --git a/composer.json b/composer.json index d7f67be..09aa0fa 100644 --- a/composer.json +++ b/composer.json @@ -1,19 +1,32 @@ { "name": "zendframework/zend-mvc-plugin-prg", - "description": " ", + "description": "Post/Redirect/Get plugin for zend-mvc controllers", "license": "BSD-3-Clause", "keywords": [ - "zf2", + "zf", + "zendframework", "mvc" ], - "homepage": "https://github.com/zendframework/zend-mvc-plugin-prg", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - }, - "zf": { - "component": "Zend\\Mvc\\Plugin\\Prg" - } + "support": { + "docs": "https://docs.zendframework.com/zend-mvc-plugin-prg/", + "issues": "https://github.com/zendframework/zend-mvc-plugin-prg/issues", + "source": "https://github.com/zendframework/zend-mvc-plugin-prg", + "rss": "https://github.com/zendframework/zend-mvc-plugin-prg/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" + }, + "require-dev": { + "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4", + "zendframework/zend-coding-standard": "~1.0.0" + }, + "conflict": { + "zendframework/zend-mvc": "<3.0.0" }, "autoload": { "psr-4": { @@ -25,28 +38,26 @@ "ZendTest\\Mvc\\Plugin\\Prg\\": "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" - }, - "require-dev": { - "phpunit/PHPUnit": "^4.5", - "squizlabs/php_codesniffer": "^2.3.1" + "config": { + "sort-packages": true }, - "conflict": { - "zendframework/zend-mvc": "<3.0.0" + "extra": { + "branch-alias": { + "dev-master": "1.1.x-dev", + "dev-develop": "1.2.x-dev" + }, + "zf": { + "component": "Zend\\Mvc\\Plugin\\Prg" + } }, "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-prg.spec b/php-zendframework-zend-mvc-plugin-prg.spec index 752ee23..2d88b2c 100644 --- a/php-zendframework-zend-mvc-plugin-prg.spec +++ b/php-zendframework-zend-mvc-plugin-prg.spec @@ -1,13 +1,13 @@ # remirepo/Fedora spec file for php-zendframework-zend-mvc-plugin-prg # -# 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 8c7ccb9f0004e92ff258b483447d914f42cb7448 +%global gh_commit 9b9d555f936002b90f14fbbfe477e734601307b2 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-mvc-plugin-prg @@ -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 @@ -34,13 +34,27 @@ BuildArch: noarch # Tests %if %{with_tests} BuildRequires: php(language) >= 5.6 -BuildRequires: php-autoloader(%{gh_owner}/zend-mvc) >= 3.0 -BuildRequires: php-autoloader(%{gh_owner}/zend-session) >= 2.6.2 -BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7.5 # 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" +# 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) +%global phpunit %{_bindir}/phpunit7 +BuildRequires: phpunit7 >= 7.1.4 +# remirepo:10 +%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 +%global phpunit %{_bindir}/phpunit6 +BuildRequires: phpunit6 >= 6.5.8 +%endif %endif # Autoloader BuildRequires: php-fedora-autoloader-devel @@ -48,15 +62,23 @@ 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-session": "^2.8.5", # "zendframework/zend-stdlib": "^2.7 || ^3.0" 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) +# remirepo:8 +%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 +%endif # Autoloader Requires: php-composer(fedora/autoloader) # From phpcompatinfo report for version 1.0.0 @@ -107,9 +129,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 @@ -127,6 +150,12 @@ 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 +- 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 |