From c787c25869d5437cc72509c9fa83379a6d1881d1 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 19 Aug 2020 08:29:54 +0200
Subject: update to 1.1.0 (no change)

---
 php-laminas-zendframework-bridge-rpm.patch | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 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 8edfafb..f2df390 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	2020-03-27 07:50:26.000000000 +0100
-+++ ./src/Autoloader.php	2020-03-27 07:51:49.165983073 +0100
+--- ./src/Autoloader.php.rpm	2020-08-19 08:24:30.000000000 +0200
++++ ./src/Autoloader.php	2020-08-19 08:27:21.275930504 +0200
 @@ -9,7 +9,6 @@
  namespace Laminas\ZendFrameworkBridge;
  
@@ -17,7 +17,7 @@ diff -up ./src/Autoloader.php.rpm ./src/Autoloader.php
              $loaded
          ), true, true);
  
-@@ -61,32 +59,15 @@ class Autoloader
+@@ -61,36 +59,15 @@ class Autoloader
      }
  
      /**
@@ -26,6 +26,10 @@ diff -up ./src/Autoloader.php.rpm ./src/Autoloader.php
 -     */
 -    private static function getClassLoader()
 -    {
+-        if (file_exists(getenv('COMPOSER_VENDOR_DIR') . '/autoload.php')) {
+-            return include getenv('COMPOSER_VENDOR_DIR') . '/autoload.php';
+-        }
+-
 -        if (file_exists(__DIR__ . '/../../../autoload.php')) {
 -            return include __DIR__ . '/../../../autoload.php';
 -        }
@@ -52,7 +56,7 @@ diff -up ./src/Autoloader.php.rpm ./src/Autoloader.php
              if (isset($loaded[$class])) {
                  return;
              }
-@@ -105,7 +86,7 @@ class Autoloader
+@@ -109,7 +86,7 @@ class Autoloader
                  return;
              }
  
@@ -62,8 +66,8 @@ diff -up ./src/Autoloader.php.rpm ./src/Autoloader.php
                      . strtr(substr($class, strlen($check)), [
                          'ApiTools' => 'Apigility',
 diff -up ./src/Replacements.php.rpm ./src/Replacements.php
---- ./src/Replacements.php.rpm	2020-03-27 07:50:49.818286139 +0100
-+++ ./src/Replacements.php	2020-03-27 07:52:36.321742255 +0100
+--- ./src/Replacements.php.rpm	2020-08-19 08:24:30.000000000 +0200
++++ ./src/Replacements.php	2020-08-19 08:25:20.004129165 +0200
 @@ -21,7 +21,7 @@ class Replacements
      public function __construct(array $additionalReplacements = [])
      {
-- 
cgit