[4.0] Move addIncludePath from trait to class

libraries/src/MVC/Model/BaseDatabaseModel.php

@@ -16,6 +16,7 @@
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Extension\ComponentInterface;
 use Joomla\CMS\Factory;
+use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Factory\LegacyFactory;
 use Joomla\CMS\MVC\Factory\MVCFactoryAwareTrait;

libraries/src/MVC/Model/BaseModel.php

@@ -10,6 +10,7 @@
 
 \defined('JPATH_PLATFORM') or die;
 
+use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Object\CMSObject;
 
@@ -31,6 +32,14 @@ abstract class BaseModel extends CMSObject implements ModelInterface, StatefulMo
 	 */
 	protected $name;
 
+	/**
+	 * The include paths
+	 *
+	 * @var   array
+	 * @since  4.0.0
+	 */
+	protected static $paths;
+
 	/**
 	 * Constructor
 	 *
@@ -67,6 +76,54 @@ public function __construct($config = array())
 		}
 	}
 
+	/**
+	 * Add a directory where \JModelLegacy should search for models. You may
+	 * either pass a string or an array of directories.
+	 *
+	 * @param   mixed   $path    A path or array[sting] of paths to search.
+	 * @param   string  $prefix  A prefix for models.
+	 *
+	 * @return  array  An array with directory elements. If prefix is equal to '', all directories are returned.
+	 *
+	 * @since       3.0
+	 * @deprecated  5.0 See LeagcyModelLoaderTrait\getInstance
+	 */
+	public static function addIncludePath($path = '', $prefix = '')
+	{
+		if (!isset(self::$paths))
+		{
+			self::$paths = array();
+		}
+
+		if (!isset(self::$paths[$prefix]))
+		{
+			self::$paths[$prefix] = array();
+		}
+
+		if (!isset(self::$paths['']))
+		{
+			self::$paths[''] = array();
+		}
+
+		if (!empty($path))
+		{
+			foreach ((array) $path as $includePath)
+			{
+				if (!\in_array($includePath, self::$paths[$prefix]))
+				{
+					array_unshift(self::$paths[$prefix], Path::clean($includePath));
+				}
+
+				if (!\in_array($includePath, self::$paths['']))
+				{
+					array_unshift(self::$paths[''], Path::clean($includePath));
+				}
+			}
+		}
+
+		return self::$paths[$prefix];
+	}
+
 	/**
 	 * Method to get the model name
 	 *

libraries/src/MVC/Model/LegacyModelLoaderTrait.php

@@ -23,56 +23,6 @@
  */
 trait LegacyModelLoaderTrait
 {
-	/**
-	 * Add a directory where \JModelLegacy should search for models. You may
-	 * either pass a string or an array of directories.
-	 *
-	 * @param   mixed   $path    A path or array[sting] of paths to search.
-	 * @param   string  $prefix  A prefix for models.
-	 *
-	 * @return  array  An array with directory elements. If prefix is equal to '', all directories are returned.
-	 *
-	 * @since       3.0
-	 * @deprecated  5.0 See getInstance
-	 */
-	public static function addIncludePath($path = '', $prefix = '')
-	{
-		static $paths;
-
-		if (!isset($paths))
-		{
-			$paths = array();
-		}
-
-		if (!isset($paths[$prefix]))
-		{
-			$paths[$prefix] = array();
-		}
-
-		if (!isset($paths['']))
-		{
-			$paths[''] = array();
-		}
-
-		if (!empty($path))
-		{
-			foreach ((array) $path as $includePath)
-			{
-				if (!\in_array($includePath, $paths[$prefix]))
-				{
-					array_unshift($paths[$prefix], Path::clean($includePath));
-				}
-
-				if (!\in_array($includePath, $paths['']))
-				{
-					array_unshift($paths[''], Path::clean($includePath));
-				}
-			}
-		}
-
-		return $paths[$prefix];
-	}
-
 
 	/**
 	 * Create the filename for a resource