@@ -137,8 +137,7 @@ |
||
137 | 137 | foreach( $cond->getExpressions() as $expr ) { |
138 | 138 | $list = array_merge( $list, $this->getProductCodes( $expr ) ); |
139 | 139 | } |
140 | - } |
|
141 | - elseif( $cond instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface ) |
|
140 | + } elseif( $cond instanceof \Aimeos\MW\Criteria\Expression\Compare\Iface ) |
|
142 | 141 | { |
143 | 142 | if( $cond->getName() === 'stock.productcode' && $cond->getOperator() === '==' ) { |
144 | 143 | $list = array_merge( $list, (array) $cond->getValue() ); |
@@ -73,7 +73,7 @@ |
||
73 | 73 | |
74 | 74 | foreach( $testdata['subscription'] as $key => $dataset ) |
75 | 75 | { |
76 | - $ordProdItem = $this->getOrderProductItem( $dataset['ordprodid'] ) ; |
|
76 | + $ordProdItem = $this->getOrderProductItem( $dataset['ordprodid'] ); |
|
77 | 77 | |
78 | 78 | $item = $subscriptionManager->createItem(); |
79 | 79 | $item->setOrderBaseId( $ordProdItem->getBaseId() ); |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | |
75 | 75 | foreach( $addresses as $id => $addr ) |
76 | 76 | { |
77 | - $addrId = ( count( $addresses ) > 1) ? $item->getCode() . '-' . $id : $item->getCode(); |
|
77 | + $addrId = ( count( $addresses ) > 1 ) ? $item->getCode() . '-' . $id : $item->getCode(); |
|
78 | 78 | |
79 | 79 | $this->feConfig['supplier.code']['default'][$addrId] = preg_replace( "/\n+/m", "\n", sprintf( |
80 | 80 | /// Supplier address format with label (%1$s), company (%2$s), |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | /// address part one (%3$s, e.g street), address part two (%4$s, e.g house number), address part three (%5$s, e.g additional information), |
113 | 113 | /// postal/zip code (%6$s), city (%7$s), state (%8$s), country ID (%9$s), |
114 | 114 | /// e-mail (%10$s), phone (%11$s), facsimile/telefax (%12$s), web site (%13$s) |
115 | - $context->getI18n()->dt( 'mshop', '%1$s, %2$s, %3$s %4$s, %6$s %7$s'), |
|
115 | + $context->getI18n()->dt( 'mshop', '%1$s, %2$s, %3$s %4$s, %6$s %7$s' ), |
|
116 | 116 | $item->getLabel(), |
117 | 117 | $addr->getCompany(), |
118 | 118 | $addr->getAddress1(), |
@@ -192,7 +192,7 @@ discard block |
||
192 | 192 | $attributes['supplier.address'] = $this->feConfig['supplier.code']['short'][$code]; |
193 | 193 | |
194 | 194 | // remove code attribute for summary page / customer email |
195 | - if( $this->getConfigValue('supplier.display-code') == 0 ) { |
|
195 | + if( $this->getConfigValue( 'supplier.display-code' ) == 0 ) { |
|
196 | 196 | unset( $attributes['supplier.code'] ); |
197 | 197 | } |
198 | 198 | } |
@@ -172,7 +172,9 @@ |
||
172 | 172 | $feconfig['supplier.code']['default'] = [$value => $address] + $feconfig['supplier.code']['default']; |
173 | 173 | } |
174 | 174 | } |
175 | - catch( \Aimeos\MShop\Service\Exception $e ) {} // If service isn't available |
|
175 | + catch( \Aimeos\MShop\Service\Exception $e ) |
|
176 | + { |
|
177 | +} // If service isn't available |
|
176 | 178 | |
177 | 179 | return array_merge( $this->getProvider()->getConfigFE( $basket ), $this->getConfigItems( $feconfig ) ); |
178 | 180 | } |
@@ -139,7 +139,7 @@ |
||
139 | 139 | $stmt->bind( 6, $item->getFirstname() ); |
140 | 140 | $stmt->bind( 7, $item->getLastname() ); |
141 | 141 | $stmt->bind( 8, $item->getAddress1() ); |
142 | - $stmt->bind( 9, $item->getAddress2()); |
|
142 | + $stmt->bind( 9, $item->getAddress2() ); |
|
143 | 143 | $stmt->bind( 10, $item->getAddress3() ); |
144 | 144 | $stmt->bind( 11, $item->getPostal() ); |
145 | 145 | $stmt->bind( 12, $item->getCity() ); |
@@ -713,7 +713,7 @@ |
||
713 | 713 | |
714 | 714 | try { |
715 | 715 | $stmt->execute()->finish(); |
716 | - } catch( \Aimeos\MW\DB\Exception $e ) { ; } // Ignore duplicates |
|
716 | + } catch( \Aimeos\MW\DB\Exception $e ) {; } // Ignore duplicates |
|
717 | 717 | } |
718 | 718 | } |
719 | 719 | } |
@@ -670,9 +670,13 @@ |
||
670 | 670 | $stmt->bind( 6, $date ); // mtime |
671 | 671 | $stmt->bind( 7, $siteid, \Aimeos\MW\DB\Statement\Base::PARAM_INT ); |
672 | 672 | |
673 | - try { |
|
673 | + try |
|
674 | + { |
|
674 | 675 | $stmt->execute()->finish(); |
675 | - } catch( \Aimeos\MW\DB\Exception $e ) { ; } // Ignore duplicates |
|
676 | + } |
|
677 | + catch( \Aimeos\MW\DB\Exception $e ) |
|
678 | + { |
|
679 | +; } // Ignore duplicates |
|
676 | 680 | } |
677 | 681 | } |
678 | 682 | } |
@@ -521,7 +521,7 @@ |
||
521 | 521 | |
522 | 522 | try { |
523 | 523 | $stmt->execute()->finish(); |
524 | - } catch( \Aimeos\MW\DB\Exception $e ) { ; } // Ignore duplicates |
|
524 | + } catch( \Aimeos\MW\DB\Exception $e ) {; } // Ignore duplicates |
|
525 | 525 | } |
526 | 526 | } |
527 | 527 |
@@ -472,9 +472,13 @@ |
||
472 | 472 | $stmt->bind( 5, $date ); //mtime |
473 | 473 | $stmt->bind( 6, $siteid, \Aimeos\MW\DB\Statement\Base::PARAM_INT ); |
474 | 474 | |
475 | - try { |
|
475 | + try |
|
476 | + { |
|
476 | 477 | $stmt->execute()->finish(); |
477 | - } catch( \Aimeos\MW\DB\Exception $e ) { ; } // Ignore duplicates |
|
478 | + } |
|
479 | + catch( \Aimeos\MW\DB\Exception $e ) |
|
480 | + { |
|
481 | +; } // Ignore duplicates |
|
478 | 482 | } |
479 | 483 | } |
480 | 484 |
@@ -234,7 +234,7 @@ |
||
234 | 234 | foreach( $cols as $idx => $col ) |
235 | 235 | { |
236 | 236 | $list[] = 'MIN(' . $col . ') AS "s' . $idx . '"'; |
237 | - $aliases[ $names[$idx] ] = '"s' . $idx . '"'; |
|
237 | + $aliases[$names[$idx]] = '"s' . $idx . '"'; |
|
238 | 238 | } |
239 | 239 | |
240 | 240 | $keys[] = 'orderby'; |
@@ -922,7 +922,7 @@ |
||
922 | 922 | |
923 | 923 | try { |
924 | 924 | $stmt->execute()->finish(); |
925 | - } catch( \Aimeos\MW\DB\Exception $e ) { ; } // Ignore duplicates |
|
925 | + } catch( \Aimeos\MW\DB\Exception $e ) {; } // Ignore duplicates |
|
926 | 926 | } |
927 | 927 | |
928 | 928 |
@@ -745,9 +745,13 @@ |
||
745 | 745 | $stmt->bind( 6, $date ); //mtime |
746 | 746 | $stmt->bind( 7, $siteid, \Aimeos\MW\DB\Statement\Base::PARAM_INT ); |
747 | 747 | |
748 | - try { |
|
748 | + try |
|
749 | + { |
|
749 | 750 | $stmt->execute()->finish(); |
750 | - } catch( \Aimeos\MW\DB\Exception $e ) { ; } // Ignore duplicates |
|
751 | + } |
|
752 | + catch( \Aimeos\MW\DB\Exception $e ) |
|
753 | + { |
|
754 | +; } // Ignore duplicates |
|
751 | 755 | } |
752 | 756 | |
753 | 757 |
@@ -13,15 +13,15 @@ discard block |
||
13 | 13 | error_reporting( -1 ); |
14 | 14 | ini_set( 'display_errors', '1' ); |
15 | 15 | |
16 | -date_default_timezone_set('UTC'); |
|
16 | +date_default_timezone_set( 'UTC' ); |
|
17 | 17 | |
18 | 18 | /* |
19 | 19 | * Set locale settings to reasonable defaults |
20 | 20 | */ |
21 | -setlocale(LC_ALL, 'en_US.UTF-8'); |
|
22 | -setlocale(LC_NUMERIC, 'POSIX'); |
|
23 | -setlocale(LC_CTYPE, 'en_US.UTF-8'); |
|
24 | -setlocale(LC_TIME, 'POSIX'); |
|
21 | +setlocale( LC_ALL, 'en_US.UTF-8' ); |
|
22 | +setlocale( LC_NUMERIC, 'POSIX' ); |
|
23 | +setlocale( LC_CTYPE, 'en_US.UTF-8' ); |
|
24 | +setlocale( LC_TIME, 'POSIX' ); |
|
25 | 25 | |
26 | 26 | |
27 | 27 | /* |
@@ -30,9 +30,9 @@ discard block |
||
30 | 30 | |
31 | 31 | require_once dirname( dirname( dirname( __DIR__ ) ) ) . '/vendor/autoload.php'; |
32 | 32 | |
33 | -$testdir = __DIR__; |
|
34 | -$srcdir = dirname( $testdir ) . DIRECTORY_SEPARATOR . 'src'; |
|
35 | -$libdir = dirname( $testdir ) . DIRECTORY_SEPARATOR . 'lib'; |
|
33 | +$testdir = __DIR__; |
|
34 | +$srcdir = dirname( $testdir ) . DIRECTORY_SEPARATOR . 'src'; |
|
35 | +$libdir = dirname( $testdir ) . DIRECTORY_SEPARATOR . 'lib'; |
|
36 | 36 | |
37 | 37 | $path = array( $testdir, $srcdir, $libdir, get_include_path() ); |
38 | 38 | set_include_path( implode( PATH_SEPARATOR, $path ) ); |