From 09693e76445f79ffe0961b60bf02899c56081a79 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 15 Dec 2016 07:45:30 +0100 Subject: php-zendframework-zend-expressive-aurarouter: 1.1.1 --- composer.json | 22 +++++++----- php-zendframework-zend-expressive-aurarouter.spec | 43 +++++++++++++++-------- 2 files changed, 41 insertions(+), 24 deletions(-) diff --git a/composer.json b/composer.json index d2f9d4d..b1a3256 100644 --- a/composer.json +++ b/composer.json @@ -13,19 +13,21 @@ ], "extra": { "branch-alias": { - "dev-master": "1.0-dev", - "dev-develop": "1.1-dev" + "dev-master": "1.1-dev", + "dev-develop": "1.2-dev" } }, "require": { - "php": "^5.5 || ^7.0", - "aura/router": "^2.3", + "php": "^5.6 || ^7.0", + "aura/router": "^3.0", "psr/http-message": "^1.0", - "zendframework/zend-expressive-router": "^1.0" + "zendframework/zend-expressive-router": "^1.3.2", + "fig/http-message-util": "^1.1" }, "require-dev": { - "phpunit/phpunit": "^4.7", - "squizlabs/php_codesniffer": "^2.3" + "phpunit/phpunit": "^4.7 || ^5.6", + "zendframework/zend-coding-standard": "~1.0.0", + "malukenho/docheader": "^0.1.5" }, "autoload": { "psr-4": { @@ -39,11 +41,13 @@ }, "scripts": { "check": [ - "@cs", + "@license-check", + "@cs-check", "@test" ], - "cs": "phpcs", + "cs-check": "phpcs", "cs-fix": "phpcbf", + "license-check": "docheader check src/ test/", "test": "phpunit" } } diff --git a/php-zendframework-zend-expressive-aurarouter.spec b/php-zendframework-zend-expressive-aurarouter.spec index 239883b..d7d2165 100644 --- a/php-zendframework-zend-expressive-aurarouter.spec +++ b/php-zendframework-zend-expressive-aurarouter.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit cfca5afe885dc7db3358ab0eb8fae38a20d619c2 +%global gh_commit 3131e2bc488a3e77cae688ba23f7cd020b860a19 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-expressive-aurarouter @@ -21,8 +21,8 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 1.0.0 -Release: 2%{?dist} +Version: 1.1.1 +Release: 1%{?dist} Summary: Aura.Router integration for %{library} Group: Development/Libraries @@ -35,13 +35,15 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch # Tests %if %{with_tests} -BuildRequires: php(language) >= 5.5 -BuildRequires: php-composer(aura/router) >= 2.3 +BuildRequires: php(language) >= 5.6 +BuildRequires: php-composer(aura/router) >= 3.0 BuildRequires: php-composer(psr/http-message) >= 1.0 -BuildRequires: php-composer(%{gh_owner}/zend-expressive-router) >= 1.0 +BuildRequires: php-composer(%{gh_owner}/zend-expressive-router) >= 1.3.2 +BuildRequires: php-composer(fig/http-message-util) >= 1.1 # From composer, "require-dev": { -# "phpunit/phpunit": "^4.7", -# "squizlabs/php_codesniffer": "^2.3" +# "phpunit/phpunit": "^4.7 || ^5.6", +# "zendframework/zend-coding-standard": "~1.0.0", +# "malukenho/docheader": "^0.1.5" BuildRequires: php-composer(phpunit/phpunit) >= 4.7 # Autoloader BuildRequires: php-composer(%{gh_owner}/zend-loader) >= 2.5 @@ -50,17 +52,20 @@ BuildRequires: php-zendframework-zend-loader >= 2.5.1-4 %endif # From composer, "require": { -# "php": "^5.5 || ^7.0", -# "aura/router": "^2.3", +# "php": "^5.6 || ^7.0", +# "aura/router": "^3.0", # "psr/http-message": "^1.0", -# "zendframework/zend-expressive-router": "^1.0" -Requires: php(language) >= 5.5 -Requires: php-composer(aura/router) >= 2.3 -Requires: php-composer(aura/router) < 3 +# "zendframework/zend-expressive-router": "^1.3.2" +# "fig/http-message-util": "^1.1" +Requires: php(language) >= 5.6 +Requires: php-composer(aura/router) >= 3.0 +Requires: php-composer(aura/router) < 4 Requires: php-composer(psr/http-message) >= 1.0 Requires: php-composer(psr/http-message) < 2 -Requires: php-composer(%{gh_owner}/zend-expressive-router) >= 1.0 +Requires: php-composer(%{gh_owner}/zend-expressive-router) >= 1.3.2 Requires: php-composer(%{gh_owner}/zend-expressive-router) < 2 +Requires: php-composer(fig/http-message-util) >= 1.1 +Requires: php-composer(fig/http-message-util) < 2 # From phpcompatinfo report for version 1.0.0 # Nothing %if ! %{bootstrap} @@ -87,6 +92,7 @@ mv LICENSE.md LICENSE cat << 'EOF' | tee autoload.php - 1.1.1-1 +- update to 1.1.1 +- raise dependency on PHP 5.6 +- raise dependency on aura/router 3.0 +- raise dependency on zendframework/zend-expressive-router 1.3.2 +- add dependency on fig/http-message-util + * Sat Jul 2 2016 Remi Collet - 1.0.0-2 - clean autoloader, rely on zend-loader >= 2.5.1-4 -- cgit