@@ -226,8 +226,7 @@ |
||
226 | 226 | |
227 | 227 | $params[] = implode( ',', $list ); |
228 | 228 | } |
229 | - } |
|
230 | - else |
|
229 | + } else |
|
231 | 230 | { |
232 | 231 | $params[] = $this->escape( '==', $this->getParamType( $string ), $string ); |
233 | 232 | } |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | */ |
35 | 35 | public function updateListItems( \Aimeos\MShop\Common\Item\ListRef\Iface $item, array $map, $domain, $type ) |
36 | 36 | { |
37 | - $listManager = $this->getSubManager( 'lists' ); |
|
37 | + $listManager = $this->getSubManager( 'lists' ); |
|
38 | 38 | |
39 | 39 | if( !isset( $this->typeIds[$domain][$type] ) ) |
40 | 40 | { |
@@ -153,8 +153,8 @@ discard block |
||
153 | 153 | $search = $manager->createSearch( true ); |
154 | 154 | |
155 | 155 | $expr = array( |
156 | - $search->compare( '==', $prefix . '.lists.parentid', $ids ), |
|
157 | - $search->compare( '==', $prefix . '.lists.domain', $domains ), |
|
156 | + $search->compare( '==', $prefix.'.lists.parentid', $ids ), |
|
157 | + $search->compare( '==', $prefix.'.lists.domain', $domains ), |
|
158 | 158 | $search->getConditions(), |
159 | 159 | ); |
160 | 160 | |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | |
185 | 185 | $search = $manager->createSearch( true ); |
186 | 186 | $expr = array( |
187 | - $search->compare( '==', str_replace( '/', '.', $domain ) . '.id', array_keys( $list ) ), |
|
187 | + $search->compare( '==', str_replace( '/', '.', $domain ).'.id', array_keys( $list ) ), |
|
188 | 188 | $search->getConditions(), |
189 | 189 | ); |
190 | 190 | $search->setConditions( $search->combine( '&&', $expr ) ); |
@@ -103,10 +103,14 @@ |
||
103 | 103 | $type->setLabel( $dataset['label'] ); |
104 | 104 | $type->setStatus( $dataset['status'] ); |
105 | 105 | |
106 | - try { |
|
106 | + try |
|
107 | + { |
|
107 | 108 | $domainManager->saveItem( $type ); |
108 | 109 | $num++; |
109 | - } catch( \Exception $e ) {; } // if type was already available |
|
110 | + } |
|
111 | + catch( \Exception $e ) |
|
112 | + { |
|
113 | +; } // if type was already available |
|
110 | 114 | } |
111 | 115 | |
112 | 116 | $this->status( $num > 0 ? $num . '/' . $total : 'OK' ); |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | $this->msg( sprintf( 'Adding default code data for site "%1$s"', $site ), 0 ); $this->status( '' ); |
62 | 62 | |
63 | 63 | $ds = DIRECTORY_SEPARATOR; |
64 | - $path = __DIR__ . $ds . 'default' . $ds . 'data' . $ds . 'code.php'; |
|
64 | + $path = __DIR__.$ds.'default'.$ds.'data'.$ds.'code.php'; |
|
65 | 65 | |
66 | 66 | if( ( $data = include( $path ) ) == false ) { |
67 | 67 | throw new \Aimeos\MShop\Exception( sprintf( 'No file "%1$s" found for default codes', $path ) ); |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | } catch( \Exception $e ) {; } // if type was already available |
94 | 94 | } |
95 | 95 | |
96 | - $this->status( $num > 0 ? $num . '/' . $total : 'OK' ); |
|
96 | + $this->status( $num > 0 ? $num.'/'.$total : 'OK' ); |
|
97 | 97 | } |
98 | 98 | } |
99 | 99 | } |
100 | 100 | \ No newline at end of file |
@@ -413,7 +413,7 @@ |
||
413 | 413 | * @param array $what List of rules for the unit tests. |
414 | 414 | * @param string $error Error message if some of the tests fails. |
415 | 415 | * @param string $success Success message if all tests were passed. |
416 | - */ |
|
416 | + */ |
|
417 | 417 | public function addRule( array $what, $error, $success ) |
418 | 418 | { |
419 | 419 | $this->rules['set'] = $what; |
@@ -413,7 +413,7 @@ |
||
413 | 413 | * @param array $what List of rules for the unit tests. |
414 | 414 | * @param string $error Error message if some of the tests fails. |
415 | 415 | * @param string $success Success message if all tests were passed. |
416 | - */ |
|
416 | + */ |
|
417 | 417 | public function addRule( array $what, $error, $success ) |
418 | 418 | { |
419 | 419 | $this->rules['set'] = $what; |
@@ -76,7 +76,7 @@ |
||
76 | 76 | { |
77 | 77 | if( $code == $this->getCode() ) { return $this; } |
78 | 78 | |
79 | - $this->values['locale.site.code'] = (string) $this->checkCode( $code );; |
|
79 | + $this->values['locale.site.code'] = (string) $this->checkCode( $code ); ; |
|
80 | 80 | $this->setModified(); |
81 | 81 | |
82 | 82 | return $this; |
@@ -127,7 +127,7 @@ |
||
127 | 127 | { |
128 | 128 | if( $code == $this->getCode() ) { return; } |
129 | 129 | |
130 | - $this->values['order.base.coupon.code'] = (string) $this->checkCode( $code );; |
|
130 | + $this->values['order.base.coupon.code'] = (string) $this->checkCode( $code ); ; |
|
131 | 131 | $this->setModified(); |
132 | 132 | |
133 | 133 | return $this; |
@@ -191,7 +191,7 @@ |
||
191 | 191 | { |
192 | 192 | if( $code == $this->getCode() ) { return $this; } |
193 | 193 | |
194 | - $this->values['order.base.service.attribute.code'] = (string) $this->checkCode( $code );; |
|
194 | + $this->values['order.base.service.attribute.code'] = (string) $this->checkCode( $code ); ; |
|
195 | 195 | $this->setModified(); |
196 | 196 | |
197 | 197 | return $this; |
@@ -145,7 +145,7 @@ |
||
145 | 145 | { |
146 | 146 | if( $code == $this->getCode() ) { return $this; } |
147 | 147 | |
148 | - $this->values['order.base.service.code'] = (string) $this->checkCode( $code );; |
|
148 | + $this->values['order.base.service.code'] = (string) $this->checkCode( $code ); ; |
|
149 | 149 | $this->setModified(); |
150 | 150 | |
151 | 151 | return $this; |
@@ -64,7 +64,7 @@ |
||
64 | 64 | { |
65 | 65 | if( $code == $this->getCode() ) { return $this; } |
66 | 66 | |
67 | - $this->values['service.code'] = (string) $this->checkCode( $code );; |
|
67 | + $this->values['service.code'] = (string) $this->checkCode( $code ); ; |
|
68 | 68 | $this->setModified(); |
69 | 69 | |
70 | 70 | return $this; |