Revert "Introduce CacheControllerInterface"

This reverts commit 89940aa
joomla · Oct 18, 2018 · e819fe8 · e819fe8
1 parent caf8259
commit e819fe8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 50 deletions.
diff --git a/libraries/src/Cache/CacheController.php b/libraries/src/Cache/CacheController.php
@@ -17,8 +17,9 @@
  * Public cache handler
  *
  * @since  1.7.0
+ * @note   As of 4.0 this class will be abstract
  */
-abstract class CacheController implements CacheControllerInterface
+class CacheController
 {
 	/**
 	 * Cache object

diff --git a/libraries/src/Cache/CacheControllerFactory.php b/libraries/src/Cache/CacheControllerFactory.php
@@ -23,12 +23,12 @@ class CacheControllerFactory implements CacheControllerFactoryInterface
 	 * @param   string  $type     The cache object type to instantiate
 	 * @param   array   $options  Array of options
 	 *
-	 * @return  CacheControllerInterface
+	 * @return  CacheController
 	 *
 	 * @since   __DEPLOY_VERSION__
 	 * @throws  \RuntimeException
 	 */
-	public function createCacheController($type = 'output', $options = array()): CacheControllerInterface
+	public function createCacheController($type = 'output', $options = array()): CacheController
 	{
 		if (!$type)
 		{

diff --git a/libraries/src/Cache/CacheControllerFactoryInterface.php b/libraries/src/Cache/CacheControllerFactoryInterface.php
@@ -23,10 +23,10 @@ interface CacheControllerFactoryInterface
 	 * @param   string  $type     The cache object type to instantiate
 	 * @param   array   $options  Array of options
 	 *
-	 * @return  CacheControllerInterface
+	 * @return  CacheController
 	 *
 	 * @since   __DEPLOY_VERSION__
 	 * @throws  \RuntimeException
 	 */
-	public function createCacheController($type = 'output', $options = array()): CacheControllerInterface;
+	public function createCacheController($type = 'output', $options = array()): CacheController;
 }
diff --git a/libraries/src/Cache/CacheControllerInterface.php b/libraries/src/Cache/CacheControllerInterface.php