@@ -296,8 +296,7 @@ |
||
| 296 | 296 | } ); |
| 297 | 297 | |
| 298 | 298 | $service->setId( null )->setAttributeItems( $attrItems->setId( null ) ); |
| 299 | - } |
|
| 300 | - else |
|
| 299 | + } else |
|
| 301 | 300 | { |
| 302 | 301 | unset( $map[$type][$key] ); |
| 303 | 302 | } |
@@ -15,7 +15,7 @@ |
||
| 15 | 15 | { |
| 16 | 16 | $this->info( 'Creating test schema', 'vv' ); |
| 17 | 17 | |
| 18 | - $this->db( 'db-test' )->table( 'mshop_test', function( \Aimeos\Upscheme\Schema\Table $table ) { |
|
| 18 | + $this->db( 'db-test' )->table( 'mshop_test', function( \Aimeos\Upscheme\Schema\Table $table ) { |
|
| 19 | 19 | |
| 20 | 20 | $table->engine = 'InnoDB'; |
| 21 | 21 | |
@@ -55,9 +55,12 @@ |
||
| 55 | 55 | |
| 56 | 56 | foreach( $testdata['group'] as $entry ) |
| 57 | 57 | { |
| 58 | - try { |
|
| 58 | + try |
|
| 59 | + { |
|
| 59 | 60 | $manager->save( $manager->find( $entry['group.code'] )->fromArray( $entry ) ); |
| 60 | - } catch( \Exception $e ) { |
|
| 61 | + } |
|
| 62 | + catch( \Exception $e ) |
|
| 63 | + { |
|
| 61 | 64 | $manager->save( $manager->create()->fromArray( $entry ), false ); |
| 62 | 65 | } |
| 63 | 66 | } |
@@ -344,7 +344,8 @@ |
||
| 344 | 344 | { |
| 345 | 345 | $stockManager->decrease( [$item->getProductId() => -1 * $how * $item->getQuantity()], $item->getStockType() ); |
| 346 | 346 | |
| 347 | - switch( $item->getType() ) { |
|
| 347 | + switch( $item->getType() ) |
|
| 348 | + { |
|
| 348 | 349 | case 'default': |
| 349 | 350 | $this->updateStockBundle( $item->getParentProductId(), $item->getStockType() ); break; |
| 350 | 351 | case 'select': |
@@ -137,8 +137,7 @@ |
||
| 137 | 137 | $msg = $this->context()->translate( 'mshop', 'Unable to open file "%1$s"' ); |
| 138 | 138 | throw new \RuntimeException( sprintf( $msg, $file ) ); |
| 139 | 139 | } |
| 140 | - } |
|
| 141 | - else |
|
| 140 | + } else |
|
| 142 | 141 | { |
| 143 | 142 | $fh = $this->context()->fs( $fsname )->reads( $file ); |
| 144 | 143 | } |
@@ -56,9 +56,9 @@ |
||
| 56 | 56 | if( $this->call( 'filterPreviews', $image, $maxwidth, $maxheight, $force ) ) |
| 57 | 57 | { |
| 58 | 58 | $file = match( $force ) { |
| 59 | - 0 => (clone $image)->scaleDown( $maxwidth, $maxheight ), |
|
| 60 | - 1 => (clone $image)->pad( $maxwidth, $maxheight, $bg, 'center' ), |
|
| 61 | - 2 => (clone $image)->cover( $maxwidth, $maxheight ) |
|
| 59 | + 0 => ( clone $image )->scaleDown( $maxwidth, $maxheight ), |
|
| 60 | + 1 => ( clone $image )->pad( $maxwidth, $maxheight, $bg, 'center' ), |
|
| 61 | + 2 => ( clone $image )->cover( $maxwidth, $maxheight ) |
|
| 62 | 62 | }; |
| 63 | 63 | |
| 64 | 64 | $list[$file->width()] = $file; |
@@ -128,7 +128,7 @@ |
||
| 128 | 128 | $this->removeRefItems( map( $item ), $domains ); |
| 129 | 129 | $manager->save( $item ); |
| 130 | 130 | } |
| 131 | - catch( \Exception $e ) { ; } // If no root node was already inserted into the database |
|
| 131 | + catch( \Exception $e ) {; } // If no root node was already inserted into the database |
|
| 132 | 132 | |
| 133 | 133 | $filter = $manager->filter() |
| 134 | 134 | ->add( 'catalog.code', '=~', 'demo-' ) |
@@ -77,9 +77,12 @@ discard block |
||
| 77 | 77 | $context = $this->context(); |
| 78 | 78 | $manager = \Aimeos\MShop::create( $context, 'catalog' ); |
| 79 | 79 | |
| 80 | - try { |
|
| 80 | + try |
|
| 81 | + { |
|
| 81 | 82 | $item = $manager->getTree( null, ['media', 'text'], \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE ); |
| 82 | - } catch( \Exception $e ) { |
|
| 83 | + } |
|
| 84 | + catch( \Exception $e ) |
|
| 85 | + { |
|
| 83 | 86 | $item = $manager->insert( $manager->create()->fromArray( $data ) ); |
| 84 | 87 | } |
| 85 | 88 | |
@@ -128,7 +131,9 @@ discard block |
||
| 128 | 131 | $this->removeRefItems( map( $item ), $domains ); |
| 129 | 132 | $manager->save( $item ); |
| 130 | 133 | } |
| 131 | - catch( \Exception $e ) { ; } // If no root node was already inserted into the database |
|
| 134 | + catch( \Exception $e ) |
|
| 135 | + { |
|
| 136 | +; } // If no root node was already inserted into the database |
|
| 132 | 137 | |
| 133 | 138 | $filter = $manager->filter() |
| 134 | 139 | ->add( 'catalog.code', '=~', 'demo-' ) |
@@ -87,7 +87,7 @@ |
||
| 87 | 87 | |
| 88 | 88 | try { |
| 89 | 89 | $refItem = $refManager->find( $refItem->getCode(), [], $item->getResourceType(), $refItem->getType() ); |
| 90 | - } catch( \Exception $e ) { ; } // if not found, use the new item |
|
| 90 | + } catch( \Exception $e ) {; } // if not found, use the new item |
|
| 91 | 91 | |
| 92 | 92 | $refItem = $this->addRefItems( $refItem, $data ); |
| 93 | 93 | $item->addListItem( 'attribute', $listItem, $refItem ); |
@@ -85,9 +85,13 @@ |
||
| 85 | 85 | $listItem = $manager->createListItem()->setPosition( $idx )->fromArray( $data ); |
| 86 | 86 | $refItem = $refManager->create()->fromArray( $data ); |
| 87 | 87 | |
| 88 | - try { |
|
| 88 | + try |
|
| 89 | + { |
|
| 89 | 90 | $refItem = $refManager->find( $refItem->getCode(), [], $item->getResourceType(), $refItem->getType() ); |
| 90 | - } catch( \Exception $e ) { ; } // if not found, use the new item |
|
| 91 | + } |
|
| 92 | + catch( \Exception $e ) |
|
| 93 | + { |
|
| 94 | +; } // if not found, use the new item |
|
| 91 | 95 | |
| 92 | 96 | $refItem = $this->addRefItems( $refItem, $data ); |
| 93 | 97 | $item->addListItem( 'attribute', $listItem, $refItem ); |
@@ -843,9 +843,12 @@ discard block |
||
| 843 | 843 | |
| 844 | 844 | foreach( $sitePath as $siteId ) |
| 845 | 845 | { |
| 846 | - try { |
|
| 846 | + try |
|
| 847 | + { |
|
| 847 | 848 | $path = $this->createTreeManager( $siteId )->getPath( $id ); |
| 848 | - } catch( \Exception $e ) { |
|
| 849 | + } |
|
| 850 | + catch( \Exception $e ) |
|
| 851 | + { |
|
| 849 | 852 | continue; |
| 850 | 853 | } |
| 851 | 854 | |
@@ -889,9 +892,12 @@ discard block |
||
| 889 | 892 | |
| 890 | 893 | foreach( $sitePath as $siteId ) |
| 891 | 894 | { |
| 892 | - try { |
|
| 895 | + try |
|
| 896 | + { |
|
| 893 | 897 | $node = $this->createTreeManager( $siteId )->getNode( $id, $level, $criteria ); |
| 894 | - } catch( \Aimeos\MW\Tree\Exception $e ) { |
|
| 898 | + } |
|
| 899 | + catch( \Aimeos\MW\Tree\Exception $e ) |
|
| 900 | + { |
|
| 895 | 901 | continue; |
| 896 | 902 | } |
| 897 | 903 | |
@@ -973,8 +979,7 @@ discard block |
||
| 973 | 979 | if( $child->getParentId() !== $item->getId() ) { |
| 974 | 980 | $this->move( $child->getId(), $item->getParentId(), $child->getParentId() ); |
| 975 | 981 | } |
| 976 | - } |
|
| 977 | - else |
|
| 982 | + } else |
|
| 978 | 983 | { |
| 979 | 984 | $this->insert( $child, $item->getId() ); |
| 980 | 985 | } |
@@ -1118,8 +1123,7 @@ discard block |
||
| 1118 | 1123 | * @see mshop/catalog/manager/insert-usage/ansi |
| 1119 | 1124 | */ |
| 1120 | 1125 | $path = 'mshop/catalog/manager/update-usage'; |
| 1121 | - } |
|
| 1122 | - else |
|
| 1126 | + } else |
|
| 1123 | 1127 | { |
| 1124 | 1128 | /** mshop/catalog/manager/insert-usage/mysql |
| 1125 | 1129 | * Updates the config, editor, ctime and mtime value of an inserted record |
@@ -1183,8 +1187,7 @@ discard block |
||
| 1183 | 1187 | { |
| 1184 | 1188 | $stmt->bind( $idx++, $siteid ); |
| 1185 | 1189 | $stmt->bind( $idx++, $id, \Aimeos\Base\DB\Statement\Base::PARAM_INT ); |
| 1186 | - } |
|
| 1187 | - else |
|
| 1190 | + } else |
|
| 1188 | 1191 | { |
| 1189 | 1192 | $stmt->bind( $idx++, $context->datetime() ); // ctime |
| 1190 | 1193 | $stmt->bind( $idx++, $siteid ); |
@@ -219,7 +219,7 @@ |
||
| 219 | 219 | |
| 220 | 220 | $keys = (array) $keys; |
| 221 | 221 | $acols = $cols = $expr = []; |
| 222 | - $search = (clone $search)->slice( $search->getOffset(), min( $search->getLimit(), $limit ) ); |
|
| 222 | + $search = ( clone $search )->slice( $search->getOffset(), min( $search->getLimit(), $limit ) ); |
|
| 223 | 223 | |
| 224 | 224 | foreach( $keys as $string ) |
| 225 | 225 | { |
@@ -124,8 +124,7 @@ discard block |
||
| 124 | 124 | foreach( $columns as $name ) { |
| 125 | 125 | $names .= '"' . $name . '", '; $values .= '?, '; |
| 126 | 126 | } |
| 127 | - } |
|
| 128 | - else |
|
| 127 | + } else |
|
| 129 | 128 | { |
| 130 | 129 | foreach( $columns as $name ) { |
| 131 | 130 | $names .= '"' . $name . '" = ?, '; |
@@ -284,8 +283,7 @@ discard block |
||
| 284 | 283 | { |
| 285 | 284 | $parts = array_slice( explode( '.', $attrcode ), 0, -1 ) ?: $this->type(); |
| 286 | 285 | $str = 'm' . substr( (string) array_shift( $parts ), 0, 3 ); |
| 287 | - } |
|
| 288 | - else |
|
| 286 | + } else |
|
| 289 | 287 | { |
| 290 | 288 | $parts = $this->type(); |
| 291 | 289 | $str = 'm' . substr( (string) array_shift( $parts ), 0, 3 ); |
@@ -980,8 +978,7 @@ discard block |
||
| 980 | 978 | */ |
| 981 | 979 | $path = $this->getConfigKey( 'insert', 'mshop/common/manager/insert' ); |
| 982 | 980 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ) ); |
| 983 | - } |
|
| 984 | - else |
|
| 981 | + } else |
|
| 985 | 982 | { |
| 986 | 983 | /** mshop/common/manager/update/mysql |
| 987 | 984 | * Updates an existing record in the database |