Rewrite autoloader so we have all rules defined in separate class

.gitattributes

@@ -1,5 +1,4 @@
 /.gitattributes export-ignore
 /.gitignore export-ignore
-/composer.lock export-ignore
 /docs/ export-ignore
 /mkdocs.yml export-ignore

.gitignore

@@ -1,3 +1,4 @@
+/composer.lock
 /docs/html/
 /vendor/
 /laminas-mkdoc-theme.tgz

composer.json

@@ -21,7 +21,10 @@
     "autoload": {
         "files": [
             "src/autoload.php"
-        ]
+        ],
+        "psr-4": {
+            "Laminas\\ZendFrameworkBridge\\": "src//"
+        }
     },
     "extra": {
         "branch-alias": {

src/Autoloader.php

@@ -0,0 +1,39 @@
+<?php
+/**
+ * @see       https://github.com/laminas/laminas-zendframework-bridge for the canonical source repository
+ * @copyright Copyright (c) 2019 Laminas Foundation (https://getlaminas.org)
+ * @license   https://github.com/laminas/laminas-zendframework-bridge/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\ZendFrameworkBridge;
+
+/**
+ * Alias legacy Zend Framework project classes/interfaces/traits to Laminas equivalents.
+ */
+class Autoloader
+{
+    /**
+     * This autoloader is _append_, so a mix of legacy and Laminas classes can be used.
+     */
+    public static function load()
+    {
+        $classes = RewriteRules::namespaceRewrite();
+        spl_autoload_register(static function ($class) use ($classes) {
+            $segments = explode('\\', $class);
+
+            $i = 0;
+            $check = '';
+
+            while (isset($classes[$check . $segments[$i] . '\\'])) {
+                $check .= $segments[$i] . '\\';
+                ++$i;
+            }
+
+            if ($check !== '') {
+                $alias = $classes[$check] . substr($class, strlen($check));
+                class_alias($alias, $class);
+                return;
+            }
+        });
+    }
+}

src/RewriteRules.php

@@ -0,0 +1,37 @@
+<?php
+/**
+ * @see       https://github.com/laminas/laminas-zendframework-bridge for the canonical source repository
+ * @copyright Copyright (c) 2019 Laminas Foundation (https://getlaminas.org)
+ * @license   https://github.com/laminas/laminas-zendframework-bridge/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Laminas\ZendFrameworkBridge;
+
+class RewriteRules
+{
+    /**
+     * @return array
+     */
+    public static function namespaceRewrite()
+    {
+        // @todo Need to determine the final name and namespace for zf-console
+        return array(
+            // Expressive
+            'Zend\\ProblemDetails\\' => 'Expressive\\',
+            'Zend\\Expressive\\'     => 'Expressive\\',
+            // Laminas
+            'Zend\\'                    => 'Laminas\\',
+            'ZF\\ComposerAutoloading\\' => 'Laminas\\ComposerAutoloading\\',
+            'ZF\\Deploy\\'              => 'Laminas\\Deploy\\',
+            'ZF\\DevelopmentMode\\'     => 'Laminas\\DevelopmentMode\\',
+            // Apigility
+            'ZF\\Apigility\\' => 'Apigility\\',
+            'ZF\\'            => 'Apigility\\',
+            // ZendXml, API wrappers, zend-http OAuth support, zend-diagnostics
+            'ZendXml\\'         => 'Laminas\\Xml\\',
+            'ZendService\\'     => 'Laminas\\',
+            'ZendOAuth\\'       => 'Laminas\\OAuth\\',
+            'ZendDiagnostics\\' => 'Laminas\\Diagnostics\\',
+        );
+    }
+}

src/autoload.php

@@ -5,58 +5,4 @@
  * @license   https://github.com/laminas/laminas-zendframework-bridge/blob/master/LICENSE.md New BSD License
  */
 
-if (PHP_VERSION_ID >= 71000) {
-    require __DIR__ . '/autoload-functions-containerconfigtest.php';
-    require __DIR__ . '/autoload-functions-diactoros.php';
-    require __DIR__ . '/autoload-functions-stratigility.php';
-}
-
-/**
- * Alias legacy Zend Framework project classes/interfaces/traits to Laminas equivalents.
- *
- * This autoloader is _appended_, so a mix of legacy and Laminas classes can be used.
- */
-spl_autoload_register(function ($class) {
-    // Zend and Expressive
-    if (strpos($class, 'Zend\\') === 0) {
-        $alias = strpos($class, 'Zend\\Expressive\\') === 0 || strpos($class, 'Zend\\ProblemDetails\\') === 0
-            ? str_replace(array('Zend\\Expressive\\', 'Zend\\ProblemDetails\\'), 'Expressive\\', $class)
-            : str_replace('Zend\\', 'Laminas\\', $class);
-
-        class_alias($alias, $class);
-        return;
-    }
-
-    // Apigility
-    // @todo Need to determine the final name and namespace for zf-console
-    if (strpos($class, 'ZF\\') === 0) {
-        $alias = preg_match('#^ZF\\(ComposerAutoloading|Deploy|DevelopmentMode)\\#', $class)
-            ? str_replace('ZF\\', 'Laminas\\', $class)
-            : str_replace('ZF\\', 'Apigility\\', $class);
-
-        // zf-apigility-doctrine
-        if (strpos($alias, 'Apigility\\Apigility\\') === 0) {
-            $alias = str_replace('Apigility\\Apigility\\', 'Apigility\\', $alias);
-        }
-
-        class_alias($alias, $class);
-        return;
-    }
-
-    // ZendXml, API wrappers, zend-http OAuth support, zend-diagnostics
-    if (strpos($class, 'ZendXml\\') === 0
-        || strpos($class, 'ZendService\\') === 0
-        || strpos($class, 'ZendOAuth\\') === 0
-        || strpos($class, 'ZendDiagnostics\\') === 0
-    ) {
-        // phpcs:disable
-        $alias = str_replace(
-            array(     'ZendXml\\', 'ZendService\\',      'ZendOAuth\\',      'ZendDiagnostics\\'),
-            array('Laminas\\Xml\\',     'Laminas\\', 'Laminas\\OAuth\\', 'Laminas\\Diagnostics\\'),
-            $class
-        );
-        // phpcs:enable
-        class_alias($alias, $class);
-        return;
-    }
-});
+\Laminas\ZendFrameworkBridge\Autoloader::load();