refactor: extract methods

Extracted two methods:

- createPrependAutoloader
- createAppendAutoloader

Additionally, changed `$loaded` to be an `ArrayObject` instance, which
allows removal of the `static` declaration, as well as the need to pass
by reference (since objects always are).

These changes also allows removing intermediary variable representations within
`load()`, making it more clear what is being passed to each autoloader.

Author: weierophinney

src/Autoloader.php

@@ -7,6 +7,7 @@
 
 namespace Laminas\ZendFrameworkBridge;
 
+use ArrayObject;
 use Composer\Autoload\ClassLoader;
 use RuntimeException;
 
@@ -32,12 +33,47 @@ class Autoloader
      */
     public static function load()
     {
-        static $loaded = array();
+        $loaded = new ArrayObject(array());
+
+        spl_autoload_register(self::createPrependAutoloader(
+            RewriteRules::namespaceReverse(),
+            self::getClassLoader(),
+            $loaded
+        ), true, true);
+
+        spl_autoload_register(self::createAppendAutoloader(
+            RewriteRules::namespaceRewrite(),
+            $loaded
+        ));
+    }
 
-        $classLoader = self::getClassLoader();
+    /**
+     * @return ClassLoader
+     * @throws RuntimeException
+     */
+    private static function getClassLoader()
+    {
+        if (file_exists(__DIR__ . '/../../../autoload.php')) {
+            return include __DIR__ . '/../../../autoload.php';
+        }
 
-        $namespaces = RewriteRules::namespaceReverse();
-        spl_autoload_register(function ($class) use ($namespaces, $classLoader, &$loaded) {
+        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 callable
+     */
+    private static function createPrependAutoloader(array $namespaces, ClassLoader $classLoader, ArrayObject $loaded)
+    {
+        /**
+         * @param  string $class Class name to autoload
+         * @return void
+         */
+        return function ($class) use ($namespaces, $classLoader, $loaded) {
             if (isset($loaded[$class])) {
                 return;
             }
@@ -60,10 +96,19 @@ public static function load()
                 $legacy = $namespaces[$check] . str_replace('Laminas', 'Zend', substr($class, strlen($check)));
                 class_alias($class, $legacy);
             }
-        }, true, true);
+        };
+    }
 
-        $namespaces = RewriteRules::namespaceRewrite();
-        spl_autoload_register(function ($class) use ($namespaces, &$loaded) {
+    /**
+     * @return callable
+     */
+    private static function createAppendAutoloader(array $namespaces, ArrayObject $loaded)
+    {
+        /**
+         * @param  string $class Class name to autoload
+         * @return void
+         */
+        return function ($class) use ($namespaces, $loaded) {
             $segments = explode('\\', $class);
 
             $i = 0;
@@ -85,23 +130,6 @@ class_alias($class, $legacy);
             if (class_exists($alias) || interface_exists($alias) || trait_exists($alias)) {
                 class_alias($alias, $class);
             }
-        });
-    }
-
-    /**
-     * @return ClassLoader
-     * @throws RuntimeException
-     */
-    private static function getClassLoader()
-    {
-        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');
+        };
     }
 }