From 4dea8f9ba7226b10c43cd84c9957e7c0fe7c896b Mon Sep 17 00:00:00 2001
From: Adrien Crivelli <adrien.crivelli@gmail.com>
Date: Sun, 5 Dec 2021 18:22:39 +0900
Subject: [PATCH] Drop `laminas/laminas-zendframework-bridge` and
 `zendframework/*` compatibility

Increase performance by removing a compatibility layer while **not** introducing breaking changes.

This follow the process described in details in:

https://github.com/laminas/technical-steering-committee/blob/main/meetings/minutes/2021-08-02-TSC-Minutes.md#remove-laminaslaminas-zendframework-bridge-dependency-from-our-packages
Signed-off-by: Adrien Crivelli <adrien.crivelli@gmail.com>
---
 composer.json |  7 ++-----
 composer.lock | 17 +++++++++--------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/composer.json b/composer.json
index 19272b3..789ac09 100644
--- a/composer.json
+++ b/composer.json
@@ -29,7 +29,6 @@
     "require": {
         "php": "^7.3 || ~8.0.0",
         "laminas/laminas-permissions-rbac": "^2.5.1 || ^3.0",
-        "laminas/laminas-zendframework-bridge": "^1.0",
         "mezzio/mezzio-authorization": "^1.0",
         "mezzio/mezzio-router": "^3.0",
         "psr/container": "^1.0",
@@ -46,7 +45,8 @@
     },
     "conflict": {
         "container-interop/container-interop": "<1.2.0",
-        "phpspec/prophecy": "<1.10.2"
+        "phpspec/prophecy": "<1.10.2",
+        "zendframework/zend-expressive-authorization-rbac": "*"
     },
     "autoload": {
         "psr-4": {
@@ -68,8 +68,5 @@
         "test": "phpunit --colors=always",
         "test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
         "static-analysis": "psalm --shepherd --stats"
-    },
-    "replace": {
-        "zendframework/zend-expressive-authorization-rbac": "^1.0.2"
     }
 }
diff --git a/composer.lock b/composer.lock
index c35612a..a603abd 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "51760cbf0134ceb4f5f2c6e79a1ae490",
+    "content-hash": "1cca5e57fb895c861c03694661965386",
     "packages": [
         {
             "name": "fig/http-message-util",
@@ -125,23 +125,23 @@
         },
         {
             "name": "laminas/laminas-zendframework-bridge",
-            "version": "1.2.0",
+            "version": "1.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-zendframework-bridge.git",
-                "reference": "6cccbddfcfc742eb02158d6137ca5687d92cee32"
+                "reference": "bf180a382393e7db5c1e8d0f2ec0c4af9c724baf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/6cccbddfcfc742eb02158d6137ca5687d92cee32",
-                "reference": "6cccbddfcfc742eb02158d6137ca5687d92cee32",
+                "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/bf180a382393e7db5c1e8d0f2ec0c4af9c724baf",
+                "reference": "bf180a382393e7db5c1e8d0f2ec0c4af9c724baf",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3 || ^8.0"
+                "php": "^7.3 || ~8.0.0 || ~8.1.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.1 || ^9.3",
+                "phpunit/phpunit": "^9.3",
                 "psalm/plugin-phpunit": "^0.15.1",
                 "squizlabs/php_codesniffer": "^3.5",
                 "vimeo/psalm": "^4.6"
@@ -183,7 +183,7 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2021-02-25T21:54:58+00:00"
+            "time": "2021-09-03T17:53:30+00:00"
         },
         {
             "name": "mezzio/mezzio-authentication",
@@ -4940,6 +4940,7 @@
                 "issues": "https://github.com/webmozart/path-util/issues",
                 "source": "https://github.com/webmozart/path-util/tree/2.3.0"
             },
+            "abandoned": "symfony/filesystem",
             "time": "2015-12-17T08:42:14+00:00"
         }
     ],