@@ -65,8 +65,7 @@ |
||
65 | 65 | { |
66 | 66 | $item = $propMap[$value][$type]; |
67 | 67 | $items->remove( $item->getId() ); |
68 | - } |
|
69 | - else |
|
68 | + } else |
|
70 | 69 | { |
71 | 70 | $item = $manager->create()->setType( $type ); |
72 | 71 | } |
@@ -162,8 +162,7 @@ |
||
162 | 162 | $listItem = $listMap[$url][$type][$listtype]; |
163 | 163 | $refItem = $listItem->getRefItem(); |
164 | 164 | unset( $listItems[$listItem->getId()] ); |
165 | - } |
|
166 | - else |
|
165 | + } else |
|
167 | 166 | { |
168 | 167 | $listItem = $manager->createListItem()->setType( $listtype ); |
169 | 168 | $refItem = $refManager->create()->setType( $type ); |
@@ -139,8 +139,7 @@ |
||
139 | 139 | $listItem = $listMap[$content][$type][$listtype]; |
140 | 140 | $refItem = $listItem->getRefItem(); |
141 | 141 | unset( $listItems[$listItem->getId()] ); |
142 | - } |
|
143 | - else |
|
142 | + } else |
|
144 | 143 | { |
145 | 144 | $listItem = $manager->createListItem()->setType( $listtype ); |
146 | 145 | $refItem = $refManager->create()->setType( $type ); |
@@ -592,8 +592,7 @@ |
||
592 | 592 | { |
593 | 593 | $manager->move( $item->getId(), $item->getParentId(), $parentid ); |
594 | 594 | $item = $manager->save( $item ); |
595 | - } |
|
596 | - else |
|
595 | + } else |
|
597 | 596 | { |
598 | 597 | $item = $manager->insert( $item, $parentid ); |
599 | 598 | } |
@@ -155,7 +155,7 @@ |
||
155 | 155 | } |
156 | 156 | } |
157 | 157 | } |
158 | - catch( \Exception $e ) { ; } // no price available |
|
158 | + catch( \Exception $e ) {; } // no price available |
|
159 | 159 | } |
160 | 160 | |
161 | 161 | return $result; |
@@ -155,7 +155,9 @@ |
||
155 | 155 | } |
156 | 156 | } |
157 | 157 | } |
158 | - catch( \Exception $e ) { ; } // no price available |
|
158 | + catch( \Exception $e ) |
|
159 | + { |
|
160 | +; } // no price available |
|
159 | 161 | } |
160 | 162 | |
161 | 163 | return $result; |
@@ -270,8 +270,7 @@ |
||
270 | 270 | $subList = self::createControllers( $it, $context, $aimeos, $pref ); |
271 | 271 | |
272 | 272 | $list = array_merge( $list, $subList ); |
273 | - } |
|
274 | - else if( $prefix !== '' && $entry->getType() === 'file' |
|
273 | + } else if( $prefix !== '' && $entry->getType() === 'file' |
|
275 | 274 | && !in_array( $entry->getBaseName( '.php' ), ['Base'] ) ) |
276 | 275 | { |
277 | 276 | $list[$prefix] = self::create( $context, $aimeos, $prefix ); |
@@ -227,9 +227,12 @@ |
||
227 | 227 | |
228 | 228 | foreach( $items as $item ) |
229 | 229 | { |
230 | - try { |
|
230 | + try |
|
231 | + { |
|
231 | 232 | $manager->save( $manager->scale( $item, $force ) ); |
232 | - } catch( \Exception $e ) { |
|
233 | + } |
|
234 | + catch( \Exception $e ) |
|
235 | + { |
|
233 | 236 | $msg = sprintf( 'Scaling media item "%1$s" failed: %2$s', $item->getId(), $e->getMessage() ); |
234 | 237 | $logger->error( $msg, 'media/scale' ); |
235 | 238 | } |
@@ -63,7 +63,7 @@ |
||
63 | 63 | |
64 | 64 | $this->object->run(); |
65 | 65 | |
66 | - $expected = dirname( __DIR__, 4) . '/tmp/logs/aimeos_' . date( 'Y-m-d' ) . '.log'; |
|
66 | + $expected = dirname( __DIR__, 4 ) . '/tmp/logs/aimeos_' . date( 'Y-m-d' ) . '.log'; |
|
67 | 67 | $this->assertFileExists( $expected ); |
68 | 68 | |
69 | 69 | unlink( $expected ); |
@@ -327,7 +327,9 @@ discard block |
||
327 | 327 | |
328 | 328 | return $currentid; |
329 | 329 | } |
330 | - catch( \Aimeos\MShop\Exception $e ) {} // not found, create new |
|
330 | + catch( \Aimeos\MShop\Exception $e ) |
|
331 | + { |
|
332 | +} // not found, create new |
|
331 | 333 | } |
332 | 334 | |
333 | 335 | $item = $this->process( $manager->create(), $node ); |
@@ -365,13 +367,11 @@ discard block |
||
365 | 367 | |
366 | 368 | $currentid = $this->importNode( $node, $domains, $parentid, $childMap ); |
367 | 369 | $total++; |
368 | - } |
|
369 | - elseif( $xml->nodeType === \XMLReader::ELEMENT && $xml->name === 'catalog' ) |
|
370 | + } elseif( $xml->nodeType === \XMLReader::ELEMENT && $xml->name === 'catalog' ) |
|
370 | 371 | { |
371 | 372 | $this->importTree( $xml, $domains, $currentid, $childMap ); |
372 | 373 | $childMap = []; |
373 | - } |
|
374 | - elseif( $xml->nodeType === \XMLReader::END_ELEMENT && $xml->name === 'catalog' ) |
|
374 | + } elseif( $xml->nodeType === \XMLReader::END_ELEMENT && $xml->name === 'catalog' ) |
|
375 | 375 | { |
376 | 376 | \Aimeos\MShop::create( $this->context(), 'catalog' )->delete( $map ); |
377 | 377 | break; |