Completed
Push — master ( 10ff4e...12c65b )
by Aimeos
02:25
created
controller/frontend/src/Controller/Frontend/Product/Standard.php 1 patch
Spacing   +71 added lines, -71 removed lines patch added patch discarded remove patch
@@ -31,42 +31,42 @@  discard block
 block discarded – undo
31 31
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
32 32
 	 * @since 2017.03
33 33
 	 */
34
-	public function addFilterAttribute( \Aimeos\MW\Criteria\Iface $filter, array $attrIds, array $optIds, array $oneIds )
34
+	public function addFilterAttribute(\Aimeos\MW\Criteria\Iface $filter, array $attrIds, array $optIds, array $oneIds)
35 35
 	{
36
-		if( !empty( $attrIds ) )
36
+		if (!empty($attrIds))
37 37
 		{
38
-			$attrIds = $this->validateIds( $attrIds );
38
+			$attrIds = $this->validateIds($attrIds);
39 39
 
40
-			$func = $filter->createFunction( 'index.attributeaggregate', array( $attrIds ) );
40
+			$func = $filter->createFunction('index.attributeaggregate', array($attrIds));
41 41
 			$expr = array(
42
-				$filter->compare( '==', $func, count( $attrIds ) ),
42
+				$filter->compare('==', $func, count($attrIds)),
43 43
 				$filter->getConditions(),
44 44
 			);
45
-			$filter->setConditions( $filter->combine( '&&', $expr ) );
45
+			$filter->setConditions($filter->combine('&&', $expr));
46 46
 		}
47 47
 
48
-		if( !empty( $optIds ) )
48
+		if (!empty($optIds))
49 49
 		{
50
-			$optIds = $this->validateIds( $optIds );
50
+			$optIds = $this->validateIds($optIds);
51 51
 
52
-			$func = $filter->createFunction( 'index.attributeaggregate', array( $optIds ) );
52
+			$func = $filter->createFunction('index.attributeaggregate', array($optIds));
53 53
 			$expr = array(
54
-				$filter->compare( '>', $func, 0 ),
54
+				$filter->compare('>', $func, 0),
55 55
 				$filter->getConditions(),
56 56
 			);
57
-			$filter->setConditions( $filter->combine( '&&', $expr ) );
57
+			$filter->setConditions($filter->combine('&&', $expr));
58 58
 		}
59 59
 
60
-		foreach( $oneIds as $type => $list )
60
+		foreach ($oneIds as $type => $list)
61 61
 		{
62
-			if( ( $list = $this->validateIds( (array) $list ) ) !== array() )
62
+			if (($list = $this->validateIds((array) $list)) !== array())
63 63
 			{
64
-				$func = $filter->createFunction( 'index.attributeaggregate', array( $list ) );
64
+				$func = $filter->createFunction('index.attributeaggregate', array($list));
65 65
 				$expr = array(
66
-					$filter->compare( '>', $func, 0 ),
66
+					$filter->compare('>', $func, 0),
67 67
 					$filter->getConditions(),
68 68
 				);
69
-				$filter->setConditions( $filter->combine( '&&', $expr ) );
69
+				$filter->setConditions($filter->combine('&&', $expr));
70 70
 			}
71 71
 		}
72 72
 
@@ -86,38 +86,38 @@  discard block
 block discarded – undo
86 86
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
87 87
 	 * @since 2017.03
88 88
 	 */
89
-	public function addFilterCategory( \Aimeos\MW\Criteria\Iface $filter, $catId,
90
-		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE, $sort = null, $direction = '+', $listtype = 'default' )
89
+	public function addFilterCategory(\Aimeos\MW\Criteria\Iface $filter, $catId,
90
+		$level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE, $sort = null, $direction = '+', $listtype = 'default')
91 91
 	{
92
-		$catIds = ( !is_array( $catId ) ? explode( ',', $catId ) : $catId );
92
+		$catIds = (!is_array($catId) ? explode(',', $catId) : $catId);
93 93
 
94
-		if( $level != \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE )
94
+		if ($level != \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE)
95 95
 		{
96 96
 			$list = array();
97
-			$cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'catalog' );
97
+			$cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'catalog');
98 98
 
99
-			foreach( $catIds as $catId )
99
+			foreach ($catIds as $catId)
100 100
 			{
101
-				$tree = $cntl->getCatalogTree( $catId, array(), $level );
102
-				$list = array_merge( $list, $this->getCatalogIdsFromTree( $tree ) );
101
+				$tree = $cntl->getCatalogTree($catId, array(), $level);
102
+				$list = array_merge($list, $this->getCatalogIdsFromTree($tree));
103 103
 			}
104 104
 
105 105
 			$catIds = $list;
106 106
 		}
107 107
 
108
-		$expr = array( $filter->compare( '==', 'index.catalog.id', array_unique( $catIds ) ) );
108
+		$expr = array($filter->compare('==', 'index.catalog.id', array_unique($catIds)));
109 109
 		$expr[] = $filter->getConditions();
110 110
 
111
-		if( $sort === 'relevance' )
111
+		if ($sort === 'relevance')
112 112
 		{
113
-			$cmpfunc = $filter->createFunction( 'index.catalog.position', array( $listtype, $catIds ) );
114
-			$expr[] = $filter->compare( '>=', $cmpfunc, 0 );
113
+			$cmpfunc = $filter->createFunction('index.catalog.position', array($listtype, $catIds));
114
+			$expr[] = $filter->compare('>=', $cmpfunc, 0);
115 115
 
116
-			$sortfunc = $filter->createFunction( 'sort:index.catalog.position', array( $listtype, $catIds ) );
117
-			$filter->setSortations( array( $filter->sort( $direction, $sortfunc ) ) );
116
+			$sortfunc = $filter->createFunction('sort:index.catalog.position', array($listtype, $catIds));
117
+			$filter->setSortations(array($filter->sort($direction, $sortfunc)));
118 118
 		}
119 119
 
120
-		$filter->setConditions( $filter->combine( '&&', $expr ) );
120
+		$filter->setConditions($filter->combine('&&', $expr));
121 121
 
122 122
 		return $filter;
123 123
 	}
@@ -134,13 +134,13 @@  discard block
 block discarded – undo
134 134
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
135 135
 	 * @since 2017.03
136 136
 	 */
137
-	public function addFilterText( \Aimeos\MW\Criteria\Iface $filter, $input, $sort = null, $direction = '+', $listtype = 'default' )
137
+	public function addFilterText(\Aimeos\MW\Criteria\Iface $filter, $input, $sort = null, $direction = '+', $listtype = 'default')
138 138
 	{
139 139
 		$langid = $this->getContext()->getLocale()->getLanguageId();
140
-		$cmpfunc = $filter->createFunction( 'index.text.relevance', array( $listtype, $langid, $input ) );
141
-		$expr = array( $filter->compare( '>', $cmpfunc, 0 ), $filter->getConditions() );
140
+		$cmpfunc = $filter->createFunction('index.text.relevance', array($listtype, $langid, $input));
141
+		$expr = array($filter->compare('>', $cmpfunc, 0), $filter->getConditions());
142 142
 
143
-		return $filter->setConditions( $filter->combine( '&&', $expr ) );
143
+		return $filter->setConditions($filter->combine('&&', $expr));
144 144
 	}
145 145
 
146 146
 
@@ -152,9 +152,9 @@  discard block
 block discarded – undo
152 152
 	 * @return array Associative list of key values as key and the product count for this key as value
153 153
 	 * @since 2017.03
154 154
 	 */
155
-	public function aggregate( \Aimeos\MW\Criteria\Iface $filter, $key )
155
+	public function aggregate(\Aimeos\MW\Criteria\Iface $filter, $key)
156 156
 	{
157
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'index' )->aggregate( $filter, $key );
157
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'index')->aggregate($filter, $key);
158 158
 	}
159 159
 
160 160
 
@@ -169,46 +169,46 @@  discard block
 block discarded – undo
169 169
 	 * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching
170 170
 	 * @since 2017.03
171 171
 	 */
172
-	public function createFilter( $sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default' )
172
+	public function createFilter($sort = null, $direction = '+', $start = 0, $size = 100, $listtype = 'default')
173 173
 	{
174 174
 		$sortations = array();
175 175
 		$context = $this->getContext();
176 176
 
177
-		$search = \Aimeos\MShop\Factory::createManager( $context, 'index' )->createSearch( true );
178
-		$expr = array( $search->compare( '!=', 'index.catalog.id', null ) );
177
+		$search = \Aimeos\MShop\Factory::createManager($context, 'index')->createSearch(true);
178
+		$expr = array($search->compare('!=', 'index.catalog.id', null));
179 179
 
180
-		switch( $sort )
180
+		switch ($sort)
181 181
 		{
182 182
 			case 'code':
183
-				$sortations[] = $search->sort( $direction, 'product.code' );
183
+				$sortations[] = $search->sort($direction, 'product.code');
184 184
 				break;
185 185
 
186 186
 			case 'name':
187 187
 				$langid = $context->getLocale()->getLanguageId();
188 188
 
189
-				$cmpfunc = $search->createFunction( 'index.text.value', array( $listtype, $langid, 'name', 'product' ) );
190
-				$expr[] = $search->compare( '>=', $cmpfunc, '' );
189
+				$cmpfunc = $search->createFunction('index.text.value', array($listtype, $langid, 'name', 'product'));
190
+				$expr[] = $search->compare('>=', $cmpfunc, '');
191 191
 
192
-				$sortfunc = $search->createFunction( 'sort:index.text.value', array( $listtype, $langid, 'name' ) );
193
-				$sortations[] = $search->sort( $direction, $sortfunc );
192
+				$sortfunc = $search->createFunction('sort:index.text.value', array($listtype, $langid, 'name'));
193
+				$sortations[] = $search->sort($direction, $sortfunc);
194 194
 				break;
195 195
 
196 196
 			case 'price':
197 197
 				$currencyid = $context->getLocale()->getCurrencyId();
198 198
 
199
-				$cmpfunc = $search->createFunction( 'index.price.value', array( $listtype, $currencyid, 'default' ) );
200
-				$expr[] = $search->compare( '>=', $cmpfunc, '0.00' );
199
+				$cmpfunc = $search->createFunction('index.price.value', array($listtype, $currencyid, 'default'));
200
+				$expr[] = $search->compare('>=', $cmpfunc, '0.00');
201 201
 
202
-				$sortfunc = $search->createFunction( 'sort:index.price.value', array( $listtype, $currencyid, 'default' ) );
203
-				$sortations[] = $search->sort( $direction, $sortfunc );
202
+				$sortfunc = $search->createFunction('sort:index.price.value', array($listtype, $currencyid, 'default'));
203
+				$sortations[] = $search->sort($direction, $sortfunc);
204 204
 				break;
205 205
 		}
206 206
 
207 207
 		$expr[] = $search->getConditions();
208 208
 
209
-		$search->setConditions( $search->combine( '&&', $expr ) );
210
-		$search->setSortations( $sortations );
211
-		$search->setSlice( $start, $size );
209
+		$search->setConditions($search->combine('&&', $expr));
210
+		$search->setSortations($sortations);
211
+		$search->setSlice($start, $size);
212 212
 
213 213
 		return $search;
214 214
 	}
@@ -222,9 +222,9 @@  discard block
 block discarded – undo
222 222
 	 * @return \Aimeos\MShop\Product\Item\Iface Product item including the referenced domains items
223 223
 	 * @since 2017.03
224 224
 	 */
225
-	public function getItem( $productId, array $domains = array( 'attribute', 'media', 'price', 'product', 'product/property', 'text' ) )
225
+	public function getItem($productId, array $domains = array('attribute', 'media', 'price', 'product', 'product/property', 'text'))
226 226
 	{
227
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product' )->getItem( $productId, $domains, true );
227
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'product')->getItem($productId, $domains, true);
228 228
 	}
229 229
 
230 230
 
@@ -236,19 +236,19 @@  discard block
 block discarded – undo
236 236
 	 * @return \Aimeos\MShop\Product\Item\Iface[] Associative list of product IDs as keys and product items as values
237 237
 	 * @since 2017.03
238 238
 	 */
239
-	public function getItems( array $productIds, array $domains = array( 'media', 'price', 'text' ) )
239
+	public function getItems(array $productIds, array $domains = array('media', 'price', 'text'))
240 240
 	{
241
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product' );
241
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product');
242 242
 
243
-		$search = $manager->createSearch( true );
243
+		$search = $manager->createSearch(true);
244 244
 		$expr = array(
245
-			$search->compare( '==', 'product.id', $productIds ),
245
+			$search->compare('==', 'product.id', $productIds),
246 246
 			$search->getConditions(),
247 247
 		);
248
-		$search->setConditions( $search->combine( '&&', $expr ) );
249
-		$search->setSlice( 0, count( $productIds ) );
248
+		$search->setConditions($search->combine('&&', $expr));
249
+		$search->setSlice(0, count($productIds));
250 250
 
251
-		return $manager->searchItems( $search, $domains );
251
+		return $manager->searchItems($search, $domains);
252 252
 	}
253 253
 
254 254
 
@@ -261,9 +261,9 @@  discard block
 block discarded – undo
261 261
 	 * @return array Ordered list of product items implementing \Aimeos\MShop\Product\Item\Iface
262 262
 	 * @since 2017.03
263 263
 	 */
264
-	public function searchItems( \Aimeos\MW\Criteria\Iface $filter, array $domains = array( 'media', 'price', 'text' ), &$total = null )
264
+	public function searchItems(\Aimeos\MW\Criteria\Iface $filter, array $domains = array('media', 'price', 'text'), &$total = null)
265 265
 	{
266
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'index' )->searchItems( $filter, $domains, $total );
266
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'index')->searchItems($filter, $domains, $total);
267 267
 	}
268 268
 
269 269
 
@@ -273,12 +273,12 @@  discard block
 block discarded – undo
273 273
 	 * @param \Aimeos\MShop\Catalog\Item\Iface $item Catalog item with children
274 274
 	 * @return array List of catalog IDs
275 275
 	 */
276
-	protected function getCatalogIdsFromTree( \Aimeos\MShop\Catalog\Item\Iface $item )
276
+	protected function getCatalogIdsFromTree(\Aimeos\MShop\Catalog\Item\Iface $item)
277 277
 	{
278
-		$list = array( $item->getId() );
278
+		$list = array($item->getId());
279 279
 
280
-		foreach( $item->getChildren() as $child ) {
281
-			$list = array_merge( $list, $this->getCatalogIdsFromTree( $child ) );
280
+		foreach ($item->getChildren() as $child) {
281
+			$list = array_merge($list, $this->getCatalogIdsFromTree($child));
282 282
 		}
283 283
 
284 284
 		return $list;
@@ -291,13 +291,13 @@  discard block
 block discarded – undo
291 291
 	 * @param array $ids List of IDs to validate
292 292
 	 * @return array List of validated IDs
293 293
 	 */
294
-	protected function validateIds( array $ids )
294
+	protected function validateIds(array $ids)
295 295
 	{
296 296
 		$list = array();
297 297
 
298
-		foreach( $ids as $id )
298
+		foreach ($ids as $id)
299 299
 		{
300
-			if( $id != '' ) {
300
+			if ($id != '') {
301 301
 				$list[] = (int) $id;
302 302
 			}
303 303
 		}
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Locale/Standard.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -31,15 +31,15 @@  discard block
 block discarded – undo
31 31
 	public function createFilter()
32 32
 	{
33 33
 		$context = $this->getContext();
34
-		$filter = \Aimeos\MShop\Factory::createManager( $context, 'locale' )->createSearch( true );
34
+		$filter = \Aimeos\MShop\Factory::createManager($context, 'locale')->createSearch(true);
35 35
 
36 36
 		$expr = array(
37
-			$filter->compare( '==', 'locale.siteid', $context->getLocale()->getSitePath() ),
37
+			$filter->compare('==', 'locale.siteid', $context->getLocale()->getSitePath()),
38 38
 			$filter->getConditions(),
39 39
 		);
40 40
 
41
-		$filter->setConditions( $filter->combine( '&&', $expr ) );
42
-		$filter->setSortations( array( $filter->sort( '+', 'locale.position' ) ) );
41
+		$filter->setConditions($filter->combine('&&', $expr));
42
+		$filter->setSortations(array($filter->sort('+', 'locale.position')));
43 43
 
44 44
 		return $filter;
45 45
 	}
@@ -53,9 +53,9 @@  discard block
 block discarded – undo
53 53
 	 * @return \Aimeos\MShop\Locale\Item\Iface Locale item including the referenced domains items
54 54
 	 * @since 2017.03
55 55
 	 */
56
-	public function getItem( $id, array $domains = array() )
56
+	public function getItem($id, array $domains = array())
57 57
 	{
58
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'locale' )->getItem( $id, $domains, true );
58
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'locale')->getItem($id, $domains, true);
59 59
 	}
60 60
 
61 61
 
@@ -68,8 +68,8 @@  discard block
 block discarded – undo
68 68
 	 * @return array Ordered list of locale items implementing \Aimeos\MShop\Locale\Item\Iface
69 69
 	 * @since 2017.03
70 70
 	 */
71
-	public function searchItems( \Aimeos\MW\Criteria\Iface $filter, array $domains = array(), &$total = null )
71
+	public function searchItems(\Aimeos\MW\Criteria\Iface $filter, array $domains = array(), &$total = null)
72 72
 	{
73
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'locale' )->searchItems( $filter, $domains, $total );
73
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'locale')->searchItems($filter, $domains, $total);
74 74
 	}
75 75
 }
Please login to merge, or discard this patch.
controller/frontend/tests/Controller/Frontend/Locale/StandardTest.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -16,13 +16,13 @@  discard block
 block discarded – undo
16 16
 
17 17
 	protected function setUp()
18 18
 	{
19
-		$this->object = new \Aimeos\Controller\Frontend\Locale\Standard( \TestHelperFrontend::getContext() );
19
+		$this->object = new \Aimeos\Controller\Frontend\Locale\Standard(\TestHelperFrontend::getContext());
20 20
 	}
21 21
 
22 22
 
23 23
 	protected function tearDown()
24 24
 	{
25
-		unset( $this->object );
25
+		unset($this->object);
26 26
 	}
27 27
 
28 28
 
@@ -30,29 +30,29 @@  discard block
 block discarded – undo
30 30
 	{
31 31
 		$filter = $this->object->createFilter();
32 32
 
33
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $filter );
34
-		$this->assertEquals( 1, count( $filter->getSortations() ) );
35
-		$this->assertEquals( 0, $filter->getSliceStart() );
36
-		$this->assertEquals( 100, $filter->getSliceSize() );
33
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $filter);
34
+		$this->assertEquals(1, count($filter->getSortations()));
35
+		$this->assertEquals(0, $filter->getSliceStart());
36
+		$this->assertEquals(100, $filter->getSliceSize());
37 37
 	}
38 38
 
39 39
 
40 40
 	public function testGetItem()
41 41
 	{
42
-		$localeManager = \Aimeos\MShop\Factory::createManager( \TestHelperFrontend::getContext(), 'locale' );
43
-		$search = $localeManager->createSearch( true );
44
-		$search->setSortations( [$search->sort( '+', 'locale.position' )] );
45
-		$search->setSlice( 0, 1 );
46
-		$localeItems = $localeManager->searchItems( $search );
47
-
48
-		if( ( $localeItem = reset( $localeItems ) ) === false ) {
49
-			throw new \Exception( 'No locale item found' );
42
+		$localeManager = \Aimeos\MShop\Factory::createManager(\TestHelperFrontend::getContext(), 'locale');
43
+		$search = $localeManager->createSearch(true);
44
+		$search->setSortations([$search->sort('+', 'locale.position')]);
45
+		$search->setSlice(0, 1);
46
+		$localeItems = $localeManager->searchItems($search);
47
+
48
+		if (($localeItem = reset($localeItems)) === false) {
49
+			throw new \Exception('No locale item found');
50 50
 		}
51 51
 
52 52
 
53
-		$result = $this->object->getItem( $localeItem->getId() );
53
+		$result = $this->object->getItem($localeItem->getId());
54 54
 
55
-		$this->assertInstanceOf( '\Aimeos\MShop\Locale\Item\Iface', $result );
55
+		$this->assertInstanceOf('\Aimeos\MShop\Locale\Item\Iface', $result);
56 56
 	}
57 57
 
58 58
 
@@ -60,9 +60,9 @@  discard block
 block discarded – undo
60 60
 	{
61 61
 		$total = 0;
62 62
 		$filter = $this->object->createFilter();
63
-		$results = $this->object->searchItems( $filter, [], $total );
63
+		$results = $this->object->searchItems($filter, [], $total);
64 64
 
65
-		$this->assertEquals( 1, $total );
66
-		$this->assertEquals( 1, count( $results ) );
65
+		$this->assertEquals(1, $total);
66
+		$this->assertEquals(1, count($results));
67 67
 	}
68 68
 }
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Customer/Factory.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 	 * @param string|null $name Name of the controller implementaton (default: "Standard")
29 29
 	 * @return \Aimeos\Controller\Frontend\Customer\Iface Controller object
30 30
 	 */
31
-	public static function createController( \Aimeos\MShop\Context\Item\Iface $context, $name = null )
31
+	public static function createController(\Aimeos\MShop\Context\Item\Iface $context, $name = null)
32 32
 	{
33 33
 		/** controller/frontend/customer/name
34 34
 		 * Class name of the used customer frontend controller implementation
@@ -63,20 +63,20 @@  discard block
 block discarded – undo
63 63
 		 * @since 2014.03
64 64
 		 * @category Developer
65 65
 		 */
66
-		if( $name === null ) {
67
-			$name = $context->getConfig()->get( 'controller/frontend/customer/name', 'Standard' );
66
+		if ($name === null) {
67
+			$name = $context->getConfig()->get('controller/frontend/customer/name', 'Standard');
68 68
 		}
69 69
 
70
-		if( ctype_alnum( $name ) === false )
70
+		if (ctype_alnum($name) === false)
71 71
 		{
72
-			$classname = is_string( $name ) ? '\\Aimeos\\Controller\\Frontend\\Customer\\' . $name : '<not a string>';
73
-			throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
72
+			$classname = is_string($name) ? '\\Aimeos\\Controller\\Frontend\\Customer\\' . $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\\Customer\\Iface';
77 77
 		$classname = '\\Aimeos\\Controller\\Frontend\\Customer\\' . $name;
78 78
 
79
-		$manager = self::createControllerBase( $context, $classname, $iface );
79
+		$manager = self::createControllerBase($context, $classname, $iface);
80 80
 
81 81
 		/** controller/frontend/customer/decorators/excludes
82 82
 		 * Excludes decorators added by the "common" option from the customer frontend controllers
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
 		 * @see controller/frontend/customer/decorators/excludes
153 153
 		 * @see controller/frontend/customer/decorators/global
154 154
 		 */
155
-		return self::addControllerDecorators( $context, $manager, 'customer' );
155
+		return self::addControllerDecorators($context, $manager, 'customer');
156 156
 	}
157 157
 
158 158
 }
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Customer/Decorator/Base.php 1 patch
Spacing   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -30,18 +30,18 @@  discard block
 block discarded – undo
30 30
 	 * @param \Aimeos\Controller\Frontend\Iface $controller Controller object
31 31
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object with required objects
32 32
 	 */
33
-	public function __construct( \Aimeos\Controller\Frontend\Iface $controller, \Aimeos\MShop\Context\Item\Iface $context )
33
+	public function __construct(\Aimeos\Controller\Frontend\Iface $controller, \Aimeos\MShop\Context\Item\Iface $context)
34 34
 	{
35 35
 		$iface = '\Aimeos\Controller\Frontend\Customer\Iface';
36
-		if( !( $controller instanceof $iface ) )
36
+		if (!($controller instanceof $iface))
37 37
 		{
38
-			$msg = sprintf( 'Class "%1$s" does not implement interface "%2$s"', get_class( $controller ), $iface );
39
-			throw new \Aimeos\Controller\Frontend\Exception( $msg );
38
+			$msg = sprintf('Class "%1$s" does not implement interface "%2$s"', get_class($controller), $iface);
39
+			throw new \Aimeos\Controller\Frontend\Exception($msg);
40 40
 		}
41 41
 
42 42
 		$this->controller = $controller;
43 43
 
44
-		parent::__construct( $context );
44
+		parent::__construct($context);
45 45
 	}
46 46
 
47 47
 
@@ -53,9 +53,9 @@  discard block
 block discarded – undo
53 53
 	 * @return mixed Returns the value of the called method
54 54
 	 * @throws \Aimeos\Controller\Frontend\Exception If method call failed
55 55
 	 */
56
-	public function __call( $name, array $param )
56
+	public function __call($name, array $param)
57 57
 	{
58
-		return @call_user_func_array( array( $this->controller, $name ), $param );
58
+		return @call_user_func_array(array($this->controller, $name), $param);
59 59
 	}
60 60
 
61 61
 
@@ -66,9 +66,9 @@  discard block
 block discarded – undo
66 66
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item
67 67
 	 * @since 2017.04
68 68
 	 */
69
-	public function addItem( array $values )
69
+	public function addItem(array $values)
70 70
 	{
71
-		return $this->controller->addItem( $values );
71
+		return $this->controller->addItem($values);
72 72
 	}
73 73
 
74 74
 
@@ -78,9 +78,9 @@  discard block
 block discarded – undo
78 78
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item
79 79
 	 * @since 2017.04
80 80
 	 */
81
-	public function createItem( array $values = [] )
81
+	public function createItem(array $values = [])
82 82
 	{
83
-		return $this->controller->createItem( $values );
83
+		return $this->controller->createItem($values);
84 84
 	}
85 85
 
86 86
 
@@ -90,9 +90,9 @@  discard block
 block discarded – undo
90 90
 	 * @param string $id Unique customer ID
91 91
 	 * @since 2017.04
92 92
 	 */
93
-	public function deleteItem( $id )
93
+	public function deleteItem($id)
94 94
 	{
95
-		return $this->controller->deleteItem( $id );
95
+		return $this->controller->deleteItem($id);
96 96
 	}
97 97
 
98 98
 
@@ -104,9 +104,9 @@  discard block
 block discarded – undo
104 104
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item
105 105
 	 * @since 2017.04
106 106
 	 */
107
-	public function editItem( $id, array $values )
107
+	public function editItem($id, array $values)
108 108
 	{
109
-		return $this->controller->editItem( $id, $values );
109
+		return $this->controller->editItem($id, $values);
110 110
 	}
111 111
 
112 112
 
@@ -118,9 +118,9 @@  discard block
 block discarded – undo
118 118
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item including the referenced domains items
119 119
 	 * @since 2017.04
120 120
 	 */
121
-	public function getItem( $id = null, array $domains = [] )
121
+	public function getItem($id = null, array $domains = [])
122 122
 	{
123
-		return $this->controller->getItem( $id, $domains );
123
+		return $this->controller->getItem($id, $domains);
124 124
 	}
125 125
 
126 126
 
@@ -134,9 +134,9 @@  discard block
 block discarded – undo
134 134
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item including the referenced domains items
135 135
 	 * @since 2017.04
136 136
 	 */
137
-	public function findItem( $code, array $domains = [] )
137
+	public function findItem($code, array $domains = [])
138 138
 	{
139
-		return $this->controller->findItem( $code, $domains );
139
+		return $this->controller->findItem($code, $domains);
140 140
 	}
141 141
 
142 142
 
@@ -146,9 +146,9 @@  discard block
 block discarded – undo
146 146
 	 * @param \Aimeos\MShop\Customer\Item\Iface Customer item
147 147
 	 * @since 2017.04
148 148
 	 */
149
-	public function saveItem( \Aimeos\MShop\Customer\Item\Iface $item )
149
+	public function saveItem(\Aimeos\MShop\Customer\Item\Iface $item)
150 150
 	{
151
-		return $this->controller->saveItem( $item );
151
+		return $this->controller->saveItem($item);
152 152
 	}
153 153
 
154 154
 
@@ -159,9 +159,9 @@  discard block
 block discarded – undo
159 159
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer address item
160 160
 	 * @since 2017.04
161 161
 	 */
162
-	public function addAddressItem( array $values )
162
+	public function addAddressItem(array $values)
163 163
 	{
164
-		return $this->controller->addAddressItem( $values );
164
+		return $this->controller->addAddressItem($values);
165 165
 	}
166 166
 
167 167
 
@@ -171,9 +171,9 @@  discard block
 block discarded – undo
171 171
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
172 172
 	 * @since 2017.04
173 173
 	 */
174
-	public function createAddressItem( array $values = [] )
174
+	public function createAddressItem(array $values = [])
175 175
 	{
176
-		return $this->controller->createAddressItem( $values );
176
+		return $this->controller->createAddressItem($values);
177 177
 	}
178 178
 
179 179
 
@@ -183,9 +183,9 @@  discard block
 block discarded – undo
183 183
 	 * @param string $id Unique customer address ID
184 184
 	 * @since 2017.04
185 185
 	 */
186
-	public function deleteAddressItem( $id )
186
+	public function deleteAddressItem($id)
187 187
 	{
188
-		$this->controller->deleteAddressItem( $id );
188
+		$this->controller->deleteAddressItem($id);
189 189
 	}
190 190
 
191 191
 
@@ -197,9 +197,9 @@  discard block
 block discarded – undo
197 197
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer address item
198 198
 	 * @since 2017.04
199 199
 	 */
200
-	public function editAddressItem( $id, array $values )
200
+	public function editAddressItem($id, array $values)
201 201
 	{
202
-		return $this->controller->editAddressItem( $id, $values );
202
+		return $this->controller->editAddressItem($id, $values);
203 203
 	}
204 204
 
205 205
 
@@ -210,9 +210,9 @@  discard block
 block discarded – undo
210 210
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
211 211
 	 * @since 2017.04
212 212
 	 */
213
-	public function getAddressItem( $id )
213
+	public function getAddressItem($id)
214 214
 	{
215
-		return $this->controller->getAddressItem( $id );
215
+		return $this->controller->getAddressItem($id);
216 216
 	}
217 217
 
218 218
 
@@ -222,9 +222,9 @@  discard block
 block discarded – undo
222 222
 	 * @param \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
223 223
 	 * @since 2017.04
224 224
 	 */
225
-	public function saveAddressItem( \Aimeos\MShop\Customer\Item\Address\Iface $item )
225
+	public function saveAddressItem(\Aimeos\MShop\Customer\Item\Address\Iface $item)
226 226
 	{
227
-		$this->controller->saveAddressItem( $item );
227
+		$this->controller->saveAddressItem($item);
228 228
 	}
229 229
 
230 230
 
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Customer/Iface.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item
27 27
 	 * @since 2017.04
28 28
 	 */
29
-	public function addItem( array $values );
29
+	public function addItem(array $values);
30 30
 
31 31
 
32 32
 	/**
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item
36 36
 	 * @since 2017.04
37 37
 	 */
38
-	public function createItem( array $values = [] );
38
+	public function createItem(array $values = []);
39 39
 
40 40
 
41 41
 	/**
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 	 * @param string $id Unique customer ID
45 45
 	 * @since 2017.04
46 46
 	 */
47
-	public function deleteItem( $id );
47
+	public function deleteItem($id);
48 48
 
49 49
 
50 50
 	/**
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item
56 56
 	 * @since 2017.04
57 57
 	 */
58
-	public function editItem( $id, array $values );
58
+	public function editItem($id, array $values);
59 59
 
60 60
 
61 61
 	/**
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item including the referenced domains items
67 67
 	 * @since 2017.04
68 68
 	 */
69
-	public function getItem( $id = null, array $domains = [] );
69
+	public function getItem($id = null, array $domains = []);
70 70
 
71 71
 
72 72
 	/**
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item including the referenced domains items
80 80
 	 * @since 2017.04
81 81
 	 */
82
-	public function findItem( $code, array $domains = [] );
82
+	public function findItem($code, array $domains = []);
83 83
 
84 84
 
85 85
 	/**
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
 	 * @param \Aimeos\MShop\Customer\Item\Iface Customer item
89 89
 	 * @since 2017.04
90 90
 	 */
91
-	public function saveItem( \Aimeos\MShop\Customer\Item\Iface $item );
91
+	public function saveItem(\Aimeos\MShop\Customer\Item\Iface $item);
92 92
 
93 93
 
94 94
 	/**
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer address item
99 99
 	 * @since 2017.04
100 100
 	 */
101
-	public function addAddressItem( array $values );
101
+	public function addAddressItem(array $values);
102 102
 
103 103
 
104 104
 	/**
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
108 108
 	 * @since 2017.04
109 109
 	 */
110
-	public function createAddressItem( array $values = [] );
110
+	public function createAddressItem(array $values = []);
111 111
 
112 112
 
113 113
 	/**
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
 	 * @param string $id Unique customer address ID
117 117
 	 * @since 2017.04
118 118
 	 */
119
-	public function deleteAddressItem( $id );
119
+	public function deleteAddressItem($id);
120 120
 
121 121
 
122 122
 	/**
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer address item
128 128
 	 * @since 2017.04
129 129
 	 */
130
-	public function editAddressItem( $id, array $values );
130
+	public function editAddressItem($id, array $values);
131 131
 
132 132
 
133 133
 	/**
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
138 138
 	 * @since 2017.04
139 139
 	 */
140
-	public function getAddressItem( $id );
140
+	public function getAddressItem($id);
141 141
 
142 142
 
143 143
 	/**
@@ -146,5 +146,5 @@  discard block
 block discarded – undo
146 146
 	 * @param \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
147 147
 	 * @since 2017.04
148 148
 	 */
149
-	public function saveAddressItem( \Aimeos\MShop\Customer\Item\Address\Iface $item );
149
+	public function saveAddressItem(\Aimeos\MShop\Customer\Item\Address\Iface $item);
150 150
 }
Please login to merge, or discard this patch.
controller/frontend/tests/Controller/Frontend/Customer/FactoryTest.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -15,31 +15,31 @@
 block discarded – undo
15 15
 	{
16 16
 		$target = '\\Aimeos\\Controller\\Frontend\\Customer\\Iface';
17 17
 
18
-		$controller = \Aimeos\Controller\Frontend\Customer\Factory::createController( \TestHelperFrontend::getContext() );
19
-		$this->assertInstanceOf( $target, $controller );
18
+		$controller = \Aimeos\Controller\Frontend\Customer\Factory::createController(\TestHelperFrontend::getContext());
19
+		$this->assertInstanceOf($target, $controller);
20 20
 
21
-		$controller = \Aimeos\Controller\Frontend\Customer\Factory::createController( \TestHelperFrontend::getContext(), 'Standard' );
22
-		$this->assertInstanceOf( $target, $controller );
21
+		$controller = \Aimeos\Controller\Frontend\Customer\Factory::createController(\TestHelperFrontend::getContext(), 'Standard');
22
+		$this->assertInstanceOf($target, $controller);
23 23
 	}
24 24
 
25 25
 
26 26
 	public function testCreateControllerInvalidImplementation()
27 27
 	{
28
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
29
-		\Aimeos\Controller\Frontend\Customer\Factory::createController( \TestHelperFrontend::getContext(), 'Invalid' );
28
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
29
+		\Aimeos\Controller\Frontend\Customer\Factory::createController(\TestHelperFrontend::getContext(), 'Invalid');
30 30
 	}
31 31
 
32 32
 
33 33
 	public function testCreateControllerInvalidName()
34 34
 	{
35
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
36
-		\Aimeos\Controller\Frontend\Customer\Factory::createController( \TestHelperFrontend::getContext(), '%^' );
35
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
36
+		\Aimeos\Controller\Frontend\Customer\Factory::createController(\TestHelperFrontend::getContext(), '%^');
37 37
 	}
38 38
 
39 39
 
40 40
 	public function testCreateControllerNotExisting()
41 41
 	{
42
-		$this->setExpectedException( '\\Aimeos\\Controller\\Frontend\\Exception' );
43
-		\Aimeos\Controller\Frontend\Customer\Factory::createController( \TestHelperFrontend::getContext(), 'notexist' );
42
+		$this->setExpectedException('\\Aimeos\\Controller\\Frontend\\Exception');
43
+		\Aimeos\Controller\Frontend\Customer\Factory::createController(\TestHelperFrontend::getContext(), 'notexist');
44 44
 	}
45 45
 }
Please login to merge, or discard this patch.
frontend/tests/Controller/Frontend/Customer/Decorator/BaseTest.php 1 patch
Spacing   +60 added lines, -60 removed lines patch added patch discarded remove patch
@@ -20,76 +20,76 @@  discard block
 block discarded – undo
20 20
 	{
21 21
 		$this->context = \TestHelperFrontend::getContext();
22 22
 
23
-		$this->stub = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Customer\Standard' )
23
+		$this->stub = $this->getMockBuilder('\Aimeos\Controller\Frontend\Customer\Standard')
24 24
 			->disableOriginalConstructor()
25 25
 			->getMock();
26 26
 
27
-		$this->object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Customer\Decorator\Base' )
28
-			->setConstructorArgs( [$this->stub, $this->context] )
27
+		$this->object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Customer\Decorator\Base')
28
+			->setConstructorArgs([$this->stub, $this->context])
29 29
 			->getMockForAbstractClass();
30 30
 	}
31 31
 
32 32
 
33 33
 	protected function tearDown()
34 34
 	{
35
-		unset( $this->context, $this->object, $this->stub );
35
+		unset($this->context, $this->object, $this->stub);
36 36
 	}
37 37
 
38 38
 
39 39
 	public function testConstructException()
40 40
 	{
41
-		$stub = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Iface' )->getMock();
41
+		$stub = $this->getMockBuilder('\Aimeos\Controller\Frontend\Iface')->getMock();
42 42
 
43
-		$this->setExpectedException( '\Aimeos\Controller\Frontend\Exception' );
43
+		$this->setExpectedException('\Aimeos\Controller\Frontend\Exception');
44 44
 
45
-		$this->getMockBuilder( '\Aimeos\Controller\Frontend\Customer\Decorator\Base' )
46
-			->setConstructorArgs( [$stub, $this->context] )
45
+		$this->getMockBuilder('\Aimeos\Controller\Frontend\Customer\Decorator\Base')
46
+			->setConstructorArgs([$stub, $this->context])
47 47
 			->getMockForAbstractClass();
48 48
 	}
49 49
 
50 50
 
51 51
 	public function testCall()
52 52
 	{
53
-		$stub = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Customer\Standard' )
53
+		$stub = $this->getMockBuilder('\Aimeos\Controller\Frontend\Customer\Standard')
54 54
 			->disableOriginalConstructor()
55
-			->setMethods( ['invalid'] )
55
+			->setMethods(['invalid'])
56 56
 			->getMock();
57 57
 
58
-		$object = $this->getMockBuilder( '\Aimeos\Controller\Frontend\Customer\Decorator\Base' )
59
-			->setConstructorArgs( [$stub, $this->context] )
58
+		$object = $this->getMockBuilder('\Aimeos\Controller\Frontend\Customer\Decorator\Base')
59
+			->setConstructorArgs([$stub, $this->context])
60 60
 			->getMockForAbstractClass();
61 61
 
62
-		$stub->expects( $this->once() )->method( 'invalid' )->will( $this->returnValue( true ) );
62
+		$stub->expects($this->once())->method('invalid')->will($this->returnValue(true));
63 63
 
64
-		$this->assertTrue( $object->invalid() );
64
+		$this->assertTrue($object->invalid());
65 65
 	}
66 66
 
67 67
 
68 68
 	public function testAddItem()
69 69
 	{
70
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'customer' )->createItem();
70
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'customer')->createItem();
71 71
 
72
-		$this->stub->expects( $this->once() )->method( 'addItem' )
73
-			->will( $this->returnValue( $item ) );
72
+		$this->stub->expects($this->once())->method('addItem')
73
+			->will($this->returnValue($item));
74 74
 
75
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Iface', $this->object->addItem( [] ) );
75
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Iface', $this->object->addItem([]));
76 76
 	}
77 77
 
78 78
 
79 79
 	public function testCreateItem()
80 80
 	{
81
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'customer' )->createItem();
81
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'customer')->createItem();
82 82
 
83
-		$this->stub->expects( $this->once() )->method( 'createItem' )
84
-			->will( $this->returnValue( $item ) );
83
+		$this->stub->expects($this->once())->method('createItem')
84
+			->will($this->returnValue($item));
85 85
 
86
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Iface', $this->object->createItem() );
86
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Iface', $this->object->createItem());
87 87
 	}
88 88
 
89 89
 
90 90
 	public function testDeleteItem()
91 91
 	{
92
-		$this->stub->expects( $this->once() )->method( 'deleteItem' );
92
+		$this->stub->expects($this->once())->method('deleteItem');
93 93
 
94 94
 		$this->object->deleteItem( -1 );
95 95
 	}
@@ -97,61 +97,61 @@  discard block
 block discarded – undo
97 97
 
98 98
 	public function testEditItem()
99 99
 	{
100
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'customer' )->createItem();
100
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'customer')->createItem();
101 101
 
102
-		$this->stub->expects( $this->once() )->method( 'editItem' )
103
-			->will( $this->returnValue( $item ) );
102
+		$this->stub->expects($this->once())->method('editItem')
103
+			->will($this->returnValue($item));
104 104
 
105
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Iface', $this->object->editItem( -1, [] ) );
105
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Iface', $this->object->editItem( -1, [] ));
106 106
 	}
107 107
 
108 108
 
109 109
 	public function testGetItem()
110 110
 	{
111
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'customer' )->createItem();
111
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'customer')->createItem();
112 112
 
113
-		$this->stub->expects( $this->once() )->method( 'getItem' )
114
-			->will( $this->returnValue( $item ) );
113
+		$this->stub->expects($this->once())->method('getItem')
114
+			->will($this->returnValue($item));
115 115
 
116
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Iface', $this->object->getItem( -1 ) );
116
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Iface', $this->object->getItem( -1 ));
117 117
 	}
118 118
 
119 119
 
120 120
 	public function testFindItem()
121 121
 	{
122
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'customer' )->createItem();
122
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'customer')->createItem();
123 123
 
124
-		$this->stub->expects( $this->once() )->method( 'findItem' )
125
-			->will( $this->returnValue( $item ) );
124
+		$this->stub->expects($this->once())->method('findItem')
125
+			->will($this->returnValue($item));
126 126
 
127
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Iface', $this->object->findItem( 'test' ) );
127
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Iface', $this->object->findItem('test'));
128 128
 	}
129 129
 
130 130
 
131 131
 	public function testSaveItem()
132 132
 	{
133
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'customer' )->createItem();
133
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'customer')->createItem();
134 134
 
135
-		$this->stub->expects( $this->once() )->method( 'saveItem' );
135
+		$this->stub->expects($this->once())->method('saveItem');
136 136
 
137
-		$this->object->saveItem( $item );
137
+		$this->object->saveItem($item);
138 138
 	}
139 139
 
140 140
 
141 141
 	public function testCreateAddressItem()
142 142
 	{
143
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'customer/address' )->createItem();
143
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'customer/address')->createItem();
144 144
 
145
-		$this->stub->expects( $this->once() )->method( 'createAddressItem' )
146
-			->will( $this->returnValue( $item ) );
145
+		$this->stub->expects($this->once())->method('createAddressItem')
146
+			->will($this->returnValue($item));
147 147
 
148
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Address\Iface', $this->object->createAddressItem() );
148
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Address\Iface', $this->object->createAddressItem());
149 149
 	}
150 150
 
151 151
 
152 152
 	public function testDeleteAddressItem()
153 153
 	{
154
-		$this->stub->expects( $this->once() )->method( 'deleteAddressItem' );
154
+		$this->stub->expects($this->once())->method('deleteAddressItem');
155 155
 
156 156
 		$this->object->deleteAddressItem( -1 );
157 157
 	}
@@ -159,49 +159,49 @@  discard block
 block discarded – undo
159 159
 
160 160
 	public function testEditAddressItem()
161 161
 	{
162
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'customer/address' )->createItem();
162
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'customer/address')->createItem();
163 163
 
164
-		$this->stub->expects( $this->once() )->method( 'editAddressItem' )
165
-			->will( $this->returnValue( $item ) );
164
+		$this->stub->expects($this->once())->method('editAddressItem')
165
+			->will($this->returnValue($item));
166 166
 
167
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Address\Iface', $this->object->editAddressItem( -1, [] ) );
167
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Address\Iface', $this->object->editAddressItem( -1, [] ));
168 168
 	}
169 169
 
170 170
 
171 171
 	public function testGetAddressItem()
172 172
 	{
173
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'customer/address' )->createItem();
173
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'customer/address')->createItem();
174 174
 
175
-		$this->stub->expects( $this->once() )->method( 'getAddressItem' )
176
-			->will( $this->returnValue( $item ) );
175
+		$this->stub->expects($this->once())->method('getAddressItem')
176
+			->will($this->returnValue($item));
177 177
 
178
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Address\Iface', $this->object->getAddressItem( -1 ) );
178
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Address\Iface', $this->object->getAddressItem( -1 ));
179 179
 	}
180 180
 
181 181
 
182 182
 	public function testSaveAddressItem()
183 183
 	{
184
-		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'customer/address' )->createItem();
184
+		$item = \Aimeos\MShop\Factory::createManager($this->context, 'customer/address')->createItem();
185 185
 
186
-		$this->stub->expects( $this->once() )->method( 'saveAddressItem' );
186
+		$this->stub->expects($this->once())->method('saveAddressItem');
187 187
 
188
-		$this->object->saveAddressItem( $item );
188
+		$this->object->saveAddressItem($item);
189 189
 	}
190 190
 
191 191
 
192 192
 	public function testGetController()
193 193
 	{
194
-		$result = $this->access( 'getController' )->invokeArgs( $this->object, [] );
194
+		$result = $this->access('getController')->invokeArgs($this->object, []);
195 195
 
196
-		$this->assertSame( $this->stub, $result );
196
+		$this->assertSame($this->stub, $result);
197 197
 	}
198 198
 
199 199
 
200
-	protected function access( $name )
200
+	protected function access($name)
201 201
 	{
202
-		$class = new \ReflectionClass( '\Aimeos\Controller\Frontend\Customer\Decorator\Base' );
203
-		$method = $class->getMethod( $name );
204
-		$method->setAccessible( true );
202
+		$class = new \ReflectionClass('\Aimeos\Controller\Frontend\Customer\Decorator\Base');
203
+		$method = $class->getMethod($name);
204
+		$method->setAccessible(true);
205 205
 
206 206
 		return $method;
207 207
 	}
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Customer/Standard.php 1 patch
Spacing   +57 added lines, -57 removed lines patch added patch discarded remove patch
@@ -28,13 +28,13 @@  discard block
 block discarded – undo
28 28
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item
29 29
 	 * @since 2017.04
30 30
 	 */
31
-	public function addItem( array $values )
31
+	public function addItem(array $values)
32 32
 	{
33
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' );
33
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer');
34 34
 
35 35
 		$item = $manager->createItem();
36
-		$item->fromArray( $values );
37
-		$manager->saveItem( $item );
36
+		$item->fromArray($values);
37
+		$manager->saveItem($item);
38 38
 
39 39
 		return $item;
40 40
 	}
@@ -45,13 +45,13 @@  discard block
 block discarded – undo
45 45
 	 *
46 46
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item
47 47
 	 */
48
-	public function createItem( array $values = [] )
48
+	public function createItem(array $values = [])
49 49
 	{
50
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' );
50
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer');
51 51
 
52 52
 		$item = $manager->createItem();
53
-		$item->fromArray( $values );
54
-		$item->setStatus( 1 );
53
+		$item->fromArray($values);
54
+		$item->setStatus(1);
55 55
 
56 56
 		return $item;
57 57
 	}
@@ -63,12 +63,12 @@  discard block
 block discarded – undo
63 63
 	 * @param string $id Unique customer ID
64 64
 	 * @since 2017.04
65 65
 	 */
66
-	public function deleteItem( $id )
66
+	public function deleteItem($id)
67 67
 	{
68
-		$this->checkUser( $id );
68
+		$this->checkUser($id);
69 69
 
70
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' );
71
-		$manager->deleteItem( $id );
70
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer');
71
+		$manager->deleteItem($id);
72 72
 	}
73 73
 
74 74
 
@@ -80,15 +80,15 @@  discard block
 block discarded – undo
80 80
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item
81 81
 	 * @since 2017.04
82 82
 	 */
83
-	public function editItem( $id, array $values )
83
+	public function editItem($id, array $values)
84 84
 	{
85
-		$this->checkUser( $id );
85
+		$this->checkUser($id);
86 86
 
87
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' );
87
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer');
88 88
 
89
-		$item = $manager->getItem( $id, [], true );
90
-		$item->fromArray( $values );
91
-		$manager->saveItem( $item );
89
+		$item = $manager->getItem($id, [], true);
90
+		$item->fromArray($values);
91
+		$manager->saveItem($item);
92 92
 
93 93
 		return $item;
94 94
 	}
@@ -102,17 +102,17 @@  discard block
 block discarded – undo
102 102
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item including the referenced domains items
103 103
 	 * @since 2017.04
104 104
 	 */
105
-	public function getItem( $id = null, array $domains = [] )
105
+	public function getItem($id = null, array $domains = [])
106 106
 	{
107
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' );
107
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer');
108 108
 
109
-		if( $id == null ) {
110
-			return $manager->getItem( $this->getContext()->getUserId(), $domains, true );
109
+		if ($id == null) {
110
+			return $manager->getItem($this->getContext()->getUserId(), $domains, true);
111 111
 		}
112 112
 
113
-		$this->checkUser( $id );
113
+		$this->checkUser($id);
114 114
 
115
-		return $manager->getItem( $id, $domains, true );
115
+		return $manager->getItem($id, $domains, true);
116 116
 	}
117 117
 
118 118
 
@@ -126,9 +126,9 @@  discard block
 block discarded – undo
126 126
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item including the referenced domains items
127 127
 	 * @since 2017.04
128 128
 	 */
129
-	public function findItem( $code, array $domains = [] )
129
+	public function findItem($code, array $domains = [])
130 130
 	{
131
-		return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' )->findItem( $code, $domains );
131
+		return \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer')->findItem($code, $domains);
132 132
 	}
133 133
 
134 134
 
@@ -137,9 +137,9 @@  discard block
 block discarded – undo
137 137
 	 *
138 138
 	 * @param \Aimeos\MShop\Customer\Item\Iface Customer item
139 139
 	 */
140
-	public function saveItem( \Aimeos\MShop\Customer\Item\Iface $item )
140
+	public function saveItem(\Aimeos\MShop\Customer\Item\Iface $item)
141 141
 	{
142
-		\Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer' )->saveItem( $item );
142
+		\Aimeos\MShop\Factory::createManager($this->getContext(), 'customer')->saveItem($item);
143 143
 	}
144 144
 
145 145
 
@@ -150,15 +150,15 @@  discard block
 block discarded – undo
150 150
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
151 151
 	 * @since 2017.04
152 152
 	 */
153
-	public function addAddressItem( array $values )
153
+	public function addAddressItem(array $values)
154 154
 	{
155 155
 		$context = $this->getContext();
156
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/address' );
156
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/address');
157 157
 
158 158
 		$item = $manager->createItem();
159
-		$item->fromArray( $values );
160
-		$item->setParentId( $context->getUserId() );
161
-		$manager->saveItem( $item );
159
+		$item->fromArray($values);
160
+		$item->setParentId($context->getUserId());
161
+		$manager->saveItem($item);
162 162
 
163 163
 		return $item;
164 164
 	}
@@ -169,14 +169,14 @@  discard block
 block discarded – undo
169 169
 	 *
170 170
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
171 171
 	 */
172
-	public function createAddressItem( array $values = [] )
172
+	public function createAddressItem(array $values = [])
173 173
 	{
174 174
 		$context = $this->getContext();
175
-		$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/address' );
175
+		$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/address');
176 176
 
177 177
 		$item = $manager->createItem();
178
-		$item->fromArray( $values );
179
-		$item->setParentId( $context->getUserId() );
178
+		$item->fromArray($values);
179
+		$item->setParentId($context->getUserId());
180 180
 
181 181
 		return $item;
182 182
 	}
@@ -188,13 +188,13 @@  discard block
 block discarded – undo
188 188
 	 * @param string $id Unique customer address ID
189 189
 	 * @since 2017.04
190 190
 	 */
191
-	public function deleteAddressItem( $id )
191
+	public function deleteAddressItem($id)
192 192
 	{
193
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/address' );
193
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/address');
194 194
 
195
-		$this->checkUser( $manager->getItem( $id, [], true )->getParentId() );
195
+		$this->checkUser($manager->getItem($id, [], true)->getParentId());
196 196
 
197
-		$manager->deleteItem( $id );
197
+		$manager->deleteItem($id);
198 198
 	}
199 199
 
200 200
 
@@ -206,15 +206,15 @@  discard block
 block discarded – undo
206 206
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
207 207
 	 * @since 2017.04
208 208
 	 */
209
-	public function editAddressItem( $id, array $values )
209
+	public function editAddressItem($id, array $values)
210 210
 	{
211
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/address' );
211
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/address');
212 212
 
213
-		$item = $manager->getItem( $id, [], true );
214
-		$this->checkUser( $item->getParentId() );
213
+		$item = $manager->getItem($id, [], true);
214
+		$this->checkUser($item->getParentId());
215 215
 
216
-		$item->fromArray( $values );
217
-		$manager->saveItem( $item );
216
+		$item->fromArray($values);
217
+		$manager->saveItem($item);
218 218
 
219 219
 		return $item;
220 220
 	}
@@ -227,12 +227,12 @@  discard block
 block discarded – undo
227 227
 	 * @return \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
228 228
 	 * @since 2017.04
229 229
 	 */
230
-	public function getAddressItem( $id )
230
+	public function getAddressItem($id)
231 231
 	{
232
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/address' );
233
-		$item = $manager->getItem( $id );
232
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/address');
233
+		$item = $manager->getItem($id);
234 234
 
235
-		$this->checkUser( $item->getParentId() );
235
+		$this->checkUser($item->getParentId());
236 236
 
237 237
 		return $item;
238 238
 	}
@@ -243,9 +243,9 @@  discard block
 block discarded – undo
243 243
 	 *
244 244
 	 * @param \Aimeos\MShop\Customer\Item\Address\Iface Customer address item
245 245
 	 */
246
-	public function saveAddressItem( \Aimeos\MShop\Customer\Item\Address\Iface $item )
246
+	public function saveAddressItem(\Aimeos\MShop\Customer\Item\Address\Iface $item)
247 247
 	{
248
-		\Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/address' )->saveItem( $item );
248
+		\Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/address')->saveItem($item);
249 249
 	}
250 250
 
251 251
 
@@ -255,12 +255,12 @@  discard block
 block discarded – undo
255 255
 	 * @param string $id Unique customer ID
256 256
 	 * @throws \Aimeos\Controller\Frontend\Customer\Exception If access isn't allowed
257 257
 	 */
258
-	protected function checkUser( $id )
258
+	protected function checkUser($id)
259 259
 	{
260
-		if( $id !== $this->getContext()->getUserId() )
260
+		if ($id !== $this->getContext()->getUserId())
261 261
 		{
262
-			$msg = sprintf( 'Not allowed to access customer data for ID "%1$s"', $id );
263
-			throw new \Aimeos\Controller\Frontend\Customer\Exception( $msg );
262
+			$msg = sprintf('Not allowed to access customer data for ID "%1$s"', $id);
263
+			throw new \Aimeos\Controller\Frontend\Customer\Exception($msg);
264 264
 		}
265 265
 	}
266 266
 }
Please login to merge, or discard this patch.