Completed
Pull Request — master (#2)
by
unknown
16:16
created
lib/custom/tests/MW/Logger/Laravel5Test.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -17,53 +17,53 @@
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
lib/custom/setup/CustomerChangeAddressRefidParentidLaravel.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 	}
Please login to merge, or discard this patch.
lib/custom/tests/MShop/Customer/Manager/Lists/LaravelTest.php 1 patch
Spacing   +151 added lines, -151 removed lines patch added patch discarded remove patch
@@ -18,43 +18,43 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
lib/custom/tests/MShop/Customer/Manager/Address/LaravelTest.php 1 patch
Spacing   +133 added lines, -133 removed lines patch added patch discarded remove patch
@@ -20,18 +20,18 @@  discard block
 block discarded – undo
20 20
 	{
21 21
 		$context = \TestHelper::getContext();
22 22
 		$this->editor = $context->getEditor();
23
-		$customer = new \Aimeos\MShop\Customer\Manager\Laravel( $context );
23
+		$customer = new \Aimeos\MShop\Customer\Manager\Laravel($context);
24 24
 
25 25
 		$search = $customer->createSearch();
26 26
 		$conditions = array(
27
-			$search->compare( '==', 'customer.code', 'UTC001' ),
28
-			$search->compare( '==', 'customer.editor', $this->editor )
27
+			$search->compare('==', 'customer.code', 'UTC001'),
28
+			$search->compare('==', 'customer.editor', $this->editor)
29 29
 		);
30
-		$search->setConditions( $search->combine( '&&', $conditions ) );
31
-		$result = $customer->searchItems( $search );
30
+		$search->setConditions($search->combine('&&', $conditions));
31
+		$result = $customer->searchItems($search);
32 32
 
33
-		if( ( $customerItem = reset( $result ) ) === false ) {
34
-			throw new \RuntimeException( sprintf( 'No customer item found for code "%1$s"', 'UTC001' ) );
33
+		if (($customerItem = reset($result)) === false) {
34
+			throw new \RuntimeException(sprintf('No customer item found for code "%1$s"', 'UTC001'));
35 35
 		}
36 36
 
37 37
 		$this->fixture = array(
@@ -60,139 +60,139 @@  discard block
 block discarded – undo
60 60
 			'customer.address.siteid' => $context->getLocale()->getSiteId(),
61 61
 		);
62 62
 
63
-		$this->object = $customer->getSubManager( 'address', 'Laravel' );
63
+		$this->object = $customer->getSubManager('address', 'Laravel');
64 64
 	}
65 65
 
66 66
 
67 67
 	protected function tearDown()
68 68
 	{
69
-		unset( $this->object, $this->fixture );
69
+		unset($this->object, $this->fixture);
70 70
 	}
71 71
 
72 72
 
73 73
 	public function testCleanup()
74 74
 	{
75
-		$this->object->cleanup( array( -1 ) );
75
+		$this->object->cleanup(array( -1 ));
76 76
 	}
77 77
 
78 78
 	public function testGetSearchAttributes()
79 79
 	{
80
-		foreach( $this->object->getSearchAttributes() as $attribute ) {
81
-			$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute );
80
+		foreach ($this->object->getSearchAttributes() as $attribute) {
81
+			$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute);
82 82
 		}
83 83
 	}
84 84
 
85 85
 	public function testGetSubManager()
86 86
 	{
87
-		$this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
88
-		$this->object->getSubManager( 'unknown' );
87
+		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
88
+		$this->object->getSubManager('unknown');
89 89
 	}
90 90
 
91 91
 	public function testCreateItem()
92 92
 	{
93
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Address\\Iface', $this->object->createItem() );
93
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Address\\Iface', $this->object->createItem());
94 94
 	}
95 95
 
96 96
 	public function testGetItem()
97 97
 	{
98 98
 		$search = $this->object->createSearch();
99
-		$search->setConditions( $search->compare( '~=', 'customer.address.company', 'ABC GmbH' ) );
99
+		$search->setConditions($search->compare('~=', 'customer.address.company', 'ABC GmbH'));
100 100
 
101
-		$items = $this->object->searchItems( $search );
101
+		$items = $this->object->searchItems($search);
102 102
 
103
-		if( ( $item = reset( $items ) ) === false ) {
104
-			throw new \RuntimeException( 'No address item with company "ABC" found' );
103
+		if (($item = reset($items)) === false) {
104
+			throw new \RuntimeException('No address item with company "ABC" found');
105 105
 		}
106 106
 
107
-		$this->assertEquals( $item, $this->object->getItem( $item->getId() ) );
107
+		$this->assertEquals($item, $this->object->getItem($item->getId()));
108 108
 	}
109 109
 
110 110
 	public function testSaveUpdateDeleteItem()
111 111
 	{
112
-		$item = new \Aimeos\MShop\Common\Item\Address\Standard( 'customer.address.', $this->fixture );
113
-		$item->setId( null );
114
-		$resultSaved = $this->object->saveItem( $item );
115
-		$itemSaved = $this->object->getItem( $item->getId() );
112
+		$item = new \Aimeos\MShop\Common\Item\Address\Standard('customer.address.', $this->fixture);
113
+		$item->setId(null);
114
+		$resultSaved = $this->object->saveItem($item);
115
+		$itemSaved = $this->object->getItem($item->getId());
116 116
 
117 117
 		$itemExp = clone $itemSaved;
118
-		$itemExp->setPosition( 1 );
119
-		$itemExp->setCity( 'Berlin' );
120
-		$itemExp->setState( 'Berlin' );
121
-		$resultUpd = $this->object->saveItem( $itemExp );
122
-		$itemUpd = $this->object->getItem( $itemExp->getId() );
123
-
124
-		$this->object->deleteItem( $itemSaved->getId() );
125
-
126
-
127
-		$this->assertTrue( $item->getId() !== null );
128
-		$this->assertEquals( $item->getId(), $itemSaved->getId() );
129
-		$this->assertEquals( $item->getParentId(), $itemSaved->getParentId());
130
-		$this->assertEquals( $item->getPosition(), $itemSaved->getPosition());
131
-		$this->assertEquals( $item->getCompany(), $itemSaved->getCompany());
132
-		$this->assertEquals( $item->getVatID(), $itemSaved->getVatID());
133
-		$this->assertEquals( $item->getSalutation(), $itemSaved->getSalutation());
134
-		$this->assertEquals( $item->getTitle(), $itemSaved->getTitle());
135
-		$this->assertEquals( $item->getFirstname(), $itemSaved->getFirstname());
136
-		$this->assertEquals( $item->getLastname(), $itemSaved->getLastname());
137
-		$this->assertEquals( $item->getAddress1(), $itemSaved->getAddress1());
138
-		$this->assertEquals( $item->getAddress2(), $itemSaved->getAddress2());
139
-		$this->assertEquals( $item->getAddress3(), $itemSaved->getAddress3());
140
-		$this->assertEquals( $item->getPostal(), $itemSaved->getPostal());
141
-		$this->assertEquals( $item->getCity(), $itemSaved->getCity());
142
-		$this->assertEquals( $item->getState(), $itemSaved->getState());
143
-		$this->assertEquals( $item->getCountryId(), $itemSaved->getCountryId());
144
-		$this->assertEquals( $item->getLanguageId(), $itemSaved->getLanguageId());
145
-		$this->assertEquals( $item->getTelephone(), $itemSaved->getTelephone());
146
-		$this->assertEquals( $item->getEmail(), $itemSaved->getEmail());
147
-		$this->assertEquals( $item->getTelefax(), $itemSaved->getTelefax());
148
-		$this->assertEquals( $item->getWebsite(), $itemSaved->getWebsite());
149
-		$this->assertEquals( $item->getLongitude(), $itemSaved->getLongitude());
150
-		$this->assertEquals( $item->getLatitude(), $itemSaved->getLatitude());
151
-		$this->assertEquals( $item->getFlag(), $itemSaved->getFlag());
152
-
153
-		$this->assertEquals( $this->editor, $itemSaved->getEditor() );
154
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated() );
118
+		$itemExp->setPosition(1);
119
+		$itemExp->setCity('Berlin');
120
+		$itemExp->setState('Berlin');
121
+		$resultUpd = $this->object->saveItem($itemExp);
122
+		$itemUpd = $this->object->getItem($itemExp->getId());
123
+
124
+		$this->object->deleteItem($itemSaved->getId());
125
+
126
+
127
+		$this->assertTrue($item->getId() !== null);
128
+		$this->assertEquals($item->getId(), $itemSaved->getId());
129
+		$this->assertEquals($item->getParentId(), $itemSaved->getParentId());
130
+		$this->assertEquals($item->getPosition(), $itemSaved->getPosition());
131
+		$this->assertEquals($item->getCompany(), $itemSaved->getCompany());
132
+		$this->assertEquals($item->getVatID(), $itemSaved->getVatID());
133
+		$this->assertEquals($item->getSalutation(), $itemSaved->getSalutation());
134
+		$this->assertEquals($item->getTitle(), $itemSaved->getTitle());
135
+		$this->assertEquals($item->getFirstname(), $itemSaved->getFirstname());
136
+		$this->assertEquals($item->getLastname(), $itemSaved->getLastname());
137
+		$this->assertEquals($item->getAddress1(), $itemSaved->getAddress1());
138
+		$this->assertEquals($item->getAddress2(), $itemSaved->getAddress2());
139
+		$this->assertEquals($item->getAddress3(), $itemSaved->getAddress3());
140
+		$this->assertEquals($item->getPostal(), $itemSaved->getPostal());
141
+		$this->assertEquals($item->getCity(), $itemSaved->getCity());
142
+		$this->assertEquals($item->getState(), $itemSaved->getState());
143
+		$this->assertEquals($item->getCountryId(), $itemSaved->getCountryId());
144
+		$this->assertEquals($item->getLanguageId(), $itemSaved->getLanguageId());
145
+		$this->assertEquals($item->getTelephone(), $itemSaved->getTelephone());
146
+		$this->assertEquals($item->getEmail(), $itemSaved->getEmail());
147
+		$this->assertEquals($item->getTelefax(), $itemSaved->getTelefax());
148
+		$this->assertEquals($item->getWebsite(), $itemSaved->getWebsite());
149
+		$this->assertEquals($item->getLongitude(), $itemSaved->getLongitude());
150
+		$this->assertEquals($item->getLatitude(), $itemSaved->getLatitude());
151
+		$this->assertEquals($item->getFlag(), $itemSaved->getFlag());
152
+
153
+		$this->assertEquals($this->editor, $itemSaved->getEditor());
154
+		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated());
155 155
 		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified());
156 156
 
157
-		$this->assertEquals( $itemExp->getId(), $itemUpd->getId() );
158
-		$this->assertEquals( $itemExp->getParentId(), $itemUpd->getParentId());
159
-		$this->assertEquals( $itemExp->getPosition(), $itemUpd->getPosition());
160
-		$this->assertEquals( $itemExp->getCompany(), $itemUpd->getCompany());
161
-		$this->assertEquals( $itemExp->getVatID(), $itemUpd->getVatID());
162
-		$this->assertEquals( $itemExp->getSalutation(), $itemUpd->getSalutation());
163
-		$this->assertEquals( $itemExp->getTitle(), $itemUpd->getTitle());
164
-		$this->assertEquals( $itemExp->getFirstname(), $itemUpd->getFirstname());
165
-		$this->assertEquals( $itemExp->getLastname(), $itemUpd->getLastname());
166
-		$this->assertEquals( $itemExp->getAddress1(), $itemUpd->getAddress1());
167
-		$this->assertEquals( $itemExp->getAddress2(), $itemUpd->getAddress2());
168
-		$this->assertEquals( $itemExp->getAddress3(), $itemUpd->getAddress3());
169
-		$this->assertEquals( $itemExp->getPostal(), $itemUpd->getPostal());
170
-		$this->assertEquals( $itemExp->getCity(), $itemUpd->getCity());
171
-		$this->assertEquals( $itemExp->getState(), $itemUpd->getState());
172
-		$this->assertEquals( $itemExp->getCountryId(), $itemUpd->getCountryId());
173
-		$this->assertEquals( $itemExp->getLanguageId(), $itemUpd->getLanguageId());
174
-		$this->assertEquals( $itemExp->getTelephone(), $itemUpd->getTelephone());
175
-		$this->assertEquals( $itemExp->getEmail(), $itemUpd->getEmail());
176
-		$this->assertEquals( $itemExp->getTelefax(), $itemUpd->getTelefax());
177
-		$this->assertEquals( $itemExp->getWebsite(), $itemUpd->getWebsite());
178
-		$this->assertEquals( $itemExp->getLongitude(), $itemUpd->getLongitude());
179
-		$this->assertEquals( $itemExp->getLatitude(), $itemUpd->getLatitude());
180
-		$this->assertEquals( $itemExp->getFlag(), $itemUpd->getFlag());
181
-
182
-		$this->assertEquals( $this->editor, $itemUpd->getEditor() );
183
-		$this->assertEquals( $itemExp->getTimeCreated(), $itemUpd->getTimeCreated() );
184
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified() );
185
-
186
-		$this->assertInstanceOf( '\Aimeos\MShop\Common\Item\Iface', $resultSaved );
187
-		$this->assertInstanceOf( '\Aimeos\MShop\Common\Item\Iface', $resultUpd );
157
+		$this->assertEquals($itemExp->getId(), $itemUpd->getId());
158
+		$this->assertEquals($itemExp->getParentId(), $itemUpd->getParentId());
159
+		$this->assertEquals($itemExp->getPosition(), $itemUpd->getPosition());
160
+		$this->assertEquals($itemExp->getCompany(), $itemUpd->getCompany());
161
+		$this->assertEquals($itemExp->getVatID(), $itemUpd->getVatID());
162
+		$this->assertEquals($itemExp->getSalutation(), $itemUpd->getSalutation());
163
+		$this->assertEquals($itemExp->getTitle(), $itemUpd->getTitle());
164
+		$this->assertEquals($itemExp->getFirstname(), $itemUpd->getFirstname());
165
+		$this->assertEquals($itemExp->getLastname(), $itemUpd->getLastname());
166
+		$this->assertEquals($itemExp->getAddress1(), $itemUpd->getAddress1());
167
+		$this->assertEquals($itemExp->getAddress2(), $itemUpd->getAddress2());
168
+		$this->assertEquals($itemExp->getAddress3(), $itemUpd->getAddress3());
169
+		$this->assertEquals($itemExp->getPostal(), $itemUpd->getPostal());
170
+		$this->assertEquals($itemExp->getCity(), $itemUpd->getCity());
171
+		$this->assertEquals($itemExp->getState(), $itemUpd->getState());
172
+		$this->assertEquals($itemExp->getCountryId(), $itemUpd->getCountryId());
173
+		$this->assertEquals($itemExp->getLanguageId(), $itemUpd->getLanguageId());
174
+		$this->assertEquals($itemExp->getTelephone(), $itemUpd->getTelephone());
175
+		$this->assertEquals($itemExp->getEmail(), $itemUpd->getEmail());
176
+		$this->assertEquals($itemExp->getTelefax(), $itemUpd->getTelefax());
177
+		$this->assertEquals($itemExp->getWebsite(), $itemUpd->getWebsite());
178
+		$this->assertEquals($itemExp->getLongitude(), $itemUpd->getLongitude());
179
+		$this->assertEquals($itemExp->getLatitude(), $itemUpd->getLatitude());
180
+		$this->assertEquals($itemExp->getFlag(), $itemUpd->getFlag());
181
+
182
+		$this->assertEquals($this->editor, $itemUpd->getEditor());
183
+		$this->assertEquals($itemExp->getTimeCreated(), $itemUpd->getTimeCreated());
184
+		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified());
185
+
186
+		$this->assertInstanceOf('\Aimeos\MShop\Common\Item\Iface', $resultSaved);
187
+		$this->assertInstanceOf('\Aimeos\MShop\Common\Item\Iface', $resultUpd);
188 188
 
189 189
 		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
190
-		$this->object->getItem( $itemSaved->getId() );
190
+		$this->object->getItem($itemSaved->getId());
191 191
 	}
192 192
 
193 193
 	public function testCreateSearch()
194 194
 	{
195
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $this->object->createSearch() );
195
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $this->object->createSearch());
196 196
 	}
197 197
 
198 198
 
@@ -201,36 +201,36 @@  discard block
 block discarded – undo
201 201
 		$search = $this->object->createSearch();
202 202
 
203 203
 		$expr = [];
204
-		$expr[] = $search->compare( '!=', 'customer.address.id', null );
205
-		$expr[] = $search->compare( '!=', 'customer.address.parentid', null );
206
-		$expr[] = $search->compare( '==', 'customer.address.company', 'ABC GmbH' );
207
-		$expr[] = $search->compare( '==', 'customer.address.vatid', 'DE999999999' );
208
-		$expr[] = $search->compare( '==', 'customer.address.salutation', 'mr' );
209
-		$expr[] = $search->compare( '==', 'customer.address.title', 'Dr.' );
210
-		$expr[] = $search->compare( '==', 'customer.address.firstname', 'Good' );
211
-		$expr[] = $search->compare( '==', 'customer.address.lastname', 'Unittest' );
212
-		$expr[] = $search->compare( '==', 'customer.address.address1', 'Pickhuben' );
213
-		$expr[] = $search->compare( '==', 'customer.address.address2', '2-4' );
214
-		$expr[] = $search->compare( '==', 'customer.address.address3', '' );
215
-		$expr[] = $search->compare( '==', 'customer.address.postal', '11099' );
216
-		$expr[] = $search->compare( '==', 'customer.address.city', 'Berlin' );
217
-		$expr[] = $search->compare( '==', 'customer.address.state', 'Berlin' );
218
-		$expr[] = $search->compare( '==', 'customer.address.languageid', 'de' );
219
-		$expr[] = $search->compare( '==', 'customer.address.countryid', 'DE' );
220
-		$expr[] = $search->compare( '==', 'customer.address.telephone', '055544332221' );
221
-		$expr[] = $search->compare( '==', 'customer.address.email', '[email protected]' );
222
-		$expr[] = $search->compare( '==', 'customer.address.telefax', '055544333212' );
223
-		$expr[] = $search->compare( '==', 'customer.address.website', 'unittest.aimeos.org' );
224
-		$expr[] = $search->compare( '>=', 'customer.address.longitude', '10.0' );
225
-		$expr[] = $search->compare( '>=', 'customer.address.latitude', '50.0' );
226
-		$expr[] = $search->compare( '==', 'customer.address.flag', 0 );
227
-		$expr[] = $search->compare( '==', 'customer.address.position', 1 );
228
-		$expr[] = $search->compare( '!=', 'customer.address.mtime', '1970-01-01 00:00:00' );
229
-		$expr[] = $search->compare( '!=', 'customer.address.ctime', '1970-01-01 00:00:00' );
230
-		$expr[] = $search->compare( '==', 'customer.address.editor', $this->editor );
231
-
232
-		$search->setConditions( $search->combine( '&&', $expr ) );
233
-		$this->assertEquals( 1, count( $this->object->searchItems( $search ) ) );
204
+		$expr[] = $search->compare('!=', 'customer.address.id', null);
205
+		$expr[] = $search->compare('!=', 'customer.address.parentid', null);
206
+		$expr[] = $search->compare('==', 'customer.address.company', 'ABC GmbH');
207
+		$expr[] = $search->compare('==', 'customer.address.vatid', 'DE999999999');
208
+		$expr[] = $search->compare('==', 'customer.address.salutation', 'mr');
209
+		$expr[] = $search->compare('==', 'customer.address.title', 'Dr.');
210
+		$expr[] = $search->compare('==', 'customer.address.firstname', 'Good');
211
+		$expr[] = $search->compare('==', 'customer.address.lastname', 'Unittest');
212
+		$expr[] = $search->compare('==', 'customer.address.address1', 'Pickhuben');
213
+		$expr[] = $search->compare('==', 'customer.address.address2', '2-4');
214
+		$expr[] = $search->compare('==', 'customer.address.address3', '');
215
+		$expr[] = $search->compare('==', 'customer.address.postal', '11099');
216
+		$expr[] = $search->compare('==', 'customer.address.city', 'Berlin');
217
+		$expr[] = $search->compare('==', 'customer.address.state', 'Berlin');
218
+		$expr[] = $search->compare('==', 'customer.address.languageid', 'de');
219
+		$expr[] = $search->compare('==', 'customer.address.countryid', 'DE');
220
+		$expr[] = $search->compare('==', 'customer.address.telephone', '055544332221');
221
+		$expr[] = $search->compare('==', 'customer.address.email', '[email protected]');
222
+		$expr[] = $search->compare('==', 'customer.address.telefax', '055544333212');
223
+		$expr[] = $search->compare('==', 'customer.address.website', 'unittest.aimeos.org');
224
+		$expr[] = $search->compare('>=', 'customer.address.longitude', '10.0');
225
+		$expr[] = $search->compare('>=', 'customer.address.latitude', '50.0');
226
+		$expr[] = $search->compare('==', 'customer.address.flag', 0);
227
+		$expr[] = $search->compare('==', 'customer.address.position', 1);
228
+		$expr[] = $search->compare('!=', 'customer.address.mtime', '1970-01-01 00:00:00');
229
+		$expr[] = $search->compare('!=', 'customer.address.ctime', '1970-01-01 00:00:00');
230
+		$expr[] = $search->compare('==', 'customer.address.editor', $this->editor);
231
+
232
+		$search->setConditions($search->combine('&&', $expr));
233
+		$this->assertEquals(1, count($this->object->searchItems($search)));
234 234
 	}
235 235
 
236 236
 
@@ -240,20 +240,20 @@  discard block
 block discarded – undo
240 240
 		$search = $this->object->createSearch();
241 241
 
242 242
 		$conditions = array(
243
-			$search->compare( '~=', 'customer.address.company', 'ABC GmbH' ),
244
-			$search->compare( '==', 'customer.address.editor', $this->editor )
243
+			$search->compare('~=', 'customer.address.company', 'ABC GmbH'),
244
+			$search->compare('==', 'customer.address.editor', $this->editor)
245 245
 		);
246 246
 
247
-		$search->setConditions( $search->combine( '&&', $conditions ) );
248
-		$search->setSlice( 0, 1 );
247
+		$search->setConditions($search->combine('&&', $conditions));
248
+		$search->setSlice(0, 1);
249 249
 
250
-		$results = $this->object->searchItems( $search, [], $total );
250
+		$results = $this->object->searchItems($search, [], $total);
251 251
 
252
-		$this->assertEquals( 1, count( $results ) );
253
-		$this->assertEquals( 2, $total );
252
+		$this->assertEquals(1, count($results));
253
+		$this->assertEquals(2, $total);
254 254
 
255
-		foreach( $results as $id => $item ) {
256
-			$this->assertEquals( $id, $item->getId() );
255
+		foreach ($results as $id => $item) {
256
+			$this->assertEquals($id, $item->getId());
257 257
 		}
258 258
 	}
259 259
 }
Please login to merge, or discard this patch.
lib/custom/setup/unittest/data/customer.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -5,17 +5,17 @@
 block discarded – undo
5 5
  * @copyright Aimeos (aimeos.org), 2014-2017
6 6
  */
7 7
 
8
-return array (
8
+return array(
9 9
 	'customer' => array(
10
-		'customer/UTC001' => array( 'code' => 'UTC001', 'label' => 'unitCustomer1', 'salutation' => 'mr', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'title' => 'Dr.', 'firstname' => 'Max', 'lastname' => 'Mustermann', 'address1' => 'Musterstraße', 'address2' => '1a', 'address3' => '', 'postal' => '20001', 'city' => 'Musterstadt', 'state' => 'Hamburg', 'langid' => 'de', 'countryid' => 'DE', 'telephone' => '01234567890', 'email' => '[email protected]', 'telefax' => '01234567890', 'website' => 'unittest.aimeos.org', 'longitude' => '10.0', 'latitude' => '50.0', 'birthday' => '1970-01-01', 'status' => '1', 'password' => 'test' ),
11
-		'customer/UTC002' => array( 'code' => 'UTC002', 'label' => 'unitCustomer2', 'salutation' => 'mrs', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'title' => 'Prof. Dr.', 'firstname' => 'Erika', 'lastname' => 'Mustermann', 'address1' => 'Heidestraße', 'address2' => '17', 'address3' => '', 'postal' => '45632', 'city' => 'Köln', 'state' => '', 'langid' => 'de', 'countryid' => 'DE', 'telephone' => '09876543210', 'email' => '[email protected]', 'telefax' => '09876543210', 'website' => 'unittest.aimeos.org', 'longitude' => '10.5', 'latitude' => '51.0', 'birthday' => '1970-01-01', 'status' => '0','password' =>  'test' ),
12
-		'customer/UTC003' => array( 'code' => 'UTC003', 'label' => 'unitCustomer3', 'salutation' => 'mr', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'title' => '', 'firstname' => 'Franz-Xaver', 'lastname' => 'Gabler', 'address1' => 'Phantasiestraße', 'address2' => '2', 'address3' => '', 'postal' => '23643', 'city' => 'Berlin', 'state' => 'Berlin', 'langid' => 'de', 'countryid' => 'DE', 'telephone' => '01234509876', 'email' => '[email protected]', 'telefax' => '055544333212', 'website' => 'unittest.aimeos.org', 'longitude' => '11.0', 'latitude' => '52.0', 'birthday' => '1970-01-01', 'status' => '1', 'password' => 'test' ),
10
+		'customer/UTC001' => array('code' => 'UTC001', 'label' => 'unitCustomer1', 'salutation' => 'mr', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'title' => 'Dr.', 'firstname' => 'Max', 'lastname' => 'Mustermann', 'address1' => 'Musterstraße', 'address2' => '1a', 'address3' => '', 'postal' => '20001', 'city' => 'Musterstadt', 'state' => 'Hamburg', 'langid' => 'de', 'countryid' => 'DE', 'telephone' => '01234567890', 'email' => '[email protected]', 'telefax' => '01234567890', 'website' => 'unittest.aimeos.org', 'longitude' => '10.0', 'latitude' => '50.0', 'birthday' => '1970-01-01', 'status' => '1', 'password' => 'test'),
11
+		'customer/UTC002' => array('code' => 'UTC002', 'label' => 'unitCustomer2', 'salutation' => 'mrs', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'title' => 'Prof. Dr.', 'firstname' => 'Erika', 'lastname' => 'Mustermann', 'address1' => 'Heidestraße', 'address2' => '17', 'address3' => '', 'postal' => '45632', 'city' => 'Köln', 'state' => '', 'langid' => 'de', 'countryid' => 'DE', 'telephone' => '09876543210', 'email' => '[email protected]', 'telefax' => '09876543210', 'website' => 'unittest.aimeos.org', 'longitude' => '10.5', 'latitude' => '51.0', 'birthday' => '1970-01-01', 'status' => '0', 'password' =>  'test'),
12
+		'customer/UTC003' => array('code' => 'UTC003', 'label' => 'unitCustomer3', 'salutation' => 'mr', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'title' => '', 'firstname' => 'Franz-Xaver', 'lastname' => 'Gabler', 'address1' => 'Phantasiestraße', 'address2' => '2', 'address3' => '', 'postal' => '23643', 'city' => 'Berlin', 'state' => 'Berlin', 'langid' => 'de', 'countryid' => 'DE', 'telephone' => '01234509876', 'email' => '[email protected]', 'telefax' => '055544333212', 'website' => 'unittest.aimeos.org', 'longitude' => '11.0', 'latitude' => '52.0', 'birthday' => '1970-01-01', 'status' => '1', 'password' => 'test'),
13 13
 	),
14 14
 
15 15
 	'customer/address' => array(
16
-		array( 'parentid' => 'customer/UTC001', 'company' => 'ABC', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => 'Dr', 'firstname' => 'Our', 'lastname' => 'Unittest', 'address1' => 'Pickhuben', 'address2' => '2-4', 'address3' => '', 'postal' => '20457', 'city' => 'Hamburg', 'state' => 'Hamburg', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '055544332211', 'email' => '[email protected]', 'telefax' => '055544332212', 'website' => 'unittest.aimeos.org', 'longitude' => '10.0', 'latitude' => '50.0', 'flag' => 0, 'pos' => '0' ),
17
-		array( 'parentid' => 'customer/UTC002', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => 'Dr.', 'firstname' => 'Good', 'lastname' => 'Unittest', 'address1' => 'Pickhuben', 'address2' => '2-4', 'address3' => '', 'postal' => '20457', 'city' => 'Hamburg', 'state' => 'Hamburg', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '055544332211', 'email' => '[email protected]', 'telefax' => '055544332212', 'website' => 'unittest.aimeos.org', 'longitude' => '10.5', 'latitude' => '51.0', 'flag' => 0, 'pos' => '1' ),
18
-		array( 'parentid' => 'customer/UTC002', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => 'Dr.', 'firstname' => 'Good', 'lastname' => 'Unittest', 'address1' => 'Pickhuben', 'address2' => '2-4', 'address3' => '', 'postal' => '11099', 'city' => 'Berlin', 'state' => 'Berlin', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '055544332221', 'email' => '[email protected]', 'telefax' => '055544333212', 'website' => 'unittest.aimeos.org', 'longitude' => '11.0', 'latitude' => '52.0', 'flag' => 0, 'pos' => '1' ),
19
-		array( 'parentid' => 'customer/UTC003', 'company' => 'unitcompany', 'vatid' => 'DE999999999', 'salutation' => 'company', 'title' => 'unittitle', 'firstname' => 'unitfirstname', 'lastname' => 'unitlastname', 'address1' => 'unitaddress1', 'address2' => 'unitaddress2', 'address3' => 'unitaddress3', 'postal' => 'unitpostal', 'city' => 'unitcity', 'state' => 'unitstate', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '1234567890', 'email' => '[email protected]', 'telefax' => '1234567891', 'website' => 'unittest.aimeos.org', 'longitude' => '10.0', 'latitude' => '50.0', 'flag' => 0, 'pos' => '2' ),
16
+		array('parentid' => 'customer/UTC001', 'company' => 'ABC', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => 'Dr', 'firstname' => 'Our', 'lastname' => 'Unittest', 'address1' => 'Pickhuben', 'address2' => '2-4', 'address3' => '', 'postal' => '20457', 'city' => 'Hamburg', 'state' => 'Hamburg', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '055544332211', 'email' => '[email protected]', 'telefax' => '055544332212', 'website' => 'unittest.aimeos.org', 'longitude' => '10.0', 'latitude' => '50.0', 'flag' => 0, 'pos' => '0'),
17
+		array('parentid' => 'customer/UTC002', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => 'Dr.', 'firstname' => 'Good', 'lastname' => 'Unittest', 'address1' => 'Pickhuben', 'address2' => '2-4', 'address3' => '', 'postal' => '20457', 'city' => 'Hamburg', 'state' => 'Hamburg', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '055544332211', 'email' => '[email protected]', 'telefax' => '055544332212', 'website' => 'unittest.aimeos.org', 'longitude' => '10.5', 'latitude' => '51.0', 'flag' => 0, 'pos' => '1'),
18
+		array('parentid' => 'customer/UTC002', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => 'Dr.', 'firstname' => 'Good', 'lastname' => 'Unittest', 'address1' => 'Pickhuben', 'address2' => '2-4', 'address3' => '', 'postal' => '11099', 'city' => 'Berlin', 'state' => 'Berlin', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '055544332221', 'email' => '[email protected]', 'telefax' => '055544333212', 'website' => 'unittest.aimeos.org', 'longitude' => '11.0', 'latitude' => '52.0', 'flag' => 0, 'pos' => '1'),
19
+		array('parentid' => 'customer/UTC003', 'company' => 'unitcompany', 'vatid' => 'DE999999999', 'salutation' => 'company', 'title' => 'unittitle', 'firstname' => 'unitfirstname', 'lastname' => 'unitlastname', 'address1' => 'unitaddress1', 'address2' => 'unitaddress2', 'address3' => 'unitaddress3', 'postal' => 'unitpostal', 'city' => 'unitcity', 'state' => 'unitstate', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '1234567890', 'email' => '[email protected]', 'telefax' => '1234567891', 'website' => 'unittest.aimeos.org', 'longitude' => '10.0', 'latitude' => '50.0', 'flag' => 0, 'pos' => '2'),
20 20
 	),
21 21
 );
Please login to merge, or discard this patch.
lib/custom/setup/unittest/data/customer-property.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -5,12 +5,12 @@
 block discarded – undo
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
Please login to merge, or discard this patch.
lib/custom/setup/unittest/data/customer-list.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -5,19 +5,19 @@
 block discarded – undo
5 5
  * @copyright Aimeos (aimeos.org), 2014-2017
6 6
  */
7 7
 
8
-return array (
9
-	'customer/lists/type' => array (
10
-		'customer/group/default' => array( 'domain' => 'customer/group', 'code' => 'default', 'label' => 'Standard', 'status' => 1 ),
11
-		'order/download' => array( 'domain' => 'order', 'code' => 'download', 'label' => 'Download', 'status' => 1 ),
12
-		'product/favorite' => array( 'domain' => 'product', 'code' => 'favorite', 'label' => 'Favorite', 'status' => 1 ),
13
-		'product/watch' => array( 'domain' => 'product', 'code' => 'watch', 'label' => 'Watch list', 'status' => 1 ),
14
-		'text/default' => array( 'domain' => 'text', 'code' => 'default', 'label' => 'Standard', 'status' => 1 ),
8
+return array(
9
+	'customer/lists/type' => array(
10
+		'customer/group/default' => array('domain' => 'customer/group', 'code' => 'default', 'label' => 'Standard', 'status' => 1),
11
+		'order/download' => array('domain' => 'order', 'code' => 'download', 'label' => 'Download', 'status' => 1),
12
+		'product/favorite' => array('domain' => 'product', 'code' => 'favorite', 'label' => 'Favorite', 'status' => 1),
13
+		'product/watch' => array('domain' => 'product', 'code' => 'watch', 'label' => 'Watch list', 'status' => 1),
14
+		'text/default' => array('domain' => 'text', 'code' => 'default', 'label' => 'Standard', 'status' => 1),
15 15
 	),
16 16
 
17
-	'customer/lists' => array (
18
-		array( 'parentid' => 'customer/UTC003', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/information', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => [], 'pos' => 1, 'status' => 1 ),
19
-		array( 'parentid' => 'customer/UTC003', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/notify', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => [], 'pos' => 2, 'status' => 1 ),
20
-		array( 'parentid' => 'customer/UTC003', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/newsletter', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => [], 'pos' => 3, 'status' => 1 ),
21
-		array( 'parentid' => 'customer/UTC001', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/information', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => [], 'pos' => 1, 'status' => 1 ),
17
+	'customer/lists' => array(
18
+		array('parentid' => 'customer/UTC003', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/information', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => [], 'pos' => 1, 'status' => 1),
19
+		array('parentid' => 'customer/UTC003', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/notify', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => [], 'pos' => 2, 'status' => 1),
20
+		array('parentid' => 'customer/UTC003', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/newsletter', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => [], 'pos' => 3, 'status' => 1),
21
+		array('parentid' => 'customer/UTC001', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/information', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => [], 'pos' => 1, 'status' => 1),
22 22
 	),
23 23
 );
24 24
\ No newline at end of file
Please login to merge, or discard this patch.
lib/custom/tests/MShop/Customer/Manager/Lists/Type/LaravelTest.php 1 patch
Spacing   +59 added lines, -59 removed lines patch added patch discarded remove patch
@@ -16,29 +16,29 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 
Please login to merge, or discard this patch.
lib/custom/tests/MShop/Customer/Manager/LaravelTest.php 1 patch
Spacing   +164 added lines, -164 removed lines patch added patch discarded remove patch
@@ -21,41 +21,41 @@  discard block
 block discarded – undo
21 21
 	{
22 22
 		$context = \TestHelper::getContext();
23 23
 		$this->editor = $context->getEditor();
24
-		$this->object = new \Aimeos\MShop\Customer\Manager\Laravel( $context );
24
+		$this->object = new \Aimeos\MShop\Customer\Manager\Laravel($context);
25 25
 
26 26
 		$this->fixture = array(
27 27
 			'label' => 'unitTest',
28 28
 			'status' => 2,
29 29
 		);
30 30
 
31
-		$this->address = new \Aimeos\MShop\Common\Item\Address\Standard( 'common.address.' );
31
+		$this->address = new \Aimeos\MShop\Common\Item\Address\Standard('common.address.');
32 32
 	}
33 33
 
34 34
 
35 35
 	protected function tearDown()
36 36
 	{
37
-		unset( $this->object, $this->fixture, $this->address );
37
+		unset($this->object, $this->fixture, $this->address);
38 38
 	}
39 39
 
40 40
 
41 41
 	public function testCleanup()
42 42
 	{
43
-		$this->object->cleanup( array( -1 ) );
43
+		$this->object->cleanup(array( -1 ));
44 44
 	}
45 45
 
46 46
 
47 47
 	public function testGetSearchAttributes()
48 48
 	{
49
-		foreach( $this->object->getSearchAttributes() as $attribute )
49
+		foreach ($this->object->getSearchAttributes() as $attribute)
50 50
 		{
51
-			$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute );
51
+			$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute);
52 52
 		}
53 53
 	}
54 54
 
55 55
 
56 56
 	public function testCreateItem()
57 57
 	{
58
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Customer\\Item\\Iface', $this->object->createItem() );
58
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Customer\\Item\\Iface', $this->object->createItem());
59 59
 	}
60 60
 
61 61
 
@@ -63,21 +63,21 @@  discard block
 block discarded – undo
63 63
 	{
64 64
 		$search = $this->object->createSearch();
65 65
 		$conditions = array(
66
-			$search->compare( '==', 'customer.code', 'UTC003' ),
67
-			$search->compare( '==', 'customer.editor', $this->editor )
66
+			$search->compare('==', 'customer.code', 'UTC003'),
67
+			$search->compare('==', 'customer.editor', $this->editor)
68 68
 		);
69
-		$search->setConditions( $search->combine( '&&', $conditions ) );
70
-		$items = $this->object->searchItems( $search, array( 'text' ) );
69
+		$search->setConditions($search->combine('&&', $conditions));
70
+		$items = $this->object->searchItems($search, array('text'));
71 71
 
72
-		if( ( $expected = reset( $items ) ) === false ) {
73
-			throw new \RuntimeException( 'No customer item with code "UTC003" found' );
72
+		if (($expected = reset($items)) === false) {
73
+			throw new \RuntimeException('No customer item with code "UTC003" found');
74 74
 		}
75 75
 
76
-		$actual = $this->object->getItem( $expected->getId(), array( 'text' ) );
76
+		$actual = $this->object->getItem($expected->getId(), array('text'));
77 77
 
78
-		$this->assertEquals( $expected, $actual );
79
-		$this->assertEquals( 3, count( $actual->getListItems( 'text' ) ) );
80
-		$this->assertEquals( 3, count( $actual->getRefItems( 'text' ) ) );
78
+		$this->assertEquals($expected, $actual);
79
+		$this->assertEquals(3, count($actual->getListItems('text')));
80
+		$this->assertEquals(3, count($actual->getRefItems('text')));
81 81
 	}
82 82
 
83 83
 
@@ -85,92 +85,92 @@  discard block
 block discarded – undo
85 85
 	{
86 86
 		$item = $this->object->createItem();
87 87
 
88
-		$item->setCode( 'unitTest' );
89
-		$item->setLabel( 'unitTest' );
90
-		$resultSaved = $this->object->saveItem( $item );
91
-		$itemSaved = $this->object->getItem( $item->getId() );
88
+		$item->setCode('unitTest');
89
+		$item->setLabel('unitTest');
90
+		$resultSaved = $this->object->saveItem($item);
91
+		$itemSaved = $this->object->getItem($item->getId());
92 92
 
93 93
 		$itemExp = clone $itemSaved;
94
-		$itemExp->setCode( 'unitTest2' );
95
-		$itemExp->setLabel( 'unitTest2' );
96
-		$resultUpd = $this->object->saveItem( $itemExp );
97
-		$itemUpd = $this->object->getItem( $itemExp->getId() );
98
-
99
-		$this->object->deleteItem( $item->getId() );
100
-
101
-		$this->assertTrue( $item->getId() !== null );
102
-		$this->assertEquals( $item->getId(), $itemSaved->getId() );
103
-		$this->assertEquals( $item->getSiteId(), $itemSaved->getSiteId() );
104
-		$this->assertEquals( $item->getStatus(), $itemSaved->getStatus() );
105
-		$this->assertEquals( $item->getCode(), $itemSaved->getCode() );
106
-		$this->assertEquals( $item->getLabel(), $itemSaved->getLabel() );
107
-		$this->assertEquals( $item->getPaymentAddress(), $itemSaved->getPaymentAddress() );
108
-		$this->assertEquals( $item->getBirthday(), $itemSaved->getBirthday() );
109
-		$this->assertEquals( $item->getPassword(), $itemSaved->getPassword() );
110
-
111
-		$this->assertEquals( $this->editor, $itemSaved->getEditor() );
112
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated() );
113
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified() );
114
-
115
-		$this->assertEquals( $itemExp->getId(), $itemUpd->getId() );
116
-		$this->assertEquals( $itemExp->getSiteId(), $itemUpd->getSiteId() );
117
-		$this->assertEquals( $itemExp->getStatus(), $itemUpd->getStatus() );
118
-		$this->assertEquals( $itemExp->getCode(), $itemUpd->getCode() );
119
-		$this->assertEquals( $itemExp->getLabel(), $itemUpd->getLabel() );
120
-		$this->assertEquals( $itemExp->getPaymentAddress(), $itemUpd->getPaymentAddress() );
121
-		$this->assertEquals( $itemExp->getBirthday(), $itemUpd->getBirthday() );
122
-		$this->assertEquals( $itemExp->getPassword(), $itemUpd->getPassword() );
123
-
124
-		$this->assertEquals( $this->editor, $itemUpd->getEditor() );
125
-		$this->assertEquals( $itemExp->getTimeCreated(), $itemUpd->getTimeCreated() );
126
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified() );
127
-
128
-		$this->assertInstanceOf( '\Aimeos\MShop\Common\Item\Iface', $resultSaved );
129
-		$this->assertInstanceOf( '\Aimeos\MShop\Common\Item\Iface', $resultUpd );
130
-
131
-		$this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
132
-		$this->object->getItem( $item->getId() );
94
+		$itemExp->setCode('unitTest2');
95
+		$itemExp->setLabel('unitTest2');
96
+		$resultUpd = $this->object->saveItem($itemExp);
97
+		$itemUpd = $this->object->getItem($itemExp->getId());
98
+
99
+		$this->object->deleteItem($item->getId());
100
+
101
+		$this->assertTrue($item->getId() !== null);
102
+		$this->assertEquals($item->getId(), $itemSaved->getId());
103
+		$this->assertEquals($item->getSiteId(), $itemSaved->getSiteId());
104
+		$this->assertEquals($item->getStatus(), $itemSaved->getStatus());
105
+		$this->assertEquals($item->getCode(), $itemSaved->getCode());
106
+		$this->assertEquals($item->getLabel(), $itemSaved->getLabel());
107
+		$this->assertEquals($item->getPaymentAddress(), $itemSaved->getPaymentAddress());
108
+		$this->assertEquals($item->getBirthday(), $itemSaved->getBirthday());
109
+		$this->assertEquals($item->getPassword(), $itemSaved->getPassword());
110
+
111
+		$this->assertEquals($this->editor, $itemSaved->getEditor());
112
+		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated());
113
+		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified());
114
+
115
+		$this->assertEquals($itemExp->getId(), $itemUpd->getId());
116
+		$this->assertEquals($itemExp->getSiteId(), $itemUpd->getSiteId());
117
+		$this->assertEquals($itemExp->getStatus(), $itemUpd->getStatus());
118
+		$this->assertEquals($itemExp->getCode(), $itemUpd->getCode());
119
+		$this->assertEquals($itemExp->getLabel(), $itemUpd->getLabel());
120
+		$this->assertEquals($itemExp->getPaymentAddress(), $itemUpd->getPaymentAddress());
121
+		$this->assertEquals($itemExp->getBirthday(), $itemUpd->getBirthday());
122
+		$this->assertEquals($itemExp->getPassword(), $itemUpd->getPassword());
123
+
124
+		$this->assertEquals($this->editor, $itemUpd->getEditor());
125
+		$this->assertEquals($itemExp->getTimeCreated(), $itemUpd->getTimeCreated());
126
+		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified());
127
+
128
+		$this->assertInstanceOf('\Aimeos\MShop\Common\Item\Iface', $resultSaved);
129
+		$this->assertInstanceOf('\Aimeos\MShop\Common\Item\Iface', $resultUpd);
130
+
131
+		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
132
+		$this->object->getItem($item->getId());
133 133
 	}
134 134
 
135 135
 
136 136
 	public function testGetSaveAddressItems()
137 137
 	{
138
-		$item = $this->object->findItem( 'UTC001', ['customer/address'] );
138
+		$item = $this->object->findItem('UTC001', ['customer/address']);
139 139
 
140
-		$item->setId( null )->setCode( 'xyz' );
141
-		$item->getPaymentAddress()->setEmail( '[email protected]' );
142
-		$item->addAddressItem( new \Aimeos\MShop\Common\Item\Address\Standard( 'customer.address.' ) );
143
-		$this->object->saveItem( $item );
140
+		$item->setId(null)->setCode('xyz');
141
+		$item->getPaymentAddress()->setEmail('[email protected]');
142
+		$item->addAddressItem(new \Aimeos\MShop\Common\Item\Address\Standard('customer.address.'));
143
+		$this->object->saveItem($item);
144 144
 
145
-		$item2 = $this->object->findItem( 'xyz', ['customer/address'] );
145
+		$item2 = $this->object->findItem('xyz', ['customer/address']);
146 146
 
147
-		$this->object->deleteItem( $item->getId() );
147
+		$this->object->deleteItem($item->getId());
148 148
 
149
-		$this->assertEquals( 2, count( $item->getAddressItems() ) );
150
-		$this->assertEquals( 2, count( $item2->getAddressItems() ) );
149
+		$this->assertEquals(2, count($item->getAddressItems()));
150
+		$this->assertEquals(2, count($item2->getAddressItems()));
151 151
 	}
152 152
 
153 153
 
154 154
 	public function testGetSavePropertyItems()
155 155
 	{
156
-		$item = $this->object->findItem( 'UTC001', ['customer/property'] );
156
+		$item = $this->object->findItem('UTC001', ['customer/property']);
157 157
 
158
-		$item->setId( null )->setCode( 'xyz' );
159
-		$item->getPaymentAddress()->setEmail( '[email protected]' );
160
-		$this->object->saveItem( $item );
158
+		$item->setId(null)->setCode('xyz');
159
+		$item->getPaymentAddress()->setEmail('[email protected]');
160
+		$this->object->saveItem($item);
161 161
 
162
-		$item2 = $this->object->findItem( 'xyz', ['customer/property'] );
162
+		$item2 = $this->object->findItem('xyz', ['customer/property']);
163 163
 
164
-		$this->object->deleteItem( $item->getId() );
164
+		$this->object->deleteItem($item->getId());
165 165
 
166
-		$this->assertEquals( 1, count( $item->getPropertyItems() ) );
167
-		$this->assertEquals( 1, count( $item2->getPropertyItems() ) );
166
+		$this->assertEquals(1, count($item->getPropertyItems()));
167
+		$this->assertEquals(1, count($item2->getPropertyItems()));
168 168
 	}
169 169
 
170 170
 
171 171
 	public function testCreateSearch()
172 172
 	{
173
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $this->object->createSearch() );
173
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $this->object->createSearch());
174 174
 	}
175 175
 
176 176
 
@@ -180,69 +180,69 @@  discard block
 block discarded – undo
180 180
 		$search = $this->object->createSearch();
181 181
 
182 182
 		$expr = [];
183
-		$expr[] = $search->compare( '!=', 'customer.id', null );
184
-		$expr[] = $search->compare( '==', 'customer.label', 'unitCustomer2' );
185
-		$expr[] = $search->compare( '==', 'customer.code', 'UTC002' );
186
-
187
-		$expr[] = $search->compare( '>=', 'customer.salutation', '' );
188
-		$expr[] = $search->compare( '>=', 'customer.company', '' );
189
-		$expr[] = $search->compare( '>=', 'customer.vatid', '' );
190
-		$expr[] = $search->compare( '>=', 'customer.title', '' );
191
-		$expr[] = $search->compare( '>=', 'customer.firstname', '' );
192
-		$expr[] = $search->compare( '>=', 'customer.lastname', '' );
193
-		$expr[] = $search->compare( '>=', 'customer.address1', '' );
194
-		$expr[] = $search->compare( '>=', 'customer.address2', '' );
195
-		$expr[] = $search->compare( '>=', 'customer.address3', '' );
196
-		$expr[] = $search->compare( '>=', 'customer.postal', '' );
197
-		$expr[] = $search->compare( '>=', 'customer.city', '' );
198
-		$expr[] = $search->compare( '>=', 'customer.state', '' );
199
-		$expr[] = $search->compare( '!=', 'customer.languageid', null );
200
-		$expr[] = $search->compare( '>=', 'customer.countryid', '' );
201
-		$expr[] = $search->compare( '>=', 'customer.telephone', '' );
202
-		$expr[] = $search->compare( '>=', 'customer.email', '' );
203
-		$expr[] = $search->compare( '>=', 'customer.telefax', '' );
204
-		$expr[] = $search->compare( '>=', 'customer.website', '' );
205
-		$expr[] = $search->compare( '>=', 'customer.longitude', '10.0' );
206
-		$expr[] = $search->compare( '>=', 'customer.latitude', '50.0' );
207
-
208
-		$expr[] = $search->compare( '==', 'customer.birthday', '1970-01-01' );
209
-		$expr[] = $search->compare( '>=', 'customer.password', '' );
210
-		$expr[] = $search->compare( '==', 'customer.status', 0 );
211
-		$expr[] = $search->compare( '!=', 'customer.mtime', '1970-01-01 00:00:00' );
212
-		$expr[] = $search->compare( '!=', 'customer.ctime', '1970-01-01 00:00:00' );
213
-		$expr[] = $search->compare( '==', 'customer.editor', $this->editor );
214
-
215
-		$expr[] = $search->compare( '!=', 'customer.address.id', null );
216
-		$expr[] = $search->compare( '!=', 'customer.address.parentid', null );
217
-		$expr[] = $search->compare( '==', 'customer.address.company', 'ABC GmbH' );
218
-		$expr[] = $search->compare( '==', 'customer.address.vatid', 'DE999999999' );
219
-		$expr[] = $search->compare( '==', 'customer.address.salutation', 'mr' );
220
-		$expr[] = $search->compare( '==', 'customer.address.title', 'Dr.' );
221
-		$expr[] = $search->compare( '==', 'customer.address.firstname', 'Good' );
222
-		$expr[] = $search->compare( '==', 'customer.address.lastname', 'Unittest' );
223
-		$expr[] = $search->compare( '==', 'customer.address.address1', 'Pickhuben' );
224
-		$expr[] = $search->compare( '==', 'customer.address.address2', '2-4' );
225
-		$expr[] = $search->compare( '==', 'customer.address.address3', '' );
226
-		$expr[] = $search->compare( '==', 'customer.address.postal', '11099' );
227
-		$expr[] = $search->compare( '==', 'customer.address.city', 'Berlin' );
228
-		$expr[] = $search->compare( '==', 'customer.address.state', 'Berlin' );
229
-		$expr[] = $search->compare( '==', 'customer.address.languageid', 'de' );
230
-		$expr[] = $search->compare( '==', 'customer.address.countryid', 'DE' );
231
-		$expr[] = $search->compare( '==', 'customer.address.telephone', '055544332221' );
232
-		$expr[] = $search->compare( '==', 'customer.address.email', '[email protected]' );
233
-		$expr[] = $search->compare( '==', 'customer.address.telefax', '055544333212' );
234
-		$expr[] = $search->compare( '==', 'customer.address.website', 'unittest.aimeos.org' );
235
-		$expr[] = $search->compare( '>=', 'customer.address.longitude', '10.0' );
236
-		$expr[] = $search->compare( '>=', 'customer.address.latitude', '50.0' );
237
-		$expr[] = $search->compare( '==', 'customer.address.flag', 0 );
238
-		$expr[] = $search->compare( '==', 'customer.address.position', 1 );
239
-		$expr[] = $search->compare( '!=', 'customer.address.mtime', '1970-01-01 00:00:00' );
240
-		$expr[] = $search->compare( '!=', 'customer.address.ctime', '1970-01-01 00:00:00' );
241
-		$expr[] = $search->compare( '==', 'customer.address.editor', $this->editor );
242
-
243
-		$search->setConditions( $search->combine( '&&', $expr ) );
244
-		$result = $this->object->searchItems( $search, [], $total );
245
-		$this->assertEquals( 1, count( $result ) );
183
+		$expr[] = $search->compare('!=', 'customer.id', null);
184
+		$expr[] = $search->compare('==', 'customer.label', 'unitCustomer2');
185
+		$expr[] = $search->compare('==', 'customer.code', 'UTC002');
186
+
187
+		$expr[] = $search->compare('>=', 'customer.salutation', '');
188
+		$expr[] = $search->compare('>=', 'customer.company', '');
189
+		$expr[] = $search->compare('>=', 'customer.vatid', '');
190
+		$expr[] = $search->compare('>=', 'customer.title', '');
191
+		$expr[] = $search->compare('>=', 'customer.firstname', '');
192
+		$expr[] = $search->compare('>=', 'customer.lastname', '');
193
+		$expr[] = $search->compare('>=', 'customer.address1', '');
194
+		$expr[] = $search->compare('>=', 'customer.address2', '');
195
+		$expr[] = $search->compare('>=', 'customer.address3', '');
196
+		$expr[] = $search->compare('>=', 'customer.postal', '');
197
+		$expr[] = $search->compare('>=', 'customer.city', '');
198
+		$expr[] = $search->compare('>=', 'customer.state', '');
199
+		$expr[] = $search->compare('!=', 'customer.languageid', null);
200
+		$expr[] = $search->compare('>=', 'customer.countryid', '');
201
+		$expr[] = $search->compare('>=', 'customer.telephone', '');
202
+		$expr[] = $search->compare('>=', 'customer.email', '');
203
+		$expr[] = $search->compare('>=', 'customer.telefax', '');
204
+		$expr[] = $search->compare('>=', 'customer.website', '');
205
+		$expr[] = $search->compare('>=', 'customer.longitude', '10.0');
206
+		$expr[] = $search->compare('>=', 'customer.latitude', '50.0');
207
+
208
+		$expr[] = $search->compare('==', 'customer.birthday', '1970-01-01');
209
+		$expr[] = $search->compare('>=', 'customer.password', '');
210
+		$expr[] = $search->compare('==', 'customer.status', 0);
211
+		$expr[] = $search->compare('!=', 'customer.mtime', '1970-01-01 00:00:00');
212
+		$expr[] = $search->compare('!=', 'customer.ctime', '1970-01-01 00:00:00');
213
+		$expr[] = $search->compare('==', 'customer.editor', $this->editor);
214
+
215
+		$expr[] = $search->compare('!=', 'customer.address.id', null);
216
+		$expr[] = $search->compare('!=', 'customer.address.parentid', null);
217
+		$expr[] = $search->compare('==', 'customer.address.company', 'ABC GmbH');
218
+		$expr[] = $search->compare('==', 'customer.address.vatid', 'DE999999999');
219
+		$expr[] = $search->compare('==', 'customer.address.salutation', 'mr');
220
+		$expr[] = $search->compare('==', 'customer.address.title', 'Dr.');
221
+		$expr[] = $search->compare('==', 'customer.address.firstname', 'Good');
222
+		$expr[] = $search->compare('==', 'customer.address.lastname', 'Unittest');
223
+		$expr[] = $search->compare('==', 'customer.address.address1', 'Pickhuben');
224
+		$expr[] = $search->compare('==', 'customer.address.address2', '2-4');
225
+		$expr[] = $search->compare('==', 'customer.address.address3', '');
226
+		$expr[] = $search->compare('==', 'customer.address.postal', '11099');
227
+		$expr[] = $search->compare('==', 'customer.address.city', 'Berlin');
228
+		$expr[] = $search->compare('==', 'customer.address.state', 'Berlin');
229
+		$expr[] = $search->compare('==', 'customer.address.languageid', 'de');
230
+		$expr[] = $search->compare('==', 'customer.address.countryid', 'DE');
231
+		$expr[] = $search->compare('==', 'customer.address.telephone', '055544332221');
232
+		$expr[] = $search->compare('==', 'customer.address.email', '[email protected]');
233
+		$expr[] = $search->compare('==', 'customer.address.telefax', '055544333212');
234
+		$expr[] = $search->compare('==', 'customer.address.website', 'unittest.aimeos.org');
235
+		$expr[] = $search->compare('>=', 'customer.address.longitude', '10.0');
236
+		$expr[] = $search->compare('>=', 'customer.address.latitude', '50.0');
237
+		$expr[] = $search->compare('==', 'customer.address.flag', 0);
238
+		$expr[] = $search->compare('==', 'customer.address.position', 1);
239
+		$expr[] = $search->compare('!=', 'customer.address.mtime', '1970-01-01 00:00:00');
240
+		$expr[] = $search->compare('!=', 'customer.address.ctime', '1970-01-01 00:00:00');
241
+		$expr[] = $search->compare('==', 'customer.address.editor', $this->editor);
242
+
243
+		$search->setConditions($search->combine('&&', $expr));
244
+		$result = $this->object->searchItems($search, [], $total);
245
+		$this->assertEquals(1, count($result));
246 246
 	}
247 247
 
248 248
 
@@ -251,60 +251,60 @@  discard block
 block discarded – undo
251 251
 		$total = 0;
252 252
 
253 253
 		$search = $this->object->createSearch();
254
-		$search->setConditions( $search->compare( '==', 'customer.address.editor', $this->editor ) );
255
-		$search->setSlice( 0, 2 );
254
+		$search->setConditions($search->compare('==', 'customer.address.editor', $this->editor));
255
+		$search->setSlice(0, 2);
256 256
 
257
-		$results = $this->object->searchItems( $search, [], $total );
258
-		$this->assertEquals( 2, count( $results ) );
259
-		$this->assertEquals( 3, $total );
257
+		$results = $this->object->searchItems($search, [], $total);
258
+		$this->assertEquals(2, count($results));
259
+		$this->assertEquals(3, $total);
260 260
 
261
-		foreach($results as $itemId => $item) {
262
-			$this->assertEquals( $itemId, $item->getId() );
261
+		foreach ($results as $itemId => $item) {
262
+			$this->assertEquals($itemId, $item->getId());
263 263
 		}
264 264
 	}
265 265
 
266 266
 
267 267
 	public function testSearchItemsCriteria()
268 268
 	{
269
-		$search = $this->object->createSearch( true );
269
+		$search = $this->object->createSearch(true);
270 270
 		$conditions = array(
271
-			$search->compare( '==', 'customer.address.editor', $this->editor ),
271
+			$search->compare('==', 'customer.address.editor', $this->editor),
272 272
 			$search->getConditions()
273 273
 		);
274
-		$search->setConditions( $search->combine( '&&', $conditions ) );
275
-		$this->assertEquals( 2, count( $this->object->searchItems( $search, [], $total ) ) );
274
+		$search->setConditions($search->combine('&&', $conditions));
275
+		$this->assertEquals(2, count($this->object->searchItems($search, [], $total)));
276 276
 	}
277 277
 
278 278
 
279 279
 	public function testSearchItemsRef()
280 280
 	{
281 281
 		$search = $this->object->createSearch();
282
-		$search->setConditions( $search->compare( '==', 'customer.code', 'UTC001' ) );
282
+		$search->setConditions($search->compare('==', 'customer.code', 'UTC001'));
283 283
 
284
-		$results = $this->object->searchItems( $search, ['customer/address', 'text'] );
284
+		$results = $this->object->searchItems($search, ['customer/address', 'text']);
285 285
 
286
-		if( ( $item = reset( $results ) ) === false ) {
287
-			throw new \Exception( 'No customer item for "UTC001" available' );
286
+		if (($item = reset($results)) === false) {
287
+			throw new \Exception('No customer item for "UTC001" available');
288 288
 		}
289 289
 
290
-		$this->assertEquals( 1, count( $item->getRefItems( 'text' ) ) );
291
-		$this->assertEquals( 1, count( $item->getAddressItems() ) );
290
+		$this->assertEquals(1, count($item->getRefItems('text')));
291
+		$this->assertEquals(1, count($item->getAddressItems()));
292 292
 	}
293 293
 
294 294
 
295 295
 	public function testGetSubManager()
296 296
 	{
297
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager( 'address' ) );
298
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager( 'address', 'Standard' ) );
297
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('address'));
298
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('address', 'Standard'));
299 299
 
300
-		$this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
301
-		$this->object->getSubManager( 'unknown' );
300
+		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
301
+		$this->object->getSubManager('unknown');
302 302
 	}
303 303
 
304 304
 
305 305
 	public function testGetSubManagerInvalidName()
306 306
 	{
307
-		$this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
308
-		$this->object->getSubManager( 'address', 'unknown' );
307
+		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
308
+		$this->object->getSubManager('address', 'unknown');
309 309
 	}
310 310
 }
Please login to merge, or discard this patch.