| @@ -46,21 +46,18 @@ | ||
| 46 | 46 |  				{ | 
| 47 | 47 | $options[$name] = (array) $options[$name]; | 
| 48 | 48 | $options[$name][] = substr( $option, $pos + 1 ); | 
| 49 | - } | |
| 50 | - else | |
| 49 | + } else | |
| 51 | 50 |  				{ | 
| 52 | 51 | $options[$name] = substr( $option, $pos + 1 ); | 
| 53 | 52 | } | 
| 54 | 53 | |
| 55 | 54 | unset( $params[$key] ); | 
| 56 | - } | |
| 57 | - else | |
| 55 | + } else | |
| 58 | 56 |  			{ | 
| 59 | 57 | printf( "Invalid option \"%1\$s\"\n", $option ); | 
| 60 | 58 | usage(); | 
| 61 | 59 | } | 
| 62 | - } | |
| 63 | - elseif( $option[0] === '-' ) | |
| 60 | + } elseif( $option[0] === '-' ) | |
| 64 | 61 |  		{ | 
| 65 | 62 | $options[$option[1]] = substr( $option, 1 ); | 
| 66 | 63 | unset( $params[$key] ); | 
| @@ -173,9 +173,13 @@ | ||
| 173 | 173 | |
| 174 | 174 | foreach( $testdata[$domain] as $entry ) | 
| 175 | 175 |  				{ | 
| 176 | -					try { | |
| 176 | + try | |
| 177 | +					{ | |
| 177 | 178 | $manager->save( $manager->create()->fromArray( $entry ), false ); | 
| 178 | -					} catch( \Exception $e ) {} // Duplicate entry | |
| 179 | + } | |
| 180 | + catch( \Exception $e ) | |
| 181 | +					{ | |
| 182 | +} // Duplicate entry | |
| 179 | 183 | } | 
| 180 | 184 | } | 
| 181 | 185 | } | 
| @@ -138,9 +138,12 @@ | ||
| 138 | 138 |  		{ | 
| 139 | 139 | foreach( $data['customer/group'] as $entry ) | 
| 140 | 140 |  			{ | 
| 141 | -				try { | |
| 141 | + try | |
| 142 | +				{ | |
| 142 | 143 | $groupManager->save( $groupManager->find( $entry['customer.group.code'] )->fromArray( $entry ) ); | 
| 143 | -				} catch( \Exception $e ) { | |
| 144 | + } | |
| 145 | + catch( \Exception $e ) | |
| 146 | +				{ | |
| 144 | 147 | $groupManager->save( $groupManager->create()->fromArray( $entry ), false ); | 
| 145 | 148 | } | 
| 146 | 149 | } | 
| @@ -50,7 +50,7 @@ | ||
| 50 | 50 | $item = $item->setId( null )->fromArray( $dataset ); | 
| 51 | 51 | $manager->save( $item ); | 
| 52 | 52 | } | 
| 53 | -			catch( \Exception $e ) { ; } // if attribute was already available | |
| 53 | +			catch( \Exception $e ) {; } // if attribute was already available | |
| 54 | 54 | } | 
| 55 | 55 | } | 
| 56 | 56 | } | 
| @@ -50,7 +50,9 @@ | ||
| 50 | 50 | $item = $item->setId( null )->fromArray( $dataset ); | 
| 51 | 51 | $manager->save( $item ); | 
| 52 | 52 | } | 
| 53 | -			catch( \Exception $e ) { ; } // if attribute was already available | |
| 53 | + catch( \Exception $e ) | |
| 54 | +			{ | |
| 55 | +; } // if attribute was already available | |
| 54 | 56 | } | 
| 55 | 57 | } | 
| 56 | 58 | } | 
| @@ -89,8 +89,7 @@ | ||
| 89 | 89 | |
| 90 | 90 | $attrManager->save( $item ); | 
| 91 | 91 | $id = $item->getId(); | 
| 92 | - } | |
| 93 | - else | |
| 92 | + } else | |
| 94 | 93 |  			{ | 
| 95 | 94 | $id = $attrItem->getId(); | 
| 96 | 95 | } | 
| @@ -165,7 +165,7 @@ | ||
| 165 | 165 | $manager = \Aimeos\MShop::create( $context, 'attribute' ); | 
| 166 | 166 | $refItem = $manager->find( $refItem->getCode(), [], $domain, $refItem->getType() ); | 
| 167 | 167 | } | 
| 168 | -				catch( \Exception $e ) { ; } // attribute doesn't exist yet | |
| 168 | +				catch( \Exception $e ) {; } // attribute doesn't exist yet | |
| 169 | 169 | |
| 170 | 170 | $refItem = $this->addRefItems( $refItem, $data ); | 
| 171 | 171 | $item->addListItem( 'attribute', $listItem, $refItem ); | 
| @@ -165,7 +165,9 @@ | ||
| 165 | 165 | $manager = \Aimeos\MShop::create( $context, 'attribute' ); | 
| 166 | 166 | $refItem = $manager->find( $refItem->getCode(), [], $domain, $refItem->getType() ); | 
| 167 | 167 | } | 
| 168 | -				catch( \Exception $e ) { ; } // attribute doesn't exist yet | |
| 168 | + catch( \Exception $e ) | |
| 169 | +				{ | |
| 170 | +; } // attribute doesn't exist yet | |
| 169 | 171 | |
| 170 | 172 | $refItem = $this->addRefItems( $refItem, $data ); | 
| 171 | 173 | $item->addListItem( 'attribute', $listItem, $refItem ); | 
| @@ -85,9 +85,13 @@ | ||
| 85 | 85 | $item->setPosition( $dataset['position'] ); | 
| 86 | 86 | } | 
| 87 | 87 | |
| 88 | -			try { | |
| 88 | + try | |
| 89 | +			{ | |
| 89 | 90 | $pluginManager->save( $item ); | 
| 90 | -			} catch( \Exception $e ) {; } // if plugin configuration was already available | |
| 91 | + } | |
| 92 | + catch( \Exception $e ) | |
| 93 | +			{ | |
| 94 | +; } // if plugin configuration was already available | |
| 91 | 95 | } | 
| 92 | 96 | } | 
| 93 | 97 | } | 
| @@ -26,7 +26,8 @@ discard block | ||
| 26 | 26 | |
| 27 | 27 | public function test() | 
| 28 | 28 |  	{ | 
| 29 | -		try { | |
| 29 | + try | |
| 30 | +		{ | |
| 30 | 31 | throw new \Aimeos\MShop\Plugin\Provider\Exception( 'msg', 13, null, $this->codes ); | 
| 31 | 32 | } | 
| 32 | 33 | catch( \Aimeos\MShop\Plugin\Provider\Exception $mppe ) | 
| @@ -36,7 +37,8 @@ discard block | ||
| 36 | 37 | $this->assertEquals( $this->codes, $mppe->getErrorCodes() ); | 
| 37 | 38 | } | 
| 38 | 39 | |
| 39 | -		try { | |
| 40 | + try | |
| 41 | +		{ | |
| 40 | 42 | throw new \Aimeos\MShop\Plugin\Provider\Exception( 'msg2', 11 ); | 
| 41 | 43 | } | 
| 42 | 44 | catch( \Aimeos\MShop\Plugin\Provider\Exception $e ) | 
| @@ -196,8 +196,7 @@ discard block | ||
| 196 | 196 | $ratio = ( $w < $h ? $width / $w : $height / $h ); | 
| 197 | 197 | $newHeight = (int) $h * $ratio; | 
| 198 | 198 | $newWidth = (int) $w * $ratio; | 
| 199 | - } | |
| 200 | - else | |
| 199 | + } else | |
| 201 | 200 |  		{ | 
| 202 | 201 | list( $newWidth, $newHeight ) = $this->getSizeFitted( $w, $h, $width, $height ); | 
| 203 | 202 | |
| @@ -261,8 +260,7 @@ discard block | ||
| 261 | 260 | |
| 262 | 261 | imagedestroy( $result ); | 
| 263 | 262 | $newMedia->image = $newImage; | 
| 264 | - } | |
| 265 | - else | |
| 263 | + } else | |
| 266 | 264 |  		{ | 
| 267 | 265 | $newMedia->image = $result; | 
| 268 | 266 | } |