@@ -108,9 +108,12 @@ |
||
108 | 108 | */ |
109 | 109 | public function scan( string $path = null ) : iterable |
110 | 110 | { |
111 | - try { |
|
111 | + try |
|
112 | + { |
|
112 | 113 | return new \DirectoryIterator( $this->resolve( (string) $path ) ); |
113 | - } catch( \Exception $e ) { |
|
114 | + } |
|
115 | + catch( \Exception $e ) |
|
116 | + { |
|
114 | 117 | throw new Exception( $e->getMessage(), 0, $e ); |
115 | 118 | } |
116 | 119 | } |
@@ -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,15 +173,13 @@ 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 | $w = ( $width - $newMedia->image->getImageWidth() ) / 2; |
181 | 179 | $h = ( $height - $newMedia->image->getImageHeight() ) / 2; |
182 | 180 | |
183 | 181 | $newMedia->image->extentImage( $width, $height, (int) -$w, (int) -$h ); |
184 | - } |
|
185 | - else |
|
182 | + } else |
|
186 | 183 | { |
187 | 184 | $w = $this->image->getImageWidth(); |
188 | 185 | $h = $this->image->getImageHeight(); |
@@ -267,8 +264,7 @@ discard block |
||
267 | 264 | $wmimage = clone self::$wmimg; |
268 | 265 | $wmimage->resizeImage( $ww, $wh, \Imagick::FILTER_CUBIC, 0.8 ); |
269 | 266 | self::$wmimages[$ww . 'x' . $wh] = $wmimage; |
270 | - } |
|
271 | - else |
|
267 | + } else |
|
272 | 268 | { |
273 | 269 | $wmimage = self::$wmimages[$ww . 'x' . $wh]; |
274 | 270 | } |
@@ -169,7 +169,7 @@ |
||
169 | 169 | |
170 | 170 | try { |
171 | 171 | $localeManager->save( $item ); |
172 | - } catch( \Aimeos\MW\DB\Exception $e ) { ; } // if locale combination was already available |
|
172 | + } catch( \Aimeos\MW\DB\Exception $e ) {; } // if locale combination was already available |
|
173 | 173 | } |
174 | 174 | } |
175 | 175 | } |
@@ -52,9 +52,12 @@ discard block |
||
52 | 52 | $localeManager = \Aimeos\MShop\Locale\Manager\Factory::create( $this->context(), 'Standard' ); |
53 | 53 | $siteManager = $localeManager->getSubManager( 'site' ); |
54 | 54 | |
55 | - try { |
|
55 | + try |
|
56 | + { |
|
56 | 57 | $siteItem = $siteManager->insert( $siteManager->create()->setLabel( $code )->setCode( $code ) ); |
57 | - } catch( \Aimeos\MW\DB\Exception $e ) { |
|
58 | + } |
|
59 | + catch( \Aimeos\MW\DB\Exception $e ) |
|
60 | + { |
|
58 | 61 | $siteItem = $siteManager->find( $code ); |
59 | 62 | } |
60 | 63 | |
@@ -69,7 +72,9 @@ discard block |
||
69 | 72 | |
70 | 73 | $localeManager->save( $localeItem, false ); |
71 | 74 | } |
72 | - catch( \Aimeos\MW\DB\Exception $e ) {} // already in the database |
|
75 | + catch( \Aimeos\MW\DB\Exception $e ) |
|
76 | + { |
|
77 | +} // already in the database |
|
73 | 78 | } |
74 | 79 | |
75 | 80 | |
@@ -91,9 +96,12 @@ discard block |
||
91 | 96 | |
92 | 97 | foreach( $data as $key => $dataset ) |
93 | 98 | { |
94 | - try { |
|
99 | + try |
|
100 | + { |
|
95 | 101 | $item = $manager->insert( $manager->create()->fromArray( $dataset ), $parentId ); |
96 | - } catch( \Aimeos\MW\DB\Exception $e ) { |
|
102 | + } |
|
103 | + catch( \Aimeos\MW\DB\Exception $e ) |
|
104 | + { |
|
97 | 105 | $item = $manager->find( $key ); |
98 | 106 | } |
99 | 107 | |
@@ -162,9 +170,13 @@ discard block |
||
162 | 170 | ->set( 'site_id', $siteIds[$dataset['site']]['id'] ) |
163 | 171 | ->setSiteId( $siteIds[$dataset['site']]['site'] ); |
164 | 172 | |
165 | - try { |
|
173 | + try |
|
174 | + { |
|
166 | 175 | $localeManager->save( $item ); |
167 | - } catch( \Aimeos\MW\DB\Exception $e ) { ; } // if locale combination was already available |
|
176 | + } |
|
177 | + catch( \Aimeos\MW\DB\Exception $e ) |
|
178 | + { |
|
179 | +; } // if locale combination was already available |
|
168 | 180 | } |
169 | 181 | } |
170 | 182 | } |