@@ -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 |
@@ -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 |
@@ -158,8 +158,7 @@ |
||
| 158 | 158 | { |
| 159 | 159 | $path = 'mshop/customer/manager/address/insert'; |
| 160 | 160 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ) ); |
| 161 | - } |
|
| 162 | - else |
|
| 161 | + } else |
|
| 163 | 162 | { |
| 164 | 163 | $path = 'mshop/customer/manager/address/update'; |
| 165 | 164 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ), false ); |
@@ -161,8 +161,7 @@ |
||
| 161 | 161 | $search->compare( '==', $domain . '.lists.domain', $key ), |
| 162 | 162 | $search->compare( '==', $domain . '.lists.type', $type ), |
| 163 | 163 | ] ); |
| 164 | - } |
|
| 165 | - else |
|
| 164 | + } else |
|
| 166 | 165 | { |
| 167 | 166 | $type = !strncmp( $type, $domain . '/', $len + 1 ) ? [$type, substr( $type, $len + 1 )] : $type; // remove prefix |
| 168 | 167 | $list[] = $search->compare( '==', $domain . '.lists.domain', $type ); |
@@ -635,5 +635,5 @@ |
||
| 635 | 635 | * @see mshop/attribute/manager/newid/ansi |
| 636 | 636 | * @see mshop/attribute/manager/delete/ansi |
| 637 | 637 | * @see mshop/attribute/manager/search/ansi |
| 638 | - */ |
|
| 638 | + */ |
|
| 639 | 639 | } |
@@ -583,7 +583,7 @@ |
||
| 583 | 583 | { |
| 584 | 584 | $stock = new \Aimeos\MShop\Stock\Item\Standard( 'stock.', [] ); |
| 585 | 585 | $stocks = [123 => ( clone $stock )->setType( 'something' ), 456 => ( clone $stock )->setType( 'default' )]; |
| 586 | - $object = new \Aimeos\MShop\Product\Item\Standard( 'product.', ['.stock' => $stocks] ); |
|
| 586 | + $object = new \Aimeos\MShop\Product\Item\Standard( 'product.', ['.stock' => $stocks] ); |
|
| 587 | 587 | |
| 588 | 588 | $this->assertInstanceOf( \Aimeos\Map::class, $object->getStockItems( 'default' ) ); |
| 589 | 589 | $this->assertEquals( 'default', $object->getStockItems( 'default' )->getType()->first() ); |