@@ -31,36 +31,36 @@ discard block |
||
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( ( $attrIds = $this->validateIds( $attrIds ) ) !== [] ) |
|
36 | + if (($attrIds = $this->validateIds($attrIds)) !== []) |
|
37 | 37 | { |
38 | - $func = $filter->createFunction( 'index.attribute:all', [$attrIds] ); |
|
38 | + $func = $filter->createFunction('index.attribute:all', [$attrIds]); |
|
39 | 39 | $expr = array( |
40 | - $filter->compare( '!=', $func, null ), |
|
40 | + $filter->compare('!=', $func, null), |
|
41 | 41 | $filter->getConditions(), |
42 | 42 | ); |
43 | - $filter->setConditions( $filter->combine( '&&', $expr ) ); |
|
43 | + $filter->setConditions($filter->combine('&&', $expr)); |
|
44 | 44 | } |
45 | 45 | |
46 | - if( ( $optIds = $this->validateIds( $optIds ) ) !== [] ) |
|
46 | + if (($optIds = $this->validateIds($optIds)) !== []) |
|
47 | 47 | { |
48 | 48 | $expr = array( |
49 | - $filter->compare( '==', 'index.attribute.id', $optIds ), |
|
49 | + $filter->compare('==', 'index.attribute.id', $optIds), |
|
50 | 50 | $filter->getConditions(), |
51 | 51 | ); |
52 | - $filter->setConditions( $filter->combine( '&&', $expr ) ); |
|
52 | + $filter->setConditions($filter->combine('&&', $expr)); |
|
53 | 53 | } |
54 | 54 | |
55 | - foreach( $oneIds as $type => $list ) |
|
55 | + foreach ($oneIds as $type => $list) |
|
56 | 56 | { |
57 | - if( ( $list = $this->validateIds( (array) $list ) ) !== [] ) |
|
57 | + if (($list = $this->validateIds((array) $list)) !== []) |
|
58 | 58 | { |
59 | 59 | $expr = array( |
60 | - $filter->compare( '==', 'index.attribute.id', $list ), |
|
60 | + $filter->compare('==', 'index.attribute.id', $list), |
|
61 | 61 | $filter->getConditions(), |
62 | 62 | ); |
63 | - $filter->setConditions( $filter->combine( '&&', $expr ) ); |
|
63 | + $filter->setConditions($filter->combine('&&', $expr)); |
|
64 | 64 | } |
65 | 65 | } |
66 | 66 | |
@@ -78,42 +78,42 @@ discard block |
||
78 | 78 | * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching |
79 | 79 | * @since 2017.03 |
80 | 80 | */ |
81 | - public function addFilterCategory( \Aimeos\MW\Criteria\Iface $filter, $catIds, $listtype = 'default', |
|
82 | - $level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE ) |
|
81 | + public function addFilterCategory(\Aimeos\MW\Criteria\Iface $filter, $catIds, $listtype = 'default', |
|
82 | + $level = \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE) |
|
83 | 83 | { |
84 | - if( ( $catIds = $this->validateIds( (array) $catIds ) ) === [] ) { |
|
84 | + if (($catIds = $this->validateIds((array) $catIds)) === []) { |
|
85 | 85 | return $filter; |
86 | 86 | } |
87 | 87 | |
88 | - if( $level != \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE ) |
|
88 | + if ($level != \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE) |
|
89 | 89 | { |
90 | 90 | $list = []; |
91 | - $cntl = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'catalog' ); |
|
91 | + $cntl = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'catalog'); |
|
92 | 92 | |
93 | - foreach( $catIds as $catId ) |
|
93 | + foreach ($catIds as $catId) |
|
94 | 94 | { |
95 | - $tree = $cntl->getTree( $catId, [], $level ); |
|
96 | - $list = array_merge( $list, $this->getCatalogIdsFromTree( $tree ) ); |
|
95 | + $tree = $cntl->getTree($catId, [], $level); |
|
96 | + $list = array_merge($list, $this->getCatalogIdsFromTree($tree)); |
|
97 | 97 | } |
98 | 98 | |
99 | 99 | $catIds = $list; |
100 | 100 | } |
101 | 101 | |
102 | 102 | $expr = [$filter->getConditions()]; |
103 | - $expr[] = $filter->compare( '==', 'index.catalog.id', array_unique( $catIds ) ); |
|
103 | + $expr[] = $filter->compare('==', 'index.catalog.id', array_unique($catIds)); |
|
104 | 104 | |
105 | - if( isset( $filter->sortname ) && $filter->sortname === 'relevance' ) |
|
105 | + if (isset($filter->sortname) && $filter->sortname === 'relevance') |
|
106 | 106 | { |
107 | - $dir = ( isset( $filter->sortdir ) ? $filter->sortdir : '+' ); |
|
107 | + $dir = (isset($filter->sortdir) ? $filter->sortdir : '+'); |
|
108 | 108 | |
109 | - $cmpfunc = $filter->createFunction( 'index.catalog:position', [$listtype, $catIds] ); |
|
110 | - $expr[] = $filter->compare( '>=', $cmpfunc, 0 ); |
|
109 | + $cmpfunc = $filter->createFunction('index.catalog:position', [$listtype, $catIds]); |
|
110 | + $expr[] = $filter->compare('>=', $cmpfunc, 0); |
|
111 | 111 | |
112 | - $sortfunc = $filter->createFunction( 'sort:index.catalog:position', [$listtype, $catIds] ); |
|
113 | - $filter->setSortations( [$filter->sort( $dir, $sortfunc ), $filter->sort( '+', 'product.id' )] ); |
|
112 | + $sortfunc = $filter->createFunction('sort:index.catalog:position', [$listtype, $catIds]); |
|
113 | + $filter->setSortations([$filter->sort($dir, $sortfunc), $filter->sort('+', 'product.id')]); |
|
114 | 114 | } |
115 | 115 | |
116 | - $filter->setConditions( $filter->combine( '&&', $expr ) ); |
|
116 | + $filter->setConditions($filter->combine('&&', $expr)); |
|
117 | 117 | |
118 | 118 | return $filter; |
119 | 119 | } |
@@ -128,27 +128,27 @@ discard block |
||
128 | 128 | * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching |
129 | 129 | * @since 2018.07 |
130 | 130 | */ |
131 | - public function addFilterSupplier( \Aimeos\MW\Criteria\Iface $filter, $supIds, $listtype = 'default' ) |
|
131 | + public function addFilterSupplier(\Aimeos\MW\Criteria\Iface $filter, $supIds, $listtype = 'default') |
|
132 | 132 | { |
133 | - if( ( $supIds = $this->validateIds( (array) $supIds ) ) === [] ) { |
|
133 | + if (($supIds = $this->validateIds((array) $supIds)) === []) { |
|
134 | 134 | return $filter; |
135 | 135 | } |
136 | 136 | |
137 | 137 | $expr = [$filter->getConditions()]; |
138 | - $expr[] = $filter->compare( '==', 'index.supplier.id', array_unique( $supIds ) ); |
|
138 | + $expr[] = $filter->compare('==', 'index.supplier.id', array_unique($supIds)); |
|
139 | 139 | |
140 | - if( isset( $filter->sortname ) && $filter->sortname === 'relevance' ) |
|
140 | + if (isset($filter->sortname) && $filter->sortname === 'relevance') |
|
141 | 141 | { |
142 | - $dir = ( isset( $filter->sortdir ) ? $filter->sortdir : '+' ); |
|
142 | + $dir = (isset($filter->sortdir) ? $filter->sortdir : '+'); |
|
143 | 143 | |
144 | - $cmpfunc = $filter->createFunction( 'index.supplier:position', [$listtype, $supIds] ); |
|
145 | - $expr[] = $filter->compare( '>=', $cmpfunc, 0 ); |
|
144 | + $cmpfunc = $filter->createFunction('index.supplier:position', [$listtype, $supIds]); |
|
145 | + $expr[] = $filter->compare('>=', $cmpfunc, 0); |
|
146 | 146 | |
147 | - $sortfunc = $filter->createFunction( 'sort:index.supplier:position', [$listtype, $supIds] ); |
|
148 | - $filter->setSortations( [$filter->sort( $dir, $sortfunc ), $filter->sort( '+', 'product.id' )] ); |
|
147 | + $sortfunc = $filter->createFunction('sort:index.supplier:position', [$listtype, $supIds]); |
|
148 | + $filter->setSortations([$filter->sort($dir, $sortfunc), $filter->sort('+', 'product.id')]); |
|
149 | 149 | } |
150 | 150 | |
151 | - return $filter->setConditions( $filter->combine( '&&', $expr ) ); |
|
151 | + return $filter->setConditions($filter->combine('&&', $expr)); |
|
152 | 152 | } |
153 | 153 | |
154 | 154 | |
@@ -160,13 +160,13 @@ discard block |
||
160 | 160 | * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching |
161 | 161 | * @since 2017.03 |
162 | 162 | */ |
163 | - public function addFilterText( \Aimeos\MW\Criteria\Iface $filter, $input ) |
|
163 | + public function addFilterText(\Aimeos\MW\Criteria\Iface $filter, $input) |
|
164 | 164 | { |
165 | 165 | $langid = $this->getContext()->getLocale()->getLanguageId(); |
166 | - $cmpfunc = $filter->createFunction( 'index.text:relevance', [$langid, $input] ); |
|
167 | - $expr = array( $filter->compare( '>', $cmpfunc, 0 ), $filter->getConditions() ); |
|
166 | + $cmpfunc = $filter->createFunction('index.text:relevance', [$langid, $input]); |
|
167 | + $expr = array($filter->compare('>', $cmpfunc, 0), $filter->getConditions()); |
|
168 | 168 | |
169 | - return $filter->setConditions( $filter->combine( '&&', $expr ) ); |
|
169 | + return $filter->setConditions($filter->combine('&&', $expr)); |
|
170 | 170 | } |
171 | 171 | |
172 | 172 | |
@@ -178,9 +178,9 @@ discard block |
||
178 | 178 | * @return array Associative list of key values as key and the product count for this key as value |
179 | 179 | * @since 2017.03 |
180 | 180 | */ |
181 | - public function aggregate( \Aimeos\MW\Criteria\Iface $filter, $key ) |
|
181 | + public function aggregate(\Aimeos\MW\Criteria\Iface $filter, $key) |
|
182 | 182 | { |
183 | - return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'index' )->aggregate( $filter, $key ); |
|
183 | + return \Aimeos\MShop\Factory::createManager($this->getContext(), 'index')->aggregate($filter, $key); |
|
184 | 184 | } |
185 | 185 | |
186 | 186 | |
@@ -194,11 +194,11 @@ discard block |
||
194 | 194 | * @return \Aimeos\MW\Criteria\Iface Criteria object containing the conditions for searching |
195 | 195 | * @since 2017.03 |
196 | 196 | */ |
197 | - public function createFilter( $sort = null, $direction = '+', $start = 0, $size = 100 ) |
|
197 | + public function createFilter($sort = null, $direction = '+', $start = 0, $size = 100) |
|
198 | 198 | { |
199 | 199 | $sortations = []; |
200 | 200 | $context = $this->getContext(); |
201 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'index' ); |
|
201 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'index'); |
|
202 | 202 | |
203 | 203 | |
204 | 204 | /** controller/frontend/product/ignore-dates |
@@ -213,55 +213,55 @@ discard block |
||
213 | 213 | * @since 2017.10 |
214 | 214 | * @category Developer |
215 | 215 | */ |
216 | - if( $context->getConfig()->get( 'controller/frontend/product/ignore-dates', false ) ) |
|
216 | + if ($context->getConfig()->get('controller/frontend/product/ignore-dates', false)) |
|
217 | 217 | { |
218 | 218 | $search = $manager->createSearch(); |
219 | - $search->setConditions( $search->compare( '>', 'product.status', 0 ) ); |
|
219 | + $search->setConditions($search->compare('>', 'product.status', 0)); |
|
220 | 220 | } |
221 | 221 | else |
222 | 222 | { |
223 | - $search = $manager->createSearch( true ); |
|
223 | + $search = $manager->createSearch(true); |
|
224 | 224 | } |
225 | 225 | |
226 | 226 | |
227 | - $expr = array( $search->compare( '!=', 'index.catalog.id', null ) ); |
|
227 | + $expr = array($search->compare('!=', 'index.catalog.id', null)); |
|
228 | 228 | |
229 | - switch( $sort ) |
|
229 | + switch ($sort) |
|
230 | 230 | { |
231 | 231 | case 'code': |
232 | - $sortations[] = $search->sort( $direction, 'product.code' ); |
|
232 | + $sortations[] = $search->sort($direction, 'product.code'); |
|
233 | 233 | break; |
234 | 234 | |
235 | 235 | case 'ctime': |
236 | - $sortations[] = $search->sort( $direction, 'product.ctime' ); |
|
236 | + $sortations[] = $search->sort($direction, 'product.ctime'); |
|
237 | 237 | break; |
238 | 238 | |
239 | 239 | case 'name': |
240 | 240 | $langid = $context->getLocale()->getLanguageId(); |
241 | 241 | |
242 | - $cmpfunc = $search->createFunction( 'index.text:name', [$langid] ); |
|
243 | - $expr[] = $search->compare( '!=', $cmpfunc, null ); |
|
242 | + $cmpfunc = $search->createFunction('index.text:name', [$langid]); |
|
243 | + $expr[] = $search->compare('!=', $cmpfunc, null); |
|
244 | 244 | |
245 | - $sortfunc = $search->createFunction( 'sort:index.text:name', [$langid] ); |
|
246 | - $sortations[] = $search->sort( $direction, $sortfunc ); |
|
245 | + $sortfunc = $search->createFunction('sort:index.text:name', [$langid]); |
|
246 | + $sortations[] = $search->sort($direction, $sortfunc); |
|
247 | 247 | break; |
248 | 248 | |
249 | 249 | case 'price': |
250 | 250 | $currencyid = $context->getLocale()->getCurrencyId(); |
251 | 251 | |
252 | - $cmpfunc = $search->createFunction( 'index.price:value', [$currencyid] ); |
|
253 | - $expr[] = $search->compare( '!=', $cmpfunc, null ); |
|
252 | + $cmpfunc = $search->createFunction('index.price:value', [$currencyid]); |
|
253 | + $expr[] = $search->compare('!=', $cmpfunc, null); |
|
254 | 254 | |
255 | - $sortfunc = $search->createFunction( 'sort:index.price:value', [$currencyid] ); |
|
256 | - $sortations[] = $search->sort( $direction, $sortfunc ); |
|
255 | + $sortfunc = $search->createFunction('sort:index.price:value', [$currencyid]); |
|
256 | + $sortations[] = $search->sort($direction, $sortfunc); |
|
257 | 257 | break; |
258 | 258 | } |
259 | 259 | |
260 | 260 | $expr[] = $search->getConditions(); |
261 | 261 | |
262 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
263 | - $search->setSortations( $sortations ); |
|
264 | - $search->setSlice( $start, $size ); |
|
262 | + $search->setConditions($search->combine('&&', $expr)); |
|
263 | + $search->setSortations($sortations); |
|
264 | + $search->setSlice($start, $size); |
|
265 | 265 | $search->sortdir = $direction; |
266 | 266 | $search->sortname = $sort; |
267 | 267 | |
@@ -277,15 +277,15 @@ discard block |
||
277 | 277 | * @return \Aimeos\MShop\Product\Item\Iface Product item including the referenced domains items |
278 | 278 | * @since 2017.03 |
279 | 279 | */ |
280 | - public function getItem( $productId, array $domains = array( 'attribute', 'media', 'price', 'product', 'product/property', 'text' ) ) |
|
280 | + public function getItem($productId, array $domains = array('attribute', 'media', 'price', 'product', 'product/property', 'text')) |
|
281 | 281 | { |
282 | - $items = $this->getItems( [$productId], $domains ); |
|
282 | + $items = $this->getItems([$productId], $domains); |
|
283 | 283 | |
284 | - if( ( $item = reset( $items ) ) !== false ) { |
|
284 | + if (($item = reset($items)) !== false) { |
|
285 | 285 | return $item; |
286 | 286 | } |
287 | 287 | |
288 | - throw new \Aimeos\Controller\Frontend\Exception( sprintf( 'Product item with ID "%1$s" not found', $productId ) ); |
|
288 | + throw new \Aimeos\Controller\Frontend\Exception(sprintf('Product item with ID "%1$s" not found', $productId)); |
|
289 | 289 | } |
290 | 290 | |
291 | 291 | |
@@ -297,10 +297,10 @@ discard block |
||
297 | 297 | * @return \Aimeos\MShop\Product\Item\Iface[] Associative list of product IDs as keys and product items as values |
298 | 298 | * @since 2017.03 |
299 | 299 | */ |
300 | - public function getItems( array $productIds, array $domains = array( 'media', 'price', 'text' ) ) |
|
300 | + public function getItems(array $productIds, array $domains = array('media', 'price', 'text')) |
|
301 | 301 | { |
302 | 302 | $context = $this->getContext(); |
303 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'product' ); |
|
303 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'product'); |
|
304 | 304 | |
305 | 305 | /** controller/frontend/order/ignore-dates |
306 | 306 | * Ignore start and end dates of products |
@@ -314,24 +314,24 @@ discard block |
||
314 | 314 | * @since 2017.08 |
315 | 315 | * @category Developer |
316 | 316 | */ |
317 | - if( $context->getConfig()->get( 'controller/frontend/product/ignore-dates', false ) ) |
|
317 | + if ($context->getConfig()->get('controller/frontend/product/ignore-dates', false)) |
|
318 | 318 | { |
319 | 319 | $search = $manager->createSearch(); |
320 | - $search->setConditions( $search->compare( '>', 'product.status', 0 ) ); |
|
320 | + $search->setConditions($search->compare('>', 'product.status', 0)); |
|
321 | 321 | } |
322 | 322 | else |
323 | 323 | { |
324 | - $search = $manager->createSearch( true ); |
|
324 | + $search = $manager->createSearch(true); |
|
325 | 325 | } |
326 | 326 | |
327 | 327 | $expr = array( |
328 | - $search->compare( '==', 'product.id', $productIds ), |
|
328 | + $search->compare('==', 'product.id', $productIds), |
|
329 | 329 | $search->getConditions(), |
330 | 330 | ); |
331 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
332 | - $search->setSlice( 0, count( $productIds ) ); |
|
331 | + $search->setConditions($search->combine('&&', $expr)); |
|
332 | + $search->setSlice(0, count($productIds)); |
|
333 | 333 | |
334 | - return $manager->searchItems( $search, $domains ); |
|
334 | + return $manager->searchItems($search, $domains); |
|
335 | 335 | } |
336 | 336 | |
337 | 337 | |
@@ -344,9 +344,9 @@ discard block |
||
344 | 344 | * @return array Ordered list of product items implementing \Aimeos\MShop\Product\Item\Iface |
345 | 345 | * @since 2017.03 |
346 | 346 | */ |
347 | - public function searchItems( \Aimeos\MW\Criteria\Iface $filter, array $domains = array( 'media', 'price', 'text' ), &$total = null ) |
|
347 | + public function searchItems(\Aimeos\MW\Criteria\Iface $filter, array $domains = array('media', 'price', 'text'), &$total = null) |
|
348 | 348 | { |
349 | - return \Aimeos\MShop\Factory::createManager( $this->getContext(), 'index' )->searchItems( $filter, $domains, $total ); |
|
349 | + return \Aimeos\MShop\Factory::createManager($this->getContext(), 'index')->searchItems($filter, $domains, $total); |
|
350 | 350 | } |
351 | 351 | |
352 | 352 | |
@@ -356,16 +356,16 @@ discard block |
||
356 | 356 | * @param \Aimeos\MShop\Catalog\Item\Iface $item Catalog item with children |
357 | 357 | * @return array List of catalog IDs |
358 | 358 | */ |
359 | - protected function getCatalogIdsFromTree( \Aimeos\MShop\Catalog\Item\Iface $item ) |
|
359 | + protected function getCatalogIdsFromTree(\Aimeos\MShop\Catalog\Item\Iface $item) |
|
360 | 360 | { |
361 | - if( $item->getStatus() < 1 ) { |
|
361 | + if ($item->getStatus() < 1) { |
|
362 | 362 | return []; |
363 | 363 | } |
364 | 364 | |
365 | - $list = [ $item->getId() ]; |
|
365 | + $list = [$item->getId()]; |
|
366 | 366 | |
367 | - foreach( $item->getChildren() as $child ) { |
|
368 | - $list = array_merge( $list, $this->getCatalogIdsFromTree( $child ) ); |
|
367 | + foreach ($item->getChildren() as $child) { |
|
368 | + $list = array_merge($list, $this->getCatalogIdsFromTree($child)); |
|
369 | 369 | } |
370 | 370 | |
371 | 371 | return $list; |
@@ -378,13 +378,13 @@ discard block |
||
378 | 378 | * @param array $ids List of IDs to validate |
379 | 379 | * @return array List of validated IDs |
380 | 380 | */ |
381 | - protected function validateIds( array $ids ) |
|
381 | + protected function validateIds(array $ids) |
|
382 | 382 | { |
383 | 383 | $list = []; |
384 | 384 | |
385 | - foreach( $ids as $id ) |
|
385 | + foreach ($ids as $id) |
|
386 | 386 | { |
387 | - if( $id != '' && preg_match( '/^[A-Za-z0-9\-\_]+$/', $id ) === 1 ) { |
|
387 | + if ($id != '' && preg_match('/^[A-Za-z0-9\-\_]+$/', $id) === 1) { |
|
388 | 388 | $list[] = (string) $id; |
389 | 389 | } |
390 | 390 | } |