diff options
| -rw-r--r-- | composer.json | 54 | ||||
| -rw-r--r-- | php-zendframework-zend-expressive-fastroute.spec | 13 |
2 files changed, 41 insertions, 26 deletions
diff --git a/composer.json b/composer.json index e22c399..dbca237 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,6 @@ { "name": "zendframework/zend-expressive-fastroute", "description": "FastRoute integration for Expressive", - "type": "library", "license": "BSD-3-Clause", "keywords": [ "expressive", @@ -9,13 +8,17 @@ "http", "middleware", "psr", - "psr-7" + "psr-7", + "zf", + "zendframework", + "zend-expressive" ], - "extra": { - "branch-alias": { - "dev-master": "2.1-dev", - "dev-develop": "2.2-dev" - } + "support": { + "issues": "https://github.com/zendframework/zend-expressive-fastroute/issues", + "source": "https://github.com/zendframework/zend-expressive-fastroute", + "rss": "https://github.com/zendframework/zend-expressive-fastroute/releases.atom", + "slack": "https://zendframework-slack.herokuapp.com", + "forum": "https://discourse.zendframework.com/c/questions/expressive" }, "require": { "php": "^5.6 || ^7.0", @@ -23,26 +26,35 @@ "nikic/fast-route": "^1.2", "psr/container": "^1.0", "psr/http-message": "^1.0.1", - "zendframework/zend-expressive-router": "^2.0.1", - "zendframework/zend-stdlib": "^3.1" + "zendframework/zend-expressive-router": "^2.0.1 || ^3.0.0-dev || ^3.0.0", + "zendframework/zend-stdlib": "^3.1 || 2.*" }, "require-dev": { "malukenho/docheader": "^0.1.5", - "phpunit/phpunit": "^6.0.7 || ^5.7.14", + "phpunit/phpunit": "^5.7.23 || ^6.4.3", "zendframework/zend-coding-standard": "~1.0.0" }, "conflict": { "container-interop/container-interop": "<1.2.0" }, "autoload": { - "psr-4": { - "Zend\\Expressive\\Router\\": "src/" - } + "psr-4": { + "Zend\\Expressive\\Router\\": "src/" + } }, "autoload-dev": { - "psr-4": { - "ZendTest\\Expressive\\Router\\": "test/" - } + "psr-4": { + "ZendTest\\Expressive\\Router\\": "test/" + } + }, + "config": { + "sort-packages": true + }, + "extra": { + "branch-alias": { + "dev-master": "2.1-dev", + "dev-develop": "2.2-dev" + } }, "scripts": { "check": [ @@ -50,11 +62,11 @@ "@cs-check", "@test" ], - "upload-coverage": "coveralls -v", - "cs-check": "phpcs --colors", - "cs-fix": "phpcbf --colors", - "license-check": "docheader check src/ test/", + "cs-check": "phpcs", + "cs-fix": "phpcbf", "test": "phpunit --colors=always", - "test-coverage": "phpunit --coverage-clover clover.xml" + "test-coverage": "phpunit --colors=always --coverage-clover clover.xml", + "upload-coverage": "coveralls -v", + "license-check": "docheader check src/ test/" } } diff --git a/php-zendframework-zend-expressive-fastroute.spec b/php-zendframework-zend-expressive-fastroute.spec index eea98d7..be47054 100644 --- a/php-zendframework-zend-expressive-fastroute.spec +++ b/php-zendframework-zend-expressive-fastroute.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 20767d9df6d0154190e344e2bd6ba1a4db74a959 +%global gh_commit f6c17e7baea689633a713615a241cca032de960c %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-expressive-fastroute @@ -21,7 +21,7 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 2.1.0 +Version: 2.1.1 Release: 1%{?dist} Summary: FastRoute integration for %{library} @@ -44,7 +44,7 @@ BuildRequires: php-composer(%{gh_owner}/zend-stdlib) >= 3.1 BuildRequires: php-pcre # From composer, "require-dev": { # "malukenho/docheader": "^0.1.5", -# "phpunit/phpunit": "^6.0.7 || ^5.7.14", +# "phpunit/phpunit": "^5.7.23 || ^6.4.3", # "zendframework/zend-coding-standard": "~1.0.0" %if 0%{?fedora} >= 26 %global phpunit %{_bindir}/phpunit6 @@ -64,8 +64,8 @@ BuildRequires: php-zendframework-zend-loader >= 2.5.1-4 # "nikic/fast-route": "^1.2", # "psr/container": "^1.0", # "psr/http-message": "^1.0.1", -# "zendframework/zend-expressive-router": "^2.0.1", -# "zendframework/zend-stdlib": "^3.1" +# "zendframework/zend-expressive-router": "^2.0.1 || ^3.0.0-dev || ^3.0.0", +# "zendframework/zend-stdlib": "^3.1 || 2.*" Requires: php(language) >= 5.6 Requires: php-composer(fig/http-message-util) >= 1.1.2 Requires: php-composer(fig/http-message-util) < 2 @@ -163,6 +163,9 @@ exit $ret %changelog +* Wed Dec 6 2017 Remi Collet <remi@remirepo.net> - 2.1.1-1 +- Update to 2.1.1 + * Sat Aug 12 2017 Remi Collet <remi@remirepo.net> - 2.1.0-1 - Update to 2.1.0 - use phpunit6 |