Completed
Push — master ( 81e2f6...c8d8ff )
by Aimeos
03:24
created
lib/custom/setup/TablesCreateLaravel.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 	 */
22 22
 	public function getPostDependencies()
23 23
 	{
24
-		return array( 'MShopAddTypeData' );
24
+		return array('MShopAddTypeData');
25 25
 	}
26 26
 
27 27
 
@@ -30,15 +30,15 @@  discard block
 block discarded – undo
30 30
 	 */
31 31
 	public function migrate()
32 32
 	{
33
-		$this->msg( 'Creating Aimeos Laravel user tables', 0 );
34
-		$this->status( '' );
33
+		$this->msg('Creating Aimeos Laravel user tables', 0);
34
+		$this->status('');
35 35
 
36 36
 		$ds = DIRECTORY_SEPARATOR;
37 37
 
38 38
 		$files = array(
39
-			'db-customer' => __DIR__ . $ds . 'default' . $ds . 'schema' . $ds . 'customer.php',
39
+			'db-customer' => __DIR__.$ds.'default'.$ds.'schema'.$ds.'customer.php',
40 40
 		);
41 41
 
42
-		$this->setupSchema( $files );
42
+		$this->setupSchema($files);
43 43
 	}
44 44
 }
Please login to merge, or discard this patch.
lib/custom/tests/MShop/Customer/Manager/LaravelTest.php 1 patch
Spacing   +134 added lines, -134 removed lines patch added patch discarded remove patch
@@ -22,14 +22,14 @@  discard block
 block discarded – undo
22 22
 	{
23 23
 		$context = \TestHelper::getContext();
24 24
 		$this->editor = $context->getEditor();
25
-		$this->object = new \Aimeos\MShop\Customer\Manager\Laravel( $context );
25
+		$this->object = new \Aimeos\MShop\Customer\Manager\Laravel($context);
26 26
 
27 27
 		$this->fixture = array(
28 28
 			'label' => 'unitTest',
29 29
 			'status' => 2,
30 30
 		);
31 31
 
32
-		$this->address = new \Aimeos\MShop\Common\Item\Address\Standard( 'common.address.' );
32
+		$this->address = new \Aimeos\MShop\Common\Item\Address\Standard('common.address.');
33 33
 	}
34 34
 
35 35
 
@@ -38,28 +38,28 @@  discard block
 block discarded – undo
38 38
 	 */
39 39
 	protected function tearDown()
40 40
 	{
41
-		unset( $this->object, $this->fixture, $this->address );
41
+		unset($this->object, $this->fixture, $this->address);
42 42
 	}
43 43
 
44 44
 
45 45
 	public function testCleanup()
46 46
 	{
47
-		$this->object->cleanup( array( -1 ) );
47
+		$this->object->cleanup(array( -1 ));
48 48
 	}
49 49
 
50 50
 
51 51
 	public function testGetSearchAttributes()
52 52
 	{
53
-		foreach( $this->object->getSearchAttributes() as $attribute )
53
+		foreach ($this->object->getSearchAttributes() as $attribute)
54 54
 		{
55
-			$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute );
55
+			$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute);
56 56
 		}
57 57
 	}
58 58
 
59 59
 
60 60
 	public function testCreateItem()
61 61
 	{
62
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Customer\\Item\\Iface', $this->object->createItem() );
62
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Customer\\Item\\Iface', $this->object->createItem());
63 63
 	}
64 64
 
65 65
 
@@ -67,21 +67,21 @@  discard block
 block discarded – undo
67 67
 	{
68 68
 		$search = $this->object->createSearch();
69 69
 		$conditions = array(
70
-			$search->compare( '==', 'customer.code', 'unitCustomer3' ),
71
-			$search->compare( '==', 'customer.editor', $this->editor )
70
+			$search->compare('==', 'customer.code', 'unitCustomer3'),
71
+			$search->compare('==', 'customer.editor', $this->editor)
72 72
 		);
73
-		$search->setConditions( $search->combine( '&&', $conditions ) );
74
-		$items = $this->object->searchItems( $search, array( 'text' ) );
73
+		$search->setConditions($search->combine('&&', $conditions));
74
+		$items = $this->object->searchItems($search, array('text'));
75 75
 
76
-		if( ( $expected = reset( $items ) ) === false ) {
77
-			throw new \Exception( 'No customer item with code "unitCustomer3" found' );
76
+		if (($expected = reset($items)) === false) {
77
+			throw new \Exception('No customer item with code "unitCustomer3" found');
78 78
 		}
79 79
 
80
-		$actual = $this->object->getItem( $expected->getId(), array( 'text' ) );
80
+		$actual = $this->object->getItem($expected->getId(), array('text'));
81 81
 
82
-		$this->assertEquals( $expected, $actual );
83
-		$this->assertEquals( 3, count( $actual->getListItems( 'text' ) ) );
84
-		$this->assertEquals( 3, count( $actual->getRefItems( 'text' ) ) );
82
+		$this->assertEquals($expected, $actual);
83
+		$this->assertEquals(3, count($actual->getListItems('text')));
84
+		$this->assertEquals(3, count($actual->getRefItems('text')));
85 85
 	}
86 86
 
87 87
 
@@ -89,54 +89,54 @@  discard block
 block discarded – undo
89 89
 	{
90 90
 		$item = $this->object->createItem();
91 91
 
92
-		$item->setCode( 'unitTest' );
93
-		$item->setLabel( 'unitTest' );
94
-		$this->object->saveItem( $item );
95
-		$itemSaved = $this->object->getItem( $item->getId() );
92
+		$item->setCode('unitTest');
93
+		$item->setLabel('unitTest');
94
+		$this->object->saveItem($item);
95
+		$itemSaved = $this->object->getItem($item->getId());
96 96
 
97 97
 		$itemExp = clone $itemSaved;
98
-		$itemExp->setCode( 'unitTest2' );
99
-		$itemExp->setLabel( 'unitTest2' );
100
-		$this->object->saveItem( $itemExp );
101
-		$itemUpd = $this->object->getItem( $itemExp->getId() );
102
-
103
-		$this->object->deleteItem( $item->getId() );
104
-
105
-		$this->assertTrue( $item->getId() !== null );
106
-		$this->assertEquals( $item->getId(), $itemSaved->getId() );
107
-		$this->assertEquals( $item->getSiteId(), $itemSaved->getSiteId() );
108
-		$this->assertEquals( $item->getStatus(), $itemSaved->getStatus() );
109
-		$this->assertEquals( $item->getCode(), $itemSaved->getCode() );
110
-		$this->assertEquals( $item->getLabel(), $itemSaved->getLabel() );
111
-		$this->assertEquals( $item->getPaymentAddress(), $itemSaved->getPaymentAddress() );
112
-		$this->assertEquals( $item->getBirthday(), $itemSaved->getBirthday() );
113
-		$this->assertEquals( $item->getPassword(), $itemSaved->getPassword() );
114
-
115
-		$this->assertEquals( $this->editor, $itemSaved->getEditor() );
116
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated() );
117
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified() );
118
-
119
-		$this->assertEquals( $itemExp->getId(), $itemUpd->getId() );
120
-		$this->assertEquals( $itemExp->getSiteId(), $itemUpd->getSiteId() );
121
-		$this->assertEquals( $itemExp->getStatus(), $itemUpd->getStatus() );
122
-		$this->assertEquals( $itemExp->getCode(), $itemUpd->getCode() );
123
-		$this->assertEquals( $itemExp->getLabel(), $itemUpd->getLabel() );
124
-		$this->assertEquals( $itemExp->getPaymentAddress(), $itemUpd->getPaymentAddress() );
125
-		$this->assertEquals( $itemExp->getBirthday(), $itemUpd->getBirthday() );
126
-		$this->assertEquals( $itemExp->getPassword(), $itemUpd->getPassword() );
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() );
131
-
132
-		$this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
133
-		$this->object->getItem( $item->getId() );
98
+		$itemExp->setCode('unitTest2');
99
+		$itemExp->setLabel('unitTest2');
100
+		$this->object->saveItem($itemExp);
101
+		$itemUpd = $this->object->getItem($itemExp->getId());
102
+
103
+		$this->object->deleteItem($item->getId());
104
+
105
+		$this->assertTrue($item->getId() !== null);
106
+		$this->assertEquals($item->getId(), $itemSaved->getId());
107
+		$this->assertEquals($item->getSiteId(), $itemSaved->getSiteId());
108
+		$this->assertEquals($item->getStatus(), $itemSaved->getStatus());
109
+		$this->assertEquals($item->getCode(), $itemSaved->getCode());
110
+		$this->assertEquals($item->getLabel(), $itemSaved->getLabel());
111
+		$this->assertEquals($item->getPaymentAddress(), $itemSaved->getPaymentAddress());
112
+		$this->assertEquals($item->getBirthday(), $itemSaved->getBirthday());
113
+		$this->assertEquals($item->getPassword(), $itemSaved->getPassword());
114
+
115
+		$this->assertEquals($this->editor, $itemSaved->getEditor());
116
+		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated());
117
+		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified());
118
+
119
+		$this->assertEquals($itemExp->getId(), $itemUpd->getId());
120
+		$this->assertEquals($itemExp->getSiteId(), $itemUpd->getSiteId());
121
+		$this->assertEquals($itemExp->getStatus(), $itemUpd->getStatus());
122
+		$this->assertEquals($itemExp->getCode(), $itemUpd->getCode());
123
+		$this->assertEquals($itemExp->getLabel(), $itemUpd->getLabel());
124
+		$this->assertEquals($itemExp->getPaymentAddress(), $itemUpd->getPaymentAddress());
125
+		$this->assertEquals($itemExp->getBirthday(), $itemUpd->getBirthday());
126
+		$this->assertEquals($itemExp->getPassword(), $itemUpd->getPassword());
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());
131
+
132
+		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
133
+		$this->object->getItem($item->getId());
134 134
 	}
135 135
 
136 136
 
137 137
 	public function testCreateSearch()
138 138
 	{
139
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $this->object->createSearch() );
139
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $this->object->createSearch());
140 140
 	}
141 141
 
142 142
 
@@ -146,65 +146,65 @@  discard block
 block discarded – undo
146 146
 		$search = $this->object->createSearch();
147 147
 
148 148
 		$expr = array();
149
-		$expr[] = $search->compare( '!=', 'customer.id', null );
150
-		$expr[] = $search->compare( '==', 'customer.label', 'Erika Mustermann' );
151
-		$expr[] = $search->compare( '==', 'customer.code', 'unitCustomer2' );
152
-
153
-		$expr[] = $search->compare( '>=', 'customer.salutation', '' );
154
-		$expr[] = $search->compare( '>=', 'customer.company', '' );
155
-		$expr[] = $search->compare( '>=', 'customer.vatid', '' );
156
-		$expr[] = $search->compare( '>=', 'customer.title', '' );
157
-		$expr[] = $search->compare( '>=', 'customer.firstname', '' );
158
-		$expr[] = $search->compare( '>=', 'customer.lastname', '' );
159
-		$expr[] = $search->compare( '>=', 'customer.address1', '' );
160
-		$expr[] = $search->compare( '>=', 'customer.address2', '' );
161
-		$expr[] = $search->compare( '>=', 'customer.address3', '' );
162
-		$expr[] = $search->compare( '>=', 'customer.postal', '' );
163
-		$expr[] = $search->compare( '>=', 'customer.city', '' );
164
-		$expr[] = $search->compare( '>=', 'customer.state', '' );
165
-		$expr[] = $search->compare( '!=', 'customer.languageid', null );
166
-		$expr[] = $search->compare( '>=', 'customer.countryid', '' );
167
-		$expr[] = $search->compare( '>=', 'customer.telephone', '' );
168
-		$expr[] = $search->compare( '>=', 'customer.email', '' );
169
-		$expr[] = $search->compare( '>=', 'customer.telefax', '' );
170
-		$expr[] = $search->compare( '>=', 'customer.website', '' );
171
-
172
-		$expr[] = $search->compare( '==', 'customer.birthday', '1970-01-01' );
173
-		$expr[] = $search->compare( '>=', 'customer.password', '' );
174
-		$expr[] = $search->compare( '==', 'customer.status', 0 );
175
-		$expr[] = $search->compare( '!=', 'customer.mtime', '1970-01-01 00:00:00' );
176
-		$expr[] = $search->compare( '!=', 'customer.ctime', '1970-01-01 00:00:00' );
177
-		$expr[] = $search->compare( '==', 'customer.editor', $this->editor );
178
-
179
-		$expr[] = $search->compare( '!=', 'customer.address.id', null );
180
-		$expr[] = $search->compare( '!=', 'customer.address.parentid', null );
181
-		$expr[] = $search->compare( '==', 'customer.address.company', 'ABC GmbH' );
182
-		$expr[] = $search->compare( '==', 'customer.address.vatid', 'DE999999999' );
183
-		$expr[] = $search->compare( '==', 'customer.address.salutation', 'mr' );
184
-		$expr[] = $search->compare( '==', 'customer.address.title', 'Dr.' );
185
-		$expr[] = $search->compare( '==', 'customer.address.firstname', 'Good' );
186
-		$expr[] = $search->compare( '==', 'customer.address.lastname', 'Unittest' );
187
-		$expr[] = $search->compare( '==', 'customer.address.address1', 'Pickhuben' );
188
-		$expr[] = $search->compare( '==', 'customer.address.address2', '2-4' );
189
-		$expr[] = $search->compare( '==', 'customer.address.address3', '' );
190
-		$expr[] = $search->compare( '==', 'customer.address.postal', '11099' );
191
-		$expr[] = $search->compare( '==', 'customer.address.city', 'Berlin' );
192
-		$expr[] = $search->compare( '==', 'customer.address.state', 'Berlin' );
193
-		$expr[] = $search->compare( '==', 'customer.address.languageid', 'de' );
194
-		$expr[] = $search->compare( '==', 'customer.address.countryid', 'DE' );
195
-		$expr[] = $search->compare( '==', 'customer.address.telephone', '055544332221' );
196
-		$expr[] = $search->compare( '==', 'customer.address.email', '[email protected]' );
197
-		$expr[] = $search->compare( '==', 'customer.address.telefax', '055544333212' );
198
-		$expr[] = $search->compare( '==', 'customer.address.website', 'unittest.aimeos.org' );
199
-		$expr[] = $search->compare( '==', 'customer.address.flag', 0 );
200
-		$expr[] = $search->compare( '==', 'customer.address.position', 1 );
201
-		$expr[] = $search->compare( '!=', 'customer.address.mtime', '1970-01-01 00:00:00' );
202
-		$expr[] = $search->compare( '!=', 'customer.address.ctime', '1970-01-01 00:00:00' );
203
-		$expr[] = $search->compare( '==', 'customer.address.editor', $this->editor );
204
-
205
-		$search->setConditions( $search->combine( '&&', $expr ) );
206
-		$result = $this->object->searchItems( $search, array(), $total );
207
-		$this->assertEquals( 1, count( $result ) );
149
+		$expr[] = $search->compare('!=', 'customer.id', null);
150
+		$expr[] = $search->compare('==', 'customer.label', 'Erika Mustermann');
151
+		$expr[] = $search->compare('==', 'customer.code', 'unitCustomer2');
152
+
153
+		$expr[] = $search->compare('>=', 'customer.salutation', '');
154
+		$expr[] = $search->compare('>=', 'customer.company', '');
155
+		$expr[] = $search->compare('>=', 'customer.vatid', '');
156
+		$expr[] = $search->compare('>=', 'customer.title', '');
157
+		$expr[] = $search->compare('>=', 'customer.firstname', '');
158
+		$expr[] = $search->compare('>=', 'customer.lastname', '');
159
+		$expr[] = $search->compare('>=', 'customer.address1', '');
160
+		$expr[] = $search->compare('>=', 'customer.address2', '');
161
+		$expr[] = $search->compare('>=', 'customer.address3', '');
162
+		$expr[] = $search->compare('>=', 'customer.postal', '');
163
+		$expr[] = $search->compare('>=', 'customer.city', '');
164
+		$expr[] = $search->compare('>=', 'customer.state', '');
165
+		$expr[] = $search->compare('!=', 'customer.languageid', null);
166
+		$expr[] = $search->compare('>=', 'customer.countryid', '');
167
+		$expr[] = $search->compare('>=', 'customer.telephone', '');
168
+		$expr[] = $search->compare('>=', 'customer.email', '');
169
+		$expr[] = $search->compare('>=', 'customer.telefax', '');
170
+		$expr[] = $search->compare('>=', 'customer.website', '');
171
+
172
+		$expr[] = $search->compare('==', 'customer.birthday', '1970-01-01');
173
+		$expr[] = $search->compare('>=', 'customer.password', '');
174
+		$expr[] = $search->compare('==', 'customer.status', 0);
175
+		$expr[] = $search->compare('!=', 'customer.mtime', '1970-01-01 00:00:00');
176
+		$expr[] = $search->compare('!=', 'customer.ctime', '1970-01-01 00:00:00');
177
+		$expr[] = $search->compare('==', 'customer.editor', $this->editor);
178
+
179
+		$expr[] = $search->compare('!=', 'customer.address.id', null);
180
+		$expr[] = $search->compare('!=', 'customer.address.parentid', null);
181
+		$expr[] = $search->compare('==', 'customer.address.company', 'ABC GmbH');
182
+		$expr[] = $search->compare('==', 'customer.address.vatid', 'DE999999999');
183
+		$expr[] = $search->compare('==', 'customer.address.salutation', 'mr');
184
+		$expr[] = $search->compare('==', 'customer.address.title', 'Dr.');
185
+		$expr[] = $search->compare('==', 'customer.address.firstname', 'Good');
186
+		$expr[] = $search->compare('==', 'customer.address.lastname', 'Unittest');
187
+		$expr[] = $search->compare('==', 'customer.address.address1', 'Pickhuben');
188
+		$expr[] = $search->compare('==', 'customer.address.address2', '2-4');
189
+		$expr[] = $search->compare('==', 'customer.address.address3', '');
190
+		$expr[] = $search->compare('==', 'customer.address.postal', '11099');
191
+		$expr[] = $search->compare('==', 'customer.address.city', 'Berlin');
192
+		$expr[] = $search->compare('==', 'customer.address.state', 'Berlin');
193
+		$expr[] = $search->compare('==', 'customer.address.languageid', 'de');
194
+		$expr[] = $search->compare('==', 'customer.address.countryid', 'DE');
195
+		$expr[] = $search->compare('==', 'customer.address.telephone', '055544332221');
196
+		$expr[] = $search->compare('==', 'customer.address.email', '[email protected]');
197
+		$expr[] = $search->compare('==', 'customer.address.telefax', '055544333212');
198
+		$expr[] = $search->compare('==', 'customer.address.website', 'unittest.aimeos.org');
199
+		$expr[] = $search->compare('==', 'customer.address.flag', 0);
200
+		$expr[] = $search->compare('==', 'customer.address.position', 1);
201
+		$expr[] = $search->compare('!=', 'customer.address.mtime', '1970-01-01 00:00:00');
202
+		$expr[] = $search->compare('!=', 'customer.address.ctime', '1970-01-01 00:00:00');
203
+		$expr[] = $search->compare('==', 'customer.address.editor', $this->editor);
204
+
205
+		$search->setConditions($search->combine('&&', $expr));
206
+		$result = $this->object->searchItems($search, array(), $total);
207
+		$this->assertEquals(1, count($result));
208 208
 	}
209 209
 
210 210
 
@@ -213,44 +213,44 @@  discard block
 block discarded – undo
213 213
 		$total = 0;
214 214
 
215 215
 		$search = $this->object->createSearch();
216
-		$search->setConditions( $search->compare( '==', 'customer.address.editor', $this->editor ) );
217
-		$search->setSlice( 0, 2 );
216
+		$search->setConditions($search->compare('==', 'customer.address.editor', $this->editor));
217
+		$search->setSlice(0, 2);
218 218
 
219
-		$results = $this->object->searchItems( $search, array(), $total );
220
-		$this->assertEquals( 2, count( $results ) );
221
-		$this->assertEquals( 3, $total );
219
+		$results = $this->object->searchItems($search, array(), $total);
220
+		$this->assertEquals(2, count($results));
221
+		$this->assertEquals(3, $total);
222 222
 
223
-		foreach($results as $itemId => $item) {
224
-			$this->assertEquals( $itemId, $item->getId() );
223
+		foreach ($results as $itemId => $item) {
224
+			$this->assertEquals($itemId, $item->getId());
225 225
 		}
226 226
 	}
227 227
 
228 228
 
229 229
 	public function testSearchItemsBaseCriteria()
230 230
 	{
231
-		$search = $this->object->createSearch( true );
231
+		$search = $this->object->createSearch(true);
232 232
 		$conditions = array(
233
-			$search->compare( '==', 'customer.address.editor', $this->editor ),
233
+			$search->compare('==', 'customer.address.editor', $this->editor),
234 234
 			$search->getConditions()
235 235
 		);
236
-		$search->setConditions( $search->combine( '&&', $conditions ) );
237
-		$this->assertEquals( 2, count( $this->object->searchItems( $search, array(), $total ) ) );
236
+		$search->setConditions($search->combine('&&', $conditions));
237
+		$this->assertEquals(2, count($this->object->searchItems($search, array(), $total)));
238 238
 	}
239 239
 
240 240
 
241 241
 	public function testGetSubManager()
242 242
 	{
243
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager( 'address' ) );
244
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager( 'address', 'Standard' ) );
243
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('address'));
244
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('address', 'Standard'));
245 245
 
246
-		$this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
247
-		$this->object->getSubManager( 'unknown' );
246
+		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
247
+		$this->object->getSubManager('unknown');
248 248
 	}
249 249
 
250 250
 
251 251
 	public function testGetSubManagerInvalidName()
252 252
 	{
253
-		$this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
254
-		$this->object->getSubManager( 'address', 'unknown' );
253
+		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
254
+		$this->object->getSubManager('address', 'unknown');
255 255
 	}
256 256
 }
Please login to merge, or discard this patch.