@@ -830,7 +830,7 @@ |
||
| 830 | 830 | |
| 831 | 831 | try { |
| 832 | 832 | $stmt->execute()->finish(); |
| 833 | - } catch( \Aimeos\Base\DB\Exception $e ) { ; } // Ignore duplicates |
|
| 833 | + } catch( \Aimeos\Base\DB\Exception $e ) {; } // Ignore duplicates |
|
| 834 | 834 | } |
| 835 | 835 | |
| 836 | 836 | |
@@ -828,9 +828,13 @@ |
||
| 828 | 828 | $stmt->bind( 6, $date ); //mtime |
| 829 | 829 | $stmt->bind( 7, $siteid ); |
| 830 | 830 | |
| 831 | - try { |
|
| 831 | + try |
|
| 832 | + { |
|
| 832 | 833 | $stmt->execute()->finish(); |
| 833 | - } catch( \Aimeos\Base\DB\Exception $e ) { ; } // Ignore duplicates |
|
| 834 | + } |
|
| 835 | + catch( \Aimeos\Base\DB\Exception $e ) |
|
| 836 | + { |
|
| 837 | +; } // Ignore duplicates |
|
| 834 | 838 | } |
| 835 | 839 | |
| 836 | 840 | |
@@ -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 | } |
@@ -175,8 +174,7 @@ discard block |
||
| 175 | 174 | $newMedia->image->cropThumbnailImage( (int) $width, (int) $height ); |
| 176 | 175 | // see https://www.php.net/manual/en/imagick.cropthumbnailimage.php#106710 |
| 177 | 176 | $newMedia->image->setImagePage( 0, 0, 0, 0 ); |
| 178 | - } |
|
| 179 | - elseif( $fit === 1 && $width && $height ) |
|
| 177 | + } elseif( $fit === 1 && $width && $height ) |
|
| 180 | 178 | { |
| 181 | 179 | error_log( __METHOD__ . ': padding' ); |
| 182 | 180 | $this->resize( $newMedia, $width, $height ); |
@@ -185,8 +183,7 @@ discard block |
||
| 185 | 183 | $h = ( $height - $newMedia->image->getImageHeight() ) / 2; |
| 186 | 184 | |
| 187 | 185 | $newMedia->image->extentImage( $width, $height, (int) -$w, (int) -$h ); |
| 188 | - } |
|
| 189 | - else |
|
| 186 | + } else |
|
| 190 | 187 | { |
| 191 | 188 | error_log( __METHOD__ . ': ratio' ); |
| 192 | 189 | $this->resize( $newMedia, $width, $height ); |
@@ -290,8 +287,7 @@ discard block |
||
| 290 | 287 | $wmimage = clone self::$wmimg; |
| 291 | 288 | $wmimage->resizeImage( $ww, $wh, \Imagick::FILTER_CUBIC, 0.8 ); |
| 292 | 289 | self::$wmimages[$ww . 'x' . $wh] = $wmimage; |
| 293 | - } |
|
| 294 | - else |
|
| 290 | + } else |
|
| 295 | 291 | { |
| 296 | 292 | $wmimage = self::$wmimages[$ww . 'x' . $wh]; |
| 297 | 293 | } |