diff options
Diffstat (limited to 'php-laminas-zendframework-bridge-rpm.patch')
| -rw-r--r-- | php-laminas-zendframework-bridge-rpm.patch | 83 |
1 files changed, 52 insertions, 31 deletions
diff --git a/php-laminas-zendframework-bridge-rpm.patch b/php-laminas-zendframework-bridge-rpm.patch index f2df390..edc77c0 100644 --- a/php-laminas-zendframework-bridge-rpm.patch +++ b/php-laminas-zendframework-bridge-rpm.patch @@ -1,7 +1,7 @@ diff -up ./src/Autoloader.php.rpm ./src/Autoloader.php ---- ./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 @@ +--- ./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; use ArrayObject; @@ -9,54 +9,54 @@ diff -up ./src/Autoloader.php.rpm ./src/Autoloader.php use RuntimeException; use function array_values; -@@ -50,7 +49,6 @@ class Autoloader +@@ -46,15 +45,9 @@ class Autoloader + public static function load() + { + $loaded = new ArrayObject([]); +- $classLoader = self::getClassLoader(); +- +- if ($classLoader === null) { +- return; +- } spl_autoload_register(self::createPrependAutoloader( RewriteRules::namespaceReverse(), -- self::getClassLoader(), +- $classLoader, $loaded ), true, true); -@@ -61,36 +59,15 @@ class Autoloader +@@ -64,28 +57,17 @@ class Autoloader + )); } - /** -- * @return ClassLoader -- * @throws RuntimeException -- */ -- private static function getClassLoader() +- private static function getClassLoader(): ?ClassLoader - { -- if (file_exists(getenv('COMPOSER_VENDOR_DIR') . '/autoload.php')) { -- return include getenv('COMPOSER_VENDOR_DIR') . '/autoload.php'; +- $composerVendorDirectory = getenv('COMPOSER_VENDOR_DIR'); +- if (is_string($composerVendorDirectory)) { +- return self::getClassLoaderFromVendorDirectory($composerVendorDirectory); - } - -- if (file_exists(__DIR__ . '/../../../autoload.php')) { -- return include __DIR__ . '/../../../autoload.php'; -- } -- -- if (file_exists(__DIR__ . '/../vendor/autoload.php')) { -- return include __DIR__ . '/../vendor/autoload.php'; -- } -- -- throw new RuntimeException('Cannot detect composer autoload. Please run composer install'); +- return self::getClassLoaderFromVendorDirectory(self::UPSTREAM_COMPOSER_VENDOR_DIRECTORY) +- ?? self::getClassLoaderFromVendorDirectory(self::LOCAL_COMPOSER_VENDOR_DIRECTORY); - } - -- /** - * @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; } -@@ -109,7 +86,7 @@ class Autoloader +@@ -104,7 +86,7 @@ class Autoloader return; } @@ -65,10 +65,31 @@ diff -up ./src/Autoloader.php.rpm ./src/Autoloader.php $legacy = $namespaces[$check] . strtr(substr($class, strlen($check)), [ 'ApiTools' => 'Apigility', +@@ -166,20 +148,4 @@ class Autoloader + } + }; + } +- +- private static function getClassLoaderFromVendorDirectory(string $composerVendorDirectory): ?ClassLoader +- { +- $filename = rtrim($composerVendorDirectory, '/') . '/autoload.php'; +- if (!file_exists($filename)) { +- return null; +- } +- +- /** @psalm-suppress MixedAssignment */ +- $loader = include $filename; +- if (!$loader instanceof ClassLoader) { +- return null; +- } +- +- return $loader; +- } + } diff -up ./src/Replacements.php.rpm ./src/Replacements.php ---- ./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 +--- ./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 = []) { $this->replacements = array_merge( |