From 8212aade81ce4d230f15f6df67bb36879210afbc Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 3 May 2018 11:51:26 +0200 Subject: update to 1.2.0 use range dependencies on F27+ switch to phpunit6 or phpunit7 --- composer.json | 41 ++++++++----- php-zendframework-zend-mvc-console.spec | 105 +++++++++++++++++++++++--------- 2 files changed, 100 insertions(+), 46 deletions(-) diff --git a/composer.json b/composer.json index 016d214..185b968 100644 --- a/composer.json +++ b/composer.json @@ -1,13 +1,21 @@ { "name": "zendframework/zend-mvc-console", - "description": " ", + "description": "Integration between zend-mvc and zend-console", "license": "BSD-3-Clause", "keywords": [ - "zf2", + "zf", + "zendframework", "mvc", "console" ], - "homepage": "https://github.com/zendframework/zend-mvc-console", + "support": { + "docs": "https://docs.zendframework.com/zend-mvc-console/", + "issues": "https://github.com/zendframework/zend-mvc-console/issues", + "source": "https://github.com/zendframework/zend-mvc-console", + "rss": "https://github.com/zendframework/zend-mvc-console/releases.atom", + "chat": "https://zendframework-slack.herokuapp.com", + "forum": "https://discourse.zendframework.com/c/questions/components" + }, "require": { "php": "^5.6 || ^7.0", "container-interop/container-interop": "^1.1", @@ -22,17 +30,16 @@ "zendframework/zend-view": "^2.6.3" }, "require-dev": { - "squizlabs/php_codesniffer": "^2.3.1", - "phpunit/PHPUnit": "^4.5", - "zendframework/zend-filter": "^2.6.1", - "zendframework/zend-form": "^2.7" - }, - "suggest": { - "zendframework/zend-filter": "^2.6.1, to filter rendered results" + "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4", + "zendframework/zend-coding-standard": "~1.0.0", + "zendframework/zend-filter": "^2.6.1" }, "conflict": { "zendframework/zend-mvc": "<3.0.0" }, + "suggest": { + "zendframework/zend-filter": "^2.6.1, to filter rendered results" + }, "autoload": { "psr-4": { "Zend\\Mvc\\Console\\": "src/" @@ -43,10 +50,13 @@ "ZendTest\\Mvc\\Console\\": "test/" } }, + "config": { + "sort-packages": true + }, "extra": { "branch-alias": { - "dev-master": "1.1-dev", - "dev-develop": "1.2-dev" + "dev-master": "1.2.x-dev", + "dev-develop": "1.3.x-dev" }, "zf": { "component": "Zend\\Mvc\\Console" @@ -57,10 +67,9 @@ "@cs-check", "@test" ], - "upload-coverage": "coveralls", "cs-check": "phpcs", - "cs-fix": "phpcbf fix -v", - "test": "phpunit", - "test-coverage": "phpunit --coverage-clover clover.xml" + "cs-fix": "phpcbf", + "test": "phpunit --colors=always", + "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" } } diff --git a/php-zendframework-zend-mvc-console.spec b/php-zendframework-zend-mvc-console.spec index 48bc81f..3f2c8e8 100644 --- a/php-zendframework-zend-mvc-console.spec +++ b/php-zendframework-zend-mvc-console.spec @@ -1,13 +1,13 @@ # remirepo/Fedora spec file for php-zendframework-zend-mvc-console # -# 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 a9b5559f129c2e6cc3f3f32e54c2daa02b336301 +%global gh_commit 821c18e0d57e71b370166bd2f35623befddaf2ee %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-mvc-console @@ -20,8 +20,8 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 1.1.11 -Release: 4%{?dist} +Version: 1.2.0 +Release: 1%{?dist} Summary: Zend Framework Mvc-%{library} component Group: Development/Libraries @@ -34,25 +34,54 @@ BuildArch: noarch # Tests %if %{with_tests} BuildRequires: php(language) >= 5.6 +BuildRequires: php-spl +# From composer, "require-dev": { +# "squizlabs/php_codesniffer": "^2.3.1", +# "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4", +# "zendframework/zend-coding-standard": "~1.0.0", +# "zendframework/zend-filter": "^2.6.1" +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: (php-composer(container-interop/container-interop) >= 1.1 with php-composer(container-interop/container-interop) < 2) +BuildRequires: (php-autoloader(%{gh_owner}/zend-console) >= 2.6 with php-autoloader(%{gh_owner}/zend-console) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/zend-eventmanager) >= 2.6.2 with php-autoloader(%{gh_owner}/zend-eventmanager) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/zend-modulemanager) >= 2.7.1 with php-autoloader(%{gh_owner}/zend-modulemanager) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/zend-mvc) >= 3.0.3 with php-autoloader(%{gh_owner}/zend-mvc) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/zend-router) >= 3.0 with php-autoloader(%{gh_owner}/zend-router) < 4) +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.5 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/zend-text) >= 2.6 with php-autoloader(%{gh_owner}/zend-text) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/zend-view) >= 2.6.3 with php-autoloader(%{gh_owner}/zend-view) < 3) +BuildRequires: (php-autoloader(%{gh_owner}/zend-filter) >= 2.6.1 with php-autoloader(%{gh_owner}/zend-filter) < 3) +%global phpunit %{_bindir}/phpunit7 +BuildRequires: phpunit7 >= 7.1.4 +# remirepo:26 +%else +BuildRequires: php-composer(container-interop/container-interop) < 2 BuildRequires: php-composer(container-interop/container-interop) >= 1.1 +BuildRequires: php-autoloader(%{gh_owner}/zend-console) < 3 BuildRequires: php-autoloader(%{gh_owner}/zend-console) >= 2.6 +BuildRequires: php-autoloader(%{gh_owner}/zend-eventmanager) < 4 BuildRequires: php-autoloader(%{gh_owner}/zend-eventmanager) >= 2.6.2 +BuildRequires: php-autoloader(%{gh_owner}/zend-modulemanager) < 3 BuildRequires: php-autoloader(%{gh_owner}/zend-modulemanager) >= 2.7.1 +BuildRequires: php-autoloader(%{gh_owner}/zend-mvc) < 4 BuildRequires: php-autoloader(%{gh_owner}/zend-mvc) >= 3.0.3 +BuildRequires: php-autoloader(%{gh_owner}/zend-router) < 4 BuildRequires: php-autoloader(%{gh_owner}/zend-router) >= 3.0 +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.5 +BuildRequires: php-autoloader(%{gh_owner}/zend-text) < 3 BuildRequires: php-autoloader(%{gh_owner}/zend-text) >= 2.6 +BuildRequires: php-autoloader(%{gh_owner}/zend-view) < 3 BuildRequires: php-autoloader(%{gh_owner}/zend-view) >= 2.6.3 -BuildRequires: php-spl -# From composer, "require-dev": { -# "squizlabs/php_codesniffer": "^2.3.1", -# "phpunit/PHPUnit": "^4.5", -# "zendframework/zend-filter": "^2.6.1", -# "zendframework/zend-form": "^2.7" -BuildRequires: php-composer(phpunit/phpunit) >= 4.5 +BuildRequires: php-autoloader(%{gh_owner}/zend-filter) < 3 BuildRequires: php-autoloader(%{gh_owner}/zend-filter) >= 2.6.1 -BuildRequires: php-autoloader(%{gh_owner}/zend-form) >= 2.7 +%global phpunit %{_bindir}/phpunit6 +BuildRequires: phpunit6 >= 6.5.8 +%endif %endif # Autoloader BuildRequires: php-fedora-autoloader-devel @@ -70,26 +99,41 @@ BuildRequires: php-fedora-autoloader-devel # "zendframework/zend-text": "^2.6", # "zendframework/zend-view": "^2.6.3" Requires: php(language) >= 5.6 -Requires: php-composer(container-interop/container-interop) >= 1.1 +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Requires: (php-composer(container-interop/container-interop) >= 1.1 with php-composer(container-interop/container-interop) < 2) +Requires: (php-autoloader(%{gh_owner}/zend-console) >= 2.6 with php-autoloader(%{gh_owner}/zend-console) < 3) +Requires: (php-autoloader(%{gh_owner}/zend-eventmanager) >= 2.6.2 with php-autoloader(%{gh_owner}/zend-eventmanager) < 4) +Requires: (php-autoloader(%{gh_owner}/zend-modulemanager) >= 2.7.1 with php-autoloader(%{gh_owner}/zend-modulemanager) < 3) +Requires: (php-autoloader(%{gh_owner}/zend-mvc) >= 3.0.3 with php-autoloader(%{gh_owner}/zend-mvc) < 4) +Requires: (php-autoloader(%{gh_owner}/zend-router) >= 3.0 with php-autoloader(%{gh_owner}/zend-router) < 4) +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.5 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) +Requires: (php-autoloader(%{gh_owner}/zend-text) >= 2.6 with php-autoloader(%{gh_owner}/zend-text) < 3) +Requires: (php-autoloader(%{gh_owner}/zend-view) >= 2.6.3 with php-autoloader(%{gh_owner}/zend-view) < 3) +# remirepo:22 +%else Requires: php-composer(container-interop/container-interop) < 2 -Requires: php-autoloader(%{gh_owner}/zend-console) >= 2.6 +Requires: php-composer(container-interop/container-interop) >= 1.1 Requires: php-autoloader(%{gh_owner}/zend-console) < 3 -Requires: php-autoloader(%{gh_owner}/zend-eventmanager) >= 2.6.2 +Requires: php-autoloader(%{gh_owner}/zend-console) >= 2.6 Requires: php-autoloader(%{gh_owner}/zend-eventmanager) < 4 -Requires: php-autoloader(%{gh_owner}/zend-modulemanager) >= 2.7.1 +Requires: php-autoloader(%{gh_owner}/zend-eventmanager) >= 2.6.2 Requires: php-autoloader(%{gh_owner}/zend-modulemanager) < 3 -Requires: php-autoloader(%{gh_owner}/zend-mvc) >= 3.0.3 +Requires: php-autoloader(%{gh_owner}/zend-modulemanager) >= 2.7.1 Requires: php-autoloader(%{gh_owner}/zend-mvc) < 4 -Requires: php-autoloader(%{gh_owner}/zend-router) >= 3.0 +Requires: php-autoloader(%{gh_owner}/zend-mvc) >= 3.0.3 Requires: php-autoloader(%{gh_owner}/zend-router) < 4 -Requires: php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5 +Requires: php-autoloader(%{gh_owner}/zend-router) >= 3.0 Requires: php-autoloader(%{gh_owner}/zend-servicemanager) < 4 -Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7.5 +Requires: php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5 Requires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 -Requires: php-autoloader(%{gh_owner}/zend-text) >= 2.6 +Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7.5 Requires: php-autoloader(%{gh_owner}/zend-text) < 3 -Requires: php-autoloader(%{gh_owner}/zend-view) >= 2.6.3 +Requires: php-autoloader(%{gh_owner}/zend-text) >= 2.6 Requires: php-autoloader(%{gh_owner}/zend-view) < 3 +Requires: php-autoloader(%{gh_owner}/zend-view) >= 2.6.3 +%endif # Autoloader Requires: php-composer(fedora/autoloader) # From phpcompatinfo report for version 1.1.10 @@ -97,10 +141,8 @@ Requires: php-spl %if ! %{bootstrap} # From composer, "suggest": { # "zendframework/zend-filter": "^2.6.1, to filter rendered results" -%if 0%{?fedora} >= 21 Suggests: php-composer(%{gh_owner}/zend-filter) %endif -%endif Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version} Provides: php-autoloader(%{gh_owner}/%{gh_project}) = %{version} @@ -168,16 +210,14 @@ mkdir vendor cat << 'EOF' | tee vendor/autoload.php - 1.2.0-1 +- update to 1.2.0 +- use range dependencies on F27+ +- switch to phpunit6 or phpunit7 + * Tue Dec 12 2017 Remi Collet - 1.1.11-4 - switch from zend-loader to fedora/autoloader -- cgit