Improved autoload performances (reverted from commit beccf6e)

Author: Geolim4

src/autoload.php

@@ -16,20 +16,17 @@
 define('PFC_BIN_DIR', __DIR__ . '/../bin/');
 
 /**
- * Register PhpFastCache Autoload
- */
-set_include_path(get_include_path() . PATH_SEPARATOR . __DIR__);
-spl_autoload_register();
-
-/**
- * Register PhpFastCache
- * embedded-libraries Autoload
+ * Register Autoload
  */
 spl_autoload_register(function ($entity) {
-    /**
-     * Attempting to load Psr\Cache
-     */
-    if (strpos($entity, 'Psr\Cache') === 0) {
+    $module = explode('\\', $entity, 2);
+    if (!in_array($module[ 0 ], ['phpFastCache', 'Psr'])) {
+        /**
+         * Not a part of phpFastCache file
+         * then we return here.
+         */
+        return;
+    } else if (strpos($entity, 'Psr\Cache') === 0) {
         $path = PFC_BIN_DIR . 'legacy/Psr/Cache/src/' . substr(strrchr($entity, '\\'), 1) . '.' . PFC_PHP_EXT;
 
         if (is_readable($path)) {
@@ -38,12 +35,7 @@
             trigger_error('Cannot locate the Psr/Cache files', E_USER_ERROR);
         }
         return;
-    }
-
-    /**
-     * Attempting to load Psr\SimpleCache
-     */
-    if (strpos($entity, 'Psr\SimpleCache') === 0) {
+    } else if (strpos($entity, 'Psr\SimpleCache') === 0) {
         $path = PFC_BIN_DIR . 'legacy/Psr/SimpleCache/src/' . substr(strrchr($entity, '\\'), 1) . '.' . PFC_PHP_EXT;
 
         if (is_readable($path)) {
@@ -53,6 +45,13 @@
         }
         return;
     }
+
+    $entity = str_replace('\\', '/', $entity);
+    $path = __DIR__ . '/' . $entity . '.' . PFC_PHP_EXT;
+
+    if (is_readable($path)) {
+        require_once $path;
+    }
 });
 
 if ((!defined('PFC_IGNORE_COMPOSER_WARNING') || !PFC_IGNORE_COMPOSER_WARNING) && class_exists('Composer\Autoload\ClassLoader')) {

tests/Autoload.test.php

@@ -20,15 +20,6 @@
     $testHelper->printPassText('Autoload successfully found the CacheManager');
 }
 
-/**
- * Testing Psr autoload
- */
-if (!class_exists('phpFastCache\Drivers\Files\Driver')) {
-    $testHelper->printFailText('Autoload failed to find the "files" driver');
-}else{
-    $testHelper->printPassText('Autoload successfully found the "files" driver');
-}
-
 /**
  * Testing Psr autoload
  */