@@ -314,8 +314,7 @@ |
||
| 314 | 314 | |
| 315 | 315 | $user = $service->loadUser( $item->getId() ); |
| 316 | 316 | $service->updateUser( $user, $struct ); |
| 317 | - } |
|
| 318 | - else |
|
| 317 | + } else |
|
| 319 | 318 | { |
| 320 | 319 | $struct = $service->newUserCreateStruct( $item->getCode(), $email, $item->getPassword(), 'eng-GB' ); |
| 321 | 320 | $struct->enabled = $item->getStatus(); |
@@ -476,8 +476,8 @@ discard block |
||
| 476 | 476 | |
| 477 | 477 | while( ( $row = $results->fetch() ) !== false ) |
| 478 | 478 | { |
| 479 | - $map[ $row['customer.id'] ] = $row; |
|
| 480 | - $map[ $row['customer.id'] ]['customer.groups'] = []; |
|
| 479 | + $map[$row['customer.id']] = $row; |
|
| 480 | + $map[$row['customer.id']]['customer.groups'] = []; |
|
| 481 | 481 | } |
| 482 | 482 | |
| 483 | 483 | |
@@ -493,7 +493,7 @@ discard block |
||
| 493 | 493 | } |
| 494 | 494 | catch( \Exception $e ) |
| 495 | 495 | { |
| 496 | - $dbm->release( $conn, $dbname ); |
|
| 496 | + $dbm->release( $conn, $dbname ); |
|
| 497 | 497 | throw $e; |
| 498 | 498 | } |
| 499 | 499 | |
@@ -8,7 +8,7 @@ discard block |
||
| 8 | 8 | |
| 9 | 9 | return array( |
| 10 | 10 | 'table' => array( |
| 11 | - 'ezuser' => function ( \Doctrine\DBAL\Schema\Schema $schema ) { |
|
| 11 | + 'ezuser' => function( \Doctrine\DBAL\Schema\Schema $schema ) { |
|
| 12 | 12 | |
| 13 | 13 | $table = $schema->createTable( 'ezuser' ); |
| 14 | 14 | |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | return $schema; |
| 26 | 26 | }, |
| 27 | 27 | |
| 28 | - 'ezuser_address' => function ( \Doctrine\DBAL\Schema\Schema $schema ) { |
|
| 28 | + 'ezuser_address' => function( \Doctrine\DBAL\Schema\Schema $schema ) { |
|
| 29 | 29 | |
| 30 | 30 | $table = $schema->createTable( 'ezuser_address' ); |
| 31 | 31 | |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | $table->addColumn( 'pos', 'smallint', [] ); |
| 54 | 54 | $table->addColumn( 'mtime', 'datetime', [] ); |
| 55 | 55 | $table->addColumn( 'ctime', 'datetime', [] ); |
| 56 | - $table->addColumn( 'editor', 'string', array('length' => 255 ) ); |
|
| 56 | + $table->addColumn( 'editor', 'string', array( 'length' => 255 ) ); |
|
| 57 | 57 | |
| 58 | 58 | $table->setPrimaryKey( array( 'id' ), 'pk_ezpad_id' ); |
| 59 | 59 | $table->addIndex( array( 'lastname', 'firstname' ), 'idx_ezpad_ln_fn' ); |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | return $schema; |
| 69 | 69 | }, |
| 70 | 70 | |
| 71 | - 'ezuser_list_type' => function ( \Doctrine\DBAL\Schema\Schema $schema ) { |
|
| 71 | + 'ezuser_list_type' => function( \Doctrine\DBAL\Schema\Schema $schema ) { |
|
| 72 | 72 | |
| 73 | 73 | $table = $schema->createTable( 'ezuser_list_type' ); |
| 74 | 74 | |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | return $schema; |
| 93 | 93 | }, |
| 94 | 94 | |
| 95 | - 'ezuser_list' => function ( \Doctrine\DBAL\Schema\Schema $schema ) { |
|
| 95 | + 'ezuser_list' => function( \Doctrine\DBAL\Schema\Schema $schema ) { |
|
| 96 | 96 | |
| 97 | 97 | $table = $schema->createTable( 'ezuser_list' ); |
| 98 | 98 | |
@@ -121,7 +121,7 @@ discard block |
||
| 121 | 121 | return $schema; |
| 122 | 122 | }, |
| 123 | 123 | |
| 124 | - 'ezuser_property_type' => function ( \Doctrine\DBAL\Schema\Schema $schema ) { |
|
| 124 | + 'ezuser_property_type' => function( \Doctrine\DBAL\Schema\Schema $schema ) { |
|
| 125 | 125 | |
| 126 | 126 | $table = $schema->createTable( 'ezuser_property_type' ); |
| 127 | 127 | |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | return $schema; |
| 146 | 146 | }, |
| 147 | 147 | |
| 148 | - 'ezuser_property' => function ( \Doctrine\DBAL\Schema\Schema $schema ) { |
|
| 148 | + 'ezuser_property' => function( \Doctrine\DBAL\Schema\Schema $schema ) { |
|
| 149 | 149 | |
| 150 | 150 | $table = $schema->createTable( 'ezuser_property' ); |
| 151 | 151 | |
@@ -46,8 +46,8 @@ |
||
| 46 | 46 | |
| 47 | 47 | public function testGetSubManager() |
| 48 | 48 | { |
| 49 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type') ); |
|
| 50 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type', 'Standard') ); |
|
| 49 | + $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager( 'type' ) ); |
|
| 50 | + $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager( 'type', 'Standard' ) ); |
|
| 51 | 51 | |
| 52 | 52 | $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); |
| 53 | 53 | $this->object->getSubManager( 'unknown' ); |
@@ -46,8 +46,8 @@ |
||
| 46 | 46 | |
| 47 | 47 | public function testGetSubManager() |
| 48 | 48 | { |
| 49 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type') ); |
|
| 50 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type', 'Standard') ); |
|
| 49 | + $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager( 'type' ) ); |
|
| 50 | + $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager( 'type', 'Standard' ) ); |
|
| 51 | 51 | |
| 52 | 52 | $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); |
| 53 | 53 | $this->object->getSubManager( 'unknown' ); |