From 76a58ebb3582f387028c1096b4c8865b7d099138 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 23 Feb 2022 09:10:02 +0100
Subject: update to 1.5.0

raise dependency on PHP 7.4
---
 php-laminas-zendframework-bridge-rpm.patch | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

(limited to 'php-laminas-zendframework-bridge-rpm.patch')

diff --git a/php-laminas-zendframework-bridge-rpm.patch b/php-laminas-zendframework-bridge-rpm.patch
index 6d93f84..edc77c0 100644
--- a/php-laminas-zendframework-bridge-rpm.patch
+++ b/php-laminas-zendframework-bridge-rpm.patch
@@ -1,6 +1,6 @@
 diff -up ./src/Autoloader.php.rpm ./src/Autoloader.php
---- ./src/Autoloader.php.rpm	2021-12-21 16:21:53.000000000 +0100
-+++ ./src/Autoloader.php	2021-12-21 16:27:00.348616300 +0100
+--- ./src/Autoloader.php.rpm	2022-02-23 09:04:21.000000000 +0100
++++ ./src/Autoloader.php	2022-02-23 09:07:25.289998350 +0100
 @@ -3,7 +3,6 @@
  namespace Laminas\ZendFrameworkBridge;
  
@@ -9,7 +9,7 @@ diff -up ./src/Autoloader.php.rpm ./src/Autoloader.php
  use RuntimeException;
  
  use function array_values;
-@@ -45,15 +44,9 @@ class Autoloader
+@@ -46,15 +45,9 @@ class Autoloader
      public static function load()
      {
          $loaded = new ArrayObject([]);
@@ -25,7 +25,7 @@ diff -up ./src/Autoloader.php.rpm ./src/Autoloader.php
              $loaded
          ), true, true);
  
-@@ -63,27 +56,16 @@ class Autoloader
+@@ -64,28 +57,17 @@ class Autoloader
          ));
      }
  
@@ -41,21 +41,22 @@ diff -up ./src/Autoloader.php.rpm ./src/Autoloader.php
 -    }
 -
      /**
-      * @return callable
+      * @param array<string,string> $namespaces
+      * @return callable(string): void
       */
 -    private static function createPrependAutoloader(array $namespaces, ClassLoader $classLoader, ArrayObject $loaded)
 +    private static function createPrependAutoloader(array $namespaces, ArrayObject $loaded)
      {
          /**
-          * @param  string $class Class name to autoload
+          * @param string $class Class name to autoload
           * @return void
           */
--        return static function ($class) use ($namespaces, $classLoader, $loaded) {
-+        return static function ($class) use ($namespaces, $loaded) {
+-        return static function ($class) use ($namespaces, $classLoader, $loaded): void {
++        return static function ($class) use ($namespaces, $loaded): void {
              if (isset($loaded[$class])) {
                  return;
              }
-@@ -102,7 +84,7 @@ class Autoloader
+@@ -104,7 +86,7 @@ class Autoloader
                  return;
              }
  
@@ -64,7 +65,7 @@ diff -up ./src/Autoloader.php.rpm ./src/Autoloader.php
                  $legacy = $namespaces[$check]
                      . strtr(substr($class, strlen($check)), [
                          'ApiTools' => 'Apigility',
-@@ -162,20 +144,4 @@ class Autoloader
+@@ -166,20 +148,4 @@ class Autoloader
              }
          };
      }
@@ -86,8 +87,8 @@ diff -up ./src/Autoloader.php.rpm ./src/Autoloader.php
 -    }
  }
 diff -up ./src/Replacements.php.rpm ./src/Replacements.php
---- ./src/Replacements.php.rpm	2021-12-21 16:21:53.000000000 +0100
-+++ ./src/Replacements.php	2021-12-21 16:21:57.865043533 +0100
+--- ./src/Replacements.php.rpm	2022-02-23 09:04:21.000000000 +0100
++++ ./src/Replacements.php	2022-02-23 09:06:13.102208293 +0100
 @@ -15,7 +15,7 @@ class Replacements
      public function __construct(array $additionalReplacements = [])
      {
-- 
cgit