diff vendor/doctrine/common/lib/Doctrine/Common/Proxy/Autoloader.php @ 12:7a779792577d

Update Drupal core to v8.4.5 (via Composer)
author Chris Cannam
date Fri, 23 Feb 2018 15:52:07 +0000
parents 4c8ae668cc8c
children
line wrap: on
line diff
--- a/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Autoloader.php	Fri Feb 23 15:51:18 2018 +0000
+++ b/vendor/doctrine/common/lib/Doctrine/Common/Proxy/Autoloader.php	Fri Feb 23 15:52:07 2018 +0000
@@ -49,9 +49,13 @@
             throw InvalidArgumentException::notProxyClass($className, $proxyNamespace);
         }
 
-        $className = str_replace('\\', '', substr($className, strlen($proxyNamespace) + 1));
+        // remove proxy namespace from class name
+        $classNameRelativeToProxyNamespace = substr($className, strlen($proxyNamespace));
 
-        return $proxyDir . DIRECTORY_SEPARATOR . $className . '.php';
+        // remove namespace separators from remaining class name
+        $fileName = str_replace('\\', '', $classNameRelativeToProxyNamespace);
+
+        return $proxyDir . DIRECTORY_SEPARATOR . $fileName . '.php';
     }
 
     /**