Load the Joomla namespace trough JLoader

joomla · Mar 22, 2017 · 55cc1a9 · 55cc1a9
1 parent d18491f
commit 55cc1a9
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 59 deletions.
diff --git a/libraries/cms.php b/libraries/cms.php
@@ -28,6 +28,7 @@
 
 // Register the library base path for CMS libraries.
 JLoader::registerPrefix('J', JPATH_PLATFORM . '/cms', false, true);
+JLoader::registerNamespace('Joomla', JPATH_PLATFORM . '/src/Joomla', false, false, 'psr4');
 
 // Create the Composer autoloader
 $loader = require JPATH_LIBRARIES . '/vendor/autoload.php';

diff --git a/libraries/cms/class/loader.php b/libraries/cms/class/loader.php
@@ -52,47 +52,11 @@ public function __construct(ClassLoader $loader)
 	 */
 	public function loadClass($class)
 	{
-		// Namespaced class
-		if ($this->loadFromJLoader($class))
-		{
-			return true;
-		}
-
-		// None namespaced class
-		if ($this->loadFromJLoader('\\' . $class))
-		{
-			return true;
-		}
-
 		if ($result = $this->loader->loadClass($class))
 		{
 			JLoader::applyAliasFor($class);
 		}
 
 		return $result;
 	}
-
-	/**
-	 * Loads the class from JLoader when possible.
-	 *
-	 * @param   string  $class  The name of the class
-	 *
-	 * @return  boolean  True if loaded, false otherwise
-	 *
-	 * @since   __DEPLOY_VERSION__
-	 */
-	private function loadFromJLoader($class)
-	{
-		// Check if JLoader is able to load the class
-		if (!key_exists(strtolower($class), JLoader::getClassList()))
-		{
-			return false;
-		}
-
-		// Load the class
-		JLoader::load($class);
-
-		JLoader::applyAliasFor($class);
-		return true;
-	}
 }
diff --git a/libraries/loader.php b/libraries/loader.php
@@ -278,12 +278,6 @@ public static function load($class)
 	 */
 	public static function register($class, $path, $force = true)
 	{
-		// When an alias exists, register it as well
-		if (key_exists($class, self::$classAliases))
-		{
-			self::register(self::$classAliases[$class], $path, $force);
-		}
-
 		// Sanitize class name.
 		$class = strtolower($class);
 
@@ -642,17 +636,6 @@ class_alias(self::$classAliases[$class], $class);
 	 */
 	public static function applyAliasFor($class)
 	{
-		// When the class doesn't exists but we have a class available with the key, create the alias
-		if (!class_exists($class) && $key = array_search($class, self::$classAliases))
-		{
-			if (class_exists($key))
-			{
-				class_alias($key, $class);
-				return;
-			}
-		}
-
-
 		// Remove the root backslash if present.
 		if ($class[0] == '\\')
 		{

diff --git a/libraries/vendor/composer/autoload_psr4.php b/libraries/vendor/composer/autoload_psr4.php
@@ -28,5 +28,4 @@
     'Joomla\\DI\\Tests\\' => array($vendorDir . '/joomla/di/Tests'),
     'Joomla\\DI\\' => array($vendorDir . '/joomla/di/src'),
     'Joomla\\Application\\' => array($vendorDir . '/joomla/application/src'),
-    'Joomla\\' => array($baseDir . '/libraries/src/Joomla'),
 );
diff --git a/libraries/vendor/composer/autoload_static.php b/libraries/vendor/composer/autoload_static.php
@@ -59,7 +59,6 @@ class ComposerStaticInit205c915b9c7d3e718e7c95793ee67ffe
             'Joomla\\DI\\Tests\\' => 16,
             'Joomla\\DI\\' => 10,
             'Joomla\\Application\\' => 19,
-            'Joomla\\' => 7,
         ),
     );
 
@@ -152,10 +151,6 @@ class ComposerStaticInit205c915b9c7d3e718e7c95793ee67ffe
         array (
             0 => __DIR__ . '/..' . '/joomla/application/src',
         ),
-        'Joomla\\' => 
-        array (
-            0 => __DIR__ . '/../../..' . '/libraries/src/Joomla',
-        ),
     );
 
     public static $prefixesPsr0 = array (