@@ -89,8 +89,7 @@ |
||
89 | 89 | } |
90 | 90 | |
91 | 91 | $this->status( 'added' ); |
92 | - } |
|
93 | - else |
|
92 | + } else |
|
94 | 93 | { |
95 | 94 | $this->status( 'removed' ); |
96 | 95 | } |
@@ -74,7 +74,7 @@ |
||
74 | 74 | if( $value === '1' ) |
75 | 75 | { |
76 | 76 | $ds = DIRECTORY_SEPARATOR; |
77 | - $path = __DIR__ . $ds . 'data' . $ds . 'demo-coupon.php'; |
|
77 | + $path = __DIR__.$ds.'data'.$ds.'demo-coupon.php'; |
|
78 | 78 | |
79 | 79 | if( ( $data = include( $path ) ) == false ) { |
80 | 80 | throw new \Aimeos\MShop\Exception( sprintf( 'No file "%1$s" found for coupon domain', $path ) ); |
@@ -75,8 +75,7 @@ |
||
75 | 75 | $this->saveCustomerItems( $data ); |
76 | 76 | |
77 | 77 | $this->status( 'added' ); |
78 | - } |
|
79 | - else |
|
78 | + } else |
|
80 | 79 | { |
81 | 80 | $this->status( 'removed' ); |
82 | 81 | } |
@@ -75,7 +75,7 @@ |
||
75 | 75 | if( $value === '1' ) |
76 | 76 | { |
77 | 77 | $ds = DIRECTORY_SEPARATOR; |
78 | - $path = __DIR__ . $ds . 'data' . $ds . 'demo-customer.php'; |
|
78 | + $path = __DIR__.$ds.'data'.$ds.'demo-customer.php'; |
|
79 | 79 | |
80 | 80 | if( ( $data = include( $path ) ) == false ) { |
81 | 81 | throw new \Aimeos\MShop\Exception( sprintf( 'No file "%1$s" found for customer domain', $path ) ); |
@@ -77,8 +77,7 @@ |
||
77 | 77 | { |
78 | 78 | $this->addDemoData(); |
79 | 79 | $this->status( 'added' ); |
80 | - } |
|
81 | - else |
|
80 | + } else |
|
82 | 81 | { |
83 | 82 | $this->status( 'removed' ); |
84 | 83 | } |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | $this->removeItems( $item->getId(), 'product/lists', 'product', 'text' ); |
70 | 70 | $this->removeListItems( $item->getId(), 'product/lists', 'product' ); |
71 | 71 | |
72 | - $productCodes[] = $item->getCode(); |
|
72 | + $productCodes[] = $item->getCode(); |
|
73 | 73 | } |
74 | 74 | |
75 | 75 | $this->removeStockItems( $productCodes ); |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | protected function addDemoData() |
97 | 97 | { |
98 | 98 | $ds = DIRECTORY_SEPARATOR; |
99 | - $path = __DIR__ . $ds . 'data' . $ds . 'demo-product.php'; |
|
99 | + $path = __DIR__.$ds.'data'.$ds.'demo-product.php'; |
|
100 | 100 | |
101 | 101 | if( ( $data = include( $path ) ) == false ) { |
102 | 102 | throw new \Aimeos\MShop\Exception( sprintf( 'No file "%1$s" found for product domain', $path ) ); |
@@ -201,9 +201,12 @@ discard block |
||
201 | 201 | ); |
202 | 202 | $dbm = $context->getDatabaseManager(); |
203 | 203 | |
204 | - try { |
|
204 | + try |
|
205 | + { |
|
205 | 206 | $this->object = \Aimeos\MW\Cache\Factory::createManager( $name, $config, $dbm ); |
206 | - } catch( \Exception $e ) { |
|
207 | + } |
|
208 | + catch( \Exception $e ) |
|
209 | + { |
|
207 | 210 | $this->object = \Aimeos\MW\Cache\Factory::createManager( 'DB', $config, $dbm ); |
208 | 211 | } |
209 | 212 | } |
@@ -265,9 +268,12 @@ discard block |
||
265 | 268 | */ |
266 | 269 | public function createItem() |
267 | 270 | { |
268 | - try { |
|
271 | + try |
|
272 | + { |
|
269 | 273 | $values = array( 'siteid' => $this->getContext()->getLocale()->getSiteId() ); |
270 | - } catch( \Exception $e ) { |
|
274 | + } |
|
275 | + catch( \Exception $e ) |
|
276 | + { |
|
271 | 277 | $values = array( 'siteid' => null ); |
272 | 278 | } |
273 | 279 |
@@ -668,8 +668,7 @@ |
||
668 | 668 | |
669 | 669 | if( isset( $attributes[$name] ) && $attributes[$name] instanceof $iface ) { |
670 | 670 | return $attributes[$name]->getInternalDeps(); |
671 | - } |
|
672 | - else if( isset( $attributes['id'] ) && $attributes['id'] instanceof $iface ) { |
|
671 | + } else if( isset( $attributes['id'] ) && $attributes['id'] instanceof $iface ) { |
|
673 | 672 | return $attributes['id']->getInternalDeps(); |
674 | 673 | } |
675 | 674 |
@@ -242,7 +242,7 @@ discard block |
||
242 | 242 | $conn = $dbm->acquire( $dbname ); |
243 | 243 | |
244 | 244 | $object = new \Aimeos\MW\Criteria\SQL( $conn ); |
245 | - $object->setConditions( $object->compare( '==', $domain . '.status', 1 ) ); |
|
245 | + $object->setConditions( $object->compare( '==', $domain.'.status', 1 ) ); |
|
246 | 246 | |
247 | 247 | $dbm->release( $conn, $dbname ); |
248 | 248 | |
@@ -330,9 +330,9 @@ discard block |
||
330 | 330 | protected function getSqlConfig( $path ) |
331 | 331 | { |
332 | 332 | $config = $this->getContext()->getConfig(); |
333 | - $adapter = $config->get( 'resource/' . $this->getResourceName() . '/adapter' ); |
|
333 | + $adapter = $config->get( 'resource/'.$this->getResourceName().'/adapter' ); |
|
334 | 334 | |
335 | - return $config->get( $path . '/' . $adapter, $config->get( $path . '/ansi', $path ) ); |
|
335 | + return $config->get( $path.'/'.$adapter, $config->get( $path.'/ansi', $path ) ); |
|
336 | 336 | } |
337 | 337 | |
338 | 338 | |
@@ -348,7 +348,7 @@ discard block |
||
348 | 348 | { |
349 | 349 | $domain = strtolower( $domain ); |
350 | 350 | $manager = strtolower( $manager ); |
351 | - $key = $domain . $manager . $name; |
|
351 | + $key = $domain.$manager.$name; |
|
352 | 352 | |
353 | 353 | if( !isset( $this->subManagers[$key] ) ) |
354 | 354 | { |
@@ -361,7 +361,7 @@ discard block |
||
361 | 361 | } |
362 | 362 | |
363 | 363 | if( $name === null ) { |
364 | - $path = 'mshop/' . $domain . '/manager/' . $manager . '/name'; |
|
364 | + $path = 'mshop/'.$domain.'/manager/'.$manager.'/name'; |
|
365 | 365 | $name = $this->context->getConfig()->get( $path, 'Standard' ); |
366 | 366 | } |
367 | 367 | |
@@ -372,8 +372,8 @@ discard block |
||
372 | 372 | $domainname = ucfirst( $domain ); |
373 | 373 | $subnames = $this->createSubNames( $manager ); |
374 | 374 | |
375 | - $classname = '\\Aimeos\\MShop\\' . $domainname . '\\Manager\\' . $subnames . '\\' . $name; |
|
376 | - $interface = '\\Aimeos\\MShop\\' . $domainname . '\\Manager\\' . $subnames . '\\Iface'; |
|
375 | + $classname = '\\Aimeos\\MShop\\'.$domainname.'\\Manager\\'.$subnames.'\\'.$name; |
|
376 | + $interface = '\\Aimeos\\MShop\\'.$domainname.'\\Manager\\'.$subnames.'\\Iface'; |
|
377 | 377 | |
378 | 378 | if( class_exists( $classname ) === false ) { |
379 | 379 | throw new \Aimeos\MShop\Exception( sprintf( 'Class "%1$s" not available', $classname ) ); |
@@ -412,7 +412,7 @@ discard block |
||
412 | 412 | throw new \Aimeos\MShop\Exception( sprintf( 'Invalid characters in class name "%1$s"', $name ) ); |
413 | 413 | } |
414 | 414 | |
415 | - $classname = $classprefix . $name; |
|
415 | + $classname = $classprefix.$name; |
|
416 | 416 | |
417 | 417 | if( class_exists( $classname ) === false ) { |
418 | 418 | throw new \Aimeos\MShop\Exception( sprintf( 'Class "%1$s" not available', $classname ) ); |
@@ -441,7 +441,7 @@ discard block |
||
441 | 441 | $config = $this->context->getConfig(); |
442 | 442 | |
443 | 443 | $decorators = $config->get( 'mshop/common/manager/decorators/default', [] ); |
444 | - $excludes = $config->get( 'mshop/' . $domain . '/manager/' . $managerpath . '/decorators/excludes', [] ); |
|
444 | + $excludes = $config->get( 'mshop/'.$domain.'/manager/'.$managerpath.'/decorators/excludes', [] ); |
|
445 | 445 | |
446 | 446 | foreach( $decorators as $key => $name ) |
447 | 447 | { |
@@ -454,12 +454,12 @@ discard block |
||
454 | 454 | $manager = $this->addDecorators( $this->context, $manager, $decorators, $classprefix ); |
455 | 455 | |
456 | 456 | $classprefix = '\\Aimeos\\MShop\\Common\\Manager\\Decorator\\'; |
457 | - $decorators = $config->get( 'mshop/' . $domain . '/manager/' . $managerpath . '/decorators/global', [] ); |
|
457 | + $decorators = $config->get( 'mshop/'.$domain.'/manager/'.$managerpath.'/decorators/global', [] ); |
|
458 | 458 | $manager = $this->addDecorators( $this->context, $manager, $decorators, $classprefix ); |
459 | 459 | |
460 | 460 | $subpath = $this->createSubNames( $managerpath ); |
461 | - $classprefix = 'MShop_' . ucfirst( $domain ) . '_Manager_' . $subpath . '_Decorator_'; |
|
462 | - $decorators = $config->get( 'mshop/' . $domain . '/manager/' . $managerpath . '/decorators/local', [] ); |
|
461 | + $classprefix = 'MShop_'.ucfirst( $domain ).'_Manager_'.$subpath.'_Decorator_'; |
|
462 | + $decorators = $config->get( 'mshop/'.$domain.'/manager/'.$managerpath.'/decorators/local', [] ); |
|
463 | 463 | |
464 | 464 | return $this->addDecorators( $this->context, $manager, $decorators, $classprefix ); |
465 | 465 | } |
@@ -585,7 +585,7 @@ discard block |
||
585 | 585 | { |
586 | 586 | $iface = '\\Aimeos\\MW\\Criteria\\Attribute\\Iface'; |
587 | 587 | $sep = $this->getKeySeparator(); |
588 | - $name = $prefix . $sep . 'id'; |
|
588 | + $name = $prefix.$sep.'id'; |
|
589 | 589 | |
590 | 590 | if( isset( $attributes[$name] ) && $attributes[$name] instanceof $iface ) { |
591 | 591 | return $attributes[$name]->getInternalDeps(); |
@@ -643,7 +643,7 @@ discard block |
||
643 | 643 | { |
644 | 644 | $config = $this->context->getConfig(); |
645 | 645 | |
646 | - if( $config->get( 'resource/' . $name ) === null ) { |
|
646 | + if( $config->get( 'resource/'.$name ) === null ) { |
|
647 | 647 | $this->resourceName = $config->get( 'resource/default', 'db' ); |
648 | 648 | } else { |
649 | 649 | $this->resourceName = $name; |
@@ -713,7 +713,7 @@ discard block |
||
713 | 713 | |
714 | 714 | foreach( $keys as $key ) |
715 | 715 | { |
716 | - $name = $key . $sep . 'siteid'; |
|
716 | + $name = $key.$sep.'siteid'; |
|
717 | 717 | |
718 | 718 | if( isset( $attributes[$name] ) ) { |
719 | 719 | $cond[] = $search->compare( '==', $name, $siteIds ); |
@@ -800,7 +800,7 @@ discard block |
||
800 | 800 | $results = $stmt->execute(); |
801 | 801 | $row = $results->fetch(); |
802 | 802 | $results->finish(); |
803 | - $this->context->getLogger()->log( __METHOD__ . '(' . ( ( microtime( true ) - $time ) * 1000 ) . 'ms): SQL statement: ' . $stmt, \Aimeos\MW\Logger\Base::DEBUG ); |
|
803 | + $this->context->getLogger()->log( __METHOD__.'('.( ( microtime( true ) - $time ) * 1000 ).'ms): SQL statement: '.$stmt, \Aimeos\MW\Logger\Base::DEBUG ); |
|
804 | 804 | |
805 | 805 | if( $row === false ) { |
806 | 806 | throw new \Aimeos\MShop\Exception( sprintf( 'Total results value not found' ) ); |
@@ -816,7 +816,7 @@ discard block |
||
816 | 816 | $time = microtime( true ); |
817 | 817 | $stmt = $conn->create( $sql->str() ); |
818 | 818 | $results = $stmt->execute(); |
819 | - $this->context->getLogger()->log( __METHOD__ . '(' . ( ( microtime( true ) - $time ) * 1000 ) . 'ms): SQL statement: ' . $stmt, \Aimeos\MW\Logger\Base::DEBUG ); |
|
819 | + $this->context->getLogger()->log( __METHOD__.'('.( ( microtime( true ) - $time ) * 1000 ).'ms): SQL statement: '.$stmt, \Aimeos\MW\Logger\Base::DEBUG ); |
|
820 | 820 | |
821 | 821 | return $results; |
822 | 822 | } |
@@ -841,7 +841,7 @@ discard block |
||
841 | 841 | $search->setConditions( $search->compare( '==', $name, $ids ) ); |
842 | 842 | |
843 | 843 | $types = array( $name => \Aimeos\MW\DB\Statement\Base::PARAM_STR ); |
844 | - $translations = array( $name => '"' . $name . '"' ); |
|
844 | + $translations = array( $name => '"'.$name.'"' ); |
|
845 | 845 | |
846 | 846 | $cond = $search->getConditionString( $types, $translations ); |
847 | 847 | $sql = str_replace( ':cond', $cond, $this->getSqlConfig( $cfgpath ) ); |
@@ -243,8 +243,7 @@ |
||
243 | 243 | $stmt->bind( 8, $pos, \Aimeos\MW\DB\Statement\Base::PARAM_INT ); |
244 | 244 | |
245 | 245 | $stmt->execute()->finish(); |
246 | - } |
|
247 | - else |
|
246 | + } else |
|
248 | 247 | { |
249 | 248 | $sql = $this->getSqlConfig( $cfgPath . 'getposmax' ); |
250 | 249 |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | public function aggregate( \Aimeos\MW\Criteria\Iface $search, $key ) |
64 | 64 | { |
65 | 65 | $required = array( trim( $this->prefix, '.' ) ); |
66 | - return $this->aggregateBase( $search, $key, $this->getConfigPath() . 'aggregate', $required ); |
|
66 | + return $this->aggregateBase( $search, $key, $this->getConfigPath().'aggregate', $required ); |
|
67 | 67 | } |
68 | 68 | |
69 | 69 | |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | public function createItem() |
76 | 76 | { |
77 | 77 | $values = array( |
78 | - $this->prefix . 'siteid' => $this->getContext()->getLocale()->getSiteId() |
|
78 | + $this->prefix.'siteid' => $this->getContext()->getLocale()->getSiteId() |
|
79 | 79 | ); |
80 | 80 | return $this->createItemBase( $values ); |
81 | 81 | |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | } |
113 | 113 | |
114 | 114 | $time = date( 'Y-m-d H:i:s' ); |
115 | - $statement = $this->getCachedStatement( $conn, $this->getConfigPath() . $type ); |
|
115 | + $statement = $this->getCachedStatement( $conn, $this->getConfigPath().$type ); |
|
116 | 116 | |
117 | 117 | $statement->bind( 1, $item->getParentId(), \Aimeos\MW\DB\Statement\Base::PARAM_INT ); |
118 | 118 | $statement->bind( 2, $context->getLocale()->getSiteId(), \Aimeos\MW\DB\Statement\Base::PARAM_INT ); |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | if( $fetch === true ) |
141 | 141 | { |
142 | 142 | if( $id === null ) { |
143 | - $path = $this->getConfigPath() . 'newid'; |
|
143 | + $path = $this->getConfigPath().'newid'; |
|
144 | 144 | $item->setId( $this->newId( $conn, $path ) ); |
145 | 145 | } else { |
146 | 146 | $item->setId( $id ); // modified false |
@@ -164,7 +164,7 @@ discard block |
||
164 | 164 | */ |
165 | 165 | public function deleteItems( array $ids ) |
166 | 166 | { |
167 | - $this->deleteItemsBase( $ids, $this->getConfigPath() . 'delete' ); |
|
167 | + $this->deleteItemsBase( $ids, $this->getConfigPath().'delete' ); |
|
168 | 168 | } |
169 | 169 | |
170 | 170 | |
@@ -236,7 +236,7 @@ discard block |
||
236 | 236 | { |
237 | 237 | $newpos = $pos; |
238 | 238 | |
239 | - $sql = $this->getSqlConfig( $cfgPath . 'move' ); |
|
239 | + $sql = $this->getSqlConfig( $cfgPath.'move' ); |
|
240 | 240 | |
241 | 241 | $stmt = $conn->create( $sql ); |
242 | 242 | $stmt->bind( 1, +1, \Aimeos\MW\DB\Statement\Base::PARAM_INT ); |
@@ -252,7 +252,7 @@ discard block |
||
252 | 252 | } |
253 | 253 | else |
254 | 254 | { |
255 | - $sql = $this->getSqlConfig( $cfgPath . 'getposmax' ); |
|
255 | + $sql = $this->getSqlConfig( $cfgPath.'getposmax' ); |
|
256 | 256 | |
257 | 257 | $stmt = $conn->create( $sql ); |
258 | 258 | |
@@ -270,7 +270,7 @@ discard block |
||
270 | 270 | } |
271 | 271 | } |
272 | 272 | |
273 | - $sql = $this->getSqlConfig( $cfgPath . 'updatepos' ); |
|
273 | + $sql = $this->getSqlConfig( $cfgPath.'updatepos' ); |
|
274 | 274 | |
275 | 275 | $stmt = $conn->create( $sql ); |
276 | 276 | $stmt->bind( 1, $newpos, \Aimeos\MW\DB\Statement\Base::PARAM_INT ); |
@@ -286,7 +286,7 @@ discard block |
||
286 | 286 | |
287 | 287 | if( $oldpos > 0 ) |
288 | 288 | { |
289 | - $sql = $this->getSqlConfig( $cfgPath . 'move' ); |
|
289 | + $sql = $this->getSqlConfig( $cfgPath.'move' ); |
|
290 | 290 | |
291 | 291 | $stmt = $conn->create( $sql ); |
292 | 292 | $stmt->bind( 1, -1, \Aimeos\MW\DB\Statement\Base::PARAM_INT ); |
@@ -336,8 +336,8 @@ discard block |
||
336 | 336 | } |
337 | 337 | |
338 | 338 | $level = \Aimeos\MShop\Locale\Manager\Base::SITE_ALL; |
339 | - $cfgPathSearch = $this->getConfigPath() . 'search'; |
|
340 | - $cfgPathCount = $this->getConfigPath() . 'count'; |
|
339 | + $cfgPathSearch = $this->getConfigPath().'search'; |
|
340 | + $cfgPathCount = $this->getConfigPath().'count'; |
|
341 | 341 | |
342 | 342 | $name = trim( $this->prefix, '.' ); |
343 | 343 | $required = array( $name ); |
@@ -346,12 +346,12 @@ discard block |
||
346 | 346 | |
347 | 347 | while( ( $row = $results->fetch() ) !== false ) |
348 | 348 | { |
349 | - if( ( $row[$this->prefix . 'config'] = json_decode( $row[$this->prefix . 'config'], true ) ) === null ) { |
|
350 | - $row[$this->prefix . 'config'] = []; |
|
349 | + if( ( $row[$this->prefix.'config'] = json_decode( $row[$this->prefix.'config'], true ) ) === null ) { |
|
350 | + $row[$this->prefix.'config'] = []; |
|
351 | 351 | } |
352 | 352 | |
353 | - $map[$row[$this->prefix . 'id']] = $row; |
|
354 | - $typeIds[$row[$this->prefix . 'typeid']] = null; |
|
353 | + $map[$row[$this->prefix.'id']] = $row; |
|
354 | + $typeIds[$row[$this->prefix.'typeid']] = null; |
|
355 | 355 | } |
356 | 356 | |
357 | 357 | $dbm->release( $conn, $dbname ); |
@@ -366,19 +366,19 @@ discard block |
||
366 | 366 | { |
367 | 367 | $typeManager = $this->getSubManager( 'type' ); |
368 | 368 | $typeSearch = $typeManager->createSearch(); |
369 | - $typeSearch->setConditions( $typeSearch->compare( '==', $name . '.type.id', array_keys( $typeIds ) ) ); |
|
369 | + $typeSearch->setConditions( $typeSearch->compare( '==', $name.'.type.id', array_keys( $typeIds ) ) ); |
|
370 | 370 | $typeSearch->setSlice( 0, $search->getSliceSize() ); |
371 | 371 | $typeItems = $typeManager->searchItems( $typeSearch ); |
372 | 372 | |
373 | 373 | foreach( $map as $id => $row ) |
374 | 374 | { |
375 | - if( isset( $typeItems[$row[$this->prefix . 'typeid']] ) ) |
|
375 | + if( isset( $typeItems[$row[$this->prefix.'typeid']] ) ) |
|
376 | 376 | { |
377 | - $row[$this->prefix . 'type'] = $typeItems[$row[$this->prefix . 'typeid']]->getCode(); |
|
378 | - $row[$this->prefix . 'typename'] = $typeItems[$row[$this->prefix . 'typeid']]->getName(); |
|
377 | + $row[$this->prefix.'type'] = $typeItems[$row[$this->prefix.'typeid']]->getCode(); |
|
378 | + $row[$this->prefix.'typename'] = $typeItems[$row[$this->prefix.'typeid']]->getName(); |
|
379 | 379 | } |
380 | 380 | |
381 | - $items[$row[$this->prefix . 'id']] = $this->createItemBase( $row ); |
|
381 | + $items[$row[$this->prefix.'id']] = $this->createItemBase( $row ); |
|
382 | 382 | } |
383 | 383 | } |
384 | 384 | |
@@ -417,8 +417,8 @@ discard block |
||
417 | 417 | } |
418 | 418 | |
419 | 419 | $level = \Aimeos\MShop\Locale\Manager\Base::SITE_ALL; |
420 | - $cfgPathSearch = $this->getConfigPath() . 'search'; |
|
421 | - $cfgPathCount = $this->getConfigPath() . 'count'; |
|
420 | + $cfgPathSearch = $this->getConfigPath().'search'; |
|
421 | + $cfgPathCount = $this->getConfigPath().'count'; |
|
422 | 422 | |
423 | 423 | $name = trim( $this->prefix, '.' ); |
424 | 424 | $required = array( $name ); |
@@ -426,7 +426,7 @@ discard block |
||
426 | 426 | $results = $this->searchItemsBase( $conn, $search, $cfgPathSearch, $cfgPathCount, $required, $total, $level ); |
427 | 427 | |
428 | 428 | while( ( $row = $results->fetch() ) !== false ) { |
429 | - $map[$row[$this->prefix . 'domain']][] = $row[$this->prefix . 'refid']; |
|
429 | + $map[$row[$this->prefix.'domain']][] = $row[$this->prefix.'refid']; |
|
430 | 430 | } |
431 | 431 | |
432 | 432 | $dbm->release( $conn, $dbname ); |
@@ -444,7 +444,7 @@ discard block |
||
444 | 444 | |
445 | 445 | $search = $manager->createSearch( true ); |
446 | 446 | $expr = array( |
447 | - $search->compare( '==', str_replace( '/', '.', $domain ) . '.id', $list ), |
|
447 | + $search->compare( '==', str_replace( '/', '.', $domain ).'.id', $list ), |
|
448 | 448 | $search->getConditions(), |
449 | 449 | ); |
450 | 450 | $search->setConditions( $search->combine( '&&', $expr ) ); |
@@ -476,13 +476,13 @@ discard block |
||
476 | 476 | $expr[] = $object->getConditions(); |
477 | 477 | |
478 | 478 | $exprTwo = []; |
479 | - $exprTwo[] = $object->compare( '<=', $prefix . '.datestart', $curDate ); |
|
480 | - $exprTwo[] = $object->compare( '==', $prefix . '.datestart', null ); |
|
479 | + $exprTwo[] = $object->compare( '<=', $prefix.'.datestart', $curDate ); |
|
480 | + $exprTwo[] = $object->compare( '==', $prefix.'.datestart', null ); |
|
481 | 481 | $expr[] = $object->combine( '||', $exprTwo ); |
482 | 482 | |
483 | 483 | $exprTwo = []; |
484 | - $exprTwo[] = $object->compare( '>=', $prefix . '.dateend', $curDate ); |
|
485 | - $exprTwo[] = $object->compare( '==', $prefix . '.dateend', null ); |
|
484 | + $exprTwo[] = $object->compare( '>=', $prefix.'.dateend', $curDate ); |
|
485 | + $exprTwo[] = $object->compare( '==', $prefix.'.dateend', null ); |
|
486 | 486 | $expr[] = $object->combine( '||', $exprTwo ); |
487 | 487 | |
488 | 488 | $object->setConditions( $object->combine( '&&', $expr ) ); |
@@ -503,7 +503,7 @@ discard block |
||
503 | 503 | */ |
504 | 504 | public function getSubManager( $manager, $name = null ) |
505 | 505 | { |
506 | - return $this->getSubManagerBase( 'common', 'lists/' . $manager, $name ); |
|
506 | + return $this->getSubManagerBase( 'common', 'lists/'.$manager, $name ); |
|
507 | 507 | } |
508 | 508 | |
509 | 509 |
@@ -290,7 +290,7 @@ discard block |
||
290 | 290 | |
291 | 291 | $taxrates[$taxrate]->addItem( $price ); |
292 | 292 | } |
293 | - catch( \Exception $e ) { ; } // if delivery service isn't available |
|
293 | + catch( \Exception $e ) {; } // if delivery service isn't available |
|
294 | 294 | |
295 | 295 | try |
296 | 296 | { |
@@ -303,7 +303,7 @@ discard block |
||
303 | 303 | |
304 | 304 | $taxrates[$taxrate]->addItem( $price ); |
305 | 305 | } |
306 | - catch( \Exception $e ) { ; } // if payment service isn't available |
|
306 | + catch( \Exception $e ) {; } // if payment service isn't available |
|
307 | 307 | |
308 | 308 | return $taxrates; |
309 | 309 | } |
@@ -233,8 +233,7 @@ discard block |
||
233 | 233 | { |
234 | 234 | $value = $price->getValue() + $price->getCosts(); |
235 | 235 | $rebate -= $value; |
236 | - } |
|
237 | - else |
|
236 | + } else |
|
238 | 237 | { |
239 | 238 | $value = $rebate; |
240 | 239 | $rebate = '0.00'; |
@@ -290,7 +289,9 @@ discard block |
||
290 | 289 | |
291 | 290 | $taxrates[$taxrate]->addItem( $price ); |
292 | 291 | } |
293 | - catch( \Exception $e ) { ; } // if delivery service isn't available |
|
292 | + catch( \Exception $e ) |
|
293 | + { |
|
294 | +; } // if delivery service isn't available |
|
294 | 295 | |
295 | 296 | try |
296 | 297 | { |
@@ -303,7 +304,9 @@ discard block |
||
303 | 304 | |
304 | 305 | $taxrates[$taxrate]->addItem( $price ); |
305 | 306 | } |
306 | - catch( \Exception $e ) { ; } // if payment service isn't available |
|
307 | + catch( \Exception $e ) |
|
308 | + { |
|
309 | +; } // if payment service isn't available |
|
307 | 310 | |
308 | 311 | return $taxrates; |
309 | 312 | } |
@@ -50,8 +50,7 @@ |
||
50 | 50 | if( isset( $config['fixedrebate.rebate'][$currency] ) ) { |
51 | 51 | $rebate = $config['fixedrebate.rebate'][$currency]; |
52 | 52 | } |
53 | - } |
|
54 | - else |
|
53 | + } else |
|
55 | 54 | { |
56 | 55 | $rebate = $config['fixedrebate.rebate']; |
57 | 56 | } |
@@ -78,8 +78,7 @@ |
||
78 | 78 | { |
79 | 79 | $couponProvider = $couponManager->getProvider( $couponItem, $code ); |
80 | 80 | $couponProvider->updateCoupon( $order ); |
81 | - } |
|
82 | - else |
|
81 | + } else |
|
83 | 82 | { |
84 | 83 | $notAvailable[$code] = 'coupon.gone'; |
85 | 84 | } |