Completed
Push — master ( df9ec1...3b492e )
by Aimeos
05:45
created
controller/frontend/src/Controller/Frontend/Service/Standard.php 2 patches
Spacing   +46 added lines, -46 removed lines patch added patch discarded remove patch
@@ -35,43 +35,43 @@  discard block
 block discarded – undo
35 35
 	 * @return array List of service items implementing \Aimeos\MShop\Service\Item\Iface with referenced items
36 36
 	 * @throws \Exception If an error occurs
37 37
 	 */
38
-	public function getServices( $type, \Aimeos\MShop\Order\Item\Base\Iface $basket,
39
-		$ref = array( 'media', 'price', 'text' ) )
38
+	public function getServices($type, \Aimeos\MShop\Order\Item\Base\Iface $basket,
39
+		$ref = array('media', 'price', 'text'))
40 40
 	{
41
-		if( isset( $this->items[$type] ) ) {
41
+		if (isset($this->items[$type])) {
42 42
 			return $this->items[$type];
43 43
 		}
44 44
 
45
-		$serviceManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service' );
45
+		$serviceManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'service');
46 46
 
47
-		$search = $serviceManager->createSearch( true );
47
+		$search = $serviceManager->createSearch(true);
48 48
 		$expr = array(
49 49
 			$search->getConditions(),
50
-			$search->compare( '==', 'service.type.domain', 'service' ),
51
-			$search->compare( '==', 'service.type.code', $type ),
50
+			$search->compare('==', 'service.type.domain', 'service'),
51
+			$search->compare('==', 'service.type.code', $type),
52 52
 		);
53
-		$search->setConditions( $search->combine( '&&', $expr ) );
54
-		$search->setSortations( array( $search->sort( '+', 'service.position' ) ) );
53
+		$search->setConditions($search->combine('&&', $expr));
54
+		$search->setSortations(array($search->sort('+', 'service.position')));
55 55
 
56
-		$this->items[$type] = $serviceManager->searchItems( $search, $ref );
56
+		$this->items[$type] = $serviceManager->searchItems($search, $ref);
57 57
 
58 58
 
59
-		foreach( $this->items[$type] as $id => $service )
59
+		foreach ($this->items[$type] as $id => $service)
60 60
 		{
61 61
 			try
62 62
 			{
63
-				$provider = $serviceManager->getProvider( $service );
63
+				$provider = $serviceManager->getProvider($service);
64 64
 
65
-				if( $provider->isAvailable( $basket ) ) {
65
+				if ($provider->isAvailable($basket)) {
66 66
 					$this->providers[$type][$id] = $provider;
67 67
 				} else {
68
-					unset( $this->items[$type][$id] );
68
+					unset($this->items[$type][$id]);
69 69
 				}
70 70
 			}
71
-			catch( \Aimeos\MShop\Service\Exception $e )
71
+			catch (\Aimeos\MShop\Service\Exception $e)
72 72
 			{
73
-				$msg = sprintf( 'Unable to create provider "%1$s" for service with ID "%2$s"', $service->getCode(), $id );
74
-				$this->getContext()->getLogger()->log( $msg, \Aimeos\MW\Logger\Base::WARN );
73
+				$msg = sprintf('Unable to create provider "%1$s" for service with ID "%2$s"', $service->getCode(), $id);
74
+				$this->getContext()->getLogger()->log($msg, \Aimeos\MW\Logger\Base::WARN);
75 75
 			}
76 76
 		}
77 77
 
@@ -91,16 +91,16 @@  discard block
 block discarded – undo
91 91
 	 * @throws \Aimeos\MShop\Exception If service provider isn't available
92 92
 	 * @throws \Exception If an error occurs
93 93
 	 */
94
-	public function getServiceAttributes( $type, $serviceId, \Aimeos\MShop\Order\Item\Base\Iface $basket )
94
+	public function getServiceAttributes($type, $serviceId, \Aimeos\MShop\Order\Item\Base\Iface $basket)
95 95
 	{
96
-		if( isset( $this->providers[$type][$serviceId] ) ) {
97
-			return $this->providers[$type][$serviceId]->getConfigFE( $basket );
96
+		if (isset($this->providers[$type][$serviceId])) {
97
+			return $this->providers[$type][$serviceId]->getConfigFE($basket);
98 98
 		}
99 99
 
100
-		$item = $this->getServiceItem( $type, $serviceId );
101
-		$serviceManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service' );
100
+		$item = $this->getServiceItem($type, $serviceId);
101
+		$serviceManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'service');
102 102
 
103
-		return $serviceManager->getProvider( $item )->getConfigFE( $basket );
103
+		return $serviceManager->getProvider($item)->getConfigFE($basket);
104 104
 	}
105 105
 
106 106
 
@@ -115,16 +115,16 @@  discard block
 block discarded – undo
115 115
 	 * @throws \Aimeos\MShop\Exception If service provider isn't available
116 116
 	 * @throws \Exception If an error occurs
117 117
 	 */
118
-	public function getServicePrice( $type, $serviceId, \Aimeos\MShop\Order\Item\Base\Iface $basket )
118
+	public function getServicePrice($type, $serviceId, \Aimeos\MShop\Order\Item\Base\Iface $basket)
119 119
 	{
120
-		if( isset( $this->providers[$type][$serviceId] ) ) {
121
-			return $this->providers[$type][$serviceId]->calcPrice( $basket );
120
+		if (isset($this->providers[$type][$serviceId])) {
121
+			return $this->providers[$type][$serviceId]->calcPrice($basket);
122 122
 		}
123 123
 
124
-		$item = $this->getServiceItem( $type, $serviceId );
125
-		$serviceManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service' );
124
+		$item = $this->getServiceItem($type, $serviceId);
125
+		$serviceManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'service');
126 126
 
127
-		return $serviceManager->getProvider( $item )->calcPrice( $basket );
127
+		return $serviceManager->getProvider($item)->calcPrice($basket);
128 128
 	}
129 129
 
130 130
 
@@ -139,16 +139,16 @@  discard block
 block discarded – undo
139 139
 	 * 	known by the provider but aren't valid resp. null for attributes whose values are OK
140 140
 	 * @throws \Aimeos\Controller\Frontend\Service\Exception If no active service provider for this ID is available
141 141
 	 */
142
-	public function checkServiceAttributes( $type, $serviceId, array $attributes )
142
+	public function checkServiceAttributes($type, $serviceId, array $attributes)
143 143
 	{
144
-		if( isset( $this->providers[$type][$serviceId] ) ) {
145
-			return $this->providers[$type][$serviceId]->checkConfigFE( $attributes );
144
+		if (isset($this->providers[$type][$serviceId])) {
145
+			return $this->providers[$type][$serviceId]->checkConfigFE($attributes);
146 146
 		}
147 147
 
148
-		$item = $this->getServiceItem( $type, $serviceId );
149
-		$serviceManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service' );
148
+		$item = $this->getServiceItem($type, $serviceId);
149
+		$serviceManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'service');
150 150
 
151
-		return $serviceManager->getProvider( $item )->checkConfigFE( $attributes );
151
+		return $serviceManager->getProvider($item)->checkConfigFE($attributes);
152 152
 	}
153 153
 
154 154
 
@@ -159,25 +159,25 @@  discard block
 block discarded – undo
159 159
 	 * @param string $serviceId Identifier of the service option chosen by the customer
160 160
 	 * @throws \Aimeos\Controller\Frontend\Service\Exception If no active service provider for this ID is available
161 161
 	 */
162
-	protected function getServiceItem( $type, $serviceId )
162
+	protected function getServiceItem($type, $serviceId)
163 163
 	{
164
-		$serviceManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service' );
164
+		$serviceManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'service');
165 165
 
166
-		$search = $serviceManager->createSearch( true );
166
+		$search = $serviceManager->createSearch(true);
167 167
 		$expr = array(
168 168
 			$search->getConditions(),
169
-			$search->compare( '==', 'service.id', $serviceId ),
170
-			$search->compare( '==', 'service.type.domain', 'service' ),
171
-			$search->compare( '==', 'service.type.code', $type ),
169
+			$search->compare('==', 'service.id', $serviceId),
170
+			$search->compare('==', 'service.type.domain', 'service'),
171
+			$search->compare('==', 'service.type.code', $type),
172 172
 		);
173
-		$search->setConditions( $search->combine( '&&', $expr ) );
173
+		$search->setConditions($search->combine('&&', $expr));
174 174
 
175
-		$items = $serviceManager->searchItems( $search, array( 'price' ) );
175
+		$items = $serviceManager->searchItems($search, array('price'));
176 176
 
177
-		if( ( $item = reset( $items ) ) === false )
177
+		if (($item = reset($items)) === false)
178 178
 		{
179
-			$msg = sprintf( 'Service item for type "%1$s" and ID "%2$s" not found', $type, $serviceId );
180
-			throw new \Aimeos\Controller\Frontend\Service\Exception( $msg );
179
+			$msg = sprintf('Service item for type "%1$s" and ID "%2$s" not found', $type, $serviceId);
180
+			throw new \Aimeos\Controller\Frontend\Service\Exception($msg);
181 181
 		}
182 182
 
183 183
 		return $item;
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -67,8 +67,7 @@
 block discarded – undo
67 67
 				} else {
68 68
 					unset( $this->items[$type][$id] );
69 69
 				}
70
-			}
71
-			catch( \Aimeos\MShop\Service\Exception $e )
70
+			} catch( \Aimeos\MShop\Service\Exception $e )
72 71
 			{
73 72
 				$msg = sprintf( 'Unable to create provider "%1$s" for service with ID "%2$s"', $service->getCode(), $id );
74 73
 				$this->getContext()->getLogger()->log( $msg, \Aimeos\MW\Logger\Base::WARN );
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Service/Iface.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -29,8 +29,8 @@  discard block
 block discarded – undo
29 29
 	 * @param array $ref List of domains for which the items referenced by the services should be fetched too
30 30
 	 * @return array List of service items implementing \Aimeos\MShop\Service\Item\Iface with referenced items
31 31
 	 */
32
-	public function getServices( $type, \Aimeos\MShop\Order\Item\Base\Iface $basket,
33
-		$ref = array( 'media', 'price', 'text' ) );
32
+	public function getServices($type, \Aimeos\MShop\Order\Item\Base\Iface $basket,
33
+		$ref = array('media', 'price', 'text'));
34 34
 
35 35
 	/**
36 36
 	 * Returns the list of attribute definitions which must be used to render the input form where the customer can
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
 	 * @param \Aimeos\MShop\Order\Item\Base\Iface $basket Basket object
42 42
 	 * @return array List of attribute definitions implementing \Aimeos\MW\Criteria\Attribute\Iface
43 43
 	 */
44
-	public function getServiceAttributes( $type, $serviceId, \Aimeos\MShop\Order\Item\Base\Iface $basket );
44
+	public function getServiceAttributes($type, $serviceId, \Aimeos\MShop\Order\Item\Base\Iface $basket);
45 45
 
46 46
 	/**
47 47
 	 * Returns the price of the service.
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 	 * @throws \Aimeos\MShop\Exception If service provider isn't available
55 55
 	 * @throws \Exception If an error occurs
56 56
 	 */
57
-	public function getServicePrice( $type, $serviceId, \Aimeos\MShop\Order\Item\Base\Iface $basket );
57
+	public function getServicePrice($type, $serviceId, \Aimeos\MShop\Order\Item\Base\Iface $basket);
58 58
 
59 59
 	/**
60 60
 	 * Returns a list of attributes that are invalid.
@@ -66,5 +66,5 @@  discard block
 block discarded – undo
66 66
 	 * @return array List of key/value pairs of attributes keys and an error message for values that are invalid or
67 67
 	 * 	missing
68 68
 	 */
69
-	public function checkServiceAttributes( $type, $serviceId, array $attributes );
69
+	public function checkServiceAttributes($type, $serviceId, array $attributes);
70 70
 }
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Service/Factory.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 	 * @param string|null $name Name of the controller implementaton (default: "Standard")
30 30
 	 * @return \Aimeos\Controller\Frontend\Common\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
 block discarded – undo
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
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Factory.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -30,11 +30,11 @@  discard block
 block discarded – undo
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();
@@ -61,37 +61,37 @@  discard block
 block discarded – undo
61 61
 	 * @param string $path Name of the domain (and sub-managers) separated by slashes, e.g "basket"
62 62
 	 * @throws \Aimeos\Controller\Frontend\Exception If the given path is invalid or the manager wasn't found
63 63
 	 */
64
-	static public function createController( \Aimeos\MShop\Context\Item\Iface $context, $path )
64
+	static public function createController(\Aimeos\MShop\Context\Item\Iface $context, $path)
65 65
 	{
66
-		if( empty( $path ) ) {
67
-			throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Controller path is empty' ) );
66
+		if (empty($path)) {
67
+			throw new \Aimeos\Controller\Frontend\Exception(sprintf('Controller path is empty'));
68 68
 		}
69 69
 
70 70
 		$id = (string) $context;
71 71
 
72
-		if( self::$cache === false || !isset( self::$controllers[$id][$path] ) )
72
+		if (self::$cache === false || !isset(self::$controllers[$id][$path]))
73 73
 		{
74
-			$parts = explode( '/', $path );
74
+			$parts = explode('/', $path);
75 75
 
76
-			foreach( $parts as $key => $part )
76
+			foreach ($parts as $key => $part)
77 77
 			{
78
-				if( ctype_alnum( $part ) === false ) {
79
-					throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Invalid characters in controller name "%1$s" in "%2$s"', $part, $path ) );
78
+				if (ctype_alnum($part) === false) {
79
+					throw new \Aimeos\Controller\Frontend\Exception(sprintf('Invalid characters in controller name "%1$s" in "%2$s"', $part, $path));
80 80
 				}
81 81
 
82
-				$parts[$key] = ucwords( $part );
82
+				$parts[$key] = ucwords($part);
83 83
 			}
84 84
 
85
-			$factory = '\\Aimeos\\Controller\\Frontend\\' . join( '\\', $parts ) . '\\Factory';
85
+			$factory = '\\Aimeos\\Controller\\Frontend\\' . join('\\', $parts) . '\\Factory';
86 86
 
87
-			if( class_exists( $factory ) === false ) {
88
-				throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Class "%1$s" not available', $factory ) );
87
+			if (class_exists($factory) === false) {
88
+				throw new \Aimeos\Controller\Frontend\Exception(sprintf('Class "%1$s" not available', $factory));
89 89
 			}
90 90
 
91
-			$manager = call_user_func_array( array( $factory, 'createController' ), array( $context ) );
91
+			$manager = call_user_func_array(array($factory, 'createController'), array($context));
92 92
 
93
-			if( $manager === false ) {
94
-				throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Invalid factory "%1$s"', $factory ) );
93
+			if ($manager === false) {
94
+				throw new \Aimeos\Controller\Frontend\Exception(sprintf('Invalid factory "%1$s"', $factory));
95 95
 			}
96 96
 
97 97
 			self::$controllers[$id][$path] = $manager;
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
 	 * @param boolean $value True to enable caching, false to disable it.
108 108
 	 * @return boolean Previous cache setting
109 109
 	 */
110
-	static public function setCache( $value )
110
+	static public function setCache($value)
111 111
 	{
112 112
 		$old = self::$cache;
113 113
 		self::$cache = (boolean) $value;
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Common/Iface.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -27,6 +27,6 @@
 block discarded – undo
27 27
 	 * @param \Aimeos\MShop\Context\Item\Iface $context MShop context object
28 28
 	 * @return void
29 29
 	 */
30
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context );
30
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context);
31 31
 
32 32
 }
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Common/Factory/Iface.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -27,5 +27,5 @@
 block discarded – undo
27 27
 	 * @param string|null $name Name of the controller implementation (Default if null)
28 28
 	 * @return \Aimeos\Controller\Frontend\Common\Iface Controller object
29 29
 	 */
30
-	public static function createController( \Aimeos\MShop\Context\Item\Iface $context, $name = null );
30
+	public static function createController(\Aimeos\MShop\Context\Item\Iface $context, $name = null);
31 31
 }
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Common/Factory/Base.php 1 patch
Spacing   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
 	 * @param string $classname Full name of the class for which the object should be returned
32 32
 	 * @param \Aimeos\Controller\Frontend\Iface|null $controller Frontend controller object
33 33
 	 */
34
-	public static function injectController( $classname, \Aimeos\Controller\Frontend\Iface $controller = null )
34
+	public static function injectController($classname, \Aimeos\Controller\Frontend\Iface $controller = null)
35 35
 	{
36 36
 		self::$objects[$classname] = $controller;
37 37
 	}
@@ -46,29 +46,29 @@  discard block
 block discarded – undo
46 46
 	 * @param string $classprefix Decorator class prefix, e.g. "\Aimeos\Controller\Frontend\Basket\Decorator\"
47 47
 	 * @return \Aimeos\Controller\Frontend\Common\Iface Controller object
48 48
 	 */
49
-	protected static function addDecorators( \Aimeos\MShop\Context\Item\Iface $context,
50
-		\Aimeos\Controller\Frontend\Iface $controller, array $decorators, $classprefix )
49
+	protected static function addDecorators(\Aimeos\MShop\Context\Item\Iface $context,
50
+		\Aimeos\Controller\Frontend\Iface $controller, array $decorators, $classprefix)
51 51
 	{
52 52
 		$iface = '\\Aimeos\\Controller\\Frontend\\Common\\Decorator\\Iface';
53 53
 
54
-		foreach( $decorators as $name )
54
+		foreach ($decorators as $name)
55 55
 		{
56
-			if( ctype_alnum( $name ) === false )
56
+			if (ctype_alnum($name) === false)
57 57
 			{
58
-				$classname = is_string( $name ) ? $classprefix . $name : '<not a string>';
59
-				throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
58
+				$classname = is_string($name) ? $classprefix . $name : '<not a string>';
59
+				throw new \Aimeos\Controller\Frontend\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
60 60
 			}
61 61
 
62 62
 			$classname = $classprefix . $name;
63 63
 
64
-			if( class_exists( $classname ) === false ) {
65
-				throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Class "%1$s" not available', $classname ) );
64
+			if (class_exists($classname) === false) {
65
+				throw new \Aimeos\Controller\Frontend\Exception(sprintf('Class "%1$s" not available', $classname));
66 66
 			}
67 67
 
68
-			$controller = new $classname( $controller, $context );
68
+			$controller = new $classname($controller, $context);
69 69
 
70
-			if( !( $controller instanceof $iface ) ) {
71
-				throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Class "%1$s" does not implement interface "%2$s"', $classname, $iface ) );
70
+			if (!($controller instanceof $iface)) {
71
+				throw new \Aimeos\Controller\Frontend\Exception(sprintf('Class "%1$s" does not implement interface "%2$s"', $classname, $iface));
72 72
 			}
73 73
 		}
74 74
 
@@ -84,14 +84,14 @@  discard block
 block discarded – undo
84 84
 	 * @param string $domain Domain name in lower case, e.g. "product"
85 85
 	 * @return \Aimeos\Controller\Frontend\Common\Iface Controller object
86 86
 	 */
87
-	protected static function addControllerDecorators( \Aimeos\MShop\Context\Item\Iface $context,
88
-		\Aimeos\Controller\Frontend\Iface $controller, $domain )
87
+	protected static function addControllerDecorators(\Aimeos\MShop\Context\Item\Iface $context,
88
+		\Aimeos\Controller\Frontend\Iface $controller, $domain)
89 89
 	{
90
-		if( !is_string( $domain ) || $domain === '' ) {
91
-			throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Invalid domain "%1$s"', $domain ) );
90
+		if (!is_string($domain) || $domain === '') {
91
+			throw new \Aimeos\Controller\Frontend\Exception(sprintf('Invalid domain "%1$s"', $domain));
92 92
 		}
93 93
 
94
-		$localClass = str_replace( ' ', '\\', ucwords( str_replace( '/', ' ', $domain ) ) );
94
+		$localClass = str_replace(' ', '\\', ucwords(str_replace('/', ' ', $domain)));
95 95
 		$config = $context->getConfig();
96 96
 
97 97
 		/** controller/frontend/common/decorators/default
@@ -116,26 +116,26 @@  discard block
 block discarded – undo
116 116
 		 * @since 2014.03
117 117
 		 * @category Developer
118 118
 		 */
119
-		$decorators = $config->get( 'controller/frontend/common/decorators/default', array() );
120
-		$excludes = $config->get( 'controller/frontend/' . $domain . '/decorators/excludes', array() );
119
+		$decorators = $config->get('controller/frontend/common/decorators/default', array());
120
+		$excludes = $config->get('controller/frontend/' . $domain . '/decorators/excludes', array());
121 121
 
122
-		foreach( $decorators as $key => $name )
122
+		foreach ($decorators as $key => $name)
123 123
 		{
124
-			if( in_array( $name, $excludes ) ) {
125
-				unset( $decorators[$key] );
124
+			if (in_array($name, $excludes)) {
125
+				unset($decorators[$key]);
126 126
 			}
127 127
 		}
128 128
 
129 129
 		$classprefix = '\\Aimeos\\Controller\\Frontend\\Common\\Decorator\\';
130
-		$controller = self::addDecorators( $context, $controller, $decorators, $classprefix );
130
+		$controller = self::addDecorators($context, $controller, $decorators, $classprefix);
131 131
 
132 132
 		$classprefix = '\\Aimeos\\Controller\\Frontend\\Common\\Decorator\\';
133
-		$decorators = $config->get( 'controller/frontend/' . $domain . '/decorators/global', array() );
134
-		$controller = self::addDecorators( $context, $controller, $decorators, $classprefix );
133
+		$decorators = $config->get('controller/frontend/' . $domain . '/decorators/global', array());
134
+		$controller = self::addDecorators($context, $controller, $decorators, $classprefix);
135 135
 
136
-		$classprefix = '\\Aimeos\\Controller\\Frontend\\' . ucfirst( $localClass ) . '\\Decorator\\';
137
-		$decorators = $config->get( 'controller/frontend/' . $domain . '/decorators/local', array() );
138
-		$controller = self::addDecorators( $context, $controller, $decorators, $classprefix );
136
+		$classprefix = '\\Aimeos\\Controller\\Frontend\\' . ucfirst($localClass) . '\\Decorator\\';
137
+		$decorators = $config->get('controller/frontend/' . $domain . '/decorators/local', array());
138
+		$controller = self::addDecorators($context, $controller, $decorators, $classprefix);
139 139
 
140 140
 		return $controller;
141 141
 	}
@@ -149,20 +149,20 @@  discard block
 block discarded – undo
149 149
 	 * @param string $interface Name of the controller interface
150 150
 	 * @return \Aimeos\Controller\Frontend\Common\Iface Controller object
151 151
 	 */
152
-	protected static function createControllerBase( \Aimeos\MShop\Context\Item\Iface $context, $classname, $interface )
152
+	protected static function createControllerBase(\Aimeos\MShop\Context\Item\Iface $context, $classname, $interface)
153 153
 	{
154
-		if( isset( self::$objects[$classname] ) ) {
154
+		if (isset(self::$objects[$classname])) {
155 155
 			return self::$objects[$classname];
156 156
 		}
157 157
 
158
-		if( class_exists( $classname ) === false ) {
159
-			throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Class "%1$s" not available', $classname ) );
158
+		if (class_exists($classname) === false) {
159
+			throw new \Aimeos\Controller\Frontend\Exception(sprintf('Class "%1$s" not available', $classname));
160 160
 		}
161 161
 
162
-		$controller = new $classname( $context );
162
+		$controller = new $classname($context);
163 163
 
164
-		if( !( $controller instanceof $interface ) ) {
165
-			throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Class "%1$s" does not implement interface "%2$s"', $classname, $interface ) );
164
+		if (!($controller instanceof $interface)) {
165
+			throw new \Aimeos\Controller\Frontend\Exception(sprintf('Class "%1$s" does not implement interface "%2$s"', $classname, $interface));
166 166
 		}
167 167
 
168 168
 		return $controller;
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Common/Decorator/Iface.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -28,5 +28,5 @@
 block discarded – undo
28 28
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object with required objects
29 29
 	 * @return void
30 30
 	 */
31
-	public function __construct( \Aimeos\Controller\Frontend\Iface $controller, \Aimeos\MShop\Context\Item\Iface $context );
31
+	public function __construct(\Aimeos\Controller\Frontend\Iface $controller, \Aimeos\MShop\Context\Item\Iface $context);
32 32
 }
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Common/Decorator/Base.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
 	 * @param \Aimeos\Controller\Frontend\Iface $controller Controller object
32 32
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object with required objects
33 33
 	 */
34
-	public function __construct( \Aimeos\Controller\Frontend\Iface $controller, \Aimeos\MShop\Context\Item\Iface $context )
34
+	public function __construct(\Aimeos\Controller\Frontend\Iface $controller, \Aimeos\MShop\Context\Item\Iface $context)
35 35
 	{
36 36
 		$this->context = $context;
37 37
 		$this->controller = $controller;
@@ -46,12 +46,12 @@  discard block
 block discarded – undo
46 46
 	 * @return mixed Returns the value of the called method
47 47
 	 * @throws \Aimeos\Controller\Frontend\Exception If method call failed
48 48
 	 */
49
-	public function __call( $name, array $param )
49
+	public function __call($name, array $param)
50 50
 	{
51
-		if( ( $result = call_user_func_array( array( $this->controller, $name ), $param ) ) === false )
51
+		if (($result = call_user_func_array(array($this->controller, $name), $param)) === false)
52 52
 		{
53
-			$cntl = get_class( $this->controller );
54
-			throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Unable to call method "%1$s::%2$s"', $cntl, $name ) );
53
+			$cntl = get_class($this->controller);
54
+			throw new \Aimeos\Controller\Frontend\Exception(sprintf('Unable to call method "%1$s::%2$s"', $cntl, $name));
55 55
 		}
56 56
 
57 57
 		return $result;
Please login to merge, or discard this patch.