From d1f6e6483e65cbdcc8425e50e7b4e0caf0dba1b1 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 13 Feb 2020 07:35:54 +0100
Subject: raise dependency on fedora/autoloader 1.0.1 clean autoloader

---
 php-laminas-zendframework-bridge-rpm.patch |  5 ++---
 php-laminas-zendframework-bridge.spec      | 12 ++++++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/php-laminas-zendframework-bridge-rpm.patch b/php-laminas-zendframework-bridge-rpm.patch
index 0bd5dd1..d46d2c1 100644
--- a/php-laminas-zendframework-bridge-rpm.patch
+++ b/php-laminas-zendframework-bridge-rpm.patch
@@ -52,13 +52,12 @@ diff -up src/Autoloader.php.rpm src/Autoloader.php
              if (isset($loaded[$class])) {
                  return;
              }
-@@ -93,7 +74,8 @@ class Autoloader
+@@ -93,7 +74,7 @@ class Autoloader
                  return;
              }
  
 -            if ($classLoader->loadClass($class)) {
-+            if ($file = \Fedora\Autoloader\Autoload::findFileForClass($class)) {
-+                \Fedora\Autoloader\includeFile($file);
++            if (\Fedora\Autoloader\Autoload::loadClass($class)) {
                  $legacy = $namespaces[$check]
                      . strtr(substr($class, strlen($check)), [
                          'ApiTools' => 'Apigility',
diff --git a/php-laminas-zendframework-bridge.spec b/php-laminas-zendframework-bridge.spec
index 69dd91b..39d29d1 100644
--- a/php-laminas-zendframework-bridge.spec
+++ b/php-laminas-zendframework-bridge.spec
@@ -22,7 +22,7 @@
 
 Name:           php-%{gh_project}
 Version:        1.0.1
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        Alias legacy ZF class names to Laminas Project equivalents
 
 License:        BSD
@@ -41,11 +41,10 @@ BuildRequires:  php-spl
 # From composer, "require-dev": {
 #        "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.1",
 #        "squizlabs/php_codesniffer": "^3.5"
-# remirepo:1
 %global phpunit %{_bindir}/phpunit8
 BuildRequires:  phpunit8 >= 8.1
 # Autoloader
-BuildRequires:  php-fedora-autoloader-devel
+BuildRequires:  php-fedora-autoloader-devel >= 1.0.1
 %endif
 
 # From composer, "require": {
@@ -54,7 +53,7 @@ Requires:       php(language) >= 5.6
 # From phpcompatinfo report for version 1.0.0
 Requires:       php-spl
 # Autoloader
-Requires:       php-composer(fedora/autoloader)
+Requires:       php-composer(fedora/autoloader) >= 1.0.1
 
 Provides:       php-composer(%{gh_owner}/%{gh_project}) = %{version}
 Provides:       php-autoloader(%{gh_owner}/%{gh_project}) = %{version}
@@ -173,6 +172,7 @@ exit $ret
 
 
 %files
+# remirepo:1
 %{!?_licensedir:%global license %%doc}
 %license LICENSE
 %doc *.md
@@ -185,6 +185,10 @@ exit $ret
 
 
 %changelog
+* Thu Feb 13 2020 Remi Collet <remi@remirepo.net> - 1.0.1-5
+- raise dependency on fedora/autoloader 1.0.1
+- clean autoloader
+
 * Thu Jan 16 2020 Remi Collet <remi@remirepo.net> - 1.0.1-3
 - add full framework autoloader
 
-- 
cgit