From 1b1c81f7a41badd080c3c4f43216ad7c0f1ee030 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 22 May 2017 09:03:57 +0200 Subject: v2.7.4 --- .gitignore | 7 ++++++ composer.json | 19 ++++++++++++---- php-zendframework-zend-i18n.spec | 49 ++++++++++++++++++++++------------------ 3 files changed, 49 insertions(+), 26 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1ab5c4f --- /dev/null +++ b/.gitignore @@ -0,0 +1,7 @@ +package-*.xml +*.tgz +*.tar.gz +*.tar.xz +*.tar.xz.asc +*.src.rpm +*/*rpm diff --git a/composer.json b/composer.json index cfbc5a4..c9f6925 100644 --- a/composer.json +++ b/composer.json @@ -18,19 +18,19 @@ } }, "require": { - "php": "^5.5 || ^7.0", + "php": "^7.0 || ^5.6", "zendframework/zend-stdlib": "^2.7 || ^3.0" }, "require-dev": { + "phpunit/PHPUnit": "^6.0.8 || ^5.7.15", "zendframework/zend-cache": "^2.6.1", + "zendframework/zend-coding-standard": "~1.0.0", "zendframework/zend-config": "^2.6", "zendframework/zend-eventmanager": "^2.6.2 || ^3.0", "zendframework/zend-filter": "^2.6.1", "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", "zendframework/zend-validator": "^2.6", - "zendframework/zend-view": "^2.6.3", - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/PHPUnit": "~4.0" + "zendframework/zend-view": "^2.6.3" }, "suggest": { "ext-intl": "Required for most features of Zend\\I18n; included in default builds of PHP", @@ -52,5 +52,16 @@ "psr-4": { "ZendTest\\I18n\\": "test/" } + }, + "scripts": { + "check": [ + "@cs-check", + "@test" + ], + "cs-check": "phpcs", + "cs-fix": "phpcbf", + "test": "phpunit --colors=always", + "test-coverage": "phpunit --colors=always --coverage-clover clover.xml", + "upload-coverage": "coveralls -v" } } diff --git a/php-zendframework-zend-i18n.spec b/php-zendframework-zend-i18n.spec index b740abe..0b275e8 100644 --- a/php-zendframework-zend-i18n.spec +++ b/php-zendframework-zend-i18n.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit b2db0d8246a865c659f93199f90f5fc2cd2f3cd8 +%global gh_commit d3431e29cc00c2a1c6704e601d4371dbf24f6a31 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-i18n @@ -20,7 +20,7 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 2.7.3 +Version: 2.7.4 Release: 1%{?dist} Summary: Zend Framework %{library} component @@ -30,11 +30,10 @@ URL: https://zendframework.github.io/%{gh_project}/ Source0: %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch # Tests %if %{with_tests} -BuildRequires: php(language) >= 5.5 +BuildRequires: php(language) >= 5.6 BuildRequires: php-ctype BuildRequires: php-date BuildRequires: php-intl @@ -42,15 +41,15 @@ BuildRequires: php-pcre BuildRequires: php-spl BuildRequires: php-composer(%{gh_owner}/zend-stdlib) >= 2.7 # From composer, "require-dev": { +# "phpunit/PHPUnit": "^6.0.8 || ^5.7.15", # "zendframework/zend-cache": "^2.6.1", +# "zendframework/zend-coding-standard": "~1.0.0", # "zendframework/zend-config": "^2.6", # "zendframework/zend-eventmanager": "^2.6.2 || ^3.0", # "zendframework/zend-filter": "^2.6.1", # "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", # "zendframework/zend-validator": "^2.6", -# "zendframework/zend-view": "^2.6.3", -# "fabpot/php-cs-fixer": "1.7.*", -# "phpunit/PHPUnit": "~4.0" +# "zendframework/zend-view": "^2.6.3" BuildRequires: php-composer(%{gh_owner}/zend-cache) >= 2.6.1 BuildRequires: php-composer(%{gh_owner}/zend-config) >= 2.6 BuildRequires: php-composer(%{gh_owner}/zend-eventmanager) >= 2.6.2 @@ -58,15 +57,20 @@ BuildRequires: php-composer(%{gh_owner}/zend-filter) >= 2.5 BuildRequires: php-composer(%{gh_owner}/zend-servicemanager) >= 2.7.5 BuildRequires: php-composer(%{gh_owner}/zend-validator) >= 2.6 BuildRequires: php-composer(%{gh_owner}/zend-view) >= 2.6.3 -BuildRequires: php-composer(phpunit/phpunit) >= 4.0 +%if 0%{?fedora} >= 26 +%global phpunit %{_bindir}/phpunit6 +%else +%global phpunit %{_bindir}/phpunit +%endif +BuildRequires: %{phpunit} # Autoloader BuildRequires: php-composer(%{gh_owner}/zend-loader) >= 2.5 %endif # From composer, "require": { -# "php": "^5.5 || ^7.0", +# "php": "^7.0 || ^5.6", # "zendframework/zend-stdlib": "^2.7 || ^3.0" -Requires: php(language) >= 5.3.23 +Requires: php(language) >= 5.6 %if ! %{bootstrap} Requires: php-composer(%{gh_owner}/zend-stdlib) >= 2.7 Requires: php-composer(%{gh_owner}/zend-stdlib) < 4 @@ -127,8 +131,6 @@ mv LICENSE.md LICENSE %install -rm -rf %{buildroot} - mkdir -p %{buildroot}%{php_home}/Zend/ cp -pr src %{buildroot}%{php_home}/Zend/%{library} @@ -153,22 +155,20 @@ Zend\Loader\AutoloaderFactory::factory(array( require_once '%{php_home}/Zend/autoload.php'; EOF -%{_bindir}/phpunit --include-path=%{buildroot}%{php_home} - -if which php70; then - php70 %{_bindir}/phpunit --include-path=%{buildroot}%{php_home} -fi +ret=0 +for cmdarg in "php %{phpunit}" "php56 %{_bindir}/phpunit" php70 php71 php72; do + if which $cmdarg; then + set $cmdarg + $1 ${2:-%{_bindir}/phpunit6} --verbose || ret=1 + fi +done +exit $ret %else : Test suite disabled %endif -%clean -rm -rf %{buildroot} - - %files -%defattr(-,root,root,-) %{!?_licensedir:%global license %%doc} %license LICENSE %doc *.md @@ -177,6 +177,11 @@ rm -rf %{buildroot} %changelog +* Mon May 22 2017 Remi Collet - 2.7.4-1 +- Update to 2.7.4 +- raise dependency on PHP 5.6 +- use phpunit6 on F26+ + * Fri Jun 10 2016 Remi Collet - 2.7.3-1 - update to 2.7.3 -- cgit