@@ -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 |
@@ -188,7 +188,7 @@ |
||
| 188 | 188 | */ |
| 189 | 189 | public function getSubManager( string $manager, string $name = null ) : \Aimeos\MShop\Common\Manager\Iface |
| 190 | 190 | { |
| 191 | - return $this->getSubManagerBase( $this->getDomain(), trim( $this->getSubPath() . '/' . $manager, '/'), $name ); |
|
| 191 | + return $this->getSubManagerBase( $this->getDomain(), trim( $this->getSubPath() . '/' . $manager, '/' ), $name ); |
|
| 192 | 192 | } |
| 193 | 193 | |
| 194 | 194 | |
@@ -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 | } |
@@ -319,7 +319,7 @@ |
||
| 319 | 319 | 'order.product.id' => [ |
| 320 | 320 | 'code' => 'order.product.id', |
| 321 | 321 | 'internalcode' => 'id', |
| 322 | - 'internaldeps' => [ 'LEFT JOIN "mshop_order_product" AS mordpr ON ( mord."id" = mordpr."parentid" )' ], |
|
| 322 | + 'internaldeps' => ['LEFT JOIN "mshop_order_product" AS mordpr ON ( mord."id" = mordpr."parentid" )'], |
|
| 323 | 323 | 'label' => 'Order product ID', |
| 324 | 324 | 'type' => 'int', |
| 325 | 325 | 'public' => false, |