@@ -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 | } |
@@ -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 | } |
@@ -307,8 +307,7 @@ |
||
| 307 | 307 | */ |
| 308 | 308 | $path = 'madmin/job/manager/insert'; |
| 309 | 309 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ) ); |
| 310 | - } |
|
| 311 | - else |
|
| 310 | + } else |
|
| 312 | 311 | { |
| 313 | 312 | /** madmin/job/manager/update/mysql |
| 314 | 313 | * Updates an existing job record in the database |
@@ -434,8 +434,7 @@ |
||
| 434 | 434 | */ |
| 435 | 435 | $path = 'mshop/subscription/manager/insert'; |
| 436 | 436 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ) ); |
| 437 | - } |
|
| 438 | - else |
|
| 437 | + } else |
|
| 439 | 438 | { |
| 440 | 439 | /** mshop/subscription/manager/update/mysql |
| 441 | 440 | * Updates an existing subscription record in the database |
@@ -451,8 +451,7 @@ |
||
| 451 | 451 | */ |
| 452 | 452 | $path = 'mshop/plugin/manager/insert'; |
| 453 | 453 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ) ); |
| 454 | - } |
|
| 455 | - else |
|
| 454 | + } else |
|
| 456 | 455 | { |
| 457 | 456 | /** mshop/plugin/manager/update/mysql |
| 458 | 457 | * Updates an existing plugin record in the database |
@@ -484,8 +484,7 @@ |
||
| 484 | 484 | */ |
| 485 | 485 | $path = 'mshop/rule/manager/insert'; |
| 486 | 486 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ) ); |
| 487 | - } |
|
| 488 | - else |
|
| 487 | + } else |
|
| 489 | 488 | { |
| 490 | 489 | /** mshop/rule/manager/update/mysql |
| 491 | 490 | * Updates an existing rule record in the database |
@@ -548,8 +548,7 @@ |
||
| 548 | 548 | */ |
| 549 | 549 | $path = 'mshop/price/manager/insert'; |
| 550 | 550 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ) ); |
| 551 | - } |
|
| 552 | - else |
|
| 551 | + } else |
|
| 553 | 552 | { |
| 554 | 553 | /** mshop/price/manager/update/mysql |
| 555 | 554 | * Updates an existing price record in the database |