@@ -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 ); |
@@ -95,8 +95,7 @@ |
||
| 95 | 95 | if( !in_array( $package->name, $filter ) ) { |
| 96 | 96 | $packageContainer[$package->file][] = $package; |
| 97 | 97 | } |
| 98 | - } |
|
| 99 | - else |
|
| 98 | + } else |
|
| 100 | 99 | { |
| 101 | 100 | $packageContainer[$package->file] = [$package]; |
| 102 | 101 | } |
@@ -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 | { |
@@ -116,8 +116,7 @@ discard block |
||
| 116 | 116 | foreach( $columns as $name ) { |
| 117 | 117 | $names .= '"' . $name . '", '; $values .= '?, '; |
| 118 | 118 | } |
| 119 | - } |
|
| 120 | - else |
|
| 119 | + } else |
|
| 121 | 120 | { |
| 122 | 121 | foreach( $columns as $name ) { |
| 123 | 122 | $names .= '"' . $name . '" = ?, '; |
@@ -264,8 +263,7 @@ discard block |
||
| 264 | 263 | { |
| 265 | 264 | $parts = array_slice( explode( '.', $attrcode ), 0, -1 ); |
| 266 | 265 | $str = 'm' . substr( array_shift( $parts ) ?: $this->getDomain(), 0, 3 ); |
| 267 | - } |
|
| 268 | - else |
|
| 266 | + } else |
|
| 269 | 267 | { |
| 270 | 268 | $parts = explode( '/', $this->getSubPath() ); |
| 271 | 269 | $str = 'm' . substr( $this->getDomain(), 0, 3 ); |
@@ -1045,8 +1043,7 @@ discard block |
||
| 1045 | 1043 | */ |
| 1046 | 1044 | $path = $this->getConfigKey( 'insert' ); |
| 1047 | 1045 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ) ); |
| 1048 | - } |
|
| 1049 | - else |
|
| 1046 | + } else |
|
| 1050 | 1047 | { |
| 1051 | 1048 | /** mshop/common/manager/update/mysql |
| 1052 | 1049 | * Updates an existing record in the database |
@@ -237,27 +237,27 @@ discard block |
||
| 237 | 237 | */ |
| 238 | 238 | |
| 239 | 239 | /** mshop/group/manager/submanagers |
| 240 | - * List of manager names that can be instantiated by the group manager |
|
| 241 | - * |
|
| 242 | - * Managers provide a generic interface to the underlying storage. |
|
| 243 | - * Each manager has or can have sub-managers caring about particular |
|
| 244 | - * aspects. Each of these sub-managers can be instantiated by its |
|
| 245 | - * parent manager using the getSubManager() method. |
|
| 246 | - * |
|
| 247 | - * The search keys from sub-managers can be normally used in the |
|
| 248 | - * manager as well. It allows you to search for items of the manager |
|
| 249 | - * using the search keys of the sub-managers to further limit the |
|
| 250 | - * retrieved list of items. |
|
| 251 | - * |
|
| 252 | - * @param array List of sub-manager names |
|
| 253 | - * @since 2024.04 |
|
| 254 | - */ |
|
| 240 | + * List of manager names that can be instantiated by the group manager |
|
| 241 | + * |
|
| 242 | + * Managers provide a generic interface to the underlying storage. |
|
| 243 | + * Each manager has or can have sub-managers caring about particular |
|
| 244 | + * aspects. Each of these sub-managers can be instantiated by its |
|
| 245 | + * parent manager using the getSubManager() method. |
|
| 246 | + * |
|
| 247 | + * The search keys from sub-managers can be normally used in the |
|
| 248 | + * manager as well. It allows you to search for items of the manager |
|
| 249 | + * using the search keys of the sub-managers to further limit the |
|
| 250 | + * retrieved list of items. |
|
| 251 | + * |
|
| 252 | + * @param array List of sub-manager names |
|
| 253 | + * @since 2024.04 |
|
| 254 | + */ |
|
| 255 | 255 | |
| 256 | 256 | /** mshop/group/manager/insert/mysql |
| 257 | - * Inserts a new group record into the database table |
|
| 258 | - * |
|
| 259 | - * @see mshop/group/manager/insert/ansi |
|
| 260 | - */ |
|
| 257 | + * Inserts a new group record into the database table |
|
| 258 | + * |
|
| 259 | + * @see mshop/group/manager/insert/ansi |
|
| 260 | + */ |
|
| 261 | 261 | |
| 262 | 262 | /** mshop/group/manager/insert/ansi |
| 263 | 263 | * Inserts a new group record into the database table |
@@ -289,10 +289,10 @@ discard block |
||
| 289 | 289 | */ |
| 290 | 290 | |
| 291 | 291 | /** mshop/group/manager/update/mysql |
| 292 | - * Updates an existing group record in the database |
|
| 293 | - * |
|
| 294 | - * @see mshop/group/manager/update/ansi |
|
| 295 | - */ |
|
| 292 | + * Updates an existing group record in the database |
|
| 293 | + * |
|
| 294 | + * @see mshop/group/manager/update/ansi |
|
| 295 | + */ |
|
| 296 | 296 | |
| 297 | 297 | /** mshop/group/manager/update/ansi |
| 298 | 298 | * Updates an existing group record in the database |
@@ -366,9 +366,12 @@ |
||
| 366 | 366 | |
| 367 | 367 | $results = $this->searchItemsBase( $conn, $filter, $cfgPathSearch, $cfgPathCount, $required, $total, $level ); |
| 368 | 368 | |
| 369 | - try { |
|
| 369 | + try |
|
| 370 | + { |
|
| 370 | 371 | return $this->fetch( $results, $ref, $this->prefix(), $attrs ); |
| 371 | - } catch( \Exception $e ) { |
|
| 372 | + } |
|
| 373 | + catch( \Exception $e ) |
|
| 374 | + { |
|
| 372 | 375 | $results->finish(); throw $e; |
| 373 | 376 | } |
| 374 | 377 | } |
@@ -364,9 +364,13 @@ |
||
| 364 | 364 | |
| 365 | 365 | if( empty( $item->getInvoiceNumber() ) && $item->getStatusPayment() >= \Aimeos\MShop\Order\Item\Base::PAY_PENDING ) |
| 366 | 366 | { |
| 367 | - try { |
|
| 367 | + try |
|
| 368 | + { |
|
| 368 | 369 | $item->setInvoiceNumber( $this->createInvoiceNumber( $item ) ); |
| 369 | - } catch( \Exception $e ) { // redo on transaction deadlock |
|
| 370 | + } |
|
| 371 | + catch( \Exception $e ) |
|
| 372 | + { |
|
| 373 | +// redo on transaction deadlock |
|
| 370 | 374 | $item->setInvoiceNumber( $this->createInvoiceNumber( $item ) ); |
| 371 | 375 | } |
| 372 | 376 | } |
@@ -265,8 +265,7 @@ |
||
| 265 | 265 | */ |
| 266 | 266 | $path = 'mshop/locale/manager/currency/insert'; |
| 267 | 267 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ) ); |
| 268 | - } |
|
| 269 | - else |
|
| 268 | + } else |
|
| 270 | 269 | { |
| 271 | 270 | /** mshop/locale/manager/currency/update/mysql |
| 272 | 271 | * Updates an existing currency record in the database |
@@ -24,7 +24,7 @@ |
||
| 24 | 24 | private array $searchConfig = [ |
| 25 | 25 | 'locale.language.id' => [ |
| 26 | 26 | 'label' => 'Language ID', |
| 27 | - 'internaldeps' => [ 'LEFT JOIN "mshop_locale_language" AS mlocla ON (mloc."langid" = mlocla."id")' ], |
|
| 27 | + 'internaldeps' => ['LEFT JOIN "mshop_locale_language" AS mlocla ON (mloc."langid" = mlocla."id")'], |
|
| 28 | 28 | 'internalcode' => 'mlocla."id"', |
| 29 | 29 | 'public' => false, |
| 30 | 30 | ], |
@@ -264,8 +264,7 @@ |
||
| 264 | 264 | */ |
| 265 | 265 | $path = 'mshop/locale/manager/language/insert'; |
| 266 | 266 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ) ); |
| 267 | - } |
|
| 268 | - else |
|
| 267 | + } else |
|
| 269 | 268 | { |
| 270 | 269 | /** mshop/locale/manager/language/update/mysql |
| 271 | 270 | * Updates an existing language record in the database |