@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | * @param string|null $name Name of the controller implementaton (default: "Standard") |
| 30 | 30 | * @return \Aimeos\Controller\Frontend\Basket\Iface Controller object |
| 31 | 31 | */ |
| 32 | - public static function createController( \Aimeos\MShop\Context\Item\Iface $context, $name = null ) |
|
| 32 | + public static function createController(\Aimeos\MShop\Context\Item\Iface $context, $name = null) |
|
| 33 | 33 | { |
| 34 | 34 | /** controller/frontend/basket/name |
| 35 | 35 | * Class name of the used basket frontend controller implementation |
@@ -64,20 +64,20 @@ discard block |
||
| 64 | 64 | * @since 2014.03 |
| 65 | 65 | * @category Developer |
| 66 | 66 | */ |
| 67 | - if( $name === null ) { |
|
| 68 | - $name = $context->getConfig()->get( 'controller/frontend/basket/name', 'Standard' ); |
|
| 67 | + if ($name === null) { |
|
| 68 | + $name = $context->getConfig()->get('controller/frontend/basket/name', 'Standard'); |
|
| 69 | 69 | } |
| 70 | 70 | |
| 71 | - if( ctype_alnum( $name ) === false ) |
|
| 71 | + if (ctype_alnum($name) === false) |
|
| 72 | 72 | { |
| 73 | - $classname = is_string( $name ) ? '\\Aimeos\\Controller\\Frontend\\Basket\\' . $name : '<not a string>'; |
|
| 74 | - throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) ); |
|
| 73 | + $classname = is_string($name) ? '\\Aimeos\\Controller\\Frontend\\Basket\\' . $name : '<not a string>'; |
|
| 74 | + throw new \Aimeos\Controller\Frontend\Exception(sprintf('Invalid characters in class name "%1$s"', $classname)); |
|
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | $iface = '\\Aimeos\\Controller\\Frontend\\Basket\\Iface'; |
| 78 | 78 | $classname = '\\Aimeos\\Controller\\Frontend\\Basket\\' . $name; |
| 79 | 79 | |
| 80 | - $manager = self::createControllerBase( $context, $classname, $iface ); |
|
| 80 | + $manager = self::createControllerBase($context, $classname, $iface); |
|
| 81 | 81 | |
| 82 | 82 | /** controller/frontend/basket/decorators/excludes |
| 83 | 83 | * Excludes decorators added by the "common" option from the basket frontend controllers |
@@ -153,7 +153,7 @@ discard block |
||
| 153 | 153 | * @see controller/frontend/basket/decorators/excludes |
| 154 | 154 | * @see controller/frontend/basket/decorators/global |
| 155 | 155 | */ |
| 156 | - return self::addControllerDecorators( $context, $manager, 'basket' ); |
|
| 156 | + return self::addControllerDecorators($context, $manager, 'basket'); |
|
| 157 | 157 | } |
| 158 | 158 | |
| 159 | 159 | } |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | * @param string|null $name Name of the controller implementaton (default: "Standard") |
| 30 | 30 | * @return \Aimeos\Controller\Frontend\Order\Iface Controller object |
| 31 | 31 | */ |
| 32 | - public static function createController( \Aimeos\MShop\Context\Item\Iface $context, $name = null ) |
|
| 32 | + public static function createController(\Aimeos\MShop\Context\Item\Iface $context, $name = null) |
|
| 33 | 33 | { |
| 34 | 34 | /** controller/frontend/order/name |
| 35 | 35 | * Class name of the used order frontend controller implementation |
@@ -64,19 +64,19 @@ discard block |
||
| 64 | 64 | * @since 2014.03 |
| 65 | 65 | * @category Developer |
| 66 | 66 | */ |
| 67 | - if( $name === null ) { |
|
| 68 | - $name = $context->getConfig()->get( 'controller/frontend/order/name', 'Standard' ); |
|
| 67 | + if ($name === null) { |
|
| 68 | + $name = $context->getConfig()->get('controller/frontend/order/name', 'Standard'); |
|
| 69 | 69 | } |
| 70 | 70 | |
| 71 | - if( ctype_alnum( $name ) === false ) { |
|
| 72 | - $classname = is_string( $name ) ? '\\Aimeos\\Controller\\Frontend\\Order\\' . $name : '<not a string>'; |
|
| 73 | - throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) ); |
|
| 71 | + if (ctype_alnum($name) === false) { |
|
| 72 | + $classname = is_string($name) ? '\\Aimeos\\Controller\\Frontend\\Order\\' . $name : '<not a string>'; |
|
| 73 | + throw new \Aimeos\Controller\Frontend\Exception(sprintf('Invalid characters in class name "%1$s"', $classname)); |
|
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | $iface = '\\Aimeos\\Controller\\Frontend\\Order\\Iface'; |
| 77 | 77 | $classname = '\\Aimeos\\Controller\\Frontend\\Order\\' . $name; |
| 78 | 78 | |
| 79 | - $manager = self::createControllerBase( $context, $classname, $iface ); |
|
| 79 | + $manager = self::createControllerBase($context, $classname, $iface); |
|
| 80 | 80 | |
| 81 | 81 | /** controller/frontend/order/decorators/excludes |
| 82 | 82 | * Excludes decorators added by the "common" option from the order frontend controllers |
@@ -152,6 +152,6 @@ discard block |
||
| 152 | 152 | * @see controller/frontend/order/decorators/excludes |
| 153 | 153 | * @see controller/frontend/order/decorators/global |
| 154 | 154 | */ |
| 155 | - return self::addControllerDecorators( $context, $manager, 'order' ); |
|
| 155 | + return self::addControllerDecorators($context, $manager, 'order'); |
|
| 156 | 156 | } |
| 157 | 157 | } |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | * @param string|null $name Name of the controller implementaton (default: "Standard") |
| 30 | 30 | * @return \Aimeos\Controller\Frontend\Catalog\Iface Controller object |
| 31 | 31 | */ |
| 32 | - public static function createController( \Aimeos\MShop\Context\Item\Iface $context, $name = null ) |
|
| 32 | + public static function createController(\Aimeos\MShop\Context\Item\Iface $context, $name = null) |
|
| 33 | 33 | { |
| 34 | 34 | /** controller/frontend/catalog/name |
| 35 | 35 | * Class name of the used catalog frontend controller implementation |
@@ -64,20 +64,20 @@ discard block |
||
| 64 | 64 | * @since 2014.03 |
| 65 | 65 | * @category Developer |
| 66 | 66 | */ |
| 67 | - if( $name === null ) { |
|
| 68 | - $name = $context->getConfig()->get( 'controller/frontend/catalog/name', 'Standard' ); |
|
| 67 | + if ($name === null) { |
|
| 68 | + $name = $context->getConfig()->get('controller/frontend/catalog/name', 'Standard'); |
|
| 69 | 69 | } |
| 70 | 70 | |
| 71 | - if( ctype_alnum( $name ) === false ) |
|
| 71 | + if (ctype_alnum($name) === false) |
|
| 72 | 72 | { |
| 73 | - $classname = is_string( $name ) ? '\\Aimeos\\Controller\\Frontend\\Catalog\\' . $name : '<not a string>'; |
|
| 74 | - throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) ); |
|
| 73 | + $classname = is_string($name) ? '\\Aimeos\\Controller\\Frontend\\Catalog\\' . $name : '<not a string>'; |
|
| 74 | + throw new \Aimeos\Controller\Frontend\Exception(sprintf('Invalid characters in class name "%1$s"', $classname)); |
|
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | $iface = '\\Aimeos\\Controller\\Frontend\\Catalog\\Iface'; |
| 78 | 78 | $classname = '\\Aimeos\\Controller\\Frontend\\Catalog\\' . $name; |
| 79 | 79 | |
| 80 | - $manager = self::createControllerBase( $context, $classname, $iface ); |
|
| 80 | + $manager = self::createControllerBase($context, $classname, $iface); |
|
| 81 | 81 | |
| 82 | 82 | /** controller/frontend/catalog/decorators/excludes |
| 83 | 83 | * Excludes decorators added by the "common" option from the catalog frontend controllers |
@@ -153,7 +153,7 @@ discard block |
||
| 153 | 153 | * @see controller/frontend/catalog/decorators/excludes |
| 154 | 154 | * @see controller/frontend/catalog/decorators/global |
| 155 | 155 | */ |
| 156 | - return self::addControllerDecorators( $context, $manager, 'catalog' ); |
|
| 156 | + return self::addControllerDecorators($context, $manager, 'catalog'); |
|
| 157 | 157 | } |
| 158 | 158 | |
| 159 | 159 | } |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | * |
| 29 | 29 | * @param \Aimeos\MShop\Context\Item\Iface $context Common MShop context object |
| 30 | 30 | */ |
| 31 | - public function __construct( \Aimeos\MShop\Context\Item\Iface $context ) |
|
| 31 | + public function __construct(\Aimeos\MShop\Context\Item\Iface $context) |
|
| 32 | 32 | { |
| 33 | 33 | $this->context = $context; |
| 34 | 34 | } |
@@ -41,9 +41,9 @@ discard block |
||
| 41 | 41 | * @param array $param List of method parameter |
| 42 | 42 | * @throws \Aimeos\Controller\Frontend\Exception If method call failed |
| 43 | 43 | */ |
| 44 | - public function __call( $name, array $param ) |
|
| 44 | + public function __call($name, array $param) |
|
| 45 | 45 | { |
| 46 | - throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Unable to call method "%1$s"', $name ) ); |
|
| 46 | + throw new \Aimeos\Controller\Frontend\Exception(sprintf('Unable to call method "%1$s"', $name)); |
|
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | * @param string|null $name Name of the controller implementaton (default: "Standard") |
| 30 | 30 | * @return \Aimeos\Controller\Frontend\Service\Iface Controller object |
| 31 | 31 | */ |
| 32 | - public static function createController( \Aimeos\MShop\Context\Item\Iface $context, $name = null ) |
|
| 32 | + public static function createController(\Aimeos\MShop\Context\Item\Iface $context, $name = null) |
|
| 33 | 33 | { |
| 34 | 34 | /** controller/frontend/service/name |
| 35 | 35 | * Class name of the used service frontend controller implementation |
@@ -64,19 +64,19 @@ discard block |
||
| 64 | 64 | * @since 2014.03 |
| 65 | 65 | * @category Developer |
| 66 | 66 | */ |
| 67 | - if( $name === null ) { |
|
| 68 | - $name = $context->getConfig()->get( 'controller/frontend/service/name', 'Standard' ); |
|
| 67 | + if ($name === null) { |
|
| 68 | + $name = $context->getConfig()->get('controller/frontend/service/name', 'Standard'); |
|
| 69 | 69 | } |
| 70 | 70 | |
| 71 | - if( ctype_alnum( $name ) === false ) { |
|
| 72 | - $classname = is_string( $name ) ? '\\Aimeos\\Controller\\Frontend\\Service\\' . $name : '<not a string>'; |
|
| 73 | - throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) ); |
|
| 71 | + if (ctype_alnum($name) === false) { |
|
| 72 | + $classname = is_string($name) ? '\\Aimeos\\Controller\\Frontend\\Service\\' . $name : '<not a string>'; |
|
| 73 | + throw new \Aimeos\Controller\Frontend\Exception(sprintf('Invalid characters in class name "%1$s"', $classname)); |
|
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | $iface = '\\Aimeos\\Controller\\Frontend\\Service\\Iface'; |
| 77 | 77 | $classname = '\\Aimeos\\Controller\\Frontend\\Service\\' . $name; |
| 78 | 78 | |
| 79 | - $manager = self::createControllerBase( $context, $classname, $iface ); |
|
| 79 | + $manager = self::createControllerBase($context, $classname, $iface); |
|
| 80 | 80 | |
| 81 | 81 | /** controller/frontend/service/decorators/excludes |
| 82 | 82 | * Excludes decorators added by the "common" option from the service frontend controllers |
@@ -152,6 +152,6 @@ discard block |
||
| 152 | 152 | * @see controller/frontend/service/decorators/excludes |
| 153 | 153 | * @see controller/frontend/service/decorators/global |
| 154 | 154 | */ |
| 155 | - return self::addControllerDecorators( $context, $manager, 'service' ); |
|
| 155 | + return self::addControllerDecorators($context, $manager, 'service'); |
|
| 156 | 156 | } |
| 157 | 157 | } |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | * @param string|null $name Name of the controller implementaton (default: "Standard") |
| 29 | 29 | * @return \Aimeos\Controller\Frontend\Product\Iface Controller object |
| 30 | 30 | */ |
| 31 | - public static function createController( \Aimeos\MShop\Context\Item\Iface $context, $name = null ) |
|
| 31 | + public static function createController(\Aimeos\MShop\Context\Item\Iface $context, $name = null) |
|
| 32 | 32 | { |
| 33 | 33 | /** controller/frontend/product/name |
| 34 | 34 | * Class name of the used product frontend controller implementation |
@@ -63,20 +63,20 @@ discard block |
||
| 63 | 63 | * @since 2017.03 |
| 64 | 64 | * @category Developer |
| 65 | 65 | */ |
| 66 | - if( $name === null ) { |
|
| 67 | - $name = $context->getConfig()->get( 'controller/frontend/product/name', 'Standard' ); |
|
| 66 | + if ($name === null) { |
|
| 67 | + $name = $context->getConfig()->get('controller/frontend/product/name', 'Standard'); |
|
| 68 | 68 | } |
| 69 | 69 | |
| 70 | - if( ctype_alnum( $name ) === false ) |
|
| 70 | + if (ctype_alnum($name) === false) |
|
| 71 | 71 | { |
| 72 | - $classname = is_string( $name ) ? '\\Aimeos\\Controller\\Frontend\\Product\\' . $name : '<not a string>'; |
|
| 73 | - throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) ); |
|
| 72 | + $classname = is_string($name) ? '\\Aimeos\\Controller\\Frontend\\Product\\' . $name : '<not a string>'; |
|
| 73 | + throw new \Aimeos\Controller\Frontend\Exception(sprintf('Invalid characters in class name "%1$s"', $classname)); |
|
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | $iface = '\\Aimeos\\Controller\\Frontend\\Product\\Iface'; |
| 77 | 77 | $classname = '\\Aimeos\\Controller\\Frontend\\Product\\' . $name; |
| 78 | 78 | |
| 79 | - $manager = self::createControllerBase( $context, $classname, $iface ); |
|
| 79 | + $manager = self::createControllerBase($context, $classname, $iface); |
|
| 80 | 80 | |
| 81 | 81 | /** controller/frontend/product/decorators/excludes |
| 82 | 82 | * Excludes decorators added by the "common" option from the product frontend controllers |
@@ -152,6 +152,6 @@ discard block |
||
| 152 | 152 | * @see controller/frontend/product/decorators/excludes |
| 153 | 153 | * @see controller/frontend/product/decorators/global |
| 154 | 154 | */ |
| 155 | - return self::addControllerDecorators( $context, $manager, 'product' ); |
|
| 155 | + return self::addControllerDecorators($context, $manager, 'product'); |
|
| 156 | 156 | } |
| 157 | 157 | } |
@@ -30,11 +30,11 @@ discard block |
||
| 30 | 30 | * @param integer $id Context ID the objects have been created with (string of \Aimeos\MShop\Context\Item\Iface) |
| 31 | 31 | * @param string $path Path describing the controller to clear, e.g. "basket" |
| 32 | 32 | */ |
| 33 | - static public function clear( $id = null, $path = null ) |
|
| 33 | + static public function clear($id = null, $path = null) |
|
| 34 | 34 | { |
| 35 | - if( $id !== null ) |
|
| 35 | + if ($id !== null) |
|
| 36 | 36 | { |
| 37 | - if( $path !== null ) { |
|
| 37 | + if ($path !== null) { |
|
| 38 | 38 | self::$controllers[$id][$path] = null; |
| 39 | 39 | } else { |
| 40 | 40 | self::$controllers[$id] = array(); |
@@ -62,37 +62,37 @@ discard block |
||
| 62 | 62 | * @return \Aimeos\Controller\Frontend\Iface New frontend controller |
| 63 | 63 | * @throws \Aimeos\Controller\Frontend\Exception If the given path is invalid or the manager wasn't found |
| 64 | 64 | */ |
| 65 | - static public function createController( \Aimeos\MShop\Context\Item\Iface $context, $path ) |
|
| 65 | + static public function createController(\Aimeos\MShop\Context\Item\Iface $context, $path) |
|
| 66 | 66 | { |
| 67 | - if( empty( $path ) ) { |
|
| 68 | - throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Controller path is empty' ) ); |
|
| 67 | + if (empty($path)) { |
|
| 68 | + throw new \Aimeos\Controller\Frontend\Exception(sprintf('Controller path is empty')); |
|
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | $id = (string) $context; |
| 72 | 72 | |
| 73 | - if( self::$cache === false || !isset( self::$controllers[$id][$path] ) ) |
|
| 73 | + if (self::$cache === false || !isset(self::$controllers[$id][$path])) |
|
| 74 | 74 | { |
| 75 | - $parts = explode( '/', $path ); |
|
| 75 | + $parts = explode('/', $path); |
|
| 76 | 76 | |
| 77 | - foreach( $parts as $key => $part ) |
|
| 77 | + foreach ($parts as $key => $part) |
|
| 78 | 78 | { |
| 79 | - if( ctype_alnum( $part ) === false ) { |
|
| 80 | - throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Invalid characters in controller name "%1$s" in "%2$s"', $part, $path ) ); |
|
| 79 | + if (ctype_alnum($part) === false) { |
|
| 80 | + throw new \Aimeos\Controller\Frontend\Exception(sprintf('Invalid characters in controller name "%1$s" in "%2$s"', $part, $path)); |
|
| 81 | 81 | } |
| 82 | 82 | |
| 83 | - $parts[$key] = ucwords( $part ); |
|
| 83 | + $parts[$key] = ucwords($part); |
|
| 84 | 84 | } |
| 85 | 85 | |
| 86 | - $factory = '\\Aimeos\\Controller\\Frontend\\' . join( '\\', $parts ) . '\\Factory'; |
|
| 86 | + $factory = '\\Aimeos\\Controller\\Frontend\\' . join('\\', $parts) . '\\Factory'; |
|
| 87 | 87 | |
| 88 | - if( class_exists( $factory ) === false ) { |
|
| 89 | - throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Class "%1$s" not available', $factory ) ); |
|
| 88 | + if (class_exists($factory) === false) { |
|
| 89 | + throw new \Aimeos\Controller\Frontend\Exception(sprintf('Class "%1$s" not available', $factory)); |
|
| 90 | 90 | } |
| 91 | 91 | |
| 92 | - $manager = call_user_func_array( array( $factory, 'createController' ), array( $context ) ); |
|
| 92 | + $manager = call_user_func_array(array($factory, 'createController'), array($context)); |
|
| 93 | 93 | |
| 94 | - if( $manager === false ) { |
|
| 95 | - throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Invalid factory "%1$s"', $factory ) ); |
|
| 94 | + if ($manager === false) { |
|
| 95 | + throw new \Aimeos\Controller\Frontend\Exception(sprintf('Invalid factory "%1$s"', $factory)); |
|
| 96 | 96 | } |
| 97 | 97 | |
| 98 | 98 | self::$controllers[$id][$path] = $manager; |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | * @param boolean $value True to enable caching, false to disable it. |
| 109 | 109 | * @return boolean Previous cache setting |
| 110 | 110 | */ |
| 111 | - static public function setCache( $value ) |
|
| 111 | + static public function setCache($value) |
|
| 112 | 112 | { |
| 113 | 113 | $old = self::$cache; |
| 114 | 114 | self::$cache = (boolean) $value; |
@@ -20,33 +20,33 @@ |
||
| 20 | 20 | $this->context = \TestHelperFrontend::getContext(); |
| 21 | 21 | $config = $this->context->getConfig(); |
| 22 | 22 | |
| 23 | - $config->set( 'controller/frontend/common/decorators/default', array() ); |
|
| 24 | - $config->set( 'controller/frontend/catalog/decorators/global', array() ); |
|
| 25 | - $config->set( 'controller/frontend/catalog/decorators/local', array() ); |
|
| 23 | + $config->set('controller/frontend/common/decorators/default', array()); |
|
| 24 | + $config->set('controller/frontend/catalog/decorators/global', array()); |
|
| 25 | + $config->set('controller/frontend/catalog/decorators/local', array()); |
|
| 26 | 26 | |
| 27 | 27 | } |
| 28 | 28 | |
| 29 | 29 | |
| 30 | 30 | public function testInjectController() |
| 31 | 31 | { |
| 32 | - $controller = \Aimeos\Controller\Frontend\Catalog\Factory::createController( $this->context, 'Standard' ); |
|
| 33 | - \Aimeos\Controller\Frontend\Catalog\Factory::injectController( '\\Aimeos\\Controller\\Frontend\\Catalog\\Standard', $controller ); |
|
| 32 | + $controller = \Aimeos\Controller\Frontend\Catalog\Factory::createController($this->context, 'Standard'); |
|
| 33 | + \Aimeos\Controller\Frontend\Catalog\Factory::injectController('\\Aimeos\\Controller\\Frontend\\Catalog\\Standard', $controller); |
|
| 34 | 34 | |
| 35 | - $injectedController = \Aimeos\Controller\Frontend\Catalog\Factory::createController( $this->context, 'Standard' ); |
|
| 35 | + $injectedController = \Aimeos\Controller\Frontend\Catalog\Factory::createController($this->context, 'Standard'); |
|
| 36 | 36 | |
| 37 | - $this->assertSame( $controller, $injectedController ); |
|
| 37 | + $this->assertSame($controller, $injectedController); |
|
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | |
| 41 | 41 | public function testInjectControllerReset() |
| 42 | 42 | { |
| 43 | - $controller = \Aimeos\Controller\Frontend\Catalog\Factory::createController( $this->context, 'Standard' ); |
|
| 44 | - \Aimeos\Controller\Frontend\Catalog\Factory::injectController( '\\Aimeos\\Controller\\Frontend\\Catalog\\Standard', $controller ); |
|
| 45 | - \Aimeos\Controller\Frontend\Catalog\Factory::injectController( '\\Aimeos\\Controller\\Frontend\\Catalog\\Standard', null ); |
|
| 43 | + $controller = \Aimeos\Controller\Frontend\Catalog\Factory::createController($this->context, 'Standard'); |
|
| 44 | + \Aimeos\Controller\Frontend\Catalog\Factory::injectController('\\Aimeos\\Controller\\Frontend\\Catalog\\Standard', $controller); |
|
| 45 | + \Aimeos\Controller\Frontend\Catalog\Factory::injectController('\\Aimeos\\Controller\\Frontend\\Catalog\\Standard', null); |
|
| 46 | 46 | |
| 47 | - $new = \Aimeos\Controller\Frontend\Catalog\Factory::createController( $this->context, 'Standard' ); |
|
| 47 | + $new = \Aimeos\Controller\Frontend\Catalog\Factory::createController($this->context, 'Standard'); |
|
| 48 | 48 | |
| 49 | - $this->assertNotSame( $controller, $new ); |
|
| 49 | + $this->assertNotSame($controller, $new); |
|
| 50 | 50 | } |
| 51 | 51 | |
| 52 | 52 | } |
| 53 | 53 | \ No newline at end of file |
@@ -15,31 +15,31 @@ |
||
| 15 | 15 | { |
| 16 | 16 | $target = '\\Aimeos\\Controller\\Frontend\\Stock\\Iface'; |
| 17 | 17 | |
| 18 | - $controller = \Aimeos\Controller\Frontend\Stock\Factory::createController( \TestHelperFrontend::getContext() ); |
|
| 19 | - $this->assertInstanceOf( $target, $controller ); |
|
| 18 | + $controller = \Aimeos\Controller\Frontend\Stock\Factory::createController(\TestHelperFrontend::getContext()); |
|
| 19 | + $this->assertInstanceOf($target, $controller); |
|
| 20 | 20 | |
| 21 | - $controller = \Aimeos\Controller\Frontend\Stock\Factory::createController( \TestHelperFrontend::getContext(), 'Standard' ); |
|
| 22 | - $this->assertInstanceOf( $target, $controller ); |
|
| 21 | + $controller = \Aimeos\Controller\Frontend\Stock\Factory::createController(\TestHelperFrontend::getContext(), 'Standard'); |
|
| 22 | + $this->assertInstanceOf($target, $controller); |
|
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | |
| 26 | 26 | public function testCreateControllerInvalidImplementation() |
| 27 | 27 | { |
| 28 | - $this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' ); |
|
| 29 | - \Aimeos\Controller\Frontend\Stock\Factory::createController( \TestHelperFrontend::getContext(), 'Invalid' ); |
|
| 28 | + $this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception'); |
|
| 29 | + \Aimeos\Controller\Frontend\Stock\Factory::createController(\TestHelperFrontend::getContext(), 'Invalid'); |
|
| 30 | 30 | } |
| 31 | 31 | |
| 32 | 32 | |
| 33 | 33 | public function testCreateControllerInvalidName() |
| 34 | 34 | { |
| 35 | - $this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' ); |
|
| 36 | - \Aimeos\Controller\Frontend\Stock\Factory::createController( \TestHelperFrontend::getContext(), '%^' ); |
|
| 35 | + $this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception'); |
|
| 36 | + \Aimeos\Controller\Frontend\Stock\Factory::createController(\TestHelperFrontend::getContext(), '%^'); |
|
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | |
| 40 | 40 | public function testCreateControllerNotExisting() |
| 41 | 41 | { |
| 42 | - $this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' ); |
|
| 43 | - \Aimeos\Controller\Frontend\Stock\Factory::createController( \TestHelperFrontend::getContext(), 'notexist' ); |
|
| 42 | + $this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception'); |
|
| 43 | + \Aimeos\Controller\Frontend\Stock\Factory::createController(\TestHelperFrontend::getContext(), 'notexist'); |
|
| 44 | 44 | } |
| 45 | 45 | } |