summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--composer.json16
-rw-r--r--php-zendframework-zend-expressive-zendrouter-pr7.patch113
-rw-r--r--php-zendframework-zend-expressive-zendrouter.spec26
3 files changed, 20 insertions, 135 deletions
diff --git a/composer.json b/composer.json
index 210cf0d..7dfcb3c 100644
--- a/composer.json
+++ b/composer.json
@@ -13,20 +13,20 @@
],
"extra": {
"branch-alias": {
- "dev-master": "1.1-dev",
- "dev-develop": "1.2-dev"
+ "dev-master": "1.2-dev",
+ "dev-develop": "1.3-dev"
}
},
"require": {
- "php": "^5.5 || ^7.0",
+ "php": "^5.6 || ^7.0",
"psr/http-message": "^1.0",
- "zendframework/zend-expressive-router": "^1.0",
- "zendframework/zend-router": "^2.5",
- "zendframework/zend-psr7bridge": "^0.2.0"
+ "zendframework/zend-expressive-router": "^1.2",
+ "zendframework/zend-router": "^3.0",
+ "zendframework/zend-psr7bridge": "^0.2.2"
},
"require-dev": {
- "phpunit/phpunit": "^4.7",
- "squizlabs/php_codesniffer": "^2.3"
+ "phpunit/phpunit": "^4.8",
+ "squizlabs/php_codesniffer": "^2.6.2"
},
"autoload": {
"psr-4": {
diff --git a/php-zendframework-zend-expressive-zendrouter-pr7.patch b/php-zendframework-zend-expressive-zendrouter-pr7.patch
deleted file mode 100644
index 3a24d1b..0000000
--- a/php-zendframework-zend-expressive-zendrouter-pr7.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From 05be4a48f85f8ac5b39fd4db5984aa4ec7d4ae23 Mon Sep 17 00:00:00 2001
-From: gabbydgab <gamba@gabbydgab.com>
-Date: Tue, 7 Jun 2016 10:34:50 +0800
-Subject: [PATCH 1/3] upgrade versions and fix test
-
----
- composer.json | 12 ++++++------
- src/ZendRouter.php | 4 ++--
- test/ZendRouterTest.php | 4 ++--
- 3 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/composer.json b/composer.json
-index 210cf0d..9a0cf73 100644
---- a/composer.json
-+++ b/composer.json
-@@ -18,15 +18,15 @@
- }
- },
- "require": {
-- "php": "^5.5 || ^7.0",
-+ "php": "^5.6 || ^7.0",
- "psr/http-message": "^1.0",
-- "zendframework/zend-expressive-router": "^1.0",
-- "zendframework/zend-router": "^2.5",
-- "zendframework/zend-psr7bridge": "^0.2.0"
-+ "zendframework/zend-expressive-router": "^1.2",
-+ "zendframework/zend-router": "^3.0",
-+ "zendframework/zend-psr7bridge": "^0.2.2"
- },
- "require-dev": {
-- "phpunit/phpunit": "^4.7",
-- "squizlabs/php_codesniffer": "^2.3"
-+ "phpunit/phpunit": "^5.4",
-+ "squizlabs/php_codesniffer": "^2.4"
- },
- "autoload": {
- "psr-4": {
-diff --git a/src/ZendRouter.php b/src/ZendRouter.php
-index 36321ee..70913b0 100644
---- a/src/ZendRouter.php
-+++ b/src/ZendRouter.php
-@@ -11,8 +11,8 @@
-
- use Psr\Http\Message\ServerRequestInterface as PsrRequest;
- use Zend\Expressive\Exception;
--use Zend\Mvc\Router\Http\TreeRouteStack;
--use Zend\Mvc\Router\RouteMatch;
-+use Zend\Router\Http\TreeRouteStack;
-+use Zend\Router\RouteMatch;
- use Zend\Psr7Bridge\Psr7ServerRequest;
-
- /**
-diff --git a/test/ZendRouterTest.php b/test/ZendRouterTest.php
-index 7dfea92..d1450a6 100644
---- a/test/ZendRouterTest.php
-+++ b/test/ZendRouterTest.php
-@@ -16,8 +16,8 @@
- use Zend\Expressive\Router\RouteResult;
- use Zend\Expressive\Router\ZendRouter;
- use Zend\Http\Request as ZendRequest;
--use Zend\Mvc\Router\Http\TreeRouteStack;
--use Zend\Mvc\Router\RouteMatch;
-+use Zend\Router\Http\TreeRouteStack;
-+use Zend\Router\RouteMatch;
-
- class ZendRouterTest extends TestCase
- {
-
-From e97ff9cb611b658ae9df3105ca06d4c3488643f4 Mon Sep 17 00:00:00 2001
-From: gabbydgab <gamba@gabbydgab.com>
-Date: Tue, 7 Jun 2016 10:45:14 +0800
-Subject: [PATCH 2/3] revert php version
-
----
- composer.json | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/composer.json b/composer.json
-index 9a0cf73..3c895ad 100644
---- a/composer.json
-+++ b/composer.json
-@@ -18,7 +18,7 @@
- }
- },
- "require": {
-- "php": "^5.6 || ^7.0",
-+ "php": "^5.5 || ^7.0",
- "psr/http-message": "^1.0",
- "zendframework/zend-expressive-router": "^1.2",
- "zendframework/zend-router": "^3.0",
-
-From 1bd0c52c7d3f5227af470ac9c19524d17274c36a Mon Sep 17 00:00:00 2001
-From: gabbydgab <gamba@gabbydgab.com>
-Date: Tue, 7 Jun 2016 10:54:50 +0800
-Subject: [PATCH 3/3] revert phpunit version
-
----
- composer.json | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/composer.json b/composer.json
-index 3c895ad..626b2d7 100644
---- a/composer.json
-+++ b/composer.json
-@@ -25,7 +25,7 @@
- "zendframework/zend-psr7bridge": "^0.2.2"
- },
- "require-dev": {
-- "phpunit/phpunit": "^5.4",
-+ "phpunit/phpunit": "^4.8",
- "squizlabs/php_codesniffer": "^2.4"
- },
- "autoload": {
diff --git a/php-zendframework-zend-expressive-zendrouter.spec b/php-zendframework-zend-expressive-zendrouter.spec
index df88eae..6424ece 100644
--- a/php-zendframework-zend-expressive-zendrouter.spec
+++ b/php-zendframework-zend-expressive-zendrouter.spec
@@ -7,7 +7,7 @@
# Please, preserve the changelog entries
#
%global bootstrap 0
-%global gh_commit 0fd6c5f6b22b614960a94beceaa58742444f84b4
+%global gh_commit bbd3cc499f3dcaeb0ce483e7975c238719b0104f
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner zendframework
%global gh_project zend-expressive-zendrouter
@@ -21,8 +21,8 @@
%endif
Name: php-%{gh_owner}-%{gh_project}
-Version: 1.1.0
-Release: 2%{?dist}
+Version: 1.2.0
+Release: 1%{?dist}
Summary: zend-mvc router support for %{library}
Group: Development/Libraries
@@ -31,9 +31,6 @@ URL: https://framework.zend.com/
Source0: %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz
Source1: makesrc.sh
-# to allow ZF3 and raise dependencies
-Patch0: %{name}-pr7.patch
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildArch: noarch
# Tests
@@ -45,9 +42,9 @@ BuildRequires: php-composer(%{gh_owner}/zend-router) >= 3.0
BuildRequires: php-composer(%{gh_owner}/zend-psr7bridge) >= 0.2.2
BuildRequires: php-pcre
# From composer, "require-dev": {
-# "phpunit/phpunit": "^4.7",
-# "squizlabs/php_codesniffer": "^2.3"
-BuildRequires: php-composer(phpunit/phpunit) >= 4.7
+# "phpunit/phpunit": "^4.8",
+# "squizlabs/php_codesniffer": "^2.6.2"
+BuildRequires: php-composer(phpunit/phpunit) >= 4.8
# Autoloader
BuildRequires: php-composer(%{gh_owner}/zend-loader) >= 2.5
# For dependencies autoloader
@@ -57,9 +54,9 @@ BuildRequires: php-zendframework-zend-loader >= 2.5.1-4
# From composer, "require": {
# "php": "^5.6 || ^7.0",
# "psr/http-message": "^1.0",
-# "zendframework/zend-expressive-router": "^1.0",
-# "zendframework/zend-router": "^2.5",
-# "zendframework/zend-psr7bridge": "^0.2.0"
+# "zendframework/zend-expressive-router": "^1.2",
+# "zendframework/zend-router": "^3.0",
+# "zendframework/zend-psr7bridge": "^0.2.2"
Requires: php(language) >= 5.6
Requires: php-composer(psr/http-message) >= 1.0
Requires: php-composer(psr/http-message) < 2
@@ -89,8 +86,6 @@ https://zendframework.github.io/zend-expressive/features/router/zf2/
%prep
%setup -q -n %{gh_project}-%{gh_commit}
-%patch0 -p1
-
mv LICENSE.md LICENSE
@@ -157,6 +152,9 @@ rm -rf %{buildroot}
%changelog
+* Fri Aug 12 2016 Remi Collet <remi@fedoraproject.org> - 1.2.0-1
+- update to 1.2.0
+
* Sat Jul 2 2016 Remi Collet <remi@fedoraproject.org> - 1.1.0-2
- cleanup and build for ZF2
generated by cgit (git 2.34.1) at 2024-11-19 02:16:57 +0000