@@ -80,8 +80,7 @@ |
||
80 | 80 | { |
81 | 81 | $this->execute( $list['update'] ); |
82 | 82 | $this->status( 'migrated' ); |
83 | - } |
|
84 | - else |
|
83 | + } else |
|
85 | 84 | { |
86 | 85 | $this->status( 'OK' ); |
87 | 86 | } |
@@ -67,8 +67,7 @@ |
||
67 | 67 | { |
68 | 68 | $this->executeList( $stmts ); |
69 | 69 | $this->status( 'renamed' ); |
70 | - } |
|
71 | - else |
|
70 | + } else |
|
72 | 71 | { |
73 | 72 | $this->status( 'OK' ); |
74 | 73 | } |
@@ -779,8 +779,7 @@ |
||
779 | 779 | { |
780 | 780 | $this->executeList( $stmtList ); |
781 | 781 | $this->status( 'added' ); |
782 | - } |
|
783 | - else |
|
782 | + } else |
|
784 | 783 | { |
785 | 784 | $this->status( 'OK' ); |
786 | 785 | } |
@@ -80,8 +80,7 @@ |
||
80 | 80 | { |
81 | 81 | $this->executeList( $stmts ); |
82 | 82 | $this->status( 'done' ); |
83 | - } |
|
84 | - else |
|
83 | + } else |
|
85 | 84 | { |
86 | 85 | $this->status( 'OK' ); |
87 | 86 | } |
@@ -94,8 +94,7 @@ |
||
94 | 94 | { |
95 | 95 | $this->executeList( $stmt ); |
96 | 96 | $this->status( 'added' ); |
97 | - } |
|
98 | - else |
|
97 | + } else |
|
99 | 98 | { |
100 | 99 | $this->status( 'OK' ); |
101 | 100 | } |
@@ -89,8 +89,7 @@ |
||
89 | 89 | } |
90 | 90 | |
91 | 91 | $this->status( 'added' ); |
92 | - } |
|
93 | - else |
|
92 | + } else |
|
94 | 93 | { |
95 | 94 | $this->status( 'removed' ); |
96 | 95 | } |
@@ -74,7 +74,7 @@ |
||
74 | 74 | if( $value === '1' ) |
75 | 75 | { |
76 | 76 | $ds = DIRECTORY_SEPARATOR; |
77 | - $path = __DIR__ . $ds . 'data' . $ds . 'demo-coupon.php'; |
|
77 | + $path = __DIR__.$ds.'data'.$ds.'demo-coupon.php'; |
|
78 | 78 | |
79 | 79 | if( ( $data = include( $path ) ) == false ) { |
80 | 80 | throw new \Aimeos\MShop\Exception( sprintf( 'No file "%1$s" found for coupon domain', $path ) ); |
@@ -75,8 +75,7 @@ |
||
75 | 75 | $this->saveCustomerItems( $data ); |
76 | 76 | |
77 | 77 | $this->status( 'added' ); |
78 | - } |
|
79 | - else |
|
78 | + } else |
|
80 | 79 | { |
81 | 80 | $this->status( 'removed' ); |
82 | 81 | } |
@@ -75,7 +75,7 @@ |
||
75 | 75 | if( $value === '1' ) |
76 | 76 | { |
77 | 77 | $ds = DIRECTORY_SEPARATOR; |
78 | - $path = __DIR__ . $ds . 'data' . $ds . 'demo-customer.php'; |
|
78 | + $path = __DIR__.$ds.'data'.$ds.'demo-customer.php'; |
|
79 | 79 | |
80 | 80 | if( ( $data = include( $path ) ) == false ) { |
81 | 81 | throw new \Aimeos\MShop\Exception( sprintf( 'No file "%1$s" found for customer domain', $path ) ); |
@@ -77,8 +77,7 @@ |
||
77 | 77 | { |
78 | 78 | $this->addDemoData(); |
79 | 79 | $this->status( 'added' ); |
80 | - } |
|
81 | - else |
|
80 | + } else |
|
82 | 81 | { |
83 | 82 | $this->status( 'removed' ); |
84 | 83 | } |
@@ -101,7 +101,7 @@ |
||
101 | 101 | protected function addDemoData() |
102 | 102 | { |
103 | 103 | $ds = DIRECTORY_SEPARATOR; |
104 | - $path = __DIR__ . $ds . 'data' . $ds . 'demo-product.php'; |
|
104 | + $path = __DIR__.$ds.'data'.$ds.'demo-product.php'; |
|
105 | 105 | |
106 | 106 | if( ( $data = include( $path ) ) == false ) { |
107 | 107 | throw new \Aimeos\MShop\Exception( sprintf( 'No file "%1$s" found for product domain', $path ) ); |
@@ -201,9 +201,12 @@ discard block |
||
201 | 201 | ); |
202 | 202 | $dbm = $context->getDatabaseManager(); |
203 | 203 | |
204 | - try { |
|
204 | + try |
|
205 | + { |
|
205 | 206 | $this->object = \Aimeos\MW\Cache\Factory::createManager( $name, $config, $dbm ); |
206 | - } catch( \Exception $e ) { |
|
207 | + } |
|
208 | + catch( \Exception $e ) |
|
209 | + { |
|
207 | 210 | $this->object = \Aimeos\MW\Cache\Factory::createManager( 'DB', $config, $dbm ); |
208 | 211 | } |
209 | 212 | } |
@@ -265,9 +268,12 @@ discard block |
||
265 | 268 | */ |
266 | 269 | public function createItem() |
267 | 270 | { |
268 | - try { |
|
271 | + try |
|
272 | + { |
|
269 | 273 | $values = array( 'siteid' => $this->getContext()->getLocale()->getSiteId() ); |
270 | - } catch( \Exception $e ) { |
|
274 | + } |
|
275 | + catch( \Exception $e ) |
|
276 | + { |
|
271 | 277 | $values = array( 'siteid' => null ); |
272 | 278 | } |
273 | 279 |