Only start with main component helper for now

joomla · Jun 10, 2017 · 05ecc31 · 05ecc31
1 parent ab17237
commit 05ecc31
Show file tree

Hide file tree

Showing 10 changed files with 51 additions and 46 deletions.
diff --git a/administrator/components/com_associations/Helper/AssociationsHelper.php b/administrator/components/com_associations/Helper/AssociationsHelper.php
@@ -10,7 +10,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Helper\ContentHelper;
 use Joomla\CMS\Layout\LayoutHelper;
 use Joomla\Registry\Registry;
@@ -341,9 +340,17 @@ public static function getSupportedExtension($extensionName)
 		$result->def('associationssupport', false);
 		$result->def('helper', null);
 
-		$componentAssociationsHelperClassName = ComponentHelper::getHelperClassName($extensionName, 'associations');
+		// Check if associations helper exists
+		if (!file_exists(JPATH_ADMINISTRATOR . '/components/' . $extensionName . '/helpers/associations.php'))
+		{
+			return $result;
+		}
+
+		require_once JPATH_ADMINISTRATOR . '/components/' . $extensionName . '/helpers/associations.php';
+
+		$componentAssociationsHelperClassName = self::getExtensionHelperClassName($extensionName);
 
-		if (!$componentAssociationsHelperClassName)
+		if (!class_exists($componentAssociationsHelperClassName, false))
 		{
 			return $result;
 		}

diff --git a/administrator/components/com_categories/Helper/CategoriesHelper.php b/administrator/components/com_categories/Helper/CategoriesHelper.php
@@ -48,11 +48,12 @@ public static function addSubmenu($extension)
 			$section = $parts[1];
 		}
 
-
-		$cName = ComponentHelper::getHelperClassName($component);
+		// Try to find the component helper.
+		$cName = ComponentHelper::getComponentHelperClassName($component);
 
 		if ($cName && is_callable(array($cName, 'addSubmenu')))
 		{
+
 			$lang = \JFactory::getLanguage();
 
 			// Loading language file from the administrator/language directory then

diff --git a/administrator/components/com_categories/Model/Categories.php b/administrator/components/com_categories/Model/Categories.php
@@ -380,7 +380,7 @@ public function countItems(&$items, $extension)
 		}
 
 		// Try to find the component helper.
-		$cName = ComponentHelper::getHelperClassName($component);
+		$cName = ComponentHelper::getComponentHelperClassName($component);
 
 		if ($cName && is_callable(array($cName, 'countItems')))
 		{

diff --git a/administrator/components/com_categories/helpers/association.php b/administrator/components/com_categories/helpers/association.php
@@ -38,14 +38,13 @@ public static function getCategoryAssociations($id = 0, $extension = 'com_conten
 		{
 			// Load route helper
 			jimport('helper.route', JPATH_COMPONENT_SITE);
-			$helperClassname = \Joomla\CMS\Component\ComponentHelper::getHelperClassName($extension, 'Route', 'Site');
-
+			$helperClassname = ucfirst(substr($extension, 4)) . 'HelperRoute';
 
 			$associations = CategoriesHelper::getAssociations($id, $extension);
 
 			foreach ($associations as $tag => $item)
 			{
-				if ($helperClassname && is_callable(array($helperClassname, 'getCategoryRoute')))
+				if (class_exists($helperClassname) && is_callable(array($helperClassname, 'getCategoryRoute')))
 				{
 					$return[$tag] = $helperClassname::getCategoryRoute($item, $tag);
 				}

diff --git a/administrator/components/com_fields/helpers/fields.php b/administrator/components/com_fields/helpers/fields.php
@@ -10,6 +10,8 @@
 
 JLoader::register('JFolder', JPATH_LIBRARIES . '/joomla/filesystem/folder.php');
 
+use Joomla\CMS\Component\ComponentHelper;
+
 /**
  * FieldsHelper
  *
@@ -43,7 +45,7 @@ public static function extract($contextString, $item = null)
 
 		$component = $parts[0];
 
-		$cName = \Joomla\CMS\Component\ComponentHelper::getHelperClassName($component);
+		$cName = ComponentHelper::getComponentHelperClassName($component);
 
 		if ($cName && is_callable(array($cName, 'validateSection')))
 		{

diff --git a/administrator/components/com_fields/models/fields/fieldcontexts.php b/administrator/components/com_fields/models/fields/fieldcontexts.php
@@ -10,6 +10,8 @@
 
 JFormHelper::loadFieldClass('list');
 
+use Joomla\CMS\Component\ComponentHelper;
+
 /**
  * Fields Contexts
  *
@@ -43,7 +45,7 @@ protected function getOptions()
 	{
 		$parts = explode('.', $this->value);
 
-		$cName = \Joomla\CMS\Component\ComponentHelper::getHelperClassName($parts[0]);
+		$cName = ComponentHelper::getComponentHelperClassName($parts[0]);
 
 		$contexts = array();
 
@@ -54,7 +56,7 @@ protected function getOptions()
 
 		if (!$contexts || !is_array($contexts) || count($contexts) == 1)
 		{
-			return array();
+			$contexts = array();
 		}
 
 		return $contexts;

diff --git a/administrator/components/com_tags/Model/Tags.php b/administrator/components/com_tags/Model/Tags.php
@@ -359,7 +359,7 @@ public function countItems(&$items, $extension)
 		}
 
 		// Try to find the component helper.
-		$cName = ComponentHelper::getHelperClassName($component);
+		$cName = ComponentHelper::getComponentHelperClassName($component);
 
 		if ($cName && is_callable(array($cName, 'countTagItems')))
 		{

diff --git a/libraries/src/CMS/Categories/Categories.php b/libraries/src/CMS/Categories/Categories.php
@@ -10,7 +10,6 @@
 
 defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Language\Multilanguage;
 
 /**
@@ -141,12 +140,14 @@ public static function getInstance($extension, $options = array())
 
 		if (!class_exists($classname))
 		{
-			$classname = ComponentHelper::getHelperClassName($component, 'category', 'Site');
+			$path = JPATH_SITE . '/components/' . $component . '/helpers/category.php';
 
-			if (!$classname)
+			if (!is_file($path))
 			{
 				return false;
 			}
+
+			include_once $path;
 		}
 
 		// Check for a possible service from the container otherwise manually instantiate the class

diff --git a/libraries/src/CMS/Component/ComponentHelper.php b/libraries/src/CMS/Component/ComponentHelper.php
@@ -567,53 +567,45 @@ public static function getComponentName($object, $alternativeName)
 	/**
 	 * Method to get helper class for a component
 	 *
-	 * @param   string  $option   The name of component to get helper class, for example com_content
-	 * @param   string  $helper   The type of helper to get like helper (main component helper), association, route, associations..
-	 * @param   string  $appName  Name of application to get helper class (Site or Administrator)
+	 * @param   string $option The name of component to get helper class, for example com_content
 	 *
 	 * @return bool|string  The class name if exists, false otherwise
 	 */
-	public static function getHelperClassName($option, $helper = 'helper', $appName = 'Administrator')
+	public static function getComponentHelperClassName($option)
 	{
 		jimport('joomla.filesystem.path');
 
-		$componentName = str_replace('com_', '', $option);
-		$helper        = ucfirst($helper);
-
-		if ($helper == 'Helper')
-		{
-			// Main component helper class name, like ContentHelper
-			$className = ucfirst($componentName) . 'Helper';
-		}
-		else
+		// Check and make sure component exists to avoid warning
+		if (!self::isInstalled($option))
 		{
-			// Specific type component class name like ContentAssociationsHelper
-			$className = ucfirst($componentName) . $helper . 'Helper';;
+			return false;
 		}
 
+		$componentName = str_replace('com_', '', $option);
+
 		// If this is a namespace component, try to find a helper namespace class
 		if ($componentNamespace = self::getComponent($option)->namespace)
 		{
-			$fqcn = $componentNamespace . '\\' . ucfirst($appName) . '\\Helper\\' . $className;
+			$className = $componentNamespace . '\\Administrator\\Helper\\' . ucfirst($componentName) . 'Helper';
 
-			if (class_exists($fqcn))
+			if (class_exists($className))
 			{
-				return $fqcn;
+				return $className;
 			}
 		}
-
-		// Fall back to find a none namespace helper class
-		$rootPath = constant('JPATH_' . strtoupper($appName));
-
-		$file = \JPath::clean($rootPath . '/components/' . $option . '/helpers/' . $helper . '.php');
-
-		if (file_exists($file))
+		else
 		{
-			\JLoader::register($className, $file);
+			$file = \JPath::clean(JPATH_ADMINISTRATOR . '/components/' . $option . '/helpers/' . $componentName . '.php');
 
-			if (class_exists($className))
+			if (file_exists($file))
 			{
-				return $className;
+				$className = ucfirst($componentName) . 'Helper';
+				\JLoader::register($className, $file);
+
+				if (class_exists($className))
+				{
+					return $className;
+				}
 			}
 		}
 

diff --git a/modules/mod_languages/helper.php b/modules/mod_languages/helper.php
@@ -62,9 +62,10 @@ public static function getList(&$params)
 			}
 
 			// Load component associations
-			$class = \Joomla\CMS\Component\ComponentHelper::getHelperClassName($app->input->get('option'), 'association', 'Site');
+			$class = str_replace('com_', '', $app->input->get('option')) . 'HelperAssociation';
+			JLoader::register($class, JPATH_COMPONENT_SITE . '/helpers/association.php');
 
-			if ($class && is_callable(array($class, 'getAssociations')))
+			if (class_exists($class) && is_callable(array($class, 'getAssociations')))
 			{
 				$cassociations = call_user_func(array($class, 'getAssociations'));
 			}