@@ -706,7 +706,7 @@ |
||
706 | 706 | |
707 | 707 | try { |
708 | 708 | $stmt->execute()->finish(); |
709 | - } catch( \Aimeos\Base\DB\Exception $e ) { ; } // Ignore duplicates |
|
709 | + } catch( \Aimeos\Base\DB\Exception $e ) {; } // Ignore duplicates |
|
710 | 710 | } |
711 | 711 | } |
712 | 712 | } |
@@ -704,9 +704,13 @@ |
||
704 | 704 | $stmt->bind( 4, $date ); // mtime |
705 | 705 | $stmt->bind( 5, $siteid ); |
706 | 706 | |
707 | - try { |
|
707 | + try |
|
708 | + { |
|
708 | 709 | $stmt->execute()->finish(); |
709 | - } catch( \Aimeos\Base\DB\Exception $e ) { ; } // Ignore duplicates |
|
710 | + } |
|
711 | + catch( \Aimeos\Base\DB\Exception $e ) |
|
712 | + { |
|
713 | +; } // Ignore duplicates |
|
710 | 714 | } |
711 | 715 | } |
712 | 716 | } |
@@ -140,8 +140,7 @@ |
||
140 | 140 | foreach( $cond->getExpressions() as $expr ) { |
141 | 141 | $list = array_merge( $list, $this->getProductIds( $expr ) ); |
142 | 142 | } |
143 | - } |
|
144 | - elseif( $cond instanceof \Aimeos\Base\Criteria\Expression\Compare\Iface ) |
|
143 | + } elseif( $cond instanceof \Aimeos\Base\Criteria\Expression\Compare\Iface ) |
|
145 | 144 | { |
146 | 145 | if( $cond->getName() === 'stock.productid' && $cond->getOperator() === '==' ) { |
147 | 146 | $list = array_merge( $list, (array) $cond->getValue() ); |
@@ -50,8 +50,7 @@ discard block |
||
50 | 50 | { |
51 | 51 | $this->image->setImageAlphaChannel( \Imagick::ALPHACHANNEL_ACTIVATE ); |
52 | 52 | $this->image->setImageBackgroundColor( $options['image']['background'] ?? 'transparent' ); |
53 | - } |
|
54 | - else |
|
53 | + } else |
|
55 | 54 | { |
56 | 55 | $this->image->setImageBackgroundColor( $options['image']['background'] ?? '#ffffff' ); |
57 | 56 | } |
@@ -174,8 +173,7 @@ discard block |
||
174 | 173 | $newMedia->image->cropThumbnailImage( (int) $width, (int) $height ); |
175 | 174 | // see https://www.php.net/manual/en/imagick.cropthumbnailimage.php#106710 |
176 | 175 | $newMedia->image->setImagePage( 0, 0, 0, 0 ); |
177 | - } |
|
178 | - elseif( $fit === 1 && $width && $height ) |
|
176 | + } elseif( $fit === 1 && $width && $height ) |
|
179 | 177 | { |
180 | 178 | $this->resize( $newMedia, $width, $height ); |
181 | 179 | |
@@ -183,8 +181,7 @@ discard block |
||
183 | 181 | $h = ( $height - $newMedia->image->getImageHeight() ) / 2; |
184 | 182 | |
185 | 183 | $newMedia->image->extentImage( $width, $height, (int) -$w, (int) -$h ); |
186 | - } |
|
187 | - else |
|
184 | + } else |
|
188 | 185 | { |
189 | 186 | $this->resize( $newMedia, $width, $height ); |
190 | 187 | } |
@@ -287,8 +284,7 @@ discard block |
||
287 | 284 | $wmimage = clone self::$wmimg; |
288 | 285 | $wmimage->resizeImage( $ww, $wh, \Imagick::FILTER_CUBIC, 0.8 ); |
289 | 286 | self::$wmimages[$ww . 'x' . $wh] = $wmimage; |
290 | - } |
|
291 | - else |
|
287 | + } else |
|
292 | 288 | { |
293 | 289 | $wmimage = self::$wmimages[$ww . 'x' . $wh]; |
294 | 290 | } |
@@ -159,9 +159,12 @@ discard block |
||
159 | 159 | */ |
160 | 160 | public function create( array $values = [] ) : \Aimeos\MShop\Common\Item\Iface |
161 | 161 | { |
162 | - try { |
|
162 | + try |
|
163 | + { |
|
163 | 164 | $values['log.siteid'] = $this->context()->locale()->getSiteId(); |
164 | - } catch( \Exception $e ) { |
|
165 | + } |
|
166 | + catch( \Exception $e ) |
|
167 | + { |
|
165 | 168 | $values['log.siteid'] = null; |
166 | 169 | } |
167 | 170 | |
@@ -185,9 +188,12 @@ discard block |
||
185 | 188 | $context = $this->context(); |
186 | 189 | $conn = $context->db( $this->getResourceName() ); |
187 | 190 | |
188 | - try { |
|
191 | + try |
|
192 | + { |
|
189 | 193 | $siteid = $context->locale()->getSiteId(); |
190 | - } catch( \Exception $e ) { |
|
194 | + } |
|
195 | + catch( \Exception $e ) |
|
196 | + { |
|
191 | 197 | $siteid = ''; |
192 | 198 | } |
193 | 199 | |
@@ -233,8 +239,7 @@ discard block |
||
233 | 239 | */ |
234 | 240 | $path = 'madmin/log/manager/insert'; |
235 | 241 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ) ); |
236 | - } |
|
237 | - else |
|
242 | + } else |
|
238 | 243 | { |
239 | 244 | /** madmin/log/manager/update/mysql |
240 | 245 | * Updates an existing log record in the database |
@@ -153,8 +153,8 @@ |
||
153 | 153 | { |
154 | 154 | $map = []; |
155 | 155 | |
156 | - $conn = $this->context()->db( 'db-locale' ); |
|
157 | - $tconn = $this->context()->db( 'db-locale', true ); |
|
156 | + $conn = $this->context()->db( 'db-locale' ); |
|
157 | + $tconn = $this->context()->db( 'db-locale', true ); |
|
158 | 158 | |
159 | 159 | $type = \Aimeos\Base\DB\Statement\Base::PARAM_INT; |
160 | 160 | $roots = $conn->create( 'SELECT id, nleft, nright FROM mshop_locale_site WHERE level = 0' )->execute(); |
@@ -39,9 +39,12 @@ |
||
39 | 39 | { |
40 | 40 | $db->for( 'mysql', 'CREATE FULLTEXT INDEX `idx_msindte_content` ON `mshop_index_text` (`content`)' ); |
41 | 41 | |
42 | - try { |
|
42 | + try |
|
43 | + { |
|
43 | 44 | $db->for( 'postgresql', 'CREATE INDEX "idx_msindte_content" ON "mshop_index_text" USING GIN (to_tsvector(\'english\', "content"))' ); |
44 | - } catch( \Exception $e ) { |
|
45 | + } |
|
46 | + catch( \Exception $e ) |
|
47 | + { |
|
45 | 48 | // Doctrine DBAL bug: https://github.com/doctrine/dbal/issues/5351 |
46 | 49 | } |
47 | 50 | } |