@@ -97,8 +97,7 @@ discard block |
||
| 97 | 97 | $files[] = $entry->getPathname(); |
| 98 | 98 | } |
| 99 | 99 | } |
| 100 | - } |
|
| 101 | - else |
|
| 100 | + } else |
|
| 102 | 101 | { |
| 103 | 102 | $files[] = $location; |
| 104 | 103 | } |
@@ -240,7 +239,9 @@ discard block |
||
| 240 | 239 | |
| 241 | 240 | return $currentid; |
| 242 | 241 | } |
| 243 | - catch( \Aimeos\MShop\Exception $e ) {} // not found, create new |
|
| 242 | + catch( \Aimeos\MShop\Exception $e ) |
|
| 243 | + { |
|
| 244 | +} // not found, create new |
|
| 244 | 245 | } |
| 245 | 246 | |
| 246 | 247 | $item = $this->process( $manager->create(), $node ); |
@@ -278,13 +279,11 @@ discard block |
||
| 278 | 279 | |
| 279 | 280 | $currentid = $this->importNode( $node, $domains, $parentid, $childMap ); |
| 280 | 281 | $total++; |
| 281 | - } |
|
| 282 | - elseif( $xml->nodeType === \XMLReader::ELEMENT && $xml->name === 'catalog' ) |
|
| 282 | + } elseif( $xml->nodeType === \XMLReader::ELEMENT && $xml->name === 'catalog' ) |
|
| 283 | 283 | { |
| 284 | 284 | $this->importTree( $xml, $domains, $currentid, $childMap ); |
| 285 | 285 | $childMap = []; |
| 286 | - } |
|
| 287 | - elseif( $xml->nodeType === \XMLReader::END_ELEMENT && $xml->name === 'catalog' ) |
|
| 286 | + } elseif( $xml->nodeType === \XMLReader::END_ELEMENT && $xml->name === 'catalog' ) |
|
| 288 | 287 | { |
| 289 | 288 | \Aimeos\MShop::create( $this->context(), 'catalog' )->delete( $map ); |
| 290 | 289 | break; |
@@ -81,8 +81,7 @@ |
||
| 81 | 81 | foreach( $manager->search( $search ) as $item ) { |
| 82 | 82 | $this->listTypes[$item->getCode()] = $item->getCode(); |
| 83 | 83 | } |
| 84 | - } |
|
| 85 | - else |
|
| 84 | + } else |
|
| 86 | 85 | { |
| 87 | 86 | $this->listTypes = array_flip( $this->listTypes ); |
| 88 | 87 | } |
@@ -118,9 +118,12 @@ |
||
| 118 | 118 | |
| 119 | 119 | foreach( $items as $item ) |
| 120 | 120 | { |
| 121 | - try { |
|
| 121 | + try |
|
| 122 | + { |
|
| 122 | 123 | $manager->save( $cntl->scale( $item, $force ) ); |
| 123 | - } catch( \Exception $e ) { |
|
| 124 | + } |
|
| 125 | + catch( \Exception $e ) |
|
| 126 | + { |
|
| 124 | 127 | $msg = sprintf( 'Scaling media item "%1$s" failed: %2$s', $item->getId(), $e->getMessage() ); |
| 125 | 128 | $logger->error( $msg, 'media/scale' ); |
| 126 | 129 | } |