From 46bcfa92850f3c335183a6d2928ea48ed3a6e151 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Fri, 12 Aug 2016 09:08:48 +0200
Subject: php-zendframework-zend-expressive-zendrouter: 1.2.0

---
 ...dframework-zend-expressive-zendrouter-pr7.patch | 113 ---------------------
 1 file changed, 113 deletions(-)
 delete mode 100644 php-zendframework-zend-expressive-zendrouter-pr7.patch

(limited to 'php-zendframework-zend-expressive-zendrouter-pr7.patch')

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": {
-- 
cgit