@@ -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' ); |
@@ -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', |
@@ -58,8 +58,7 @@ |
||
| 58 | 58 | { |
| 59 | 59 | $this->execute( $stmt ); |
| 60 | 60 | $this->status( 'done' ); |
| 61 | - } |
|
| 62 | - else |
|
| 61 | + } else |
|
| 63 | 62 | { |
| 64 | 63 | $this->status( 'OK' ); |
| 65 | 64 | } |
@@ -216,13 +216,13 @@ |
||
| 216 | 216 | $expr[] = $search->compare( '==', 'customer.longitude', '10.0' ); |
| 217 | 217 | $expr[] = $search->compare( '==', 'customer.latitude', '50.0' ); |
| 218 | 218 | |
| 219 | - $param = ['text','default', 0]; |
|
| 219 | + $param = ['text', 'default', 0]; |
|
| 220 | 220 | $expr[] = $search->compare( '==', $search->createFunction( 'customer:has', $param ), null ); |
| 221 | 221 | |
| 222 | - $param = ['text','default', $listItem->getRefId()]; |
|
| 222 | + $param = ['text', 'default', $listItem->getRefId()]; |
|
| 223 | 223 | $expr[] = $search->compare( '!=', $search->createFunction( 'customer:has', $param ), null ); |
| 224 | 224 | |
| 225 | - $param = ['text','default']; |
|
| 225 | + $param = ['text', 'default']; |
|
| 226 | 226 | $expr[] = $search->compare( '!=', $search->createFunction( 'customer:has', $param ), null ); |
| 227 | 227 | |
| 228 | 228 | $param = ['text']; |
@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | |
| 28 | 28 | protected function tearDown() |
| 29 | 29 | { |
| 30 | - unset($this->object); |
|
| 30 | + unset( $this->object ); |
|
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | |
| 71 | 71 | $results = $this->object->searchItems( $search ); |
| 72 | 72 | |
| 73 | - if( ($expected = reset($results) ) === false ) |
|
| 73 | + if( ( $expected = reset( $results ) ) === false ) |
|
| 74 | 74 | { |
| 75 | 75 | throw new \RuntimeException( 'No property type item found.' ); |
| 76 | 76 | } |
@@ -92,13 +92,13 @@ discard block |
||
| 92 | 92 | { |
| 93 | 93 | $search = $this->object->createSearch(); |
| 94 | 94 | $search->setConditions( $search->compare( '==', 'customer.property.type.editor', $this->editor ) ); |
| 95 | - $results = $this->object->searchItems($search); |
|
| 95 | + $results = $this->object->searchItems( $search ); |
|
| 96 | 96 | |
| 97 | - if( ( $item = reset($results) ) === false ) { |
|
| 97 | + if( ( $item = reset( $results ) ) === false ) { |
|
| 98 | 98 | throw new \RuntimeException( 'No type item found' ); |
| 99 | 99 | } |
| 100 | 100 | |
| 101 | - $item->setId(null); |
|
| 101 | + $item->setId( null ); |
|
| 102 | 102 | $item->setCode( 'unitTestSave' ); |
| 103 | 103 | $resultSaved = $this->object->saveItem( $item ); |
| 104 | 104 | $itemSaved = $this->object->getItem( $item->getId() ); |
@@ -159,19 +159,19 @@ discard block |
||
| 159 | 159 | $expr[] = $search->compare( '>=', 'customer.property.type.ctime', '1970-01-01 00:00:00' ); |
| 160 | 160 | $expr[] = $search->compare( '==', 'customer.property.type.editor', $this->editor ); |
| 161 | 161 | |
| 162 | - $search->setConditions( $search->combine('&&', $expr) ); |
|
| 162 | + $search->setConditions( $search->combine( '&&', $expr ) ); |
|
| 163 | 163 | $results = $this->object->searchItems( $search, [], $total ); |
| 164 | 164 | $this->assertEquals( 1, count( $results ) ); |
| 165 | 165 | |
| 166 | 166 | |
| 167 | 167 | $search = $this->object->createSearch(); |
| 168 | 168 | $conditions = array( |
| 169 | - $search->compare( '=~', 'customer.property.type.code', 'newsletter'), |
|
| 169 | + $search->compare( '=~', 'customer.property.type.code', 'newsletter' ), |
|
| 170 | 170 | $search->compare( '==', 'customer.property.type.editor', $this->editor ) |
| 171 | 171 | ); |
| 172 | - $search->setConditions( $search->combine('&&', $conditions ) ); |
|
| 173 | - $search->setSlice(0, 1); |
|
| 174 | - $items = $this->object->searchItems( $search, [], $total); |
|
| 172 | + $search->setConditions( $search->combine( '&&', $conditions ) ); |
|
| 173 | + $search->setSlice( 0, 1 ); |
|
| 174 | + $items = $this->object->searchItems( $search, [], $total ); |
|
| 175 | 175 | |
| 176 | 176 | $this->assertEquals( 1, count( $items ) ); |
| 177 | 177 | $this->assertEquals( 1, $total ); |
@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | |
| 185 | 185 | public function testGetSubManager() |
| 186 | 186 | { |
| 187 | - $this->setExpectedException('\\Aimeos\\MShop\\Exception'); |
|
| 188 | - $this->object->getSubManager('unknown'); |
|
| 187 | + $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); |
|
| 188 | + $this->object->getSubManager( 'unknown' ); |
|
| 189 | 189 | } |
| 190 | 190 | } |
@@ -45,10 +45,10 @@ discard block |
||
| 45 | 45 | public function testGetItem() |
| 46 | 46 | { |
| 47 | 47 | $search = $this->object->createSearch(); |
| 48 | - $search->setSlice(0, 1); |
|
| 49 | - $results = $this->object->searchItems($search); |
|
| 48 | + $search->setSlice( 0, 1 ); |
|
| 49 | + $results = $this->object->searchItems( $search ); |
|
| 50 | 50 | |
| 51 | - if( ( $expected = reset($results) ) === false ) { |
|
| 51 | + if( ( $expected = reset( $results ) ) === false ) { |
|
| 52 | 52 | throw new \RuntimeException( 'No list type item found' ); |
| 53 | 53 | } |
| 54 | 54 | |
@@ -66,14 +66,14 @@ discard block |
||
| 66 | 66 | public function testSaveUpdateDeleteItem() |
| 67 | 67 | { |
| 68 | 68 | $search = $this->object->createSearch(); |
| 69 | - $search->setSlice(0, 1); |
|
| 70 | - $results = $this->object->searchItems($search); |
|
| 69 | + $search->setSlice( 0, 1 ); |
|
| 70 | + $results = $this->object->searchItems( $search ); |
|
| 71 | 71 | |
| 72 | - if( ( $item = reset($results) ) === false ) { |
|
| 72 | + if( ( $item = reset( $results ) ) === false ) { |
|
| 73 | 73 | throw new \RuntimeException( 'No type item found' ); |
| 74 | 74 | } |
| 75 | 75 | |
| 76 | - $item->setId(null); |
|
| 76 | + $item->setId( null ); |
|
| 77 | 77 | $item->setCode( 'unitTestInit' ); |
| 78 | 78 | $resultSaved = $this->object->saveItem( $item ); |
| 79 | 79 | $itemSaved = $this->object->getItem( $item->getId() ); |
@@ -112,7 +112,7 @@ discard block |
||
| 112 | 112 | $this->assertInstanceOf( \Aimeos\MShop\Common\Item\Iface::class, $resultSaved ); |
| 113 | 113 | $this->assertInstanceOf( \Aimeos\MShop\Common\Item\Iface::class, $resultUpd ); |
| 114 | 114 | |
| 115 | - $this->setExpectedException('\\Aimeos\\MShop\\Exception'); |
|
| 115 | + $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); |
|
| 116 | 116 | $this->object->getItem( $itemSaved->getId() ); |
| 117 | 117 | } |
| 118 | 118 | |
@@ -135,7 +135,7 @@ discard block |
||
| 135 | 135 | $expr[] = $search->compare( '==', 'customer.lists.type.editor', $this->editor ); |
| 136 | 136 | |
| 137 | 137 | $search->setConditions( $search->combine( '&&', $expr ) ); |
| 138 | - $search->setSlice(0, 1); |
|
| 138 | + $search->setSlice( 0, 1 ); |
|
| 139 | 139 | |
| 140 | 140 | $results = $this->object->searchItems( $search, [], $total ); |
| 141 | 141 | $this->assertEquals( 1, count( $results ) ); |