@@ -10,16 +10,16 @@ |
||
10 | 10 | * Set error reporting to maximum |
11 | 11 | */ |
12 | 12 | error_reporting( -1 ); |
13 | -ini_set('display_errors', '1'); |
|
13 | +ini_set( 'display_errors', '1' ); |
|
14 | 14 | |
15 | 15 | |
16 | 16 | /* |
17 | 17 | * Set locale settings to reasonable defaults |
18 | 18 | */ |
19 | -setlocale(LC_ALL, 'en_US.UTF-8'); |
|
20 | -setlocale(LC_NUMERIC, 'POSIX'); |
|
21 | -setlocale(LC_CTYPE, 'en_US.UTF-8'); |
|
22 | -setlocale(LC_TIME, 'POSIX'); |
|
19 | +setlocale( LC_ALL, 'en_US.UTF-8' ); |
|
20 | +setlocale( LC_NUMERIC, 'POSIX' ); |
|
21 | +setlocale( LC_CTYPE, 'en_US.UTF-8' ); |
|
22 | +setlocale( LC_TIME, 'POSIX' ); |
|
23 | 23 | |
24 | 24 | |
25 | 25 | require_once 'TestHelper.php'; |
@@ -489,14 +489,14 @@ |
||
489 | 489 | |
490 | 490 | $results = $this->searchItemsBase( $conn, $search, $cfgPathSearch, $cfgPathCount, $required, $total, $level ); |
491 | 491 | while( ( $row = $results->fetch() ) !== false ) { |
492 | - $map[ $row['customer.id'] ] = $row; |
|
492 | + $map[$row['customer.id']] = $row; |
|
493 | 493 | } |
494 | 494 | |
495 | 495 | $dbm->release( $conn, $dbname ); |
496 | 496 | } |
497 | 497 | catch( \Exception $e ) |
498 | 498 | { |
499 | - $dbm->release( $conn, $dbname ); |
|
499 | + $dbm->release( $conn, $dbname ); |
|
500 | 500 | throw $e; |
501 | 501 | } |
502 | 502 |
@@ -340,8 +340,7 @@ |
||
340 | 340 | * @see mshop/customer/manager/laravel/count |
341 | 341 | */ |
342 | 342 | $path = 'mshop/customer/manager/laravel/insert'; |
343 | - } |
|
344 | - else |
|
343 | + } else |
|
345 | 344 | { |
346 | 345 | /** mshop/customer/manager/laravel/update |
347 | 346 | * Updates an existing customer record in the database |
@@ -54,7 +54,7 @@ |
||
54 | 54 | |
55 | 55 | $this->logger->log( $message, $this->translatePriority( $priority ) ); |
56 | 56 | } |
57 | - catch( \Exception $e ) { |
|
57 | + catch( \Exception $e ) { |
|
58 | 58 | throw new \Aimeos\MW\Logger\Exception( $e->getMessage(), $e->getCode(), $e ); |
59 | 59 | } |
60 | 60 | } |
@@ -54,7 +54,8 @@ |
||
54 | 54 | |
55 | 55 | $this->logger->log( $message, $this->translatePriority( $priority ) ); |
56 | 56 | } |
57 | - catch( \Exception $e ) { |
|
57 | + catch( \Exception $e ) |
|
58 | + { |
|
58 | 59 | throw new \Aimeos\MW\Logger\Exception( $e->getMessage(), $e->getCode(), $e ); |
59 | 60 | } |
60 | 61 | } |
@@ -47,8 +47,7 @@ |
||
47 | 47 | $factory = $this->factory; |
48 | 48 | $lv = $factory->file( $filename, $values ); |
49 | 49 | |
50 | - $fcn = function() use ( $factory, $view ) |
|
51 | - { |
|
50 | + $fcn = function() use ( $factory, $view ) { |
|
52 | 51 | foreach( $factory->getSections() as $name => $section ) { |
53 | 52 | $view->block()->set( $name, $section ); |
54 | 53 | } |
@@ -44,9 +44,12 @@ discard block |
||
44 | 44 | $schema = $this->getSchema( 'db-customer' ); |
45 | 45 | $sql = 'SELECT COLUMN_TYPE FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = \'users\' AND COLUMN_NAME = \'id\''; |
46 | 46 | |
47 | - try { |
|
47 | + try |
|
48 | + { |
|
48 | 49 | $type = $this->getValue( $sql, 'COLUMN_TYPE', 'db-customer' ); |
49 | - } catch( \Aimeos\MW\Setup\Exception $e ) { |
|
50 | + } |
|
51 | + catch( \Aimeos\MW\Setup\Exception $e ) |
|
52 | + { |
|
50 | 53 | $type = null; |
51 | 54 | } |
52 | 55 | |
@@ -62,8 +65,7 @@ discard block |
||
62 | 65 | { |
63 | 66 | $this->execute( 'ALTER TABLE "users_address" DROP FOREIGN KEY "fk_lvuad_pid"', 'db-customer' ); |
64 | 67 | $this->status( 'done' ); |
65 | - } |
|
66 | - else |
|
68 | + } else |
|
67 | 69 | { |
68 | 70 | $this->status( 'OK' ); |
69 | 71 | } |
@@ -75,8 +77,7 @@ discard block |
||
75 | 77 | { |
76 | 78 | $this->execute( 'ALTER TABLE "users_list" DROP FOREIGN KEY "fk_lvuli_pid"', 'db-customer' ); |
77 | 79 | $this->status( 'done' ); |
78 | - } |
|
79 | - else |
|
80 | + } else |
|
80 | 81 | { |
81 | 82 | $this->status( 'OK' ); |
82 | 83 | } |
@@ -88,8 +89,7 @@ discard block |
||
88 | 89 | { |
89 | 90 | $this->execute( 'ALTER TABLE "users_property" DROP FOREIGN KEY "fk_lvupr_pid"', 'db-customer' ); |
90 | 91 | $this->status( 'done' ); |
91 | - } |
|
92 | - else |
|
92 | + } else |
|
93 | 93 | { |
94 | 94 | $this->status( 'OK' ); |
95 | 95 | } |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | public function testGetItem() |
64 | 64 | { |
65 | 65 | $search = $this->object->createSearch(); |
66 | - $search->setSlice(0, 1); |
|
66 | + $search->setSlice( 0, 1 ); |
|
67 | 67 | $results = $this->object->searchItems( $search ); |
68 | 68 | |
69 | 69 | if( ( $item = reset( $results ) ) === false ) { |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | public function testSaveUpdateDeleteItem() |
78 | 78 | { |
79 | 79 | $search = $this->object->createSearch(); |
80 | - $search->setSlice(0, 1); |
|
80 | + $search->setSlice( 0, 1 ); |
|
81 | 81 | $items = $this->object->searchItems( $search ); |
82 | 82 | |
83 | 83 | if( ( $item = reset( $items ) ) === false ) { |
@@ -108,12 +108,12 @@ discard block |
||
108 | 108 | $this->assertEquals( $item->getDateEnd(), $itemSaved->getDateEnd() ); |
109 | 109 | $this->assertEquals( $item->getPosition(), $itemSaved->getPosition() ); |
110 | 110 | $this->assertEquals( $this->editor, $itemSaved->getEditor() ); |
111 | - $this->assertStringStartsWith(date('Y-m-d', time()), $itemSaved->getTimeCreated()); |
|
112 | - $this->assertStringStartsWith(date('Y-m-d', time()), $itemSaved->getTimeModified()); |
|
111 | + $this->assertStringStartsWith( date( 'Y-m-d', time() ), $itemSaved->getTimeCreated() ); |
|
112 | + $this->assertStringStartsWith( date( 'Y-m-d', time() ), $itemSaved->getTimeModified() ); |
|
113 | 113 | |
114 | 114 | $this->assertEquals( $this->editor, $itemSaved->getEditor() ); |
115 | 115 | $this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated() ); |
116 | - $this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified() ); |
|
116 | + $this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified() ); |
|
117 | 117 | |
118 | 118 | $this->assertEquals( $itemExp->getId(), $itemUpd->getId() ); |
119 | 119 | $this->assertEquals( $itemExp->getSiteId(), $itemUpd->getSiteId() ); |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | $this->assertInstanceOf( \Aimeos\MShop\Common\Item\Iface::class, $resultSaved ); |
133 | 133 | $this->assertInstanceOf( \Aimeos\MShop\Common\Item\Iface::class, $resultUpd ); |
134 | 134 | |
135 | - $this->setExpectedException('\\Aimeos\\MShop\\Exception'); |
|
135 | + $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); |
|
136 | 136 | $this->object->getItem( $itemSaved->getId() ); |
137 | 137 | } |
138 | 138 | |
@@ -278,8 +278,8 @@ discard block |
||
278 | 278 | |
279 | 279 | public function testGetSubManager() |
280 | 280 | { |
281 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type') ); |
|
282 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type', 'Standard') ); |
|
281 | + $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager( 'type' ) ); |
|
282 | + $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager( 'type', 'Standard' ) ); |
|
283 | 283 | |
284 | 284 | $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); |
285 | 285 | $this->object->getSubManager( 'unknown' ); |
@@ -216,10 +216,10 @@ discard block |
||
216 | 216 | $expr[] = $search->compare( '==', 'customer.longitude', '10.0' ); |
217 | 217 | $expr[] = $search->compare( '==', 'customer.latitude', '50.0' ); |
218 | 218 | |
219 | - $param = ['text','default', $listItem->getRefId()]; |
|
219 | + $param = ['text', 'default', $listItem->getRefId()]; |
|
220 | 220 | $expr[] = $search->compare( '!=', $search->createFunction( 'customer:has', $param ), null ); |
221 | 221 | |
222 | - $param = ['text','default', 0]; |
|
222 | + $param = ['text', 'default', 0]; |
|
223 | 223 | $expr[] = $search->compare( '==', $search->createFunction( 'customer:has', $param ), null ); |
224 | 224 | |
225 | 225 | $param = ['newsletter', null, '1']; |
@@ -295,7 +295,7 @@ discard block |
||
295 | 295 | $this->assertEquals( 2, count( $results ) ); |
296 | 296 | $this->assertEquals( 3, $total ); |
297 | 297 | |
298 | - foreach($results as $itemId => $item) { |
|
298 | + foreach( $results as $itemId => $item ) { |
|
299 | 299 | $this->assertEquals( $itemId, $item->getId() ); |
300 | 300 | } |
301 | 301 | } |
@@ -75,7 +75,7 @@ |
||
75 | 75 | 'customer.address.telefax' => '055544332212', 'customer.address.website' => 'www.example.com', |
76 | 76 | 'customer.address.longitude' => '10.5', 'customer.address.latitude' => '51.0', |
77 | 77 | 'customer.address.position' => '0', |
78 | - ],[ |
|
78 | + ], [ |
|
79 | 79 | 'customer.address.company' => 'Example company LLC', 'customer.address.vatid' => 'DE999999999', |
80 | 80 | 'customer.address.salutation' => 'mr', 'customer.address.title' => 'Dr.', |
81 | 81 | 'customer.address.firstname' => 'Good', 'customer.address.lastname' => 'Unittest', |