Completed
Push — master ( 921503...9109fd )
by Aimeos
02:03
created
controller/frontend/src/Controller/Frontend/Catalog/Decorator/Base.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -30,12 +30,12 @@  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\Catalog\Iface::class;
36
-		$this->controller = \Aimeos\MW\Common\Base::checkClass( $iface, $controller );
36
+		$this->controller = \Aimeos\MW\Common\Base::checkClass($iface, $controller);
37 37
 
38
-		parent::__construct( $context );
38
+		parent::__construct($context);
39 39
 	}
40 40
 
41 41
 
@@ -47,9 +47,9 @@  discard block
 block discarded – undo
47 47
 	 * @return mixed Returns the value of the called method
48 48
 	 * @throws \Aimeos\Controller\Frontend\Exception If method call failed
49 49
 	 */
50
-	public function __call( $name, array $param )
50
+	public function __call($name, array $param)
51 51
 	{
52
-		return @call_user_func_array( array( $this->controller, $name ), $param );
52
+		return @call_user_func_array(array($this->controller, $name), $param);
53 53
 	}
54 54
 
55 55
 
@@ -71,9 +71,9 @@  discard block
 block discarded – undo
71 71
 	 * @return \Aimeos\Controller\Frontend\Catalog\Iface Catalog controller for fluent interface
72 72
 	 * @since 2019.04
73 73
 	 */
74
-	public function compare( $operator, $key, $value )
74
+	public function compare($operator, $key, $value)
75 75
 	{
76
-		$this->controller->compare( $operator, $key, $value );
76
+		$this->controller->compare($operator, $key, $value);
77 77
 		return $this;
78 78
 	}
79 79
 
@@ -86,9 +86,9 @@  discard block
 block discarded – undo
86 86
 	 * @return \Aimeos\MShop\Catalog\Item\Iface Catalog item including the referenced domains items
87 87
 	 * @since 2019.04
88 88
 	 */
89
-	public function get( $id, array $domains = ['media', 'text'] )
89
+	public function get($id, array $domains = ['media', 'text'])
90 90
 	{
91
-		return $this->controller->get( $id, $domains );
91
+		return $this->controller->get($id, $domains);
92 92
 	}
93 93
 
94 94
 
@@ -100,9 +100,9 @@  discard block
 block discarded – undo
100 100
 	 * @return \Aimeos\MShop\Catalog\Item\Iface[] Associative list of categories
101 101
 	 * @since 2017.03
102 102
 	 */
103
-	public function getPath( $id, array $domains = ['text', 'media'] )
103
+	public function getPath($id, array $domains = ['text', 'media'])
104 104
 	{
105
-		return $this->controller->getPath( $id, $domains );
105
+		return $this->controller->getPath($id, $domains);
106 106
 	}
107 107
 
108 108
 
@@ -114,9 +114,9 @@  discard block
 block discarded – undo
114 114
 	 * @return \Aimeos\MShop\Catalog\Item\Iface Category tree
115 115
 	 * @since 2019.04
116 116
 	 */
117
-	public function getTree( array $domains = ['media', 'text'], $level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE )
117
+	public function getTree(array $domains = ['media', 'text'], $level = \Aimeos\MW\Tree\Manager\Base::LEVEL_TREE)
118 118
 	{
119
-		return $this->controller->getTree( $domains, $level );
119
+		return $this->controller->getTree($domains, $level);
120 120
 	}
121 121
 
122 122
 
@@ -128,9 +128,9 @@  discard block
 block discarded – undo
128 128
 	 * @return \Aimeos\MShop\Catalog\Item\Iface Catalog item including the referenced domains items
129 129
 	 * @since 2019.04
130 130
 	 */
131
-	public function find( $code, array $domains = ['media', 'text'] )
131
+	public function find($code, array $domains = ['media', 'text'])
132 132
 	{
133
-		return $this->controller->find( $code, $domains );
133
+		return $this->controller->find($code, $domains);
134 134
 	}
135 135
 
136 136
 
@@ -141,9 +141,9 @@  discard block
 block discarded – undo
141 141
 	 * @return \Aimeos\Controller\Frontend\Catalog\Iface Catalog controller for fluent interface
142 142
 	 * @since 2019.04
143 143
 	 */
144
-	public function parse( array $conditions )
144
+	public function parse(array $conditions)
145 145
 	{
146
-		$this->controller->parse( $conditions );
146
+		$this->controller->parse($conditions);
147 147
 		return $this;
148 148
 	}
149 149
 
@@ -155,9 +155,9 @@  discard block
 block discarded – undo
155 155
 	 * @return \Aimeos\Controller\Frontend\Catalog\Iface Catalog controller for fluent interface
156 156
 	 * @since 2019.04
157 157
 	 */
158
-	public function root( $id )
158
+	public function root($id)
159 159
 	{
160
-		$this->controller->root( $id );
160
+		$this->controller->root($id);
161 161
 		return $this;
162 162
 	}
163 163
 
@@ -168,9 +168,9 @@  discard block
 block discarded – undo
168 168
 	 * @param array $catIds List of category IDs
169 169
 	 * @return \Aimeos\Controller\Frontend\Catalog\Iface Catalog controller for fluent interface
170 170
 	 */
171
-	public function visible( array $catIds )
171
+	public function visible(array $catIds)
172 172
 	{
173
-		$this->controller->visible( $catIds );
173
+		$this->controller->visible($catIds);
174 174
 		return $this;
175 175
 	}
176 176
 
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Product/Standard.php 1 patch
Spacing   +85 added lines, -85 removed lines patch added patch discarded remove patch
@@ -32,13 +32,13 @@  discard block
 block discarded – undo
32 32
 	 *
33 33
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Common MShop context object
34 34
 	 */
35
-	public function __construct( \Aimeos\MShop\Context\Item\Iface $context )
35
+	public function __construct(\Aimeos\MShop\Context\Item\Iface $context)
36 36
 	{
37
-		parent::__construct( $context );
37
+		parent::__construct($context);
38 38
 
39
-		$this->manager = \Aimeos\MShop::create( $context, 'index' );
40
-		$this->filter = $this->manager->createSearch( true );
41
-		$this->conditions[] = $this->filter->compare( '!=', 'index.catalog.id', null );
39
+		$this->manager = \Aimeos\MShop::create($context, 'index');
40
+		$this->filter = $this->manager->createSearch(true);
41
+		$this->conditions[] = $this->filter->compare('!=', 'index.catalog.id', null);
42 42
 
43 43
 		/** controller/frontend/product/ignore-dates
44 44
 		 * Ignore start and end dates of products
@@ -52,8 +52,8 @@  discard block
 block discarded – undo
52 52
 		 * @since 2017.08
53 53
 		 * @category Developer
54 54
 		 */
55
-		if( $context->getConfig()->get( 'controller/frontend/product/ignore-dates', false ) ) {
56
-			$this->conditions[] = $this->filter->compare( '>', 'product.status', 0 );
55
+		if ($context->getConfig()->get('controller/frontend/product/ignore-dates', false)) {
56
+			$this->conditions[] = $this->filter->compare('>', 'product.status', 0);
57 57
 		} else {
58 58
 			$this->conditions[] = $this->filter->getConditions();
59 59
 		}
@@ -76,10 +76,10 @@  discard block
 block discarded – undo
76 76
 	 * @return array Associative list of key values as key and the product count for this key as value
77 77
 	 * @since 2019.04
78 78
 	 */
79
-	public function aggregate( $key )
79
+	public function aggregate($key)
80 80
 	{
81
-		$this->filter->setConditions( $this->filter->combine( '&&', $this->conditions ) );
82
-		return $this->manager->aggregate( $this->filter, $key );
81
+		$this->filter->setConditions($this->filter->combine('&&', $this->conditions));
82
+		return $this->manager->aggregate($this->filter, $key);
83 83
 	}
84 84
 
85 85
 
@@ -90,12 +90,12 @@  discard block
 block discarded – undo
90 90
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
91 91
 	 * @since 2019.04
92 92
 	 */
93
-	public function allOf( $attrIds )
93
+	public function allOf($attrIds)
94 94
 	{
95
-		if( !empty( $attrIds ) && ( $ids = array_unique( $this->validateIds( (array) $attrIds ) ) ) !== [] )
95
+		if (!empty($attrIds) && ($ids = array_unique($this->validateIds((array) $attrIds))) !== [])
96 96
 		{
97
-			$func = $this->filter->createFunction( 'index.attribute:all', [$ids] );
98
-			$this->conditions[] = $this->filter->compare( '!=', $func, null );
97
+			$func = $this->filter->createFunction('index.attribute:all', [$ids]);
98
+			$this->conditions[] = $this->filter->compare('!=', $func, null);
99 99
 		}
100 100
 
101 101
 		return $this;
@@ -111,29 +111,29 @@  discard block
 block discarded – undo
111 111
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
112 112
 	 * @since 2019.04
113 113
 	 */
114
-	public function category( $catIds, $listtype = 'default', $level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE )
114
+	public function category($catIds, $listtype = 'default', $level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE)
115 115
 	{
116
-		if( !empty( $catIds ) && ( $ids = $this->validateIds( (array) $catIds ) ) !== [] )
116
+		if (!empty($catIds) && ($ids = $this->validateIds((array) $catIds)) !== [])
117 117
 		{
118
-			if( $level != \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE )
118
+			if ($level != \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE)
119 119
 			{
120 120
 				$list = [];
121
-				$cntl = \Aimeos\Controller\Frontend::create( $this->getContext(), 'catalog' );
121
+				$cntl = \Aimeos\Controller\Frontend::create($this->getContext(), 'catalog');
122 122
 
123
-				foreach( $ids as $catId ) {
124
-					$list += $cntl->root( $catId )->getTree( [], $level )->toList();
123
+				foreach ($ids as $catId) {
124
+					$list += $cntl->root($catId)->getTree([], $level)->toList();
125 125
 				}
126 126
 
127
-				$ids = array_keys( $list );
127
+				$ids = array_keys($list);
128 128
 			}
129 129
 
130
-			$func = $this->filter->createFunction( 'index.catalog:position', [$listtype, $ids] );
130
+			$func = $this->filter->createFunction('index.catalog:position', [$listtype, $ids]);
131 131
 
132
-			$this->conditions[] = $this->filter->compare( '==', 'index.catalog.id', $ids );
133
-			$this->conditions[] = $this->filter->compare( '>=', $func, 0 );
132
+			$this->conditions[] = $this->filter->compare('==', 'index.catalog.id', $ids);
133
+			$this->conditions[] = $this->filter->compare('>=', $func, 0);
134 134
 
135
-			$func = $this->filter->createFunction( 'sort:index.catalog:position', [$listtype, $ids] );
136
-			$this->sort = $this->filter->sort( '+', $func );
135
+			$func = $this->filter->createFunction('sort:index.catalog:position', [$listtype, $ids]);
136
+			$this->sort = $this->filter->sort('+', $func);
137 137
 		}
138 138
 
139 139
 		return $this;
@@ -149,9 +149,9 @@  discard block
 block discarded – undo
149 149
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
150 150
 	 * @since 2019.04
151 151
 	 */
152
-	public function compare( $operator, $key, $value )
152
+	public function compare($operator, $key, $value)
153 153
 	{
154
-		$this->conditions[] = $this->filter->compare( $operator, $key, $value );
154
+		$this->conditions[] = $this->filter->compare($operator, $key, $value);
155 155
 		return $this;
156 156
 	}
157 157
 
@@ -164,9 +164,9 @@  discard block
 block discarded – undo
164 164
 	 * @return \Aimeos\MShop\Product\Item\Iface Product item including the referenced domains items
165 165
 	 * @since 2019.04
166 166
 	 */
167
-	public function get( $id, $domains = ['media', 'price', 'text'] )
167
+	public function get($id, $domains = ['media', 'price', 'text'])
168 168
 	{
169
-		return $this->manager->getItem( $id, $domains, true );
169
+		return $this->manager->getItem($id, $domains, true);
170 170
 	}
171 171
 
172 172
 
@@ -178,9 +178,9 @@  discard block
 block discarded – undo
178 178
 	 * @return \Aimeos\MShop\Product\Item\Iface Product item including the referenced domains items
179 179
 	 * @since 2019.04
180 180
 	 */
181
-	public function find( $code, $domains = ['media', 'price', 'text'] )
181
+	public function find($code, $domains = ['media', 'price', 'text'])
182 182
 	{
183
-		return $this->manager->findItem( $code, $domains, 'product', null, true );
183
+		return $this->manager->findItem($code, $domains, 'product', null, true);
184 184
 	}
185 185
 
186 186
 
@@ -193,20 +193,20 @@  discard block
 block discarded – undo
193 193
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
194 194
 	 * @since 2019.04
195 195
 	 */
196
-	public function oneOf( $attrIds )
196
+	public function oneOf($attrIds)
197 197
 	{
198 198
 		$attrIds = (array) $attrIds;
199 199
 
200
-		foreach( $attrIds as $key => $entry )
200
+		foreach ($attrIds as $key => $entry)
201 201
 		{
202
-			if( is_array( $entry ) && ( $ids = array_unique( $this->validateIds( $entry ) ) ) !== [] ) {
203
-				$this->conditions[] = $this->filter->compare( '==', 'index.attribute.id', $ids );
204
-				unset( $attrIds[$key] );
202
+			if (is_array($entry) && ($ids = array_unique($this->validateIds($entry))) !== []) {
203
+				$this->conditions[] = $this->filter->compare('==', 'index.attribute.id', $ids);
204
+				unset($attrIds[$key]);
205 205
 			}
206 206
 		}
207 207
 
208
-		if( ( $ids = array_unique( $this->validateIds( $attrIds ) ) ) !== [] ) {
209
-			$this->conditions[] = $this->filter->compare( '==', 'index.attribute.id', $ids );
208
+		if (($ids = array_unique($this->validateIds($attrIds))) !== []) {
209
+			$this->conditions[] = $this->filter->compare('==', 'index.attribute.id', $ids);
210 210
 		}
211 211
 
212 212
 		return $this;
@@ -220,9 +220,9 @@  discard block
 block discarded – undo
220 220
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
221 221
 	 * @since 2019.04
222 222
 	 */
223
-	public function parse( array $conditions )
223
+	public function parse(array $conditions)
224 224
 	{
225
-		$this->conditions[] = $this->filter->toConditions( $conditions );
225
+		$this->conditions[] = $this->filter->toConditions($conditions);
226 226
 		return $this;
227 227
 	}
228 228
 
@@ -234,10 +234,10 @@  discard block
 block discarded – undo
234 234
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
235 235
 	 * @since 2019.04
236 236
 	 */
237
-	public function product( $prodIds )
237
+	public function product($prodIds)
238 238
 	{
239
-		if( !empty( $prodIds ) && ( $ids = array_unique( $this->validateIds( (array) $prodIds ) ) ) !== [] ) {
240
-			$this->conditions[] = $this->filter->compare( '==', 'product.id', $ids );
239
+		if (!empty($prodIds) && ($ids = array_unique($this->validateIds((array) $prodIds))) !== []) {
240
+			$this->conditions[] = $this->filter->compare('==', 'product.id', $ids);
241 241
 		}
242 242
 
243 243
 		return $this;
@@ -252,10 +252,10 @@  discard block
 block discarded – undo
252 252
 	 * @return \Aimeos\MShop\Product\Item\Iface[] Ordered list of product items
253 253
 	 * @since 2019.04
254 254
 	 */
255
-	public function search( $domains = ['media', 'price', 'text'], &$total = null )
255
+	public function search($domains = ['media', 'price', 'text'], &$total = null)
256 256
 	{
257
-		$this->filter->setConditions( $this->filter->combine( '&&', $this->conditions ) );
258
-		return $this->manager->searchItems( $this->filter, $domains, $total );
257
+		$this->filter->setConditions($this->filter->combine('&&', $this->conditions));
258
+		return $this->manager->searchItems($this->filter, $domains, $total);
259 259
 	}
260 260
 
261 261
 
@@ -267,9 +267,9 @@  discard block
 block discarded – undo
267 267
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
268 268
 	 * @since 2019.04
269 269
 	 */
270
-	public function slice( $start, $limit )
270
+	public function slice($start, $limit)
271 271
 	{
272
-		$this->filter->setSlice( $start, $limit );
272
+		$this->filter->setSlice($start, $limit);
273 273
 		return $this;
274 274
 	}
275 275
 
@@ -281,17 +281,17 @@  discard block
 block discarded – undo
281 281
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
282 282
 	 * @since 2019.04
283 283
 	 */
284
-	public function sort( $key = null )
284
+	public function sort($key = null)
285 285
 	{
286 286
 		$direction = '+';
287 287
 
288
-		if( $key != null && $key[0] === '-' )
288
+		if ($key != null && $key[0] === '-')
289 289
 		{
290
-			$key = substr( $key, 1 );
290
+			$key = substr($key, 1);
291 291
 			$direction = '-';
292 292
 		}
293 293
 
294
-		switch( $key )
294
+		switch ($key)
295 295
 		{
296 296
 			case null:
297 297
 				$this->sort = null;
@@ -301,39 +301,39 @@  discard block
 block discarded – undo
301 301
 				break;
302 302
 
303 303
 			case 'code':
304
-				$this->sort = $this->filter->sort( $direction, 'product.code' );
304
+				$this->sort = $this->filter->sort($direction, 'product.code');
305 305
 				break;
306 306
 
307 307
 			case 'ctime':
308
-				$this->sort = $this->filter->sort( $direction, 'product.ctime' );
308
+				$this->sort = $this->filter->sort($direction, 'product.ctime');
309 309
 				break;
310 310
 
311 311
 			case 'name':
312 312
 				$langid = $this->getContext()->getLocale()->getLanguageId();
313 313
 
314
-				$cmpfunc = $this->filter->createFunction( 'index.text:name', [$langid] );
315
-				$this->conditions[] = $this->filter->compare( '!=', $cmpfunc, null );
314
+				$cmpfunc = $this->filter->createFunction('index.text:name', [$langid]);
315
+				$this->conditions[] = $this->filter->compare('!=', $cmpfunc, null);
316 316
 
317
-				$sortfunc = $this->filter->createFunction( 'sort:index.text:name', [$langid] );
318
-				$this->sort = $this->filter->sort( $direction, $sortfunc );
317
+				$sortfunc = $this->filter->createFunction('sort:index.text:name', [$langid]);
318
+				$this->sort = $this->filter->sort($direction, $sortfunc);
319 319
 				break;
320 320
 
321 321
 			case 'price':
322 322
 				$currencyid = $this->getContext()->getLocale()->getCurrencyId();
323 323
 
324
-				$cmpfunc = $this->filter->createFunction( 'index.price:value', [$currencyid] );
325
-				$this->conditions[] = $this->filter->compare( '!=', $cmpfunc, null );
324
+				$cmpfunc = $this->filter->createFunction('index.price:value', [$currencyid]);
325
+				$this->conditions[] = $this->filter->compare('!=', $cmpfunc, null);
326 326
 
327
-				$sortfunc = $this->filter->createFunction( 'sort:index.price:value', [$currencyid] );
328
-				$this->sort = $this->filter->sort( $direction, $sortfunc );
327
+				$sortfunc = $this->filter->createFunction('sort:index.price:value', [$currencyid]);
328
+				$this->sort = $this->filter->sort($direction, $sortfunc);
329 329
 				break;
330 330
 
331 331
 			default:
332
-				$this->sort = $this->filter->sort( $direction, $key );
332
+				$this->sort = $this->filter->sort($direction, $key);
333 333
 		}
334 334
 
335
-		if( $this->sort ) {
336
-			$this->filter->setSortations( [$this->sort] );
335
+		if ($this->sort) {
336
+			$this->filter->setSortations([$this->sort]);
337 337
 		}
338 338
 
339 339
 		return $this;
@@ -348,17 +348,17 @@  discard block
 block discarded – undo
348 348
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
349 349
 	 * @since 2019.04
350 350
 	 */
351
-	public function supplier( $supIds, $listtype = 'default' )
351
+	public function supplier($supIds, $listtype = 'default')
352 352
 	{
353
-		if( !empty( $supIds ) && ( $ids = array_unique( $this->validateIds( (array) $supIds ) ) ) !== [] )
353
+		if (!empty($supIds) && ($ids = array_unique($this->validateIds((array) $supIds))) !== [])
354 354
 		{
355
-			$func = $this->filter->createFunction( 'index.supplier:position', [$listtype, $ids] );
355
+			$func = $this->filter->createFunction('index.supplier:position', [$listtype, $ids]);
356 356
 
357
-			$this->conditions[] = $this->filter->compare( '==', 'index.supplier.id', $ids );
358
-			$this->conditions[] = $this->filter->compare( '>=', $func, 0 );
357
+			$this->conditions[] = $this->filter->compare('==', 'index.supplier.id', $ids);
358
+			$this->conditions[] = $this->filter->compare('>=', $func, 0);
359 359
 
360
-			$func = $this->filter->createFunction( 'sort:index.supplier:position', [$listtype, $ids] );
361
-			$this->sort = $this->filter->sort( '+', $func );
360
+			$func = $this->filter->createFunction('sort:index.supplier:position', [$listtype, $ids]);
361
+			$this->sort = $this->filter->sort('+', $func);
362 362
 		}
363 363
 
364 364
 		return $this;
@@ -372,14 +372,14 @@  discard block
 block discarded – undo
372 372
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
373 373
 	 * @since 2019.04
374 374
 	 */
375
-	public function text( $text )
375
+	public function text($text)
376 376
 	{
377
-		if( !empty( $text ) )
377
+		if (!empty($text))
378 378
 		{
379 379
 			$langid = $this->getContext()->getLocale()->getLanguageId();
380
-			$func = $this->filter->createFunction( 'index.text:relevance', [$langid, $text] );
380
+			$func = $this->filter->createFunction('index.text:relevance', [$langid, $text]);
381 381
 
382
-			$this->conditions[] = $this->filter->compare( '>', $func, 0 );
382
+			$this->conditions[] = $this->filter->compare('>', $func, 0);
383 383
 		}
384 384
 
385 385
 		return $this;
@@ -392,16 +392,16 @@  discard block
 block discarded – undo
392 392
 	 * @param \Aimeos\MShop\Catalog\Item\Iface $item Catalog item with children
393 393
 	 * @return array List of catalog IDs
394 394
 	 */
395
-	protected function getCatalogIdsFromTree( \Aimeos\MShop\Catalog\Item\Iface $item )
395
+	protected function getCatalogIdsFromTree(\Aimeos\MShop\Catalog\Item\Iface $item)
396 396
 	{
397
-		if( $item->getStatus() < 1 ) {
397
+		if ($item->getStatus() < 1) {
398 398
 			return [];
399 399
 		}
400 400
 
401
-		$list = [ $item->getId() ];
401
+		$list = [$item->getId()];
402 402
 
403
-		foreach( $item->getChildren() as $child ) {
404
-			$list = array_merge( $list, $this->getCatalogIdsFromTree( $child ) );
403
+		foreach ($item->getChildren() as $child) {
404
+			$list = array_merge($list, $this->getCatalogIdsFromTree($child));
405 405
 		}
406 406
 
407 407
 		return $list;
@@ -414,13 +414,13 @@  discard block
 block discarded – undo
414 414
 	 * @param array $ids List of IDs to validate
415 415
 	 * @return array List of validated IDs
416 416
 	 */
417
-	protected function validateIds( array $ids )
417
+	protected function validateIds(array $ids)
418 418
 	{
419 419
 		$list = [];
420 420
 
421
-		foreach( $ids as $id )
421
+		foreach ($ids as $id)
422 422
 		{
423
-			if( $id != '' && preg_match( '/^[A-Za-z0-9\-\_]+$/', $id ) === 1 ) {
423
+			if ($id != '' && preg_match('/^[A-Za-z0-9\-\_]+$/', $id) === 1) {
424 424
 				$list[] = (string) $id;
425 425
 			}
426 426
 		}
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Product/Iface.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 	 * @return array Associative list of key values as key and the product count for this key as value
27 27
 	 * @since 2019.04
28 28
 	 */
29
-	public function aggregate( $key );
29
+	public function aggregate($key);
30 30
 
31 31
 	/**
32 32
 	 * Adds attribute IDs for filtering where products must reference all IDs
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
36 36
 	 * @since 2019.04
37 37
 	 */
38
-	public function allOf( $attrIds );
38
+	public function allOf($attrIds);
39 39
 
40 40
 	/**
41 41
 	 * Adds catalog IDs for filtering
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
47 47
 	 * @since 2019.04
48 48
 	 */
49
-	public function category( $catIds, $listtype = 'default', $level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE );
49
+	public function category($catIds, $listtype = 'default', $level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE);
50 50
 
51 51
 	/**
52 52
 	 * Adds generic condition for filtering products
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
58 58
 	 * @since 2019.04
59 59
 	 */
60
-	public function compare( $operator, $key, $value );
60
+	public function compare($operator, $key, $value);
61 61
 
62 62
 	/**
63 63
 	 * Returns the product for the given product ID
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
 	 * @return \Aimeos\MShop\Product\Item\Iface Product item including the referenced domains items
68 68
 	 * @since 2019.04
69 69
 	 */
70
-	public function get( $id, $domains = ['media', 'price', 'text'] );
70
+	public function get($id, $domains = ['media', 'price', 'text']);
71 71
 
72 72
 	/**
73 73
 	 * Returns the product for the given product code
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
 	 * @return \Aimeos\MShop\Product\Item\Iface Product item including the referenced domains items
78 78
 	 * @since 2019.04
79 79
 	 */
80
-	public function find( $code, $domains = ['media', 'price', 'text'] );
80
+	public function find($code, $domains = ['media', 'price', 'text']);
81 81
 
82 82
 	/**
83 83
 	 * Adds attribute IDs for filtering where products must reference at least one ID
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
87 87
 	 * @since 2019.04
88 88
 	 */
89
-	public function oneOf( $attrIds );
89
+	public function oneOf($attrIds);
90 90
 
91 91
 	/**
92 92
 	 * Parses the given array and adds the conditions to the list of conditions
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
96 96
 	 * @since 2019.04
97 97
 	 */
98
-	public function parse( array $conditions );
98
+	public function parse(array $conditions);
99 99
 
100 100
 	/**
101 101
 	 * Adds product IDs for filtering
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
105 105
 	 * @since 2019.04
106 106
 	 */
107
-	public function product( $prodIds );
107
+	public function product($prodIds);
108 108
 
109 109
 	/**
110 110
 	 * Returns the products filtered by the previously assigned conditions
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
 	 * @return \Aimeos\MShop\Product\Item\Iface[] Ordered list of product items
115 115
 	 * @since 2019.04
116 116
 	 */
117
-	public function search( $domains = ['media', 'price', 'text'], &$total = null );
117
+	public function search($domains = ['media', 'price', 'text'], &$total = null);
118 118
 
119 119
 	/**
120 120
 	 * Sets the start value and the number of returned products for slicing the list of found products
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
125 125
 	 * @since 2019.04
126 126
 	 */
127
-	public function slice( $start, $limit );
127
+	public function slice($start, $limit);
128 128
 
129 129
 	/**
130 130
 	 * Sets the sorting of the product list
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
134 134
 	 * @since 2019.04
135 135
 	 */
136
-	public function sort( $key = null );
136
+	public function sort($key = null);
137 137
 
138 138
 	/**
139 139
 	 * Adds supplier IDs for filtering
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
144 144
 	 * @since 2019.04
145 145
 	 */
146
-	public function supplier( $supIds, $listtype = 'default' );
146
+	public function supplier($supIds, $listtype = 'default');
147 147
 
148 148
 	/**
149 149
 	 * Adds input string for full text search
@@ -152,5 +152,5 @@  discard block
 block discarded – undo
152 152
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
153 153
 	 * @since 2019.04
154 154
 	 */
155
-	public function text( $text );
155
+	public function text($text);
156 156
 }
Please login to merge, or discard this patch.
controller/frontend/src/Controller/Frontend/Product/Decorator/Base.php 1 patch
Spacing   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -30,12 +30,12 @@  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\Product\Iface::class;
36
-		$this->controller = \Aimeos\MW\Common\Base::checkClass( $iface, $controller );
36
+		$this->controller = \Aimeos\MW\Common\Base::checkClass($iface, $controller);
37 37
 
38
-		parent::__construct( $context );
38
+		parent::__construct($context);
39 39
 	}
40 40
 
41 41
 
@@ -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
 	 * @return array Associative list of key values as key and the product count for this key as value
70 70
 	 * @since 2019.04
71 71
 	 */
72
-	public function aggregate( $key )
72
+	public function aggregate($key)
73 73
 	{
74
-		return $this->controller->aggregate( $key );
74
+		return $this->controller->aggregate($key);
75 75
 	}
76 76
 
77 77
 
@@ -82,9 +82,9 @@  discard block
 block discarded – undo
82 82
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
83 83
 	 * @since 2019.04
84 84
 	 */
85
-	public function allOf( $attrIds )
85
+	public function allOf($attrIds)
86 86
 	{
87
-		$this->controller->allOf( $attrIds );
87
+		$this->controller->allOf($attrIds);
88 88
 		return $this;
89 89
 	}
90 90
 
@@ -98,9 +98,9 @@  discard block
 block discarded – undo
98 98
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
99 99
 	 * @since 2019.04
100 100
 	 */
101
-	public function category( $catIds, $listtype = 'default', $level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE )
101
+	public function category($catIds, $listtype = 'default', $level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE)
102 102
 	{
103
-		$this->controller->category( $catIds, $listtype, $level );
103
+		$this->controller->category($catIds, $listtype, $level);
104 104
 		return $this;
105 105
 	}
106 106
 
@@ -114,9 +114,9 @@  discard block
 block discarded – undo
114 114
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
115 115
 	 * @since 2019.04
116 116
 	 */
117
-	public function compare( $operator, $key, $value )
117
+	public function compare($operator, $key, $value)
118 118
 	{
119
-		$this->controller->compare( $operator, $key, $value );
119
+		$this->controller->compare($operator, $key, $value);
120 120
 		return $this;
121 121
 	}
122 122
 
@@ -129,9 +129,9 @@  discard block
 block discarded – undo
129 129
 	 * @return \Aimeos\MShop\Product\Item\Iface Product item including the referenced domains items
130 130
 	 * @since 2019.04
131 131
 	 */
132
-	public function get( $id, $domains = ['media', 'price', 'text'] )
132
+	public function get($id, $domains = ['media', 'price', 'text'])
133 133
 	{
134
-		return $this->controller->get( $id, $domains );
134
+		return $this->controller->get($id, $domains);
135 135
 	}
136 136
 
137 137
 
@@ -143,9 +143,9 @@  discard block
 block discarded – undo
143 143
 	 * @return \Aimeos\MShop\Product\Item\Iface Product item including the referenced domains items
144 144
 	 * @since 2019.04
145 145
 	 */
146
-	public function find( $code, $domains = ['media', 'price', 'text'] )
146
+	public function find($code, $domains = ['media', 'price', 'text'])
147 147
 	{
148
-		return $this->controller->find( $code, $domains );
148
+		return $this->controller->find($code, $domains);
149 149
 	}
150 150
 
151 151
 
@@ -156,9 +156,9 @@  discard block
 block discarded – undo
156 156
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
157 157
 	 * @since 2019.04
158 158
 	 */
159
-	public function oneOf( $attrIds )
159
+	public function oneOf($attrIds)
160 160
 	{
161
-		$this->controller->oneOf( $attrIds );
161
+		$this->controller->oneOf($attrIds);
162 162
 		return $this;
163 163
 	}
164 164
 
@@ -170,9 +170,9 @@  discard block
 block discarded – undo
170 170
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
171 171
 	 * @since 2019.04
172 172
 	 */
173
-	public function parse( array $conditions )
173
+	public function parse(array $conditions)
174 174
 	{
175
-		$this->controller->parse( $conditions );
175
+		$this->controller->parse($conditions);
176 176
 		return $this;
177 177
 	}
178 178
 
@@ -184,9 +184,9 @@  discard block
 block discarded – undo
184 184
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
185 185
 	 * @since 2019.04
186 186
 	 */
187
-	public function product( $prodIds )
187
+	public function product($prodIds)
188 188
 	{
189
-		$this->controller->product( $prodIds );
189
+		$this->controller->product($prodIds);
190 190
 		return $this;
191 191
 	}
192 192
 
@@ -199,9 +199,9 @@  discard block
 block discarded – undo
199 199
 	 * @return \Aimeos\MShop\Product\Item\Iface[] Ordered list of product items
200 200
 	 * @since 2019.04
201 201
 	 */
202
-	public function search( $domains = ['media', 'price', 'text'], &$total = null )
202
+	public function search($domains = ['media', 'price', 'text'], &$total = null)
203 203
 	{
204
-		return $this->controller->search( $domains, $total );
204
+		return $this->controller->search($domains, $total);
205 205
 	}
206 206
 
207 207
 
@@ -213,9 +213,9 @@  discard block
 block discarded – undo
213 213
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
214 214
 	 * @since 2019.04
215 215
 	 */
216
-	public function slice( $start, $limit )
216
+	public function slice($start, $limit)
217 217
 	{
218
-		$this->controller->slice( $start, $limit );
218
+		$this->controller->slice($start, $limit);
219 219
 		return $this;
220 220
 	}
221 221
 
@@ -227,9 +227,9 @@  discard block
 block discarded – undo
227 227
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
228 228
 	 * @since 2019.04
229 229
 	 */
230
-	public function sort( $key = null )
230
+	public function sort($key = null)
231 231
 	{
232
-		$this->controller->sort( $key );
232
+		$this->controller->sort($key);
233 233
 		return $this;
234 234
 	}
235 235
 
@@ -242,9 +242,9 @@  discard block
 block discarded – undo
242 242
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
243 243
 	 * @since 2019.04
244 244
 	 */
245
-	public function supplier( $supIds, $listtype = 'default' )
245
+	public function supplier($supIds, $listtype = 'default')
246 246
 	{
247
-		$this->controller->supplier( $supIds, $listtype );
247
+		$this->controller->supplier($supIds, $listtype);
248 248
 		return $this;
249 249
 	}
250 250
 
@@ -256,9 +256,9 @@  discard block
 block discarded – undo
256 256
 	 * @return \Aimeos\Controller\Frontend\Product\Iface Product controller for fluent interface
257 257
 	 * @since 2019.04
258 258
 	 */
259
-	public function text( $text )
259
+	public function text($text)
260 260
 	{
261
-		$this->controller->text( $text );
261
+		$this->controller->text($text);
262 262
 		return $this;
263 263
 	}
264 264
 
Please login to merge, or discard this patch.