@@ -17,32 +17,32 @@ |
||
17 | 17 | |
18 | 18 | protected function setUp() |
19 | 19 | { |
20 | - if( interface_exists( '\\Illuminate\\Session\\Store' ) === false ) { |
|
21 | - $this->markTestSkipped( 'Class \\Illuminate\\Session\\Store not found' ); |
|
20 | + if (interface_exists('\\Illuminate\\Session\\Store') === false) { |
|
21 | + $this->markTestSkipped('Class \\Illuminate\\Session\\Store not found'); |
|
22 | 22 | } |
23 | 23 | |
24 | - $this->mock = $this->getMockBuilder( '\\Illuminate\\Session\\Store' )->getMock(); |
|
25 | - $this->object = new \Aimeos\MW\Session\Laravel5( $this->mock ); |
|
24 | + $this->mock = $this->getMockBuilder('\\Illuminate\\Session\\Store')->getMock(); |
|
25 | + $this->object = new \Aimeos\MW\Session\Laravel5($this->mock); |
|
26 | 26 | } |
27 | 27 | |
28 | 28 | |
29 | 29 | protected function tearDown() |
30 | 30 | { |
31 | - unset( $this->object ); |
|
31 | + unset($this->object); |
|
32 | 32 | } |
33 | 33 | |
34 | 34 | |
35 | 35 | public function testGetDefault() |
36 | 36 | { |
37 | - $this->mock->expects( $this->once() )->method( 'get' )->with( $this->equalTo( 'notexist' ) ); |
|
38 | - $this->object->get( 'notexist' ); |
|
37 | + $this->mock->expects($this->once())->method('get')->with($this->equalTo('notexist')); |
|
38 | + $this->object->get('notexist'); |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | |
42 | 42 | public function testSet() |
43 | 43 | { |
44 | - $this->mock->expects( $this->once() )->method( 'put' ) |
|
45 | - ->with( $this->equalTo( 'key' ), $this->equalTo( 'value' ) ); |
|
46 | - $this->object->set( 'key', 'value' ); |
|
44 | + $this->mock->expects($this->once())->method('put') |
|
45 | + ->with($this->equalTo('key'), $this->equalTo('value')); |
|
46 | + $this->object->set('key', 'value'); |
|
47 | 47 | } |
48 | 48 | } |
@@ -17,53 +17,53 @@ |
||
17 | 17 | |
18 | 18 | protected function setUp() |
19 | 19 | { |
20 | - if( interface_exists( '\\Illuminate\\Contracts\\Logging\\Log' ) === false ) { |
|
21 | - $this->markTestSkipped( 'Class \\Illuminate\\Contracts\\Logging\\Log not found' ); |
|
20 | + if (interface_exists('\\Illuminate\\Contracts\\Logging\\Log') === false) { |
|
21 | + $this->markTestSkipped('Class \\Illuminate\\Contracts\\Logging\\Log not found'); |
|
22 | 22 | } |
23 | 23 | |
24 | - $this->mock = $this->getMockBuilder( '\\Illuminate\\Contracts\\Logging\\Log' )->getMock(); |
|
25 | - $this->object = new \Aimeos\MW\Logger\Laravel5( $this->mock ); |
|
24 | + $this->mock = $this->getMockBuilder('\\Illuminate\\Contracts\\Logging\\Log')->getMock(); |
|
25 | + $this->object = new \Aimeos\MW\Logger\Laravel5($this->mock); |
|
26 | 26 | } |
27 | 27 | |
28 | 28 | |
29 | 29 | protected function tearDown() |
30 | 30 | { |
31 | - unset( $this->mock, $this->object ); |
|
31 | + unset($this->mock, $this->object); |
|
32 | 32 | } |
33 | 33 | |
34 | 34 | |
35 | 35 | public function testLog() |
36 | 36 | { |
37 | - $this->mock->expects( $this->once() )->method( 'log' ) |
|
38 | - ->with( $this->equalTo( 'msg' ), $this->equalTo( 'error' ) ); |
|
39 | - $this->object->log( 'msg' ); |
|
37 | + $this->mock->expects($this->once())->method('log') |
|
38 | + ->with($this->equalTo('msg'), $this->equalTo('error')); |
|
39 | + $this->object->log('msg'); |
|
40 | 40 | } |
41 | 41 | |
42 | 42 | |
43 | 43 | public function testNonScalarLog() |
44 | 44 | { |
45 | - $this->mock->expects( $this->once() )->method( 'log' ) |
|
46 | - ->with( $this->equalTo( '["error","error2",2]' ), $this->equalTo( 'error' ) ); |
|
47 | - $this->object->log( array( 'error', 'error2', 2 ) ); |
|
45 | + $this->mock->expects($this->once())->method('log') |
|
46 | + ->with($this->equalTo('["error","error2",2]'), $this->equalTo('error')); |
|
47 | + $this->object->log(array('error', 'error2', 2)); |
|
48 | 48 | } |
49 | 49 | |
50 | 50 | |
51 | 51 | public function testLogDebug() |
52 | 52 | { |
53 | - $this->object->log( 'emergency', \Aimeos\MW\Logger\Base::EMERG ); |
|
54 | - $this->object->log( 'alert', \Aimeos\MW\Logger\Base::ALERT ); |
|
55 | - $this->object->log( 'critical', \Aimeos\MW\Logger\Base::CRIT ); |
|
56 | - $this->object->log( 'error', \Aimeos\MW\Logger\Base::ERR ); |
|
57 | - $this->object->log( 'warning', \Aimeos\MW\Logger\Base::WARN ); |
|
58 | - $this->object->log( 'notice', \Aimeos\MW\Logger\Base::NOTICE ); |
|
59 | - $this->object->log( 'info', \Aimeos\MW\Logger\Base::INFO ); |
|
60 | - $this->object->log( 'debug', \Aimeos\MW\Logger\Base::DEBUG ); |
|
53 | + $this->object->log('emergency', \Aimeos\MW\Logger\Base::EMERG); |
|
54 | + $this->object->log('alert', \Aimeos\MW\Logger\Base::ALERT); |
|
55 | + $this->object->log('critical', \Aimeos\MW\Logger\Base::CRIT); |
|
56 | + $this->object->log('error', \Aimeos\MW\Logger\Base::ERR); |
|
57 | + $this->object->log('warning', \Aimeos\MW\Logger\Base::WARN); |
|
58 | + $this->object->log('notice', \Aimeos\MW\Logger\Base::NOTICE); |
|
59 | + $this->object->log('info', \Aimeos\MW\Logger\Base::INFO); |
|
60 | + $this->object->log('debug', \Aimeos\MW\Logger\Base::DEBUG); |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | |
64 | 64 | public function testBadPriority() |
65 | 65 | { |
66 | - $this->setExpectedException( '\\Aimeos\\MW\\Logger\\Exception' ); |
|
67 | - $this->object->log( 'error', -1 ); |
|
66 | + $this->setExpectedException('\\Aimeos\\MW\\Logger\\Exception'); |
|
67 | + $this->object->log('error', -1); |
|
68 | 68 | } |
69 | 69 | } |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | */ |
41 | 41 | public function getPostDependencies() |
42 | 42 | { |
43 | - return array( 'TablesCreateLaravel' ); |
|
43 | + return array('TablesCreateLaravel'); |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | */ |
50 | 50 | public function migrate() |
51 | 51 | { |
52 | - $this->process( $this->mysql ); |
|
52 | + $this->process($this->mysql); |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | |
@@ -58,22 +58,22 @@ discard block |
||
58 | 58 | * |
59 | 59 | * array string $stmts List of SQL statements for changing the columns |
60 | 60 | */ |
61 | - protected function process( array $stmts ) |
|
61 | + protected function process(array $stmts) |
|
62 | 62 | { |
63 | 63 | $table = 'users_address'; |
64 | - $this->msg( sprintf( 'Rename "refid" to "parentid" in table "%1$s"', $table ), 0 ); $this->status( '' ); |
|
64 | + $this->msg(sprintf('Rename "refid" to "parentid" in table "%1$s"', $table), 0); $this->status(''); |
|
65 | 65 | |
66 | - foreach( $stmts as $column => $stmts ) |
|
66 | + foreach ($stmts as $column => $stmts) |
|
67 | 67 | { |
68 | - $this->msg( sprintf( 'Checking column "%1$s"', $column ), 1 ); |
|
68 | + $this->msg(sprintf('Checking column "%1$s"', $column), 1); |
|
69 | 69 | |
70 | - if( $this->schema->tableExists( $table ) |
|
71 | - && $this->schema->columnExists( $table, $column ) === true |
|
70 | + if ($this->schema->tableExists($table) |
|
71 | + && $this->schema->columnExists($table, $column) === true |
|
72 | 72 | ) { |
73 | - $this->executeList( $stmts ); |
|
74 | - $this->status( 'done' ); |
|
73 | + $this->executeList($stmts); |
|
74 | + $this->status('done'); |
|
75 | 75 | } else { |
76 | - $this->status( 'OK' ); |
|
76 | + $this->status('OK'); |
|
77 | 77 | } |
78 | 78 | } |
79 | 79 | } |
@@ -18,43 +18,43 @@ discard block |
||
18 | 18 | { |
19 | 19 | $this->context = \TestHelper::getContext(); |
20 | 20 | $this->editor = $this->context->getEditor(); |
21 | - $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $this->context, 'Laravel' ); |
|
22 | - $this->object = $manager->getSubManager( 'lists', 'Laravel' ); |
|
21 | + $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager($this->context, 'Laravel'); |
|
22 | + $this->object = $manager->getSubManager('lists', 'Laravel'); |
|
23 | 23 | } |
24 | 24 | |
25 | 25 | |
26 | 26 | protected function tearDown() |
27 | 27 | { |
28 | - unset( $this->object, $this->context ); |
|
28 | + unset($this->object, $this->context); |
|
29 | 29 | } |
30 | 30 | |
31 | 31 | |
32 | 32 | public function testCleanup() |
33 | 33 | { |
34 | - $this->object->cleanup( array( -1 ) ); |
|
34 | + $this->object->cleanup(array( -1 )); |
|
35 | 35 | } |
36 | 36 | |
37 | 37 | |
38 | 38 | public function testAggregate() |
39 | 39 | { |
40 | - $search = $this->object->createSearch( true ); |
|
40 | + $search = $this->object->createSearch(true); |
|
41 | 41 | $expr = array( |
42 | 42 | $search->getConditions(), |
43 | - $search->compare( '==', 'customer.lists.editor', 'ai-laravel:unittest' ), |
|
43 | + $search->compare('==', 'customer.lists.editor', 'ai-laravel:unittest'), |
|
44 | 44 | ); |
45 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
45 | + $search->setConditions($search->combine('&&', $expr)); |
|
46 | 46 | |
47 | - $result = $this->object->aggregate( $search, 'customer.lists.domain' ); |
|
47 | + $result = $this->object->aggregate($search, 'customer.lists.domain'); |
|
48 | 48 | |
49 | - $this->assertEquals( 1, count( $result ) ); |
|
50 | - $this->assertArrayHasKey( 'text', $result ); |
|
51 | - $this->assertEquals( 4, $result['text'] ); |
|
49 | + $this->assertEquals(1, count($result)); |
|
50 | + $this->assertArrayHasKey('text', $result); |
|
51 | + $this->assertEquals(4, $result['text']); |
|
52 | 52 | } |
53 | 53 | |
54 | 54 | |
55 | 55 | public function testCreateItem() |
56 | 56 | { |
57 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $this->object->createItem() ); |
|
57 | + $this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $this->object->createItem()); |
|
58 | 58 | } |
59 | 59 | |
60 | 60 | |
@@ -62,13 +62,13 @@ discard block |
||
62 | 62 | { |
63 | 63 | $search = $this->object->createSearch(); |
64 | 64 | $search->setSlice(0, 1); |
65 | - $results = $this->object->searchItems( $search ); |
|
65 | + $results = $this->object->searchItems($search); |
|
66 | 66 | |
67 | - if( ( $item = reset( $results ) ) === false ) { |
|
68 | - throw new \RuntimeException( 'No item found' ); |
|
67 | + if (($item = reset($results)) === false) { |
|
68 | + throw new \RuntimeException('No item found'); |
|
69 | 69 | } |
70 | 70 | |
71 | - $this->assertEquals( $item, $this->object->getItem( $item->getId() ) ); |
|
71 | + $this->assertEquals($item, $this->object->getItem($item->getId())); |
|
72 | 72 | } |
73 | 73 | |
74 | 74 | |
@@ -76,147 +76,147 @@ discard block |
||
76 | 76 | { |
77 | 77 | $search = $this->object->createSearch(); |
78 | 78 | $search->setSlice(0, 1); |
79 | - $items = $this->object->searchItems( $search ); |
|
79 | + $items = $this->object->searchItems($search); |
|
80 | 80 | |
81 | - if( ( $item = reset( $items ) ) === false ) { |
|
82 | - throw new \RuntimeException( 'No item found' ); |
|
81 | + if (($item = reset($items)) === false) { |
|
82 | + throw new \RuntimeException('No item found'); |
|
83 | 83 | } |
84 | 84 | |
85 | - $item->setId( null ); |
|
86 | - $item->setDomain( 'unittest' ); |
|
87 | - $resultSaved = $this->object->saveItem( $item ); |
|
88 | - $itemSaved = $this->object->getItem( $item->getId() ); |
|
85 | + $item->setId(null); |
|
86 | + $item->setDomain('unittest'); |
|
87 | + $resultSaved = $this->object->saveItem($item); |
|
88 | + $itemSaved = $this->object->getItem($item->getId()); |
|
89 | 89 | |
90 | 90 | $itemExp = clone $itemSaved; |
91 | - $itemExp->setDomain( 'unittest2' ); |
|
92 | - $resultUpd = $this->object->saveItem( $itemExp ); |
|
93 | - $itemUpd = $this->object->getItem( $itemExp->getId() ); |
|
94 | - |
|
95 | - $this->object->deleteItem( $itemSaved->getId() ); |
|
96 | - |
|
97 | - |
|
98 | - $this->assertTrue( $item->getId() !== null ); |
|
99 | - $this->assertTrue( $itemSaved->getType() !== null ); |
|
100 | - $this->assertEquals( $item->getId(), $itemSaved->getId() ); |
|
101 | - $this->assertEquals( $item->getSiteId(), $itemSaved->getSiteId() ); |
|
102 | - $this->assertEquals( $item->getParentId(), $itemSaved->getParentId() ); |
|
103 | - $this->assertEquals( $item->getTypeId(), $itemSaved->getTypeId() ); |
|
104 | - $this->assertEquals( $item->getRefId(), $itemSaved->getRefId() ); |
|
105 | - $this->assertEquals( $item->getDomain(), $itemSaved->getDomain() ); |
|
106 | - $this->assertEquals( $item->getDateStart(), $itemSaved->getDateStart() ); |
|
107 | - $this->assertEquals( $item->getDateEnd(), $itemSaved->getDateEnd() ); |
|
108 | - $this->assertEquals( $item->getPosition(), $itemSaved->getPosition() ); |
|
109 | - $this->assertEquals( $this->editor, $itemSaved->getEditor() ); |
|
91 | + $itemExp->setDomain('unittest2'); |
|
92 | + $resultUpd = $this->object->saveItem($itemExp); |
|
93 | + $itemUpd = $this->object->getItem($itemExp->getId()); |
|
94 | + |
|
95 | + $this->object->deleteItem($itemSaved->getId()); |
|
96 | + |
|
97 | + |
|
98 | + $this->assertTrue($item->getId() !== null); |
|
99 | + $this->assertTrue($itemSaved->getType() !== null); |
|
100 | + $this->assertEquals($item->getId(), $itemSaved->getId()); |
|
101 | + $this->assertEquals($item->getSiteId(), $itemSaved->getSiteId()); |
|
102 | + $this->assertEquals($item->getParentId(), $itemSaved->getParentId()); |
|
103 | + $this->assertEquals($item->getTypeId(), $itemSaved->getTypeId()); |
|
104 | + $this->assertEquals($item->getRefId(), $itemSaved->getRefId()); |
|
105 | + $this->assertEquals($item->getDomain(), $itemSaved->getDomain()); |
|
106 | + $this->assertEquals($item->getDateStart(), $itemSaved->getDateStart()); |
|
107 | + $this->assertEquals($item->getDateEnd(), $itemSaved->getDateEnd()); |
|
108 | + $this->assertEquals($item->getPosition(), $itemSaved->getPosition()); |
|
109 | + $this->assertEquals($this->editor, $itemSaved->getEditor()); |
|
110 | 110 | $this->assertStringStartsWith(date('Y-m-d', time()), $itemSaved->getTimeCreated()); |
111 | 111 | $this->assertStringStartsWith(date('Y-m-d', time()), $itemSaved->getTimeModified()); |
112 | 112 | |
113 | - $this->assertEquals( $this->editor, $itemSaved->getEditor() ); |
|
114 | - $this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated() ); |
|
115 | - $this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified() ); |
|
113 | + $this->assertEquals($this->editor, $itemSaved->getEditor()); |
|
114 | + $this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated()); |
|
115 | + $this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified()); |
|
116 | 116 | |
117 | - $this->assertTrue( $itemUpd->getType() !== null ); |
|
118 | - $this->assertEquals( $itemExp->getId(), $itemUpd->getId() ); |
|
119 | - $this->assertEquals( $itemExp->getSiteId(), $itemUpd->getSiteId() ); |
|
120 | - $this->assertEquals( $itemExp->getParentId(), $itemUpd->getParentId() ); |
|
121 | - $this->assertEquals( $itemExp->getTypeId(), $itemUpd->getTypeId() ); |
|
122 | - $this->assertEquals( $itemExp->getRefId(), $itemUpd->getRefId() ); |
|
123 | - $this->assertEquals( $itemExp->getDomain(), $itemUpd->getDomain() ); |
|
124 | - $this->assertEquals( $itemExp->getDateStart(), $itemUpd->getDateStart() ); |
|
125 | - $this->assertEquals( $itemExp->getDateEnd(), $itemUpd->getDateEnd() ); |
|
126 | - $this->assertEquals( $itemExp->getPosition(), $itemUpd->getPosition() ); |
|
117 | + $this->assertTrue($itemUpd->getType() !== null); |
|
118 | + $this->assertEquals($itemExp->getId(), $itemUpd->getId()); |
|
119 | + $this->assertEquals($itemExp->getSiteId(), $itemUpd->getSiteId()); |
|
120 | + $this->assertEquals($itemExp->getParentId(), $itemUpd->getParentId()); |
|
121 | + $this->assertEquals($itemExp->getTypeId(), $itemUpd->getTypeId()); |
|
122 | + $this->assertEquals($itemExp->getRefId(), $itemUpd->getRefId()); |
|
123 | + $this->assertEquals($itemExp->getDomain(), $itemUpd->getDomain()); |
|
124 | + $this->assertEquals($itemExp->getDateStart(), $itemUpd->getDateStart()); |
|
125 | + $this->assertEquals($itemExp->getDateEnd(), $itemUpd->getDateEnd()); |
|
126 | + $this->assertEquals($itemExp->getPosition(), $itemUpd->getPosition()); |
|
127 | 127 | |
128 | - $this->assertEquals( $this->editor, $itemUpd->getEditor() ); |
|
129 | - $this->assertEquals( $itemExp->getTimeCreated(), $itemUpd->getTimeCreated() ); |
|
130 | - $this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified() ); |
|
128 | + $this->assertEquals($this->editor, $itemUpd->getEditor()); |
|
129 | + $this->assertEquals($itemExp->getTimeCreated(), $itemUpd->getTimeCreated()); |
|
130 | + $this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified()); |
|
131 | 131 | |
132 | - $this->assertInstanceOf( '\Aimeos\MShop\Common\Item\Iface', $resultSaved ); |
|
133 | - $this->assertInstanceOf( '\Aimeos\MShop\Common\Item\Iface', $resultUpd ); |
|
132 | + $this->assertInstanceOf('\Aimeos\MShop\Common\Item\Iface', $resultSaved); |
|
133 | + $this->assertInstanceOf('\Aimeos\MShop\Common\Item\Iface', $resultUpd); |
|
134 | 134 | |
135 | 135 | $this->setExpectedException('\\Aimeos\\MShop\\Exception'); |
136 | - $this->object->getItem( $itemSaved->getId() ); |
|
136 | + $this->object->getItem($itemSaved->getId()); |
|
137 | 137 | } |
138 | 138 | |
139 | 139 | |
140 | 140 | public function testMoveItemLastToFront() |
141 | 141 | { |
142 | 142 | $listItems = $this->getListItems(); |
143 | - $this->assertGreaterThan( 1, count( $listItems ) ); |
|
143 | + $this->assertGreaterThan(1, count($listItems)); |
|
144 | 144 | |
145 | - if( ( $first = reset( $listItems ) ) === false ) { |
|
146 | - throw new \RuntimeException( 'No first customer list item' ); |
|
145 | + if (($first = reset($listItems)) === false) { |
|
146 | + throw new \RuntimeException('No first customer list item'); |
|
147 | 147 | } |
148 | 148 | |
149 | - if( ( $last = end( $listItems ) ) === false ) { |
|
150 | - throw new \RuntimeException( 'No last customer list item' ); |
|
149 | + if (($last = end($listItems)) === false) { |
|
150 | + throw new \RuntimeException('No last customer list item'); |
|
151 | 151 | } |
152 | 152 | |
153 | - $this->object->moveItem( $last->getId(), $first->getId() ); |
|
153 | + $this->object->moveItem($last->getId(), $first->getId()); |
|
154 | 154 | |
155 | - $newFirst = $this->object->getItem( $last->getId() ); |
|
156 | - $newSecond = $this->object->getItem( $first->getId() ); |
|
155 | + $newFirst = $this->object->getItem($last->getId()); |
|
156 | + $newSecond = $this->object->getItem($first->getId()); |
|
157 | 157 | |
158 | - $this->object->moveItem( $last->getId() ); |
|
158 | + $this->object->moveItem($last->getId()); |
|
159 | 159 | |
160 | - $this->assertEquals( 1, $newFirst->getPosition() ); |
|
161 | - $this->assertEquals( 2, $newSecond->getPosition() ); |
|
160 | + $this->assertEquals(1, $newFirst->getPosition()); |
|
161 | + $this->assertEquals(2, $newSecond->getPosition()); |
|
162 | 162 | } |
163 | 163 | |
164 | 164 | |
165 | 165 | public function testMoveItemFirstToLast() |
166 | 166 | { |
167 | 167 | $listItems = $this->getListItems(); |
168 | - $this->assertGreaterThan( 1, count( $listItems ) ); |
|
168 | + $this->assertGreaterThan(1, count($listItems)); |
|
169 | 169 | |
170 | - if( ( $first = reset( $listItems ) ) === false ) { |
|
171 | - throw new \RuntimeException( 'No first customer list item' ); |
|
170 | + if (($first = reset($listItems)) === false) { |
|
171 | + throw new \RuntimeException('No first customer list item'); |
|
172 | 172 | } |
173 | 173 | |
174 | - if( ( $second = next( $listItems ) ) === false ) { |
|
175 | - throw new \RuntimeException( 'No second customer list item' ); |
|
174 | + if (($second = next($listItems)) === false) { |
|
175 | + throw new \RuntimeException('No second customer list item'); |
|
176 | 176 | } |
177 | 177 | |
178 | - if( ( $last = end( $listItems ) ) === false ) { |
|
179 | - throw new \RuntimeException( 'No last customer list item' ); |
|
178 | + if (($last = end($listItems)) === false) { |
|
179 | + throw new \RuntimeException('No last customer list item'); |
|
180 | 180 | } |
181 | 181 | |
182 | - $this->object->moveItem( $first->getId() ); |
|
182 | + $this->object->moveItem($first->getId()); |
|
183 | 183 | |
184 | - $newBefore = $this->object->getItem( $last->getId() ); |
|
185 | - $newLast = $this->object->getItem( $first->getId() ); |
|
184 | + $newBefore = $this->object->getItem($last->getId()); |
|
185 | + $newLast = $this->object->getItem($first->getId()); |
|
186 | 186 | |
187 | - $this->object->moveItem( $first->getId(), $second->getId() ); |
|
187 | + $this->object->moveItem($first->getId(), $second->getId()); |
|
188 | 188 | |
189 | - $this->assertEquals( $last->getPosition() - 1, $newBefore->getPosition() ); |
|
190 | - $this->assertEquals( $last->getPosition(), $newLast->getPosition() ); |
|
189 | + $this->assertEquals($last->getPosition() - 1, $newBefore->getPosition()); |
|
190 | + $this->assertEquals($last->getPosition(), $newLast->getPosition()); |
|
191 | 191 | } |
192 | 192 | |
193 | 193 | |
194 | 194 | public function testMoveItemFirstUp() |
195 | 195 | { |
196 | 196 | $listItems = $this->getListItems(); |
197 | - $this->assertGreaterThan( 1, count( $listItems ) ); |
|
197 | + $this->assertGreaterThan(1, count($listItems)); |
|
198 | 198 | |
199 | - if( ( $first = reset( $listItems ) ) === false ) { |
|
200 | - throw new \RuntimeException( 'No first customer list item' ); |
|
199 | + if (($first = reset($listItems)) === false) { |
|
200 | + throw new \RuntimeException('No first customer list item'); |
|
201 | 201 | } |
202 | 202 | |
203 | - if( ( $second = next( $listItems ) ) === false ) { |
|
204 | - throw new \RuntimeException( 'No second customer list item' ); |
|
203 | + if (($second = next($listItems)) === false) { |
|
204 | + throw new \RuntimeException('No second customer list item'); |
|
205 | 205 | } |
206 | 206 | |
207 | - if( ( $last = end( $listItems ) ) === false ) { |
|
208 | - throw new \RuntimeException( 'No last customer list item' ); |
|
207 | + if (($last = end($listItems)) === false) { |
|
208 | + throw new \RuntimeException('No last customer list item'); |
|
209 | 209 | } |
210 | 210 | |
211 | - $this->object->moveItem( $first->getId(), $last->getId() ); |
|
211 | + $this->object->moveItem($first->getId(), $last->getId()); |
|
212 | 212 | |
213 | - $newLast = $this->object->getItem( $last->getId() ); |
|
214 | - $newUp = $this->object->getItem( $first->getId() ); |
|
213 | + $newLast = $this->object->getItem($last->getId()); |
|
214 | + $newUp = $this->object->getItem($first->getId()); |
|
215 | 215 | |
216 | - $this->object->moveItem( $first->getId(), $second->getId() ); |
|
216 | + $this->object->moveItem($first->getId(), $second->getId()); |
|
217 | 217 | |
218 | - $this->assertEquals( $last->getPosition() - 1, $newUp->getPosition() ); |
|
219 | - $this->assertEquals( $last->getPosition(), $newLast->getPosition() ); |
|
218 | + $this->assertEquals($last->getPosition() - 1, $newUp->getPosition()); |
|
219 | + $this->assertEquals($last->getPosition(), $newLast->getPosition()); |
|
220 | 220 | } |
221 | 221 | |
222 | 222 | |
@@ -226,39 +226,39 @@ discard block |
||
226 | 226 | $search = $this->object->createSearch(); |
227 | 227 | |
228 | 228 | $expr = []; |
229 | - $expr[] = $search->compare( '!=', 'customer.lists.id', null ); |
|
230 | - $expr[] = $search->compare( '!=', 'customer.lists.siteid', null ); |
|
231 | - $expr[] = $search->compare( '>', 'customer.lists.parentid', 0 ); |
|
232 | - $expr[] = $search->compare( '==', 'customer.lists.domain', 'text' ); |
|
233 | - $expr[] = $search->compare( '>', 'customer.lists.typeid', 0 ); |
|
234 | - $expr[] = $search->compare( '>', 'customer.lists.refid', 0 ); |
|
235 | - $expr[] = $search->compare( '==', 'customer.lists.datestart', '2010-01-01 00:00:00' ); |
|
236 | - $expr[] = $search->compare( '==', 'customer.lists.dateend', '2100-01-01 00:00:00' ); |
|
237 | - $expr[] = $search->compare( '!=', 'customer.lists.config', null ); |
|
238 | - $expr[] = $search->compare( '>', 'customer.lists.position', 1 ); |
|
239 | - $expr[] = $search->compare( '==', 'customer.lists.status', 1 ); |
|
240 | - $expr[] = $search->compare( '>=', 'customer.lists.mtime', '1970-01-01 00:00:00' ); |
|
241 | - $expr[] = $search->compare( '>=', 'customer.lists.ctime', '1970-01-01 00:00:00' ); |
|
242 | - $expr[] = $search->compare( '==', 'customer.lists.editor', $this->editor ); |
|
243 | - |
|
244 | - $expr[] = $search->compare( '!=', 'customer.lists.type.id', 0 ); |
|
245 | - $expr[] = $search->compare( '!=', 'customer.lists.type.siteid', null ); |
|
246 | - $expr[] = $search->compare( '==', 'customer.lists.type.code', 'default' ); |
|
247 | - $expr[] = $search->compare( '==', 'customer.lists.type.domain', 'text' ); |
|
248 | - $expr[] = $search->compare( '==', 'customer.lists.type.label', 'Standard' ); |
|
249 | - $expr[] = $search->compare( '==', 'customer.lists.type.status', 1 ); |
|
250 | - $expr[] = $search->compare( '>=', 'customer.lists.type.mtime', '1970-01-01 00:00:00' ); |
|
251 | - $expr[] = $search->compare( '>=', 'customer.lists.type.ctime', '1970-01-01 00:00:00' ); |
|
252 | - $expr[] = $search->compare( '==', 'customer.lists.type.editor', $this->editor ); |
|
253 | - |
|
254 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
229 | + $expr[] = $search->compare('!=', 'customer.lists.id', null); |
|
230 | + $expr[] = $search->compare('!=', 'customer.lists.siteid', null); |
|
231 | + $expr[] = $search->compare('>', 'customer.lists.parentid', 0); |
|
232 | + $expr[] = $search->compare('==', 'customer.lists.domain', 'text'); |
|
233 | + $expr[] = $search->compare('>', 'customer.lists.typeid', 0); |
|
234 | + $expr[] = $search->compare('>', 'customer.lists.refid', 0); |
|
235 | + $expr[] = $search->compare('==', 'customer.lists.datestart', '2010-01-01 00:00:00'); |
|
236 | + $expr[] = $search->compare('==', 'customer.lists.dateend', '2100-01-01 00:00:00'); |
|
237 | + $expr[] = $search->compare('!=', 'customer.lists.config', null); |
|
238 | + $expr[] = $search->compare('>', 'customer.lists.position', 1); |
|
239 | + $expr[] = $search->compare('==', 'customer.lists.status', 1); |
|
240 | + $expr[] = $search->compare('>=', 'customer.lists.mtime', '1970-01-01 00:00:00'); |
|
241 | + $expr[] = $search->compare('>=', 'customer.lists.ctime', '1970-01-01 00:00:00'); |
|
242 | + $expr[] = $search->compare('==', 'customer.lists.editor', $this->editor); |
|
243 | + |
|
244 | + $expr[] = $search->compare('!=', 'customer.lists.type.id', 0); |
|
245 | + $expr[] = $search->compare('!=', 'customer.lists.type.siteid', null); |
|
246 | + $expr[] = $search->compare('==', 'customer.lists.type.code', 'default'); |
|
247 | + $expr[] = $search->compare('==', 'customer.lists.type.domain', 'text'); |
|
248 | + $expr[] = $search->compare('==', 'customer.lists.type.label', 'Standard'); |
|
249 | + $expr[] = $search->compare('==', 'customer.lists.type.status', 1); |
|
250 | + $expr[] = $search->compare('>=', 'customer.lists.type.mtime', '1970-01-01 00:00:00'); |
|
251 | + $expr[] = $search->compare('>=', 'customer.lists.type.ctime', '1970-01-01 00:00:00'); |
|
252 | + $expr[] = $search->compare('==', 'customer.lists.type.editor', $this->editor); |
|
253 | + |
|
254 | + $search->setConditions($search->combine('&&', $expr)); |
|
255 | 255 | $search->setSlice(0, 1); |
256 | - $results = $this->object->searchItems( $search, [], $total ); |
|
257 | - $this->assertEquals( 1, count( $results ) ); |
|
258 | - $this->assertEquals( 2, $total ); |
|
256 | + $results = $this->object->searchItems($search, [], $total); |
|
257 | + $this->assertEquals(1, count($results)); |
|
258 | + $this->assertEquals(2, $total); |
|
259 | 259 | |
260 | - foreach($results as $itemId => $item) { |
|
261 | - $this->assertEquals( $itemId, $item->getId() ); |
|
260 | + foreach ($results as $itemId => $item) { |
|
261 | + $this->assertEquals($itemId, $item->getId()); |
|
262 | 262 | } |
263 | 263 | } |
264 | 264 | |
@@ -266,8 +266,8 @@ discard block |
||
266 | 266 | public function testSearchItemsNoCriteria() |
267 | 267 | { |
268 | 268 | $search = $this->object->createSearch(); |
269 | - $search->setConditions( $search->compare( '==', 'customer.lists.editor', $this->editor ) ); |
|
270 | - $this->assertEquals( 4, count( $this->object->searchItems($search) ) ); |
|
269 | + $search->setConditions($search->compare('==', 'customer.lists.editor', $this->editor)); |
|
270 | + $this->assertEquals(4, count($this->object->searchItems($search))); |
|
271 | 271 | } |
272 | 272 | |
273 | 273 | |
@@ -275,48 +275,48 @@ discard block |
||
275 | 275 | { |
276 | 276 | $search = $this->object->createSearch(true); |
277 | 277 | $conditions = array( |
278 | - $search->compare( '==', 'customer.lists.editor', $this->editor ), |
|
278 | + $search->compare('==', 'customer.lists.editor', $this->editor), |
|
279 | 279 | $search->getConditions() |
280 | 280 | ); |
281 | - $search->setConditions( $search->combine( '&&', $conditions ) ); |
|
282 | - $this->assertEquals( 4, count( $this->object->searchItems($search) ) ); |
|
281 | + $search->setConditions($search->combine('&&', $conditions)); |
|
282 | + $this->assertEquals(4, count($this->object->searchItems($search))); |
|
283 | 283 | } |
284 | 284 | |
285 | 285 | |
286 | 286 | public function testGetSubManager() |
287 | 287 | { |
288 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type') ); |
|
289 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type', 'Standard') ); |
|
288 | + $this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type')); |
|
289 | + $this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type', 'Standard')); |
|
290 | 290 | |
291 | - $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); |
|
292 | - $this->object->getSubManager( 'unknown' ); |
|
291 | + $this->setExpectedException('\\Aimeos\\MShop\\Exception'); |
|
292 | + $this->object->getSubManager('unknown'); |
|
293 | 293 | } |
294 | 294 | |
295 | 295 | |
296 | 296 | protected function getListItems() |
297 | 297 | { |
298 | - $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $this->context, 'Laravel' ); |
|
298 | + $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager($this->context, 'Laravel'); |
|
299 | 299 | |
300 | 300 | $search = $manager->createSearch(); |
301 | - $search->setConditions( $search->compare( '==', 'customer.code', 'UTC003' ) ); |
|
302 | - $search->setSlice( 0, 1 ); |
|
301 | + $search->setConditions($search->compare('==', 'customer.code', 'UTC003')); |
|
302 | + $search->setSlice(0, 1); |
|
303 | 303 | |
304 | - $results = $manager->searchItems( $search ); |
|
304 | + $results = $manager->searchItems($search); |
|
305 | 305 | |
306 | - if( ( $item = reset( $results ) ) === false ) { |
|
307 | - throw new \RuntimeException( 'No customer item found' ); |
|
306 | + if (($item = reset($results)) === false) { |
|
307 | + throw new \RuntimeException('No customer item found'); |
|
308 | 308 | } |
309 | 309 | |
310 | 310 | $search = $this->object->createSearch(); |
311 | 311 | $expr = array( |
312 | - $search->compare( '==', 'customer.lists.parentid', $item->getId() ), |
|
313 | - $search->compare( '==', 'customer.lists.domain', 'text' ), |
|
314 | - $search->compare( '==', 'customer.lists.editor', $this->editor ), |
|
315 | - $search->compare( '==', 'customer.lists.type.code', 'default' ), |
|
312 | + $search->compare('==', 'customer.lists.parentid', $item->getId()), |
|
313 | + $search->compare('==', 'customer.lists.domain', 'text'), |
|
314 | + $search->compare('==', 'customer.lists.editor', $this->editor), |
|
315 | + $search->compare('==', 'customer.lists.type.code', 'default'), |
|
316 | 316 | ); |
317 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
318 | - $search->setSortations( array( $search->sort( '+', 'customer.lists.position' ) ) ); |
|
317 | + $search->setConditions($search->combine('&&', $expr)); |
|
318 | + $search->setSortations(array($search->sort('+', 'customer.lists.position'))); |
|
319 | 319 | |
320 | - return $this->object->searchItems( $search ); |
|
320 | + return $this->object->searchItems($search); |
|
321 | 321 | } |
322 | 322 | } |
@@ -5,12 +5,12 @@ |
||
5 | 5 | * @copyright Aimeos (aimeos.org), 2018 |
6 | 6 | */ |
7 | 7 | |
8 | -return array ( |
|
8 | +return array( |
|
9 | 9 | 'customer/property/type' => array( |
10 | - 'customer/property/type/newsletter' => array( 'domain' => 'customer', 'code' => 'newsletter', 'label' => 'Newsletter', 'status' => 1 ), |
|
10 | + 'customer/property/type/newsletter' => array('domain' => 'customer', 'code' => 'newsletter', 'label' => 'Newsletter', 'status' => 1), |
|
11 | 11 | ), |
12 | 12 | |
13 | 13 | 'customer/property' => array( |
14 | - 'customer/property/UTC001/newsletter' => array( 'parentid' => 'customer/UTC001', 'typeid' => 'customer/property/type/newsletter', 'langid' => null, 'value' => '1' ), |
|
14 | + 'customer/property/UTC001/newsletter' => array('parentid' => 'customer/UTC001', 'typeid' => 'customer/property/type/newsletter', 'langid' => null, 'value' => '1'), |
|
15 | 15 | ), |
16 | 16 | ); |
17 | 17 | \ No newline at end of file |
@@ -16,29 +16,29 @@ discard block |
||
16 | 16 | protected function setUp() |
17 | 17 | { |
18 | 18 | $this->editor = \TestHelper::getContext()->getEditor(); |
19 | - $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( \TestHelper::getContext(), 'Laravel' ); |
|
19 | + $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager(\TestHelper::getContext(), 'Laravel'); |
|
20 | 20 | |
21 | - $listManager = $manager->getSubManager( 'lists', 'Laravel' ); |
|
22 | - $this->object = $listManager->getSubManager( 'type', 'Laravel' ); |
|
21 | + $listManager = $manager->getSubManager('lists', 'Laravel'); |
|
22 | + $this->object = $listManager->getSubManager('type', 'Laravel'); |
|
23 | 23 | } |
24 | 24 | |
25 | 25 | |
26 | 26 | protected function tearDown() |
27 | 27 | { |
28 | - unset( $this->object ); |
|
28 | + unset($this->object); |
|
29 | 29 | } |
30 | 30 | |
31 | 31 | |
32 | 32 | public function testCleanup() |
33 | 33 | { |
34 | - $this->object->cleanup( array( -1 ) ); |
|
34 | + $this->object->cleanup(array( -1 )); |
|
35 | 35 | } |
36 | 36 | |
37 | 37 | |
38 | 38 | public function testCreateItem() |
39 | 39 | { |
40 | 40 | $item = $this->object->createItem(); |
41 | - $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Type\\Iface', $item ); |
|
41 | + $this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Type\\Iface', $item); |
|
42 | 42 | } |
43 | 43 | |
44 | 44 | |
@@ -48,18 +48,18 @@ discard block |
||
48 | 48 | $search->setSlice(0, 1); |
49 | 49 | $results = $this->object->searchItems($search); |
50 | 50 | |
51 | - if( ( $expected = reset($results) ) === false ) { |
|
52 | - throw new \RuntimeException( 'No list type item found' ); |
|
51 | + if (($expected = reset($results)) === false) { |
|
52 | + throw new \RuntimeException('No list type item found'); |
|
53 | 53 | } |
54 | 54 | |
55 | - $this->assertEquals( $expected, $this->object->getItem( $expected->getId() ) ); |
|
55 | + $this->assertEquals($expected, $this->object->getItem($expected->getId())); |
|
56 | 56 | } |
57 | 57 | |
58 | 58 | |
59 | 59 | public function testGetSubManager() |
60 | 60 | { |
61 | - $this->setExpectedException( '\\Aimeos\\MShop\\Exception' ); |
|
62 | - $this->object->getSubManager( 'unknown' ); |
|
61 | + $this->setExpectedException('\\Aimeos\\MShop\\Exception'); |
|
62 | + $this->object->getSubManager('unknown'); |
|
63 | 63 | } |
64 | 64 | |
65 | 65 | |
@@ -69,51 +69,51 @@ discard block |
||
69 | 69 | $search->setSlice(0, 1); |
70 | 70 | $results = $this->object->searchItems($search); |
71 | 71 | |
72 | - if( ( $item = reset($results) ) === false ) { |
|
73 | - throw new \RuntimeException( 'No type item found' ); |
|
72 | + if (($item = reset($results)) === false) { |
|
73 | + throw new \RuntimeException('No type item found'); |
|
74 | 74 | } |
75 | 75 | |
76 | 76 | $item->setId(null); |
77 | - $item->setCode( 'unitTestInit' ); |
|
78 | - $resultSaved = $this->object->saveItem( $item ); |
|
79 | - $itemSaved = $this->object->getItem( $item->getId() ); |
|
77 | + $item->setCode('unitTestInit'); |
|
78 | + $resultSaved = $this->object->saveItem($item); |
|
79 | + $itemSaved = $this->object->getItem($item->getId()); |
|
80 | 80 | |
81 | 81 | $itemExp = clone $itemSaved; |
82 | - $itemExp->setCode( 'unitTestSave' ); |
|
83 | - $resultUpd = $this->object->saveItem( $itemExp ); |
|
84 | - $itemUpd = $this->object->getItem( $itemExp->getId() ); |
|
82 | + $itemExp->setCode('unitTestSave'); |
|
83 | + $resultUpd = $this->object->saveItem($itemExp); |
|
84 | + $itemUpd = $this->object->getItem($itemExp->getId()); |
|
85 | 85 | |
86 | - $this->object->deleteItem( $itemSaved->getId() ); |
|
86 | + $this->object->deleteItem($itemSaved->getId()); |
|
87 | 87 | |
88 | 88 | |
89 | - $this->assertTrue( $item->getId() !== null ); |
|
90 | - $this->assertEquals( $item->getId(), $itemSaved->getId() ); |
|
91 | - $this->assertEquals( $item->getSiteId(), $itemSaved->getSiteId() ); |
|
92 | - $this->assertEquals( $item->getCode(), $itemSaved->getCode() ); |
|
93 | - $this->assertEquals( $item->getDomain(), $itemSaved->getDomain() ); |
|
94 | - $this->assertEquals( $item->getLabel(), $itemSaved->getLabel() ); |
|
95 | - $this->assertEquals( $item->getStatus(), $itemSaved->getStatus() ); |
|
89 | + $this->assertTrue($item->getId() !== null); |
|
90 | + $this->assertEquals($item->getId(), $itemSaved->getId()); |
|
91 | + $this->assertEquals($item->getSiteId(), $itemSaved->getSiteId()); |
|
92 | + $this->assertEquals($item->getCode(), $itemSaved->getCode()); |
|
93 | + $this->assertEquals($item->getDomain(), $itemSaved->getDomain()); |
|
94 | + $this->assertEquals($item->getLabel(), $itemSaved->getLabel()); |
|
95 | + $this->assertEquals($item->getStatus(), $itemSaved->getStatus()); |
|
96 | 96 | |
97 | - $this->assertEquals( $this->editor, $itemSaved->getEditor() ); |
|
98 | - $this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated() ); |
|
99 | - $this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified() ); |
|
97 | + $this->assertEquals($this->editor, $itemSaved->getEditor()); |
|
98 | + $this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated()); |
|
99 | + $this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified()); |
|
100 | 100 | |
101 | - $this->assertEquals( $itemExp->getId(), $itemUpd->getId() ); |
|
102 | - $this->assertEquals( $itemExp->getSiteId(), $itemUpd->getSiteId() ); |
|
103 | - $this->assertEquals( $itemExp->getCode(), $itemUpd->getCode() ); |
|
104 | - $this->assertEquals( $itemExp->getDomain(), $itemUpd->getDomain() ); |
|
105 | - $this->assertEquals( $itemExp->getLabel(), $itemUpd->getLabel() ); |
|
106 | - $this->assertEquals( $itemExp->getStatus(), $itemUpd->getStatus() ); |
|
101 | + $this->assertEquals($itemExp->getId(), $itemUpd->getId()); |
|
102 | + $this->assertEquals($itemExp->getSiteId(), $itemUpd->getSiteId()); |
|
103 | + $this->assertEquals($itemExp->getCode(), $itemUpd->getCode()); |
|
104 | + $this->assertEquals($itemExp->getDomain(), $itemUpd->getDomain()); |
|
105 | + $this->assertEquals($itemExp->getLabel(), $itemUpd->getLabel()); |
|
106 | + $this->assertEquals($itemExp->getStatus(), $itemUpd->getStatus()); |
|
107 | 107 | |
108 | - $this->assertEquals( $this->editor, $itemUpd->getEditor() ); |
|
109 | - $this->assertEquals( $itemExp->getTimeCreated(), $itemUpd->getTimeCreated() ); |
|
110 | - $this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified() ); |
|
108 | + $this->assertEquals($this->editor, $itemUpd->getEditor()); |
|
109 | + $this->assertEquals($itemExp->getTimeCreated(), $itemUpd->getTimeCreated()); |
|
110 | + $this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified()); |
|
111 | 111 | |
112 | - $this->assertInstanceOf( '\Aimeos\MShop\Common\Item\Iface', $resultSaved ); |
|
113 | - $this->assertInstanceOf( '\Aimeos\MShop\Common\Item\Iface', $resultUpd ); |
|
112 | + $this->assertInstanceOf('\Aimeos\MShop\Common\Item\Iface', $resultSaved); |
|
113 | + $this->assertInstanceOf('\Aimeos\MShop\Common\Item\Iface', $resultUpd); |
|
114 | 114 | |
115 | 115 | $this->setExpectedException('\\Aimeos\\MShop\\Exception'); |
116 | - $this->object->getItem( $itemSaved->getId() ); |
|
116 | + $this->object->getItem($itemSaved->getId()); |
|
117 | 117 | } |
118 | 118 | |
119 | 119 | |
@@ -123,26 +123,26 @@ discard block |
||
123 | 123 | $search = $this->object->createSearch(); |
124 | 124 | |
125 | 125 | $expr = []; |
126 | - $expr[] = $search->compare( '!=', 'customer.lists.type.id', 0 ); |
|
127 | - $expr[] = $search->compare( '!=', 'customer.lists.type.siteid', null ); |
|
128 | - $expr[] = $search->compare( '==', 'customer.lists.type.code', 'default' ); |
|
129 | - $expr[] = $search->compare( '==', 'customer.lists.type.domain', 'text' ); |
|
130 | - $expr[] = $search->compare( '==', 'customer.lists.type.label', 'Standard' ); |
|
131 | - $expr[] = $search->compare( '>=', 'customer.lists.type.position', 0 ); |
|
132 | - $expr[] = $search->compare( '==', 'customer.lists.type.status', 1 ); |
|
133 | - $expr[] = $search->compare( '>=', 'customer.lists.type.mtime', '1970-01-01 00:00:00' ); |
|
134 | - $expr[] = $search->compare( '>=', 'customer.lists.type.ctime', '1970-01-01 00:00:00' ); |
|
135 | - $expr[] = $search->compare( '==', 'customer.lists.type.editor', $this->editor ); |
|
136 | - |
|
137 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
126 | + $expr[] = $search->compare('!=', 'customer.lists.type.id', 0); |
|
127 | + $expr[] = $search->compare('!=', 'customer.lists.type.siteid', null); |
|
128 | + $expr[] = $search->compare('==', 'customer.lists.type.code', 'default'); |
|
129 | + $expr[] = $search->compare('==', 'customer.lists.type.domain', 'text'); |
|
130 | + $expr[] = $search->compare('==', 'customer.lists.type.label', 'Standard'); |
|
131 | + $expr[] = $search->compare('>=', 'customer.lists.type.position', 0); |
|
132 | + $expr[] = $search->compare('==', 'customer.lists.type.status', 1); |
|
133 | + $expr[] = $search->compare('>=', 'customer.lists.type.mtime', '1970-01-01 00:00:00'); |
|
134 | + $expr[] = $search->compare('>=', 'customer.lists.type.ctime', '1970-01-01 00:00:00'); |
|
135 | + $expr[] = $search->compare('==', 'customer.lists.type.editor', $this->editor); |
|
136 | + |
|
137 | + $search->setConditions($search->combine('&&', $expr)); |
|
138 | 138 | $search->setSlice(0, 1); |
139 | 139 | |
140 | - $results = $this->object->searchItems( $search, [], $total ); |
|
141 | - $this->assertEquals( 1, count( $results ) ); |
|
142 | - $this->assertEquals( 1, $total ); |
|
140 | + $results = $this->object->searchItems($search, [], $total); |
|
141 | + $this->assertEquals(1, count($results)); |
|
142 | + $this->assertEquals(1, $total); |
|
143 | 143 | |
144 | - foreach($results as $itemId => $item) { |
|
145 | - $this->assertEquals( $itemId, $item->getId() ); |
|
144 | + foreach ($results as $itemId => $item) { |
|
145 | + $this->assertEquals($itemId, $item->getId()); |
|
146 | 146 | } |
147 | 147 | } |
148 | 148 |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | */ |
39 | 39 | public function getPostDependencies() |
40 | 40 | { |
41 | - return array( 'TablesCreateMShop' ); |
|
41 | + return array('TablesCreateMShop'); |
|
42 | 42 | } |
43 | 43 | |
44 | 44 | |
@@ -47,29 +47,29 @@ discard block |
||
47 | 47 | */ |
48 | 48 | public function migrate() |
49 | 49 | { |
50 | - $this->msg( 'Remove left over Laravel user address records', 0 ); |
|
50 | + $this->msg('Remove left over Laravel user address records', 0); |
|
51 | 51 | |
52 | - if( $this->schema->tableExists( 'users' ) && $this->schema->tableExists( 'users_address' ) ) |
|
52 | + if ($this->schema->tableExists('users') && $this->schema->tableExists('users_address')) |
|
53 | 53 | { |
54 | - $this->execute( $this->sql['address'] ); |
|
55 | - $this->status( 'done' ); |
|
54 | + $this->execute($this->sql['address']); |
|
55 | + $this->status('done'); |
|
56 | 56 | } |
57 | 57 | else |
58 | 58 | { |
59 | - $this->status( 'OK' ); |
|
59 | + $this->status('OK'); |
|
60 | 60 | } |
61 | 61 | |
62 | 62 | |
63 | - $this->msg( 'Remove left over Laravel user list records', 0 ); |
|
63 | + $this->msg('Remove left over Laravel user list records', 0); |
|
64 | 64 | |
65 | - if( $this->schema->tableExists( 'users' ) && $this->schema->tableExists( 'users_list' ) ) |
|
65 | + if ($this->schema->tableExists('users') && $this->schema->tableExists('users_list')) |
|
66 | 66 | { |
67 | - $this->execute( $this->sql['list'] ); |
|
68 | - $this->status( 'done' ); |
|
67 | + $this->execute($this->sql['list']); |
|
68 | + $this->status('done'); |
|
69 | 69 | } |
70 | 70 | else |
71 | 71 | { |
72 | - $this->status( 'OK' ); |
|
72 | + $this->status('OK'); |
|
73 | 73 | } |
74 | 74 | } |
75 | 75 | } |
@@ -53,8 +53,7 @@ discard block |
||
53 | 53 | { |
54 | 54 | $this->execute( $this->sql['address'] ); |
55 | 55 | $this->status( 'done' ); |
56 | - } |
|
57 | - else |
|
56 | + } else |
|
58 | 57 | { |
59 | 58 | $this->status( 'OK' ); |
60 | 59 | } |
@@ -66,8 +65,7 @@ discard block |
||
66 | 65 | { |
67 | 66 | $this->execute( $this->sql['list'] ); |
68 | 67 | $this->status( 'done' ); |
69 | - } |
|
70 | - else |
|
68 | + } else |
|
71 | 69 | { |
72 | 70 | $this->status( 'OK' ); |
73 | 71 | } |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | 'customer.property.type.id' => array( |
25 | 25 | 'code' => 'customer.property.type.id', |
26 | 26 | 'internalcode' => 'lvuprty."id"', |
27 | - 'internaldeps' => array( 'LEFT JOIN "users_property_type" AS lvuprty ON ( lvupr."typeid" = lvuprty."id" )' ), |
|
27 | + 'internaldeps' => array('LEFT JOIN "users_property_type" AS lvuprty ON ( lvupr."typeid" = lvuprty."id" )'), |
|
28 | 28 | 'label' => 'Property type ID', |
29 | 29 | 'type' => 'integer', |
30 | 30 | 'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT, |
@@ -105,14 +105,14 @@ discard block |
||
105 | 105 | * |
106 | 106 | * @param array $siteids List of IDs for sites whose entries should be deleted |
107 | 107 | */ |
108 | - public function cleanup( array $siteids ) |
|
108 | + public function cleanup(array $siteids) |
|
109 | 109 | { |
110 | 110 | $path = 'mshop/customer/manager/property/type/submanagers'; |
111 | - foreach( $this->getContext()->getConfig()->get( $path, [] ) as $domain ) { |
|
112 | - $this->getObject()->getSubManager( $domain )->cleanup( $siteids ); |
|
111 | + foreach ($this->getContext()->getConfig()->get($path, []) as $domain) { |
|
112 | + $this->getObject()->getSubManager($domain)->cleanup($siteids); |
|
113 | 113 | } |
114 | 114 | |
115 | - $this->cleanupBase( $siteids, 'mshop/customer/manager/property/type/laravel/delete' ); |
|
115 | + $this->cleanupBase($siteids, 'mshop/customer/manager/property/type/laravel/delete'); |
|
116 | 116 | } |
117 | 117 | |
118 | 118 | |
@@ -122,11 +122,11 @@ discard block |
||
122 | 122 | * @param boolean $withsub Return also attributes of sub-managers if true |
123 | 123 | * @return array Returns a list of attribtes implementing \Aimeos\MW\Criteria\Attribute\Iface |
124 | 124 | */ |
125 | - public function getSearchAttributes( $withsub = true ) |
|
125 | + public function getSearchAttributes($withsub = true) |
|
126 | 126 | { |
127 | 127 | $path = 'mshop/customer/manager/property/type/submanagers'; |
128 | 128 | |
129 | - return $this->getSearchAttributesBase( $this->searchConfig, $path, [], $withsub ); |
|
129 | + return $this->getSearchAttributesBase($this->searchConfig, $path, [], $withsub); |
|
130 | 130 | } |
131 | 131 | |
132 | 132 | |
@@ -137,9 +137,9 @@ discard block |
||
137 | 137 | * @param string|null $name Name of the implementation, will be from configuration (or Default) if null |
138 | 138 | * @return \Aimeos\MShop\Common\Manager\Iface Manager for different extensions, e.g types, lists etc. |
139 | 139 | */ |
140 | - public function getSubManager( $manager, $name = null ) |
|
140 | + public function getSubManager($manager, $name = null) |
|
141 | 141 | { |
142 | - return $this->getSubManagerBase( 'customer', 'property/type/' . $manager, ( $name === null ? 'Laravel' : $name ) ); |
|
142 | + return $this->getSubManagerBase('customer', 'property/type/'.$manager, ($name === null ? 'Laravel' : $name)); |
|
143 | 143 | } |
144 | 144 | |
145 | 145 |
@@ -31,9 +31,9 @@ discard block |
||
31 | 31 | * @param \Aimeos\MW\Config\Iface $config Configuration object |
32 | 32 | * @param string $tempdir Directory for storing temporary files |
33 | 33 | */ |
34 | - public function __construct( \Illuminate\Filesystem\FilesystemManager $fsm, \Aimeos\MW\Config\Iface $config, $tempdir ) |
|
34 | + public function __construct(\Illuminate\Filesystem\FilesystemManager $fsm, \Aimeos\MW\Config\Iface $config, $tempdir) |
|
35 | 35 | { |
36 | - parent::__construct( $config ); |
|
36 | + parent::__construct($config); |
|
37 | 37 | |
38 | 38 | $this->fsm = $fsm; |
39 | 39 | $this->tempdir = $tempdir; |
@@ -45,8 +45,8 @@ discard block |
||
45 | 45 | */ |
46 | 46 | public function __destruct() |
47 | 47 | { |
48 | - foreach( $this->objects as $key => $object ) { |
|
49 | - unset( $this->objects[$key] ); |
|
48 | + foreach ($this->objects as $key => $object) { |
|
49 | + unset($this->objects[$key]); |
|
50 | 50 | } |
51 | 51 | } |
52 | 52 | |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | |
61 | 61 | $this->objects = []; |
62 | 62 | |
63 | - return get_object_vars( $this ); |
|
63 | + return get_object_vars($this); |
|
64 | 64 | } |
65 | 65 | |
66 | 66 | |
@@ -71,19 +71,19 @@ discard block |
||
71 | 71 | * @return \Aimeos\MW\Filesystem\Iface File system object |
72 | 72 | * @throws \Aimeos\MW\Filesystem\Exception If an no configuration for that name is found |
73 | 73 | */ |
74 | - public function get( $name ) |
|
74 | + public function get($name) |
|
75 | 75 | { |
76 | - $key = $this->getConfig( $name ); |
|
76 | + $key = $this->getConfig($name); |
|
77 | 77 | |
78 | - if( is_string( $key ) ) |
|
78 | + if (is_string($key)) |
|
79 | 79 | { |
80 | - if( !isset( $this->objects[$key] ) ) { |
|
81 | - $this->objects[$key] = new \Aimeos\MW\Filesystem\Laravel( $this->fsm->disk( $key ), $this->tempdir ); |
|
80 | + if (!isset($this->objects[$key])) { |
|
81 | + $this->objects[$key] = new \Aimeos\MW\Filesystem\Laravel($this->fsm->disk($key), $this->tempdir); |
|
82 | 82 | } |
83 | 83 | |
84 | 84 | return $this->objects[$key]; |
85 | 85 | } |
86 | 86 | |
87 | - return parent::get( $name ); |
|
87 | + return parent::get($name); |
|
88 | 88 | } |
89 | 89 | } |