From 9cc2eb91a779d4d8f7f18db82042ebd849c5ce22 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 3 May 2018 10:24:07 +0200 Subject: update to 2.7.0 raise dependency on PHP 5.6 use range dependencies on F27+ switch to phpunit6 or phpunit7 --- composer.json | 50 +++++++++++++++++++++-------- php-zendframework-zend-text.spec | 68 ++++++++++++++++++++++++++++------------ 2 files changed, 85 insertions(+), 33 deletions(-) diff --git a/composer.json b/composer.json index ea1186c..b1b118b 100644 --- a/composer.json +++ b/composer.json @@ -1,26 +1,28 @@ { "name": "zendframework/zend-text", - "description": " ", + "description": "Create FIGlets and text-based tables", "license": "BSD-3-Clause", "keywords": [ - "zf2", + "zf", + "zendframework", "text" ], - "homepage": "https://github.com/zendframework/zend-text", - "extra": { - "branch-alias": { - "dev-master": "2.6-dev", - "dev-develop": "2.7-dev" - } + "support": { + "docs": "https://docs.zendframework.com/zend-text/", + "issues": "https://github.com/zendframework/zend-text/issues", + "source": "https://github.com/zendframework/zend-text", + "rss": "https://github.com/zendframework/zend-text/releases.atom", + "chat": "https://zendframework-slack.herokuapp.com", + "forum": "https://discourse.zendframework.com/c/questions/components" }, "require": { - "php": "^5.5 || ^7.0", - "zendframework/zend-stdlib": "^2.7 || ^3.0", - "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3" + "php": "^5.6 || ^7.0", + "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", + "zendframework/zend-stdlib": "^2.7 || ^3.0" }, "require-dev": { - "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", "zendframework/zend-config": "^2.6" }, "autoload": { @@ -29,8 +31,30 @@ } }, "autoload-dev": { + "files": [ + "test/autoload.php" + ], "psr-4": { "ZendTest\\Text\\": "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-text.spec b/php-zendframework-zend-text.spec index 1d6913c..73b5368 100644 --- a/php-zendframework-zend-text.spec +++ b/php-zendframework-zend-text.spec @@ -1,13 +1,13 @@ # remirepo/Fedora spec file for php-zendframework-zend-text # -# Copyright (c) 2015-2017 Remi Collet +# Copyright (c) 2015-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 07ad9388e4d4f12620ad37b52a5b0e4ee7845f92 +%global gh_commit ca987dd4594f5f9508771fccd82c89bc7fbb39ac %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-text @@ -20,8 +20,8 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 2.6.0 -Release: 4%{?dist} +Version: 2.7.0 +Release: 2%{?dist} Summary: Zend Framework %{library} component Group: Development/Libraries @@ -33,32 +33,53 @@ Source1: makesrc.sh BuildArch: noarch # Tests %if %{with_tests} -BuildRequires: php(language) >= 5.3.23 +BuildRequires: php(language) >= 5.6 BuildRequires: php-ctype BuildRequires: php-pcre BuildRequires: php-spl -BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.5 -BuildRequires: php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.5 # From composer, "require-dev": { -# "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", # "zendframework/zend-config": "^2.6" +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: (php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5 with php-autoloader(%{gh_owner}/zend-servicemanager) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/zend-config) >= 2.6 with php-autoloader(%{gh_owner}/zend-config) < 3) +%global phpunit %{_bindir}/phpunit7 +BuildRequires: phpunit7 >= 7.1.4 +# remirepo:10 +%else +BuildRequires: php-autoloader(%{gh_owner}/zend-servicemanager) < 4 +BuildRequires: php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5 +BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 +BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 +BuildRequires: php-autoloader(%{gh_owner}/zend-config) < 3 BuildRequires: php-autoloader(%{gh_owner}/zend-config) >= 2.6 -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", -# "zendframework/zend-stdlib": "^2.7 || ^3.0", -# "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3" -Requires: php(language) >= 5.5 +# "php": "^5.6 || ^7.0", +# "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", +# "zendframework/zend-stdlib": "^2.7 || ^3.0" +Requires: php(language) >= 5.6 %if ! %{bootstrap} -Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 -Requires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 -Requires: php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5 +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Requires: (php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5 with php-autoloader(%{gh_owner}/zend-servicemanager) < 4) +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-servicemanager) < 4 +Requires: php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5 +Requires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 +Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 +%endif %endif # Autoloader Requires: php-composer(fedora/autoloader) @@ -125,9 +146,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 --include-path=%{buildroot}%{php_home} || 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 @@ -145,6 +167,12 @@ exit $ret %changelog +* Thu May 3 2018 Remi Collet - 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 + * Thu Dec 7 2017 Remi Collet - 2.6.0-4 - switch from zend-loader to fedora/autoloader -- cgit