Completed
Push — master ( 22be93...ed7986 )
by Aimeos
03:44
created
controller/frontend/src/Controller/Frontend/Service/Standard.php 1 patch
Spacing   +69 added lines, -69 removed lines patch added patch discarded remove patch
@@ -35,12 +35,12 @@  discard block
 block discarded – undo
35 35
 	 * @param string[] $attributes List of attribute codes as keys and strings entered by the customer as value
36 36
 	 * @return string[] List of attributes codes as keys and error messages as values for invalid or missing values
37 37
 	 */
38
-	public function checkAttributes( $serviceId, array $attributes )
38
+	public function checkAttributes($serviceId, array $attributes)
39 39
 	{
40
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service' );
41
-		$provider = $manager->getProvider( $manager->getItem( $serviceId, [], true ) );
40
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'service');
41
+		$provider = $manager->getProvider($manager->getItem($serviceId, [], true));
42 42
 
43
-		return array_filter( $provider->checkConfigFE( $attributes ) );
43
+		return array_filter($provider->checkConfigFE($attributes));
44 44
 	}
45 45
 
46 46
 
@@ -51,10 +51,10 @@  discard block
 block discarded – undo
51 51
 	 * @param string[] $ref List of domain names whose items should be fetched too
52 52
 	 * @return \Aimeos\MShop\Service\Provider\Iface Service provider object
53 53
 	 */
54
-	public function getProvider( $serviceId, $ref = ['media', 'price', 'text'] )
54
+	public function getProvider($serviceId, $ref = ['media', 'price', 'text'])
55 55
 	{
56
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service' );
57
-		return $manager->getProvider( $manager->getItem( $serviceId, $ref, true ) );
56
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'service');
57
+		return $manager->getProvider($manager->getItem($serviceId, $ref, true));
58 58
 	}
59 59
 
60 60
 
@@ -65,26 +65,26 @@  discard block
 block discarded – undo
65 65
 	 * @param string[] $ref List of domain names whose items should be fetched too
66 66
 	 * @return \Aimeos\MShop\Service\Provider\Iface[] List of service IDs as keys and service provider objects as values
67 67
 	 */
68
-	public function getProviders( $type = null, $ref = ['media', 'price', 'text'] )
68
+	public function getProviders($type = null, $ref = ['media', 'price', 'text'])
69 69
 	{
70 70
 		$list = [];
71
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service' );
71
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'service');
72 72
 
73
-		$search = $manager->createSearch( true );
74
-		$search->setSortations( array( $search->sort( '+', 'service.position' ) ) );
73
+		$search = $manager->createSearch(true);
74
+		$search->setSortations(array($search->sort('+', 'service.position')));
75 75
 
76
-		if( $type != null )
76
+		if ($type != null)
77 77
 		{
78 78
 			$expr = array(
79 79
 				$search->getConditions(),
80
-				$search->compare( '==', 'service.type.code', $type ),
81
-				$search->compare( '==', 'service.type.domain', 'service' ),
80
+				$search->compare('==', 'service.type.code', $type),
81
+				$search->compare('==', 'service.type.domain', 'service'),
82 82
 			);
83
-			$search->setConditions( $search->combine( '&&', $expr ) );
83
+			$search->setConditions($search->combine('&&', $expr));
84 84
 		}
85 85
 
86
-		foreach( $manager->searchItems( $search, $ref ) as $id => $item ) {
87
-			$list[$id] = $manager->getProvider( $item );
86
+		foreach ($manager->searchItems($search, $ref) as $id => $item) {
87
+			$list[$id] = $manager->getProvider($item);
88 88
 		}
89 89
 
90 90
 		return $list;
@@ -102,14 +102,14 @@  discard block
 block discarded – undo
102 102
 	 * @return \Aimeos\MShop\Common\Item\Helper\Form\Iface|null Form object with URL, parameters, etc.
103 103
 	 * 	or null if no form data is required
104 104
 	 */
105
-	public function process( \Aimeos\MShop\Order\Item\Iface $orderItem, $serviceId, array $urls, array $params )
105
+	public function process(\Aimeos\MShop\Order\Item\Iface $orderItem, $serviceId, array $urls, array $params)
106 106
 	{
107
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service' );
107
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'service');
108 108
 
109
-		$provider = $manager->getProvider( $manager->getItem( $serviceId, [], true ) );
110
-		$provider->injectGlobalConfigBE( $urls );
109
+		$provider = $manager->getProvider($manager->getItem($serviceId, [], true));
110
+		$provider->injectGlobalConfigBE($urls);
111 111
 
112
-		return $provider->process( $orderItem, $params );
112
+		return $provider->process($orderItem, $params);
113 113
 	}
114 114
 
115 115
 
@@ -122,35 +122,35 @@  discard block
 block discarded – undo
122 122
 	 * 	(keys are <type>.url-self, <type>.url-success, <type>.url-update where type can be "delivery" or "payment")
123 123
 	 * @return \Aimeos\MShop\Order\Item\Iface $orderItem Order item that has been updated
124 124
 	 */
125
-	public function updateSync( ServerRequestInterface $request, ResponseInterface $response, array $urls )
125
+	public function updateSync(ServerRequestInterface $request, ResponseInterface $response, array $urls)
126 126
 	{
127 127
 		$queryParams = $request->getQueryParams();
128 128
 
129
-		if( !isset( $queryParams['code'] ) ) {
129
+		if (!isset($queryParams['code'])) {
130 130
 			return;
131 131
 		}
132 132
 
133 133
 		$context = $this->getContext();
134
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'service' );
134
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'service');
135 135
 
136
-		$provider = $manager->getProvider( $manager->findItem( $queryParams['code'] ) );
137
-		$provider->injectGlobalConfigBE( $urls );
136
+		$provider = $manager->getProvider($manager->findItem($queryParams['code']));
137
+		$provider->injectGlobalConfigBE($urls);
138 138
 
139
-		$params = array_merge( $queryParams, (array) $request->getParsedBody() );
139
+		$params = array_merge($queryParams, (array) $request->getParsedBody());
140 140
 		$body = (string) $request->getBody();
141 141
 		$response = null;
142 142
 		$headers = [];
143 143
 
144
-		if( ( $orderItem = $provider->updateSync( $params, $body, $response, $headers ) ) !== null )
144
+		if (($orderItem = $provider->updateSync($params, $body, $response, $headers)) !== null)
145 145
 		{
146
-			if( $orderItem->getPaymentStatus() === \Aimeos\MShop\Order\Item\Base::PAY_UNFINISHED
147
-				&& $provider->isImplemented( \Aimeos\MShop\Service\Provider\Payment\Base::FEAT_QUERY )
146
+			if ($orderItem->getPaymentStatus() === \Aimeos\MShop\Order\Item\Base::PAY_UNFINISHED
147
+				&& $provider->isImplemented(\Aimeos\MShop\Service\Provider\Payment\Base::FEAT_QUERY)
148 148
 			) {
149
-				$provider->query( $orderItem );
149
+				$provider->query($orderItem);
150 150
 			}
151 151
 
152 152
 			// update stock, coupons, etc.
153
-			\Aimeos\Controller\Frontend\Factory::createController( $context, 'order' )->update( $orderItem );
153
+			\Aimeos\Controller\Frontend\Factory::createController($context, 'order')->update($orderItem);
154 154
 		}
155 155
 
156 156
 		return $orderItem;
@@ -167,38 +167,38 @@  discard block
 block discarded – undo
167 167
 	 * @throws \Exception If an error occurs
168 168
 	 * @deprecated Use getProviders() instead
169 169
 	 */
170
-	public function getServices( $type, \Aimeos\MShop\Order\Item\Base\Iface $basket, $ref = ['media', 'price', 'text'] )
170
+	public function getServices($type, \Aimeos\MShop\Order\Item\Base\Iface $basket, $ref = ['media', 'price', 'text'])
171 171
 	{
172
-		$serviceManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service' );
172
+		$serviceManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'service');
173 173
 
174
-		$search = $serviceManager->createSearch( true );
174
+		$search = $serviceManager->createSearch(true);
175 175
 		$expr = array(
176 176
 			$search->getConditions(),
177
-			$search->compare( '==', 'service.type.domain', 'service' ),
178
-			$search->compare( '==', 'service.type.code', $type ),
177
+			$search->compare('==', 'service.type.domain', 'service'),
178
+			$search->compare('==', 'service.type.code', $type),
179 179
 		);
180
-		$search->setConditions( $search->combine( '&&', $expr ) );
181
-		$search->setSortations( array( $search->sort( '+', 'service.position' ) ) );
180
+		$search->setConditions($search->combine('&&', $expr));
181
+		$search->setSortations(array($search->sort('+', 'service.position')));
182 182
 
183
-		$items = $serviceManager->searchItems( $search, $ref );
183
+		$items = $serviceManager->searchItems($search, $ref);
184 184
 
185 185
 
186
-		foreach( $items as $id => $service )
186
+		foreach ($items as $id => $service)
187 187
 		{
188 188
 			try
189 189
 			{
190
-				$provider = $serviceManager->getProvider( $service );
190
+				$provider = $serviceManager->getProvider($service);
191 191
 
192
-				if( $provider->isAvailable( $basket ) ) {
192
+				if ($provider->isAvailable($basket)) {
193 193
 					$this->providers[$type][$id] = $provider;
194 194
 				} else {
195
-					unset( $items[$id] );
195
+					unset($items[$id]);
196 196
 				}
197 197
 			}
198
-			catch( \Aimeos\MShop\Service\Exception $e )
198
+			catch (\Aimeos\MShop\Service\Exception $e)
199 199
 			{
200
-				$msg = sprintf( 'Unable to create provider "%1$s" for service with ID "%2$s"', $service->getCode(), $id );
201
-				$this->getContext()->getLogger()->log( $msg, \Aimeos\MW\Logger\Base::WARN );
200
+				$msg = sprintf('Unable to create provider "%1$s" for service with ID "%2$s"', $service->getCode(), $id);
201
+				$this->getContext()->getLogger()->log($msg, \Aimeos\MW\Logger\Base::WARN);
202 202
 			}
203 203
 		}
204 204
 
@@ -219,16 +219,16 @@  discard block
 block discarded – undo
219 219
 	 * @throws \Exception If an error occurs
220 220
 	 * @deprecated Use getProvider() instead
221 221
 	 */
222
-	public function getServiceAttributes( $type, $serviceId, \Aimeos\MShop\Order\Item\Base\Iface $basket )
222
+	public function getServiceAttributes($type, $serviceId, \Aimeos\MShop\Order\Item\Base\Iface $basket)
223 223
 	{
224
-		if( isset( $this->providers[$type][$serviceId] ) ) {
225
-			return $this->providers[$type][$serviceId]->getConfigFE( $basket );
224
+		if (isset($this->providers[$type][$serviceId])) {
225
+			return $this->providers[$type][$serviceId]->getConfigFE($basket);
226 226
 		}
227 227
 
228
-		$serviceManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service' );
229
-		$item = $serviceManager->getItem( $serviceId, ['price'], true );
228
+		$serviceManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'service');
229
+		$item = $serviceManager->getItem($serviceId, ['price'], true);
230 230
 
231
-		return $serviceManager->getProvider( $item )->getConfigFE( $basket );
231
+		return $serviceManager->getProvider($item)->getConfigFE($basket);
232 232
 	}
233 233
 
234 234
 
@@ -244,16 +244,16 @@  discard block
 block discarded – undo
244 244
 	 * @throws \Exception If an error occurs
245 245
 	 * @deprecated Use getProvider() instead
246 246
 	 */
247
-	public function getServicePrice( $type, $serviceId, \Aimeos\MShop\Order\Item\Base\Iface $basket )
247
+	public function getServicePrice($type, $serviceId, \Aimeos\MShop\Order\Item\Base\Iface $basket)
248 248
 	{
249
-		if( isset( $this->providers[$type][$serviceId] ) ) {
250
-			return $this->providers[$type][$serviceId]->calcPrice( $basket );
249
+		if (isset($this->providers[$type][$serviceId])) {
250
+			return $this->providers[$type][$serviceId]->calcPrice($basket);
251 251
 		}
252 252
 
253
-		$serviceManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service' );
254
-		$item = $serviceManager->getItem( $serviceId, ['price'], true );
253
+		$serviceManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'service');
254
+		$item = $serviceManager->getItem($serviceId, ['price'], true);
255 255
 
256
-		return $serviceManager->getProvider( $item )->calcPrice( $basket );
256
+		return $serviceManager->getProvider($item)->calcPrice($basket);
257 257
 	}
258 258
 
259 259
 
@@ -269,22 +269,22 @@  discard block
 block discarded – undo
269 269
 	 * @throws \Aimeos\Controller\Frontend\Service\Exception If no active service provider for this ID is available
270 270
 	 * @deprecated Use checkAttributes() instead
271 271
 	 */
272
-	public function checkServiceAttributes( $type, $serviceId, array $attributes )
272
+	public function checkServiceAttributes($type, $serviceId, array $attributes)
273 273
 	{
274
-		if( !isset( $this->providers[$type][$serviceId] ) )
274
+		if (!isset($this->providers[$type][$serviceId]))
275 275
 		{
276
-			$serviceManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service' );
277
-			$item = $serviceManager->getItem( $serviceId, ['price'], true );
276
+			$serviceManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'service');
277
+			$item = $serviceManager->getItem($serviceId, ['price'], true);
278 278
 
279
-			$this->providers[$type][$serviceId] = $serviceManager->getProvider( $item );
279
+			$this->providers[$type][$serviceId] = $serviceManager->getProvider($item);
280 280
 		}
281 281
 
282
-		$errors = $this->providers[$type][$serviceId]->checkConfigFE( $attributes );
282
+		$errors = $this->providers[$type][$serviceId]->checkConfigFE($attributes);
283 283
 
284
-		foreach( $errors as $key => $msg )
284
+		foreach ($errors as $key => $msg)
285 285
 		{
286
-			if( $msg === null ) {
287
-				unset( $errors[$key] );
286
+			if ($msg === null) {
287
+				unset($errors[$key]);
288 288
 			}
289 289
 		}
290 290
 
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
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 	 * @param string[] $attributes List of attribute codes as keys and strings entered by the customer as value
31 31
 	 * @return string[] List of attributes codes as keys and error messages as values for invalid or missing values
32 32
 	 */
33
-	public function checkAttributes( $serviceId, array $attributes );
33
+	public function checkAttributes($serviceId, array $attributes);
34 34
 
35 35
 	/**
36 36
 	 * Returns the service item for the given ID
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
 	 * @param array $ref List of domains for which the items referenced by the services should be fetched too
40 40
 	 * @return \Aimeos\MShop\Service\Provider\Iface Service provider object
41 41
 	 */
42
-	public function getProvider( $serviceId, $ref = ['media', 'price', 'text'] );
42
+	public function getProvider($serviceId, $ref = ['media', 'price', 'text']);
43 43
 
44 44
 	/**
45 45
 	 * Returns the service providers for the given type
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
 	 * @param array $ref List of domains for which the items referenced by the services should be fetched too
49 49
 	 * @return \Aimeos\MShop\Service\Provider\Iface[] List of service IDs as keys and service provider objects as values
50 50
 	 */
51
-	public function getProviders( $type = null, $ref = ['media', 'price', 'text'] );
51
+	public function getProviders($type = null, $ref = ['media', 'price', 'text']);
52 52
 
53 53
 	/**
54 54
 	 * Processes the service for the given order, e.g. payment and delivery services
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
 	 * @return \Aimeos\MShop\Common\Item\Helper\Form\Iface|null Form object with URL, parameters, etc.
62 62
 	 * 	or null if no form data is required
63 63
 	 */
64
-	public function process( \Aimeos\MShop\Order\Item\Iface $orderItem, $serviceId, array $urls, array $params );
64
+	public function process(\Aimeos\MShop\Order\Item\Iface $orderItem, $serviceId, array $urls, array $params);
65 65
 
66 66
 	/**
67 67
 	 * Updates the payment or delivery status for the given request
@@ -72,5 +72,5 @@  discard block
 block discarded – undo
72 72
 	 * 	(keys are <type>.url-self, <type>.url-success, <type>.url-update where type can be "delivery" or "payment")
73 73
 	 * @return \Aimeos\MShop\Order\Item\Iface $orderItem Order item that has been updated
74 74
 	 */
75
-	public function updateSync( ServerRequestInterface $request, ResponseInterface $response, array $urls );
75
+	public function updateSync(ServerRequestInterface $request, ResponseInterface $response, array $urls);
76 76
 }
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Service/Decorator/Base.php 1 patch
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -33,18 +33,18 @@  discard block
 block discarded – undo
33 33
 	 * @param \Aimeos\Controller\Frontend\Iface $controller Controller object
34 34
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object with required objects
35 35
 	 */
36
-	public function __construct( \Aimeos\Controller\Frontend\Iface $controller, \Aimeos\MShop\Context\Item\Iface $context )
36
+	public function __construct(\Aimeos\Controller\Frontend\Iface $controller, \Aimeos\MShop\Context\Item\Iface $context)
37 37
 	{
38 38
 		$iface = '\Aimeos\Controller\Frontend\Service\Iface';
39
-		if( !( $controller instanceof $iface ) )
39
+		if (!($controller instanceof $iface))
40 40
 		{
41
-			$msg = sprintf( 'Class "%1$s" does not implement interface "%2$s"', get_class( $controller ), $iface );
42
-			throw new \Aimeos\Controller\Frontend\Exception( $msg );
41
+			$msg = sprintf('Class "%1$s" does not implement interface "%2$s"', get_class($controller), $iface);
42
+			throw new \Aimeos\Controller\Frontend\Exception($msg);
43 43
 		}
44 44
 
45 45
 		$this->controller = $controller;
46 46
 
47
-		parent::__construct( $context );
47
+		parent::__construct($context);
48 48
 	}
49 49
 
50 50
 
@@ -56,9 +56,9 @@  discard block
 block discarded – undo
56 56
 	 * @return mixed Returns the value of the called method
57 57
 	 * @throws \Aimeos\Controller\Frontend\Exception If method call failed
58 58
 	 */
59
-	public function __call( $name, array $param )
59
+	public function __call($name, array $param)
60 60
 	{
61
-		return @call_user_func_array( array( $this->controller, $name ), $param );
61
+		return @call_user_func_array(array($this->controller, $name), $param);
62 62
 	}
63 63
 
64 64
 
@@ -69,9 +69,9 @@  discard block
 block discarded – undo
69 69
 	 * @param string[] $attributes List of attribute codes as keys and strings entered by the customer as value
70 70
 	 * @return string[] List of attributes codes as keys and error messages as values for invalid or missing values
71 71
 	 */
72
-	public function checkAttributes( $serviceId, array $attributes )
72
+	public function checkAttributes($serviceId, array $attributes)
73 73
 	{
74
-		return $this->controller->checkAttributes( $serviceId, $attributes );
74
+		return $this->controller->checkAttributes($serviceId, $attributes);
75 75
 	}
76 76
 
77 77
 
@@ -82,9 +82,9 @@  discard block
 block discarded – undo
82 82
 	 * @param array $ref List of domains for which the items referenced by the services should be fetched too
83 83
 	 * @return \Aimeos\MShop\Service\Provider\Iface Service provider object
84 84
 	 */
85
-	public function getProvider( $serviceId, $ref = ['media', 'price', 'text'] )
85
+	public function getProvider($serviceId, $ref = ['media', 'price', 'text'])
86 86
 	{
87
-		return $this->controller->getProvider( $serviceId, $ref );
87
+		return $this->controller->getProvider($serviceId, $ref);
88 88
 	}
89 89
 
90 90
 
@@ -95,9 +95,9 @@  discard block
 block discarded – undo
95 95
 	 * @param array $ref List of domains for which the items referenced by the services should be fetched too
96 96
 	 * @return \Aimeos\MShop\Service\Provider\Iface[] List of service IDs as keys and service provider objects as values
97 97
 	 */
98
-	public function getProviders( $type = null, $ref = ['media', 'price', 'text'] )
98
+	public function getProviders($type = null, $ref = ['media', 'price', 'text'])
99 99
 	{
100
-		return $this->controller->getProviders( $type, $ref );
100
+		return $this->controller->getProviders($type, $ref);
101 101
 	}
102 102
 
103 103
 
@@ -112,9 +112,9 @@  discard block
 block discarded – undo
112 112
 	 * @return \Aimeos\MShop\Common\Item\Helper\Form\Iface|null Form object with URL, parameters, etc.
113 113
 	 * 	or null if no form data is required
114 114
 	 */
115
-	public function process( \Aimeos\MShop\Order\Item\Iface $orderItem, $serviceId, array $urls, array $params )
115
+	public function process(\Aimeos\MShop\Order\Item\Iface $orderItem, $serviceId, array $urls, array $params)
116 116
 	{
117
-		return $this->controller->process( $orderItem, $serviceId, $urls, $params );
117
+		return $this->controller->process($orderItem, $serviceId, $urls, $params);
118 118
 	}
119 119
 
120 120
 
@@ -127,9 +127,9 @@  discard block
 block discarded – undo
127 127
 	 * 	(keys are <type>.url-self, <type>.url-success, <type>.url-update where type can be "delivery" or "payment")
128 128
 	 * @return \Aimeos\MShop\Order\Item\Iface $orderItem Order item that has been updated
129 129
 	 */
130
-	public function updateSync( ServerRequestInterface $request, ResponseInterface $response, array $urls )
130
+	public function updateSync(ServerRequestInterface $request, ResponseInterface $response, array $urls)
131 131
 	{
132
-		return $this->controller->updateSync( $request, $response, $urls );
132
+		return $this->controller->updateSync($request, $response, $urls);
133 133
 	}
134 134
 
135 135
 
@@ -142,10 +142,10 @@  discard block
 block discarded – undo
142 142
 	 * @return array List of service items implementing \Aimeos\MShop\Service\Item\Iface with referenced items
143 143
 	 * @deprecated Use getProviders() instead
144 144
 	 */
145
-	public function getServices( $type, \Aimeos\MShop\Order\Item\Base\Iface $basket,
146
-		$ref = array( 'media', 'price', 'text' ) )
145
+	public function getServices($type, \Aimeos\MShop\Order\Item\Base\Iface $basket,
146
+		$ref = array('media', 'price', 'text'))
147 147
 	{
148
-		return $this->controller->getServices( $type, $basket, $ref );
148
+		return $this->controller->getServices($type, $basket, $ref);
149 149
 	}
150 150
 
151 151
 
@@ -159,9 +159,9 @@  discard block
 block discarded – undo
159 159
 	 * @return array List of attribute definitions implementing \Aimeos\MW\Criteria\Attribute\Iface
160 160
 	 * @deprecated Use getProvider() instead
161 161
 	 */
162
-	public function getServiceAttributes( $type, $serviceId, \Aimeos\MShop\Order\Item\Base\Iface $basket )
162
+	public function getServiceAttributes($type, $serviceId, \Aimeos\MShop\Order\Item\Base\Iface $basket)
163 163
 	{
164
-		return $this->controller->getServiceAttributes( $type, $serviceId, $basket );
164
+		return $this->controller->getServiceAttributes($type, $serviceId, $basket);
165 165
 	}
166 166
 
167 167
 
@@ -177,9 +177,9 @@  discard block
 block discarded – undo
177 177
 	 * @throws \Exception If an error occurs
178 178
 	 * @deprecated Use getProvider() instead
179 179
 	 */
180
-	public function getServicePrice( $type, $serviceId, \Aimeos\MShop\Order\Item\Base\Iface $basket )
180
+	public function getServicePrice($type, $serviceId, \Aimeos\MShop\Order\Item\Base\Iface $basket)
181 181
 	{
182
-		return $this->controller->getServicePrice( $type, $serviceId, $basket );
182
+		return $this->controller->getServicePrice($type, $serviceId, $basket);
183 183
 	}
184 184
 
185 185
 
@@ -194,9 +194,9 @@  discard block
 block discarded – undo
194 194
 	 * 	missing
195 195
 	 * @deprecated Use checkAttributes() instead
196 196
 	 */
197
-	public function checkServiceAttributes( $type, $serviceId, array $attributes )
197
+	public function checkServiceAttributes($type, $serviceId, array $attributes)
198 198
 	{
199
-		return $this->controller->checkServiceAttributes( $type, $serviceId, $attributes );
199
+		return $this->controller->checkServiceAttributes($type, $serviceId, $attributes);
200 200
 	}
201 201
 
202 202
 
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Order/Standard.php 1 patch
Spacing   +32 added lines, -32 removed lines patch added patch discarded remove patch
@@ -29,12 +29,12 @@  discard block
 block discarded – undo
29 29
 	 * @param string $type Arbitrary order type (max. eight chars)
30 30
 	 * @return \Aimeos\MShop\Order\Item\Iface Created order object
31 31
 	 */
32
-	public function addItem( $baseId, $type )
32
+	public function addItem($baseId, $type)
33 33
 	{
34
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'order' );
34
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'order');
35 35
 
36
-		$item = $manager->createItem()->setBaseId( $baseId )->setType( $type );
37
-		$manager->saveItem( $item );
36
+		$item = $manager->createItem()->setBaseId($baseId)->setType($type);
37
+		$manager->saveItem($item);
38 38
 
39 39
 		return $item;
40 40
 	}
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
 	 */
48 48
 	public function createFilter()
49 49
 	{
50
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'order' )->createSearch( true );
50
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'order')->createSearch(true);
51 51
 	}
52 52
 
53 53
 
@@ -57,26 +57,26 @@  discard block
 block discarded – undo
57 57
 	 * @param string $id Unique order ID
58 58
 	 * @return \Aimeos\MShop\Order\Item\Iface Order object
59 59
 	 */
60
-	public function getItem( $id )
60
+	public function getItem($id)
61 61
 	{
62 62
 		$context = $this->getContext();
63
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'order' );
63
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'order');
64 64
 
65
-		$search = $manager->createSearch( true );
65
+		$search = $manager->createSearch(true);
66 66
 		$expr = [
67
-			$search->compare( '==', 'order.id', $id ),
68
-			$search->compare( '==', 'order.base.customerid', $context->getUserId() ),
67
+			$search->compare('==', 'order.id', $id),
68
+			$search->compare('==', 'order.base.customerid', $context->getUserId()),
69 69
 			$search->getConditions(),
70 70
 		];
71
-		$search->setConditions( $search->combine( '&&', $expr ) );
71
+		$search->setConditions($search->combine('&&', $expr));
72 72
 
73
-		$items = $manager->searchItems( $search );
73
+		$items = $manager->searchItems($search);
74 74
 
75
-		if( ( $item = reset( $items ) ) !== false ) {
75
+		if (($item = reset($items)) !== false) {
76 76
 			return $item;
77 77
 		}
78 78
 
79
-		throw new \Aimeos\Controller\Frontend\Order\Exception( sprintf( 'No order item for ID "%1$s" found', $id ) );
79
+		throw new \Aimeos\Controller\Frontend\Order\Exception(sprintf('No order item for ID "%1$s" found', $id));
80 80
 	}
81 81
 
82 82
 
@@ -87,18 +87,18 @@  discard block
 block discarded – undo
87 87
 	 * @param integer|null &$total Variable that will contain the total number of available items
88 88
 	 * @return \Aimeos\MShop\Order\Item\Iface[] Associative list of IDs as keys and order objects as values
89 89
 	 */
90
-	public function searchItems( \Aimeos\MW\Criteria\Iface $filter, &$total = null )
90
+	public function searchItems(\Aimeos\MW\Criteria\Iface $filter, &$total = null)
91 91
 	{
92 92
 		$context = $this->getContext();
93
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'order' );
93
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'order');
94 94
 
95 95
 		$expr = [
96 96
 			$filter->getConditions(),
97
-			$filter->compare( '==', 'order.base.customerid', $context->getUserId() ),
97
+			$filter->compare('==', 'order.base.customerid', $context->getUserId()),
98 98
 		];
99
-		$filter->setConditions( $filter->combine( '&&', $expr ) );
99
+		$filter->setConditions($filter->combine('&&', $expr));
100 100
 
101
-		return $manager->searchItems( $filter, [], $total );
101
+		return $manager->searchItems($filter, [], $total);
102 102
 	}
103 103
 
104 104
 
@@ -120,9 +120,9 @@  discard block
 block discarded – undo
120 120
 	 *
121 121
 	 * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object
122 122
 	 */
123
-	public function block( \Aimeos\MShop\Order\Item\Iface $orderItem )
123
+	public function block(\Aimeos\MShop\Order\Item\Iface $orderItem)
124 124
 	{
125
-		\Aimeos\Controller\Common\Order\Factory::createController( $this->getContext() )->block( $orderItem );
125
+		\Aimeos\Controller\Common\Order\Factory::createController($this->getContext())->block($orderItem);
126 126
 	}
127 127
 
128 128
 
@@ -144,9 +144,9 @@  discard block
 block discarded – undo
144 144
 	 *
145 145
 	 * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object
146 146
 	 */
147
-	public function unblock( \Aimeos\MShop\Order\Item\Iface $orderItem )
147
+	public function unblock(\Aimeos\MShop\Order\Item\Iface $orderItem)
148 148
 	{
149
-		\Aimeos\Controller\Common\Order\Factory::createController( $this->getContext() )->unblock( $orderItem );
149
+		\Aimeos\Controller\Common\Order\Factory::createController($this->getContext())->unblock($orderItem);
150 150
 	}
151 151
 
152 152
 
@@ -164,9 +164,9 @@  discard block
 block discarded – undo
164 164
 	 *
165 165
 	 * @param \Aimeos\MShop\Order\Item\Iface $orderItem Order item object
166 166
 	 */
167
-	public function update( \Aimeos\MShop\Order\Item\Iface $orderItem )
167
+	public function update(\Aimeos\MShop\Order\Item\Iface $orderItem)
168 168
 	{
169
-		\Aimeos\Controller\Common\Order\Factory::createController( $this->getContext() )->update( $orderItem );
169
+		\Aimeos\Controller\Common\Order\Factory::createController($this->getContext())->update($orderItem);
170 170
 	}
171 171
 
172 172
 
@@ -181,22 +181,22 @@  discard block
 block discarded – undo
181 181
 	 * @return \Aimeos\MShop\Order\Item\Iface Order item that belongs to the stored basket
182 182
 	 * @deprecated 2017.04 Use store() from basket controller instead
183 183
 	 */
184
-	public function store( \Aimeos\MShop\Order\Item\Base\Iface $basket )
184
+	public function store(\Aimeos\MShop\Order\Item\Base\Iface $basket)
185 185
 	{
186 186
 		$context = $this->getContext();
187 187
 
188
-		$orderManager = \Aimeos\MShop\Factory::createManager( $context, 'order' );
189
-		$orderBaseManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base' );
188
+		$orderManager = \Aimeos\MShop\Factory::createManager($context, 'order');
189
+		$orderBaseManager = \Aimeos\MShop\Factory::createManager($context, 'order/base');
190 190
 
191 191
 
192 192
 		$orderBaseManager->begin();
193
-		$orderBaseManager->store( $basket );
193
+		$orderBaseManager->store($basket);
194 194
 		$orderBaseManager->commit();
195 195
 
196 196
 		$orderItem = $orderManager->createItem();
197
-		$orderItem->setBaseId( $basket->getId() );
198
-		$orderItem->setType( \Aimeos\MShop\Order\Item\Base::TYPE_WEB );
199
-		$orderManager->saveItem( $orderItem );
197
+		$orderItem->setBaseId($basket->getId());
198
+		$orderItem->setType(\Aimeos\MShop\Order\Item\Base::TYPE_WEB);
199
+		$orderManager->saveItem($orderItem);
200 200
 
201 201
 
202 202
 		return $orderItem;
Please login to merge, or discard this patch.
controller/frontend/tests/Controller/Frontend/Order/StandardTest.php 1 patch
Spacing   +64 added lines, -64 removed lines patch added patch discarded remove patch
@@ -18,175 +18,175 @@
 block discarded – undo
18 18
 
19 19
 	protected function setUp()
20 20
 	{
21
-		\Aimeos\MShop\Factory::setCache( true );
21
+		\Aimeos\MShop\Factory::setCache(true);
22 22
 
23 23
 		$this->context = \TestHelperFrontend::getContext();
24
-		$this->object = new \Aimeos\Controller\Frontend\Order\Standard( $this->context );
24
+		$this->object = new \Aimeos\Controller\Frontend\Order\Standard($this->context);
25 25
 	}
26 26
 
27 27
 
28 28
 	protected function tearDown()
29 29
 	{
30
-		unset( $this->object, $this->context );
30
+		unset($this->object, $this->context);
31 31
 
32
-		\Aimeos\MShop\Factory::setCache( false );
32
+		\Aimeos\MShop\Factory::setCache(false);
33 33
 		\Aimeos\MShop\Factory::clear();
34 34
 	}
35 35
 
36 36
 
37 37
 	public function testAddItem()
38 38
 	{
39
-		$manager = $this->getMockBuilder( '\\Aimeos\\MShop\\Order\\Manager\\Standard' )
40
-			->setConstructorArgs( [$this->context] )
41
-			->setMethods( ['saveItem'] )
39
+		$manager = $this->getMockBuilder('\\Aimeos\\MShop\\Order\\Manager\\Standard')
40
+			->setConstructorArgs([$this->context])
41
+			->setMethods(['saveItem'])
42 42
 			->getMock();
43 43
 
44
-		\Aimeos\MShop\Factory::injectManager( $this->context, 'order', $manager );
44
+		\Aimeos\MShop\Factory::injectManager($this->context, 'order', $manager);
45 45
 
46
-		$manager->expects( $this->once() )->method( 'saveItem' );
46
+		$manager->expects($this->once())->method('saveItem');
47 47
 
48
-		$this->assertInstanceOf( '\Aimeos\MShop\Order\Item\Iface', $this->object->addItem( -1, 'test' ) );
48
+		$this->assertInstanceOf('\Aimeos\MShop\Order\Item\Iface', $this->object->addItem( -1, 'test' ));
49 49
 	}
50 50
 
51 51
 
52 52
 	public function testCreateFilter()
53 53
 	{
54
-		$this->assertInstanceOf( '\Aimeos\MW\Criteria\Iface', $this->object->createFilter() );
54
+		$this->assertInstanceOf('\Aimeos\MW\Criteria\Iface', $this->object->createFilter());
55 55
 	}
56 56
 
57 57
 
58 58
 	public function testGetItem()
59 59
 	{
60
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'customer' );
61
-		$customerItem = $manager->findItem( 'UTC001' );
60
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'customer');
61
+		$customerItem = $manager->findItem('UTC001');
62 62
 
63
-		$this->context->setUserId( $customerItem->getId() );
63
+		$this->context->setUserId($customerItem->getId());
64 64
 
65
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'order' );
66
-		$search = $manager->createSearch()->setSlice( 0, 1 );
67
-		$search->setConditions( $search->compare( '==', 'order.base.customerid', $customerItem->getId() ) );
68
-		$result = $manager->searchItems( $search );
65
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'order');
66
+		$search = $manager->createSearch()->setSlice(0, 1);
67
+		$search->setConditions($search->compare('==', 'order.base.customerid', $customerItem->getId()));
68
+		$result = $manager->searchItems($search);
69 69
 
70
-		if( ( $item = reset( $result ) ) === false ) {
71
-			throw new \RuntimeException( 'No order item found' );
70
+		if (($item = reset($result)) === false) {
71
+			throw new \RuntimeException('No order item found');
72 72
 		}
73 73
 
74
-		$this->assertInstanceOf( '\Aimeos\MShop\Order\Item\Iface', $this->object->getItem( $item->getId() ) );
74
+		$this->assertInstanceOf('\Aimeos\MShop\Order\Item\Iface', $this->object->getItem($item->getId()));
75 75
 	}
76 76
 
77 77
 
78 78
 	public function testGetItemException()
79 79
 	{
80
-		$manager = \Aimeos\MShop\Factory::createManager( $this->context, 'order' );
81
-		$search = $manager->createSearch()->setSlice( 0, 1 );
82
-		$result = $manager->searchItems( $search );
80
+		$manager = \Aimeos\MShop\Factory::createManager($this->context, 'order');
81
+		$search = $manager->createSearch()->setSlice(0, 1);
82
+		$result = $manager->searchItems($search);
83 83
 
84
-		if( ( $item = reset( $result ) ) === false ) {
85
-			throw new \RuntimeException( 'No order item found' );
84
+		if (($item = reset($result)) === false) {
85
+			throw new \RuntimeException('No order item found');
86 86
 		}
87 87
 
88
-		$this->setExpectedException( '\Aimeos\Controller\Frontend\Order\Exception' );
89
-		$this->object->getItem( $item->getId() );
88
+		$this->setExpectedException('\Aimeos\Controller\Frontend\Order\Exception');
89
+		$this->object->getItem($item->getId());
90 90
 	}
91 91
 
92 92
 
93 93
 	public function testSearchItems()
94 94
 	{
95
-		$this->assertGreaterThan( 1, $this->object->searchItems( $this->object->createFilter() ) );
95
+		$this->assertGreaterThan(1, $this->object->searchItems($this->object->createFilter()));
96 96
 	}
97 97
 
98 98
 
99 99
 	public function testStore()
100 100
 	{
101 101
 		$name = 'ControllerFrontendOrderStore';
102
-		$this->context->getConfig()->set( 'mshop/order/manager/name', $name );
102
+		$this->context->getConfig()->set('mshop/order/manager/name', $name);
103 103
 
104 104
 
105
-		$orderManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Order\\Manager\\Standard' )
106
-			->setMethods( array( 'saveItem', 'getSubManager' ) )
107
-			->setConstructorArgs( array( $this->context ) )
105
+		$orderManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Order\\Manager\\Standard')
106
+			->setMethods(array('saveItem', 'getSubManager'))
107
+			->setConstructorArgs(array($this->context))
108 108
 			->getMock();
109 109
 
110
-		$orderBaseManagerStub = $this->getMockBuilder( '\\Aimeos\\MShop\\Order\\Manager\\Base\\Standard' )
111
-			->setMethods( array( 'store' ) )
112
-			->setConstructorArgs( array( $this->context ) )
110
+		$orderBaseManagerStub = $this->getMockBuilder('\\Aimeos\\MShop\\Order\\Manager\\Base\\Standard')
111
+			->setMethods(array('store'))
112
+			->setConstructorArgs(array($this->context))
113 113
 			->getMock();
114 114
 
115
-		\Aimeos\MShop\Order\Manager\Factory::injectManager( '\\Aimeos\\MShop\\Order\\Manager\\' . $name, $orderManagerStub );
115
+		\Aimeos\MShop\Order\Manager\Factory::injectManager('\\Aimeos\\MShop\\Order\\Manager\\' . $name, $orderManagerStub);
116 116
 
117 117
 
118 118
 		$orderBaseItem = $orderBaseManagerStub->createItem();
119
-		$orderBaseItem->setId( 1 );
119
+		$orderBaseItem->setId(1);
120 120
 
121 121
 
122
-		$orderBaseManagerStub->expects( $this->once() )->method( 'store' );
122
+		$orderBaseManagerStub->expects($this->once())->method('store');
123 123
 
124
-		$orderManagerStub->expects( $this->once() )->method( 'getSubManager' )
125
-			->will( $this->returnValue( $orderBaseManagerStub ) );
124
+		$orderManagerStub->expects($this->once())->method('getSubManager')
125
+			->will($this->returnValue($orderBaseManagerStub));
126 126
 
127
-		$orderManagerStub->expects( $this->once() )->method( 'saveItem' );
127
+		$orderManagerStub->expects($this->once())->method('saveItem');
128 128
 
129 129
 
130
-		$this->object->store( $orderBaseItem );
130
+		$this->object->store($orderBaseItem);
131 131
 	}
132 132
 
133 133
 
134 134
 	public function testBlock()
135 135
 	{
136 136
 		$name = 'ControllerFrontendOrderBlock';
137
-		$this->context->getConfig()->set( 'controller/common/order/name', $name );
137
+		$this->context->getConfig()->set('controller/common/order/name', $name);
138 138
 
139 139
 
140
-		$orderCntlStub = $this->getMockBuilder( '\\Aimeos\\Controller\\Common\\Order\\Standard' )
141
-			->setMethods( array( 'block' ) )
142
-			->setConstructorArgs( array( $this->context ) )
140
+		$orderCntlStub = $this->getMockBuilder('\\Aimeos\\Controller\\Common\\Order\\Standard')
141
+			->setMethods(array('block'))
142
+			->setConstructorArgs(array($this->context))
143 143
 			->getMock();
144 144
 
145
-		\Aimeos\Controller\Common\Order\Factory::injectController( '\\Aimeos\\Controller\\Common\\Order\\' . $name, $orderCntlStub );
145
+		\Aimeos\Controller\Common\Order\Factory::injectController('\\Aimeos\\Controller\\Common\\Order\\' . $name, $orderCntlStub);
146 146
 
147
-		$orderCntlStub->expects( $this->once() )->method( 'block' );
147
+		$orderCntlStub->expects($this->once())->method('block');
148 148
 
149 149
 
150
-		$this->object->block( \Aimeos\MShop\Factory::createManager( $this->context, 'order' )->createItem() );
150
+		$this->object->block(\Aimeos\MShop\Factory::createManager($this->context, 'order')->createItem());
151 151
 	}
152 152
 
153 153
 
154 154
 	public function testUnblock()
155 155
 	{
156 156
 		$name = 'ControllerFrontendOrderUnblock';
157
-		$this->context->getConfig()->set( 'controller/common/order/name', $name );
157
+		$this->context->getConfig()->set('controller/common/order/name', $name);
158 158
 
159 159
 
160
-		$orderCntlStub = $this->getMockBuilder( '\\Aimeos\\Controller\\Common\\Order\\Standard' )
161
-			->setMethods( array( 'unblock' ) )
162
-			->setConstructorArgs( array( $this->context ) )
160
+		$orderCntlStub = $this->getMockBuilder('\\Aimeos\\Controller\\Common\\Order\\Standard')
161
+			->setMethods(array('unblock'))
162
+			->setConstructorArgs(array($this->context))
163 163
 			->getMock();
164 164
 
165
-		\Aimeos\Controller\Common\Order\Factory::injectController( '\\Aimeos\\Controller\\Common\\Order\\' . $name, $orderCntlStub );
165
+		\Aimeos\Controller\Common\Order\Factory::injectController('\\Aimeos\\Controller\\Common\\Order\\' . $name, $orderCntlStub);
166 166
 
167
-		$orderCntlStub->expects( $this->once() )->method( 'unblock' );
167
+		$orderCntlStub->expects($this->once())->method('unblock');
168 168
 
169 169
 
170
-		$this->object->unblock( \Aimeos\MShop\Factory::createManager( $this->context, 'order' )->createItem() );
170
+		$this->object->unblock(\Aimeos\MShop\Factory::createManager($this->context, 'order')->createItem());
171 171
 	}
172 172
 
173 173
 
174 174
 	public function testUpdate()
175 175
 	{
176 176
 		$name = 'ControllerFrontendOrderUpdate';
177
-		$this->context->getConfig()->set( 'controller/common/order/name', $name );
177
+		$this->context->getConfig()->set('controller/common/order/name', $name);
178 178
 
179 179
 
180
-		$orderCntlStub = $this->getMockBuilder( '\\Aimeos\\Controller\\Common\\Order\\Standard' )
181
-			->setMethods( array( 'update' ) )
182
-			->setConstructorArgs( array( $this->context ) )
180
+		$orderCntlStub = $this->getMockBuilder('\\Aimeos\\Controller\\Common\\Order\\Standard')
181
+			->setMethods(array('update'))
182
+			->setConstructorArgs(array($this->context))
183 183
 			->getMock();
184 184
 
185
-		\Aimeos\Controller\Common\Order\Factory::injectController( '\\Aimeos\\Controller\\Common\\Order\\' . $name, $orderCntlStub );
185
+		\Aimeos\Controller\Common\Order\Factory::injectController('\\Aimeos\\Controller\\Common\\Order\\' . $name, $orderCntlStub);
186 186
 
187
-		$orderCntlStub->expects( $this->once() )->method( 'update' );
187
+		$orderCntlStub->expects($this->once())->method('update');
188 188
 
189 189
 
190
-		$this->object->update( \Aimeos\MShop\Factory::createManager( $this->context, 'order' )->createItem() );
190
+		$this->object->update(\Aimeos\MShop\Factory::createManager($this->context, 'order')->createItem());
191 191
 	}
192 192
 }
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Basket/Standard.php 1 patch
Spacing   +122 added lines, -122 removed lines patch added patch discarded remove patch
@@ -33,11 +33,11 @@  discard block
 block discarded – undo
33 33
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Object storing the required instances for manaing databases
34 34
 	 *  connections, logger, session, etc.
35 35
 	 */
36
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context )
36
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context)
37 37
 	{
38
-		parent::__construct( $context );
38
+		parent::__construct($context);
39 39
 
40
-		$this->domainManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base' );
40
+		$this->domainManager = \Aimeos\MShop\Factory::createManager($context, 'order/base');
41 41
 	}
42 42
 
43 43
 
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 	public function clear()
50 50
 	{
51 51
 		$this->baskets[$this->type] = $this->domainManager->createItem();
52
-		$this->domainManager->setSession( $this->baskets[$this->type], $this->type );
52
+		$this->domainManager->setSession($this->baskets[$this->type], $this->type);
53 53
 
54 54
 		return $this;
55 55
 	}
@@ -62,10 +62,10 @@  discard block
 block discarded – undo
62 62
 	 */
63 63
 	public function get()
64 64
 	{
65
-		if( !isset( $this->baskets[$this->type] ) )
65
+		if (!isset($this->baskets[$this->type]))
66 66
 		{
67
-			$this->baskets[$this->type] = $this->domainManager->getSession( $this->type );
68
-			$this->checkLocale( $this->type );
67
+			$this->baskets[$this->type] = $this->domainManager->getSession($this->type);
68
+			$this->checkLocale($this->type);
69 69
 		}
70 70
 
71 71
 		return $this->baskets[$this->type];
@@ -79,8 +79,8 @@  discard block
 block discarded – undo
79 79
 	 */
80 80
 	public function save()
81 81
 	{
82
-		if( isset( $this->baskets[$this->type] ) && $this->baskets[$this->type]->isModified() ) {
83
-			$this->domainManager->setSession( $this->baskets[$this->type], $this->type );
82
+		if (isset($this->baskets[$this->type]) && $this->baskets[$this->type]->isModified()) {
83
+			$this->domainManager->setSession($this->baskets[$this->type], $this->type);
84 84
 		}
85 85
 
86 86
 		return $this;
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
 	 * @param string $type Basket type
94 94
 	 * @return \Aimeos\Controller\Frontend\Basket\Iface Basket frontend object
95 95
 	 */
96
-	public function setType( $type )
96
+	public function setType($type)
97 97
 	{
98 98
 		$this->type = $type;
99 99
 		return $this;
@@ -107,10 +107,10 @@  discard block
 block discarded – undo
107 107
 	 */
108 108
 	public function store()
109 109
 	{
110
-		$basket = $this->get()->finish()->setStatus( 1 );
110
+		$basket = $this->get()->finish()->setStatus(1);
111 111
 
112 112
 		$this->domainManager->begin();
113
-		$this->domainManager->store( $basket );
113
+		$this->domainManager->store($basket);
114 114
 		$this->domainManager->commit();
115 115
 
116 116
 		return $basket;
@@ -125,9 +125,9 @@  discard block
 block discarded – undo
125 125
 	 * @param boolean $default True to add default criteria (user logged in), false if not
126 126
 	 * @return \Aimeos\MShop\Order\Item\Base\Iface Order base object including the given parts
127 127
 	 */
128
-	public function load( $id, $parts = \Aimeos\MShop\Order\Manager\Base\Base::PARTS_ALL, $default = true )
128
+	public function load($id, $parts = \Aimeos\MShop\Order\Manager\Base\Base::PARTS_ALL, $default = true)
129 129
 	{
130
-		return $this->domainManager->load( $id, $parts, false, $default );
130
+		return $this->domainManager->load($id, $parts, false, $default);
131 131
 	}
132 132
 
133 133
 
@@ -147,36 +147,36 @@  discard block
 block discarded – undo
147 147
 	 * @param string $stocktype Unique code of the stock type to deliver the products from
148 148
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the product isn't available
149 149
 	 */
150
-	public function addProduct( $prodid, $quantity = 1, array $options = array(), array $variantAttributeIds = array(),
150
+	public function addProduct($prodid, $quantity = 1, array $options = array(), array $variantAttributeIds = array(),
151 151
 		array $configAttributeIds = array(), array $hiddenAttributeIds = array(), array $customAttributeValues = array(),
152
-		$stocktype = 'default' )
152
+		$stocktype = 'default')
153 153
 	{
154 154
 		$context = $this->getContext();
155
-		$productManager = \Aimeos\MShop\Factory::createManager( $context, 'product' );
156
-		$productItem = $productManager->getItem( $prodid, array( 'media', 'supplier', 'price', 'product', 'text' ), true );
155
+		$productManager = \Aimeos\MShop\Factory::createManager($context, 'product');
156
+		$productItem = $productManager->getItem($prodid, array('media', 'supplier', 'price', 'product', 'text'), true);
157 157
 
158
-		$orderBaseProductItem = \Aimeos\MShop\Factory::createManager( $context, 'order/base/product' )->createItem();
159
-		$orderBaseProductItem->copyFrom( $productItem );
160
-		$orderBaseProductItem->setQuantity( $quantity );
161
-		$orderBaseProductItem->setStockType( $stocktype );
158
+		$orderBaseProductItem = \Aimeos\MShop\Factory::createManager($context, 'order/base/product')->createItem();
159
+		$orderBaseProductItem->copyFrom($productItem);
160
+		$orderBaseProductItem->setQuantity($quantity);
161
+		$orderBaseProductItem->setStockType($stocktype);
162 162
 
163 163
 		$attr = array();
164
-		$prices = $productItem->getRefItems( 'price', 'default', 'default' );
164
+		$prices = $productItem->getRefItems('price', 'default', 'default');
165 165
 
166
-		$priceManager = \Aimeos\MShop\Factory::createManager( $context, 'price' );
167
-		$price = $priceManager->getLowestPrice( $prices, $quantity );
166
+		$priceManager = \Aimeos\MShop\Factory::createManager($context, 'price');
167
+		$price = $priceManager->getLowestPrice($prices, $quantity);
168 168
 
169
-		$attr = array_merge( $attr, $this->createOrderProductAttributes( $price, $prodid, $quantity, $configAttributeIds, 'config' ) );
170
-		$attr = array_merge( $attr, $this->createOrderProductAttributes( $price, $prodid, $quantity, $hiddenAttributeIds, 'hidden' ) );
171
-		$attr = array_merge( $attr, $this->createOrderProductAttributes( $price, $prodid, $quantity, array_keys( $customAttributeValues ), 'custom', $customAttributeValues ) );
169
+		$attr = array_merge($attr, $this->createOrderProductAttributes($price, $prodid, $quantity, $configAttributeIds, 'config'));
170
+		$attr = array_merge($attr, $this->createOrderProductAttributes($price, $prodid, $quantity, $hiddenAttributeIds, 'hidden'));
171
+		$attr = array_merge($attr, $this->createOrderProductAttributes($price, $prodid, $quantity, array_keys($customAttributeValues), 'custom', $customAttributeValues));
172 172
 
173 173
 		// remove product rebate of original price in favor to rebates granted for the order
174
-		$price->setRebate( '0.00' );
174
+		$price->setRebate('0.00');
175 175
 
176
-		$orderBaseProductItem->setPrice( $price );
177
-		$orderBaseProductItem->setAttributes( $attr );
176
+		$orderBaseProductItem->setPrice($price);
177
+		$orderBaseProductItem->setAttributes($attr);
178 178
 
179
-		$this->get()->addProduct( $orderBaseProductItem );
179
+		$this->get()->addProduct($orderBaseProductItem);
180 180
 		$this->save();
181 181
 	}
182 182
 
@@ -186,17 +186,17 @@  discard block
 block discarded – undo
186 186
 	 *
187 187
 	 * @param integer $position Position number (key) of the order product item
188 188
 	 */
189
-	public function deleteProduct( $position )
189
+	public function deleteProduct($position)
190 190
 	{
191
-		$product = $this->get()->getProduct( $position );
191
+		$product = $this->get()->getProduct($position);
192 192
 
193
-		if( $product->getFlags() === \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE )
193
+		if ($product->getFlags() === \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE)
194 194
 		{
195
-			$msg = sprintf( 'Basket item at position "%1$d" cannot be deleted manually', $position );
196
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
195
+			$msg = sprintf('Basket item at position "%1$d" cannot be deleted manually', $position);
196
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
197 197
 		}
198 198
 
199
-		$this->get()->deleteProduct( $position );
199
+		$this->get()->deleteProduct($position);
200 200
 		$this->save();
201 201
 	}
202 202
 
@@ -210,34 +210,34 @@  discard block
 block discarded – undo
210 210
 	 * 	The 'stock'=>false option allows adding products without being in stock.
211 211
 	 * @param string[] $configAttributeCodes Codes of the product config attributes that should be REMOVED
212 212
 	 */
213
-	public function editProduct( $position, $quantity, array $options = array(),
214
-		array $configAttributeCodes = array() )
213
+	public function editProduct($position, $quantity, array $options = array(),
214
+		array $configAttributeCodes = array())
215 215
 	{
216
-		$product = $this->get()->getProduct( $position );
216
+		$product = $this->get()->getProduct($position);
217 217
 
218
-		if( $product->getFlags() & \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE )
218
+		if ($product->getFlags() & \Aimeos\MShop\Order\Item\Base\Product\Base::FLAG_IMMUTABLE)
219 219
 		{
220
-			$msg = sprintf( 'Basket item at position "%1$d" cannot be changed', $position );
221
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
220
+			$msg = sprintf('Basket item at position "%1$d" cannot be changed', $position);
221
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
222 222
 		}
223 223
 
224
-		$product->setQuantity( $quantity );
224
+		$product->setQuantity($quantity);
225 225
 
226 226
 		$attributes = $product->getAttributes();
227
-		foreach( $attributes as $key => $attribute )
227
+		foreach ($attributes as $key => $attribute)
228 228
 		{
229
-			if( in_array( $attribute->getCode(), $configAttributeCodes ) ) {
230
-				unset( $attributes[$key] );
229
+			if (in_array($attribute->getCode(), $configAttributeCodes)) {
230
+				unset($attributes[$key]);
231 231
 			}
232 232
 		}
233
-		$product->setAttributes( $attributes );
233
+		$product->setAttributes($attributes);
234 234
 
235
-		$productItem = $this->getDomainItem( 'product', 'product.code', $product->getProductCode(), array( 'price', 'text' ) );
236
-		$prices = $productItem->getRefItems( 'price', 'default' );
237
-		$product->setPrice( $this->calcPrice( $product, $prices, $quantity ) );
235
+		$productItem = $this->getDomainItem('product', 'product.code', $product->getProductCode(), array('price', 'text'));
236
+		$prices = $productItem->getRefItems('price', 'default');
237
+		$product->setPrice($this->calcPrice($product, $prices, $quantity));
238 238
 
239
-		$this->get()->deleteProduct( $position );
240
-		$this->get()->addProduct( $product, $position );
239
+		$this->get()->deleteProduct($position);
240
+		$this->get()->addProduct($product, $position);
241 241
 
242 242
 		$this->save();
243 243
 	}
@@ -249,49 +249,49 @@  discard block
 block discarded – undo
249 249
 	 * @param string $code Coupon code entered by the user
250 250
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception if the coupon code is invalid or not allowed
251 251
 	 */
252
-	public function addCoupon( $code )
252
+	public function addCoupon($code)
253 253
 	{
254
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'coupon' );
255
-		$codeManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'coupon/code' );
254
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'coupon');
255
+		$codeManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'coupon/code');
256 256
 
257 257
 
258
-		$search = $codeManager->createSearch( true );
258
+		$search = $codeManager->createSearch(true);
259 259
 		$expr = array(
260
-			$search->compare( '==', 'coupon.code.code', $code ),
260
+			$search->compare('==', 'coupon.code.code', $code),
261 261
 			$search->getConditions(),
262 262
 		);
263
-		$search->setConditions( $search->combine( '&&', $expr ) );
264
-		$search->setSlice( 0, 1 );
263
+		$search->setConditions($search->combine('&&', $expr));
264
+		$search->setSlice(0, 1);
265 265
 
266
-		$result = $codeManager->searchItems( $search );
266
+		$result = $codeManager->searchItems($search);
267 267
 
268
-		if( ( $codeItem = reset( $result ) ) === false ) {
269
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Coupon code "%1$s" is invalid or not available any more', $code ) );
268
+		if (($codeItem = reset($result)) === false) {
269
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Coupon code "%1$s" is invalid or not available any more', $code));
270 270
 		}
271 271
 
272 272
 
273
-		$search = $manager->createSearch( true );
273
+		$search = $manager->createSearch(true);
274 274
 		$expr = array(
275
-			$search->compare( '==', 'coupon.id', $codeItem->getParentId() ),
275
+			$search->compare('==', 'coupon.id', $codeItem->getParentId()),
276 276
 			$search->getConditions(),
277 277
 		);
278
-		$search->setConditions( $search->combine( '&&', $expr ) );
279
-		$search->setSlice( 0, 1 );
278
+		$search->setConditions($search->combine('&&', $expr));
279
+		$search->setSlice(0, 1);
280 280
 
281
-		$result = $manager->searchItems( $search );
281
+		$result = $manager->searchItems($search);
282 282
 
283
-		if( ( $item = reset( $result ) ) === false ) {
284
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Coupon for code "%1$s" is not available any more', $code ) );
283
+		if (($item = reset($result)) === false) {
284
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Coupon for code "%1$s" is not available any more', $code));
285 285
 		}
286 286
 
287 287
 
288
-		$provider = $manager->getProvider( $item, $code );
288
+		$provider = $manager->getProvider($item, $code);
289 289
 
290
-		if( $provider->isAvailable( $this->get() ) !== true ) {
291
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Requirements for coupon code "%1$s" aren\'t met', $code ) );
290
+		if ($provider->isAvailable($this->get()) !== true) {
291
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Requirements for coupon code "%1$s" aren\'t met', $code));
292 292
 		}
293 293
 
294
-		$provider->addCoupon( $this->get() );
294
+		$provider->addCoupon($this->get());
295 295
 		$this->save();
296 296
 	}
297 297
 
@@ -302,21 +302,21 @@  discard block
 block discarded – undo
302 302
 	 * @param string $code Coupon code entered by the user
303 303
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception if the coupon code is invalid
304 304
 	 */
305
-	public function deleteCoupon( $code )
305
+	public function deleteCoupon($code)
306 306
 	{
307
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'coupon' );
307
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'coupon');
308 308
 
309 309
 		$search = $manager->createSearch();
310
-		$search->setConditions( $search->compare( '==', 'coupon.code.code', $code ) );
311
-		$search->setSlice( 0, 1 );
310
+		$search->setConditions($search->compare('==', 'coupon.code.code', $code));
311
+		$search->setSlice(0, 1);
312 312
 
313
-		$result = $manager->searchItems( $search );
313
+		$result = $manager->searchItems($search);
314 314
 
315
-		if( ( $item = reset( $result ) ) === false ) {
316
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Coupon code "%1$s" is invalid', $code ) );
315
+		if (($item = reset($result)) === false) {
316
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Coupon code "%1$s" is invalid', $code));
317 317
 		}
318 318
 
319
-		$manager->getProvider( $item, $code )->deleteCoupon( $this->get() );
319
+		$manager->getProvider($item, $code)->deleteCoupon($this->get());
320 320
 		$this->save();
321 321
 	}
322 322
 
@@ -329,28 +329,28 @@  discard block
 block discarded – undo
329 329
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If the billing or delivery address is not of any required type of
330 330
 	 * 	if one of the keys is invalid when using an array with key/value pairs
331 331
 	 */
332
-	public function setAddress( $type, $value )
332
+	public function setAddress($type, $value)
333 333
 	{
334
-		$address = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'order/base/address' )->createItem();
335
-		$address->setType( $type );
334
+		$address = \Aimeos\MShop\Factory::createManager($this->getContext(), 'order/base/address')->createItem();
335
+		$address->setType($type);
336 336
 
337
-		if( $value instanceof \Aimeos\MShop\Common\Item\Address\Iface )
337
+		if ($value instanceof \Aimeos\MShop\Common\Item\Address\Iface)
338 338
 		{
339
-			$address->copyFrom( $value );
340
-			$this->get()->setAddress( $address, $type );
339
+			$address->copyFrom($value);
340
+			$this->get()->setAddress($address, $type);
341 341
 		}
342
-		else if( is_array( $value ) )
342
+		else if (is_array($value))
343 343
 		{
344
-			$this->setAddressFromArray( $address, $value );
345
-			$this->get()->setAddress( $address, $type );
344
+			$this->setAddressFromArray($address, $value);
345
+			$this->get()->setAddress($address, $type);
346 346
 		}
347
-		else if( $value === null )
347
+		else if ($value === null)
348 348
 		{
349
-			$this->get()->deleteAddress( $type );
349
+			$this->get()->deleteAddress($type);
350 350
 		}
351 351
 		else
352 352
 		{
353
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( sprintf( 'Invalid value for address type "%1$s"', $type ) );
353
+			throw new \Aimeos\Controller\Frontend\Basket\Exception(sprintf('Invalid value for address type "%1$s"', $type));
354 354
 		}
355 355
 
356 356
 		$this->save();
@@ -366,48 +366,48 @@  discard block
 block discarded – undo
366 366
 	 * 	entered by the customer when choosing one of the delivery or payment options
367 367
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception If there is no price to the service item attached
368 368
 	 */
369
-	public function setService( $type, $id, array $attributes = array() )
369
+	public function setService($type, $id, array $attributes = array())
370 370
 	{
371
-		if( $id === null )
371
+		if ($id === null)
372 372
 		{
373
-			$this->get()->deleteService( $type );
373
+			$this->get()->deleteService($type);
374 374
 			$this->save();
375 375
 			return;
376 376
 		}
377 377
 
378 378
 		$context = $this->getContext();
379 379
 
380
-		$serviceManager = \Aimeos\MShop\Factory::createManager( $context, 'service' );
381
-		$serviceItem = $this->getDomainItem( 'service', 'service.id', $id, array( 'media', 'price', 'text' ) );
380
+		$serviceManager = \Aimeos\MShop\Factory::createManager($context, 'service');
381
+		$serviceItem = $this->getDomainItem('service', 'service.id', $id, array('media', 'price', 'text'));
382 382
 
383
-		$provider = $serviceManager->getProvider( $serviceItem );
384
-		$result = $provider->checkConfigFE( $attributes );
385
-		$unknown = array_diff_key( $attributes, $result );
383
+		$provider = $serviceManager->getProvider($serviceItem);
384
+		$result = $provider->checkConfigFE($attributes);
385
+		$unknown = array_diff_key($attributes, $result);
386 386
 
387
-		if( count( $unknown ) > 0 )
387
+		if (count($unknown) > 0)
388 388
 		{
389
-			$msg = sprintf( 'Unknown attributes "%1$s"', implode( '","', array_keys( $unknown ) ) );
390
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg );
389
+			$msg = sprintf('Unknown attributes "%1$s"', implode('","', array_keys($unknown)));
390
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg);
391 391
 		}
392 392
 
393
-		foreach( $result as $key => $value )
393
+		foreach ($result as $key => $value)
394 394
 		{
395
-			if( $value !== null ) {
396
-				throw new \Aimeos\Controller\Frontend\Basket\Exception( $value );
395
+			if ($value !== null) {
396
+				throw new \Aimeos\Controller\Frontend\Basket\Exception($value);
397 397
 			}
398 398
 		}
399 399
 
400
-		$orderBaseServiceManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base/service' );
400
+		$orderBaseServiceManager = \Aimeos\MShop\Factory::createManager($context, 'order/base/service');
401 401
 		$orderServiceItem = $orderBaseServiceManager->createItem();
402
-		$orderServiceItem->copyFrom( $serviceItem );
402
+		$orderServiceItem->copyFrom($serviceItem);
403 403
 
404 404
 		// remove service rebate of original price
405
-		$price = $provider->calcPrice( $this->get() )->setRebate( '0.00' );
406
-		$orderServiceItem->setPrice( $price );
405
+		$price = $provider->calcPrice($this->get())->setRebate('0.00');
406
+		$orderServiceItem->setPrice($price);
407 407
 
408
-		$provider->setConfigFE( $orderServiceItem, $attributes );
408
+		$provider->setConfigFE($orderServiceItem, $attributes);
409 409
 
410
-		$this->get()->setService( $orderServiceItem, $type );
410
+		$this->get()->setService($orderServiceItem, $type);
411 411
 		$this->save();
412 412
 	}
413 413
 
@@ -420,18 +420,18 @@  discard block
 block discarded – undo
420 420
 	 * 	an address item.
421 421
 	 * @throws \Aimeos\Controller\Frontend\Basket\Exception
422 422
 	 */
423
-	protected function setAddressFromArray( \Aimeos\MShop\Order\Item\Base\Address\Iface $address, array $map )
423
+	protected function setAddressFromArray(\Aimeos\MShop\Order\Item\Base\Address\Iface $address, array $map)
424 424
 	{
425
-		foreach( $map as $key => $value ) {
426
-			$map[$key] = strip_tags( $value ); // prevent XSS
425
+		foreach ($map as $key => $value) {
426
+			$map[$key] = strip_tags($value); // prevent XSS
427 427
 		}
428 428
 
429
-		$errors = $address->fromArray( $map );
429
+		$errors = $address->fromArray($map);
430 430
 
431
-		if( count( $errors ) > 0 )
431
+		if (count($errors) > 0)
432 432
 		{
433
-			$msg = sprintf( 'Invalid address properties, please check your input' );
434
-			throw new \Aimeos\Controller\Frontend\Basket\Exception( $msg, 0, null, $errors );
433
+			$msg = sprintf('Invalid address properties, please check your input');
434
+			throw new \Aimeos\Controller\Frontend\Basket\Exception($msg, 0, null, $errors);
435 435
 		}
436 436
 	}
437 437
 }
Please login to merge, or discard this patch.