Move creator file to a trait in the application

joomla · Jun 3, 2017 · 5f1695c · 5f1695c
1 parent bfa7672
commit 5f1695c
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 5 deletions.
diff --git a/libraries/bootstrap.php b/libraries/bootstrap.php
@@ -95,10 +95,6 @@
 JLoader::registerAlias('JAdministrator', 'JApplicationAdministrator');
 JLoader::registerAlias('JSite', 'JApplicationSite');
 
-//JLoader::register('JNamespacePsr4Map', JPATH_LIBRARIES . '/namespacemap.php');
-//$extensionPsr4Loader = new JNamespacePsr4Map;
-//$extensionPsr4Loader->ensureMapFileExists();
-
 // Can be removed when the move of all core fields to namespace is finished
 \Joomla\CMS\Form\FormHelper::addFieldPath(JPATH_LIBRARIES . '/joomla/form/fields');
 \Joomla\CMS\Form\FormHelper::addRulePath(JPATH_LIBRARIES . '/joomla/form/rule');

diff --git a/libraries/src/CMS/Application/CMSApplication.php b/libraries/src/CMS/Application/CMSApplication.php
@@ -31,7 +31,7 @@
  */
 abstract class CMSApplication extends WebApplication implements ContainerAwareInterface
 {
-	use ContainerAwareTrait;
+	use ContainerAwareTrait, ExtensionNamespaceMapper;
 
 	/**
 	 * Constant defining an enqueued emergency message
@@ -201,6 +201,8 @@ public function __construct(\JInput $input = null, Registry $config = null, WebC
 		{
 			$this->config->set('session_name', $this->getName());
 		}
+
+		$this->createExtensionNamespaceMap();
 	}
 
 	/**

diff --git a/libraries/src/CMS/Application/ExtensionNamespaceMapper.php b/libraries/src/CMS/Application/ExtensionNamespaceMapper.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+namespace Joomla\CMS\Application;
+
+defined('JPATH_PLATFORM') or die;
+
+use JLoader;
+
+/**
+ * Trait for application classes which ensures the namespace mapper exists and includes it.
+ *
+ * @since  4.0
+ */
+trait ExtensionNamespaceMapper
+{
+	/**
+	 * Allows the application to load a custom or default identity.
+	 *
+	 * @return  void
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function createExtensionNamespaceMap()
+	{
+		JLoader::register('JNamespacePsr4Map', JPATH_LIBRARIES . '/namespacemap.php');
+		$extensionPsr4Loader = new \JNamespacePsr4Map;
+		$extensionPsr4Loader->ensureMapFileExists();
+	}
+}