diff options
| -rw-r--r-- | composer.json | 51 | ||||
| -rw-r--r-- | php-zendframework-zend-tag.spec | 62 |
2 files changed, 79 insertions, 34 deletions
diff --git a/composer.json b/composer.json index b3d5ecf..d6ae116 100644 --- a/composer.json +++ b/composer.json @@ -1,41 +1,60 @@ { "name": "zendframework/zend-tag", - "description": "a component suite which provides a facility to work with taggable Items", + "description": "Manipulate and weight taggable items, and create tag clouds", "license": "BSD-3-Clause", "keywords": [ - "zf2", + "zf", + "zendframework", "tag" ], - "homepage": "https://github.com/zendframework/zend-tag", - "autoload": { - "psr-4": { - "Zend\\Tag\\": "src/" - } + "support": { + "docs": "https://docs.zendframework.com/zend-tag/", + "issues": "https://github.com/zendframework/zend-tag/issues", + "source": "https://github.com/zendframework/zend-tag", + "rss": "https://github.com/zendframework/zend-tag/releases.atom", + "chat": "https://zendframework-slack.herokuapp.com", + "forum": "https://discourse.zendframework.com/c/questions/components" }, "require": { - "php": "^5.5 || ^7.0", + "php": "^5.6 || ^7.0", "zendframework/zend-escaper": "^2.5", "zendframework/zend-stdlib": "^2.7 || ^3.0" }, "require-dev": { "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/PHPUnit": "~4.0" + "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4", + "zendframework/zend-coding-standard": "~1.0.0" }, "suggest": { "zendframework/zend-servicemanager": "Zend\\ServiceManager component" }, - "minimum-stability": "dev", - "prefer-stable": true, - "extra": { - "branch-alias": { - "dev-master": "2.6-dev", - "dev-develop": "2.7-dev" + "autoload": { + "psr-4": { + "Zend\\Tag\\": "src/" } }, "autoload-dev": { "psr-4": { "ZendTest\\Tag\\": "test/" } + }, + "config": { + "sort-packages": true + }, + "extra": { + "branch-alias": { + "dev-master": "2.7.x-dev", + "dev-develop": "2.8.x-dev" + } + }, + "scripts": { + "check": [ + "@cs-check", + "@test" + ], + "cs-check": "phpcs", + "cs-fix": "phpcbf", + "test": "phpunit --colors=always", + "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" } } diff --git a/php-zendframework-zend-tag.spec b/php-zendframework-zend-tag.spec index ce3f8b5..6bde8a7 100644 --- a/php-zendframework-zend-tag.spec +++ b/php-zendframework-zend-tag.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 4429ca5016361f12eff920370170391a0f4adbff +%global gh_commit 2212dfae37dd6158a435df551186bd11b8eea011 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-tag @@ -20,8 +20,8 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 2.6.1 -Release: 4%{?dist} +Version: 2.7.0 +Release: 2%{?dist} Summary: Zend Framework %{library} component Group: Development/Libraries @@ -33,37 +33,56 @@ Source1: makesrc.sh BuildArch: noarch # Tests %if %{with_tests} -BuildRequires: php(language) >= 5.5 +BuildRequires: php(language) >= 5.6 BuildRequires: php-pcre BuildRequires: php-spl -BuildRequires: php-autoloader(%{gh_owner}/zend-escaper) >= 2.5 -BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 # From composer, "require-dev": { # "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", -# "fabpot/php-cs-fixer": "1.7.*", -# "phpunit/PHPUnit": "~4.0" +# "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-escaper) >= 2.5 with php-autoloader(%{gh_owner}/zend-escaper) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5 with php-autoloader(%{gh_owner}/zend-servicemanager) < 4) +%global phpunit %{_bindir}/phpunit7 +BuildRequires: phpunit7 >= 7.1.4 +# remirepo:10 +%else +BuildRequires: php-autoloader(%{gh_owner}/zend-escaper) < 3 +BuildRequires: php-autoloader(%{gh_owner}/zend-escaper) >= 2.5 +BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 +BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 +BuildRequires: php-autoloader(%{gh_owner}/zend-servicemanager) < 4 BuildRequires: php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5 -BuildRequires: php-composer(phpunit/phpunit) >= 4.0 +%global phpunit %{_bindir}/phpunit6 +BuildRequires: phpunit6 >= 6.5.8 +%endif %endif # Autoloader BuildRequires: php-fedora-autoloader-devel # From composer, "require": { -# "php": "^5.5 || ^7.0", +# "php": "^5.6 || ^7.0", # "zendframework/zend-escaper": "^2.5", # "zendframework/zend-stdlib": "^2.7 || ^3.0" -Requires: php(language) >= 5.5 +Requires: php(language) >= 5.6 %if ! %{bootstrap} -Requires: php-autoloader(%{gh_owner}/zend-escaper) >= 2.5 +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Requires: (php-autoloader(%{gh_owner}/zend-escaper) >= 2.5 with php-autoloader(%{gh_owner}/zend-escaper) < 3) +Requires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) +# remirepo:6 +%else Requires: php-autoloader(%{gh_owner}/zend-escaper) < 3 -Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 +Requires: php-autoloader(%{gh_owner}/zend-escaper) >= 2.5 Requires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 +Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 +%endif # From composer, "suggest": { # "zendframework/zend-servicemanager": "Zend\\ServiceManager component" -%if 0%{?fedora} >= 21 Suggests: php-autoloader(%{gh_owner}/servicemanager) %endif -%endif # Autoloader Requires: php-composer(fedora/autoloader) # From phpcompatinfo report for version 2.5.1 @@ -120,9 +139,10 @@ require_once '%{buildroot}%{php_home}/Zend/%{library}/autoload.php'; EOF ret=0 -for cmd in php php56 php70 php71 php72; do - if which $cmd; then - $cmd %{_bindir}/phpunit --verbose || ret=1 +for cmdarg in "php %{phpunit}" "php56 %{_bindir}/phpunit" "php70 %{_bindir}/phpunit6" php71 php72; do + if which $cmdarg; then + set $cmdarg + $1 ${2:-%{_bindir}/phpunit7} --verbose || ret=1 fi done exit $ret @@ -140,6 +160,12 @@ exit $ret %changelog +* Thu May 3 2018 Remi Collet <remi@remirepo.net> - 2.7.0-2 +- update to 2.7.0 +- raise dependency on PHP 5.6 +- use range dependencies on F27+ +- switch to phpunit6 or phpunit7 + * Wed Dec 6 2017 Remi Collet <remi@remirepo.net> - 2.6.1-4 - switch from zend-loader to fedora/autoloader |