Simplified frontend controller factory

aimeos · Jan 7, 2019 · 8086a84 · 8086a84
1 parent bc3c0c8
commit 8086a84
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 250 deletions.
diff --git a/controller/frontend/src/Controller/Frontend.php b/controller/frontend/src/Controller/Frontend.php
@@ -18,7 +18,7 @@
 class Frontend
 {
 	static private $cache = true;
-	static private $controllers = [];
+	static private $objects = [];
 
 
 	/**
@@ -29,35 +29,8 @@ class Frontend
 	 */
 	static public function cache( $value )
 	{
-		$old = self::$cache;
 		self::$cache = (boolean) $value;
-
-		return $old;
-	}
-
-
-	/**
-	 * Removes all controller objects from the cache
-	 *
-	 * If neither a context ID nor a path is given, the complete cache will be pruned.
-	 *
-	 * @param integer $id Context ID the objects have been created with (string of \Aimeos\MShop\Context\Item\Iface)
-	 * @param string $path Path describing the controller to clear, e.g. "basket"
-	 */
-	static public function clear( $id = null, $path = null )
-	{
-		if( $id !== null )
-		{
-			if( $path !== null ) {
-				self::$controllers[$id][$path] = null;
-			} else {
-				self::$controllers[$id] = [];
-			}
-
-			return;
-		}
-
-		self::$controllers = [];
+		self::$objects = [];
 	}
 
 
@@ -82,36 +55,25 @@ static public function create( \Aimeos\MShop\Context\Item\Iface $context, $path
 			throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Controller path is empty' ) );
 		}
 
-		$id = (string) $context;
-
-		if( self::$cache === false || !isset( self::$controllers[$id][$path] ) )
+		if( self::$cache === false || !isset( self::$objects[$path] ) )
 		{
-			$parts = explode( '/', $path );
-
-			foreach( $parts as $key => $part )
-			{
-				if( ctype_alnum( $part ) === false ) {
-					throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Invalid characters in controller name "%1$s" in "%2$s"', $part, $path ) );
-				}
-
-				$parts[$key] = ucwords( $part );
+			if( ctype_alnum( $path ) === false ) {
+				throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Invalid characters in controller name "%1$s"', $path ) );
 			}
 
-			$factory = '\\Aimeos\\Controller\\Frontend\\' . join( '\\', $parts ) . '\\Factory';
+			$factory = '\\Aimeos\\Controller\\Frontend\\' . ucfirst( $path ) . '\\Factory';
 
 			if( class_exists( $factory ) === false ) {
 				throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Class "%1$s" not available', $factory ) );
 			}
 
-			$manager = call_user_func_array( array( $factory, 'create' ), array( $context ) );
-
-			if( $manager === false ) {
+			if( ( $controller = call_user_func_array( [$factory, 'create'], [$context] ) ) === false ) {
 				throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Invalid factory "%1$s"', $factory ) );
 			}
 
-			self::$controllers[$id][$path] = $manager;
+			self::$objects[$path] = $controller;
 		}
 
-		return clone self::$controllers[$id][$path];
+		return clone self::$objects[$path];
 	}
 }
diff --git a/controller/frontend/src/Controller/Frontend/Factory.php b/controller/frontend/src/Controller/Frontend/Factory.php
diff --git a/controller/frontend/src/Controller/Frontend/Product/Factory.php b/controller/frontend/src/Controller/Frontend/Product/Factory.php
@@ -76,7 +76,7 @@ public static function create( \Aimeos\MShop\Context\Item\Iface $context, $name
 		$iface = '\\Aimeos\\Controller\\Frontend\\Product\\Iface';
 		$classname = '\\Aimeos\\Controller\\Frontend\\Product\\' . $name;
 
-		$manager = self::createController( $context, $classname, $iface );
+		$controller = self::createController( $context, $classname, $iface );
 
 		/** controller/frontend/product/decorators/excludes
 		 * Excludes decorators added by the "common" option from the product frontend controllers
@@ -152,6 +152,6 @@ public static function create( \Aimeos\MShop\Context\Item\Iface $context, $name
 		 * @see controller/frontend/product/decorators/excludes
 		 * @see controller/frontend/product/decorators/global
 		 */
-		return self::addControllerDecorators( $context, $manager, 'product' );
+		return self::addControllerDecorators( $context, $controller, 'product' );
 	}
 }
diff --git a/controller/frontend/tests/Controller/Frontend/FactoryTest.php b/controller/frontend/tests/Controller/Frontend/FactoryTest.php
diff --git a/controller/frontend/tests/Controller/FrontendTest.php b/controller/frontend/tests/Controller/FrontendTest.php
@@ -46,61 +46,15 @@ public function testCreateSubControllerNotExisting()
 	}
 
 
-	public function testClear()
+	public function testCache()
 	{
-		$cache = \Aimeos\Controller\Frontend::cache( true );
-
 		$context = \TestHelperFrontend::getContext();
+		\Aimeos\Controller\Frontend::cache( true );
 
 		$controller1 = \Aimeos\Controller\Frontend::create( $context, 'basket' );
-		\Aimeos\Controller\Frontend::clear();
 		$controller2 = \Aimeos\Controller\Frontend::create( $context, 'basket' );
 
-		\Aimeos\Controller\Frontend::cache( $cache );
-
+		\Aimeos\Controller\Frontend::cache( false );
 		$this->assertNotSame( $controller1, $controller2 );
 	}
-
-
-	public function testClearSite()
-	{
-		$cache = \Aimeos\Controller\Frontend::cache( true );
-
-		$context = \TestHelperFrontend::getContext();
-
-		$basket1 = \Aimeos\Controller\Frontend::create( $context, 'basket' );
-		$catalog1 = \Aimeos\Controller\Frontend::create( $context, 'catalog' );
-
-		\Aimeos\Controller\Frontend::clear( (string) $context );
-
-		$basket2 = \Aimeos\Controller\Frontend::create( $context, 'basket' );
-		$catalog2 = \Aimeos\Controller\Frontend::create( $context, 'catalog' );
-
-		\Aimeos\Controller\Frontend::cache( $cache );
-
-		$this->assertNotSame( $basket1, $basket2 );
-		$this->assertNotSame( $catalog1, $catalog2 );
-	}
-
-
-	public function testClearSpecific()
-	{
-		$cache = \Aimeos\Controller\Frontend::cache( true );
-
-		$context = \TestHelperFrontend::getContext();
-
-		$basket1 = \Aimeos\Controller\Frontend::create( $context, 'basket' );
-		$catalog1 = \Aimeos\Controller\Frontend::create( $context, 'catalog' );
-
-		\Aimeos\Controller\Frontend::clear( (string) $context, 'basket' );
-
-		$basket2 = \Aimeos\Controller\Frontend::create( $context, 'basket' );
-		$catalog2 = \Aimeos\Controller\Frontend::create( $context, 'catalog' );
-
-		\Aimeos\Controller\Frontend::cache( $cache );
-
-		$this->assertNotSame( $basket1, $basket2 );
-		$this->assertSame( $catalog1, $catalog2 );
-	}
-
 }
diff --git a/controller/frontend/tests/TestHelperFrontend.php b/controller/frontend/tests/TestHelperFrontend.php
@@ -15,8 +15,6 @@ class TestHelperFrontend
 	public static function bootstrap()
 	{
 		self::getAimeos();
-		\Aimeos\MShop::cache( false );
-		\Aimeos\Controller\Frontend\Factory::setCache( false );
 	}