From b4cb8810b838abd51c86469b9b7adf1395fcb2b3 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 12 Aug 2017 10:31:22 +0200 Subject: v2.1.0 --- .gitignore | 7 ++ composer.json | 32 ++++++---- php-zendframework-zend-expressive-fastroute.spec | 81 ++++++++++++------------ 3 files changed, 66 insertions(+), 54 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 974cd3b..e22c399 100644 --- a/composer.json +++ b/composer.json @@ -13,22 +13,26 @@ ], "extra": { "branch-alias": { - "dev-master": "2.0-dev", - "dev-develop": "2.1-dev" + "dev-master": "2.1-dev", + "dev-develop": "2.2-dev" } }, "require": { "php": "^5.6 || ^7.0", - "nikic/fast-route": "^1.0.0", - "psr/http-message": "^1.0", - "zendframework/zend-expressive-router": "^2.0", - "fig/http-message-util": "^1.1", + "fig/http-message-util": "^1.1.2", + "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" }, "require-dev": { - "phpunit/phpunit": "^4.7 || ^5.6", - "zendframework/zend-coding-standard": "~1.0.0", - "malukenho/docheader": "^0.1.5" + "malukenho/docheader": "^0.1.5", + "phpunit/phpunit": "^6.0.7 || ^5.7.14", + "zendframework/zend-coding-standard": "~1.0.0" + }, + "conflict": { + "container-interop/container-interop": "<1.2.0" }, "autoload": { "psr-4": { @@ -42,15 +46,15 @@ }, "scripts": { "check": [ - "@cs-check", "@license-check", + "@cs-check", "@test" ], - "coveralls": "coveralls", - "cs-check": "phpcs", - "cs-fix": "phpcbf", + "upload-coverage": "coveralls -v", + "cs-check": "phpcs --colors", + "cs-fix": "phpcbf --colors", "license-check": "docheader check src/ test/", - "test": "phpunit", + "test": "phpunit --colors=always", "test-coverage": "phpunit --coverage-clover clover.xml" } } diff --git a/php-zendframework-zend-expressive-fastroute.spec b/php-zendframework-zend-expressive-fastroute.spec index ccc3b0d..eea98d7 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 646ca5818f4a887f9111c1d815434155383fd508 +%global gh_commit 20767d9df6d0154190e344e2bd6ba1a4db74a959 %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.0.0 +Version: 2.1.0 Release: 1%{?dist} Summary: FastRoute integration for %{library} @@ -31,22 +31,27 @@ URL: https://framework.zend.com/ 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.6 -BuildRequires: php-composer(nikic/fast-route) >= 1.0.0 -BuildRequires: php-composer(psr/http-message) >= 1.0 +BuildRequires: php-composer(fig/http-message-util) >= 1.1.2 +BuildRequires: php-composer(nikic/fast-route) >= 1.2 +BuildRequires: php-composer(psr/container) >= 1.0 +BuildRequires: php-composer(psr/http-message) >= 1.0.1 BuildRequires: php-composer(%{gh_owner}/zend-expressive-router) >= 2.0 -BuildRequires: php-composer(fig/http-message-util) >= 1.1 BuildRequires: php-composer(%{gh_owner}/zend-stdlib) >= 3.1 BuildRequires: php-pcre # From composer, "require-dev": { -# "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 +# "malukenho/docheader": "^0.1.5", +# "phpunit/phpunit": "^6.0.7 || ^5.7.14", +# "zendframework/zend-coding-standard": "~1.0.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 # For dependencies autoloader @@ -55,23 +60,26 @@ BuildRequires: php-zendframework-zend-loader >= 2.5.1-4 # From composer, "require": { # "php": "^5.6 || ^7.0", -# "nikic/fast-route": "^1.0.0", -# "psr/http-message": "^1.0", -# "zendframework/zend-expressive-router": "^2.0", -# "fig/http-message-util": "^1.1", +# "fig/http-message-util": "^1.1.2", +# "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" Requires: php(language) >= 5.6 -Requires: php-composer(nikic/fast-route) >= 1.0.0 +Requires: php-composer(fig/http-message-util) >= 1.1.2 +Requires: php-composer(fig/http-message-util) < 2 +Requires: php-composer(nikic/fast-route) >= 1.2 Requires: php-composer(nikic/fast-route) < 2 -Requires: php-composer(psr/http-message) >= 1.0 +Requires: php-composer(psr/container) >= 1.0 +Requires: php-composer(psr/container) < 2 +Requires: php-composer(psr/http-message) >= 1.0.1 Requires: php-composer(psr/http-message) < 2 Requires: php-composer(%{gh_owner}/zend-expressive-router) >= 2.0 Requires: php-composer(%{gh_owner}/zend-expressive-router) < 3 -Requires: php-composer(fig/http-message-util) >= 1.1 -Requires: php-composer(fig/http-message-util) < 2 Requires: php-composer(%{gh_owner}/zend-stdlib) >= 3.1 Requires: php-composer(%{gh_owner}/zend-stdlib) < 4 -# From phpcompatinfo report for version 1.3.0 +# From phpcompatinfo report for version 2.1.0 Requires: php-pcre %if ! %{bootstrap} # Autoloader @@ -99,6 +107,7 @@ cat << 'EOF' | tee autoload.php - 2.1.0-1 +- Update to 2.1.0 +- use phpunit6 +- add depdency on psr/container +- raise dependency on fig/http-message-util 1.1.2 +- raise dependency on nikic/fast-route 1.2 + * Tue Feb 14 2017 Remi Collet - 2.0.0-1 - update to 2.0.0 - raise dependency on zend-expressive-router 2.0 -- cgit