change return type

joomla · Oct 18, 2018 · 0918a0a · 0918a0a
1 parent 89940aa
commit 0918a0a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/libraries/src/Cache/Cache.php b/libraries/src/Cache/Cache.php
@@ -84,7 +84,7 @@ public function __construct($options)
 	 * @param   string  $type     The cache object type to instantiate
 	 * @param   array   $options  The array of options
 	 *
-	 * @return  CacheController
+	 * @return  CacheControllerInterface
 	 *
 	 * @since       1.7.0
 	 * @deprecated  5.0 Use the cache controller factory instead

diff --git a/libraries/src/Cache/CacheController.php b/libraries/src/Cache/CacheController.php
@@ -79,7 +79,7 @@ public function __call($name, $arguments)
 	 * @param   string  $type     The cache object type to instantiate; default is output.
 	 * @param   array   $options  Array of options
 	 *
-	 * @return  CacheController
+	 * @return  CacheControllerInterface
 	 *
 	 * @since   1.7.0
 	 * @throws  \RuntimeException

diff --git a/libraries/src/Cache/CacheControllerFactory.php b/libraries/src/Cache/CacheControllerFactory.php
@@ -34,7 +34,7 @@ public function createCacheController($type = 'output', $options = array()): Cac
 
 		$class = __NAMESPACE__ . '\\Controller\\' . ucfirst($type) . 'Controller';
 
-		if ($type == '')
+		if ($type == '' && !class_exists($class))
 		{
 			$class = CacheController::class;
 		}

diff --git a/libraries/src/Factory.php b/libraries/src/Factory.php
@@ -309,7 +309,7 @@ public static function getUser($id = null)
 	 * @param   string  $handler  The handler to use
 	 * @param   string  $storage  The storage method
 	 *
-	 * @return  \Joomla\CMS\Cache\CacheController object
+	 * @return  \Joomla\CMS\Cache\CacheControllerInterface object
 	 *
 	 * @see         Cache
 	 * @since       1.7.0