diff options
| -rw-r--r-- | composer.json | 20 | ||||
| -rw-r--r-- | php-zendframework-zend-uri.spec | 27 |
2 files changed, 31 insertions, 16 deletions
diff --git a/composer.json b/composer.json index c31bdf1..df542b9 100644 --- a/composer.json +++ b/composer.json @@ -13,14 +13,14 @@ } }, "require": { - "php": "^5.5 || ^7.0", + "php": "^5.6 || ^7.0", "zendframework/zend-escaper": "^2.5", "zendframework/zend-validator": "^2.5" }, "extra": { "branch-alias": { - "dev-master": "2.5-dev", - "dev-develop": "2.6-dev" + "dev-master": "2.6.x-dev", + "dev-develop": "2.7.x-dev" } }, "autoload-dev": { @@ -29,7 +29,17 @@ } }, "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/PHPUnit": "~4.0" + "phpunit/phpunit": "^6.2.1 || ^5.7.15", + "zendframework/zend-coding-standard": "~1.0.0" + }, + "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-uri.spec b/php-zendframework-zend-uri.spec index 80a9fd2..907febb 100644 --- a/php-zendframework-zend-uri.spec +++ b/php-zendframework-zend-uri.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 0bf717a239432b1a1675ae314f7c4acd742749ed +%global gh_commit fb998b9487ea8c5f4aaac0e536190709bdd5353b %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-uri @@ -20,8 +20,8 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 2.5.2 -Release: 4%{?dist} +Version: 2.6.0 +Release: 2%{?dist} Summary: Zend Framework %{library} component Group: Development/Libraries @@ -33,24 +33,24 @@ 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-validator) >= 2.5 # From composer, "require-dev": { -# "fabpot/php-cs-fixer": "1.7.*", -# "phpunit/PHPUnit": "~4.0" -BuildRequires: php-composer(phpunit/phpunit) >= 4.0 +# "phpunit/phpunit": "^6.2.1 || ^5.7.15", +# "zendframework/zend-coding-standard": "~1.0.0" +BuildRequires: phpunit6 >= 6.2.1 %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-validator": "^2.5" -Requires: php(language) >= 5.5 +Requires: php(language) >= 5.6 %if ! %{bootstrap} Requires: php-autoloader(%{gh_owner}/zend-escaper) >= 2.5 Requires: php-autoloader(%{gh_owner}/zend-escaper) < 3 @@ -109,9 +109,9 @@ require_once '%{buildroot}%{php_home}/Zend/%{library}/autoload.php'; EOF ret=0 -for cmd in php php56 php70 php71 php72; do +for cmd in php php70 php71 php72; do if which $cmd; then - $cmd %{_bindir}/phpunit --include-path=%{buildroot}%{php_home} || ret=1 + $cmd %{_bindir}/phpunit6 --include-path=%{buildroot}%{php_home} || ret=1 fi done exit $ret @@ -129,6 +129,11 @@ exit $ret %changelog +* Wed Apr 11 2018 Remi Collet <remi@remirepo.net> - 2.6.0-1 +- update to 2.6.0 +- raise dependency on PHP 5.6 +- switch to phpunit6 + * Thu Dec 7 2017 Remi Collet <remi@remirepo.net> - 2.5.2-4 - switch from zend-loader to fedora/autoloader |