Completed
Push — master ( 1f8deb...0d5a25 )
by Aimeos
22:06
created
lib/custom/setup/unittest/CustomerAddLaravelTestData.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 	 */
22 22
 	public function getPreDependencies()
23 23
 	{
24
-		return array( 'TablesAddLaravelTestData' );
24
+		return array('TablesAddLaravelTestData');
25 25
 	}
26 26
 
27 27
 
@@ -31,36 +31,36 @@  discard block
 block discarded – undo
31 31
 	public function migrate()
32 32
 	{
33 33
 		$iface = '\\Aimeos\\MShop\\Context\\Item\\Iface';
34
-		if( !( $this->additional instanceof $iface ) ) {
35
-			throw new \Aimeos\MW\Setup\Exception( sprintf( 'Additionally provided object is not of type "%1$s"', $iface ) );
34
+		if (!($this->additional instanceof $iface)) {
35
+			throw new \Aimeos\MW\Setup\Exception(sprintf('Additionally provided object is not of type "%1$s"', $iface));
36 36
 		}
37 37
 
38
-		$this->msg( 'Adding Laravel customer test data', 0 );
39
-		$this->additional->setEditor( 'ai-laravel:unittest' );
38
+		$this->msg('Adding Laravel customer test data', 0);
39
+		$this->additional->setEditor('ai-laravel:unittest');
40 40
 
41 41
 		$parentIds = array();
42 42
 		$ds = DIRECTORY_SEPARATOR;
43
-		$path = __DIR__ . $ds . 'data' . $ds . 'customer.php';
43
+		$path = __DIR__.$ds.'data'.$ds.'customer.php';
44 44
 
45
-		if( ( $testdata = include( $path ) ) == false ){
46
-			throw new \Aimeos\MShop\Exception( sprintf( 'No file "%1$s" found for customer domain', $path ) );
45
+		if (($testdata = include($path)) == false) {
46
+			throw new \Aimeos\MShop\Exception(sprintf('No file "%1$s" found for customer domain', $path));
47 47
 		}
48 48
 
49 49
 
50
-		$customerManager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $this->additional, 'Laravel' );
51
-		$customerAddressManager = $customerManager->getSubManager( 'address', 'Laravel' );
50
+		$customerManager = \Aimeos\MShop\Customer\Manager\Factory::createManager($this->additional, 'Laravel');
51
+		$customerAddressManager = $customerManager->getSubManager('address', 'Laravel');
52 52
 
53
-		$this->cleanupCustomerData( $customerManager, $customerAddressManager );
53
+		$this->cleanupCustomerData($customerManager, $customerAddressManager);
54 54
 
55 55
 		$this->conn->begin();
56 56
 
57
-		$parentIds = $this->addCustomerData( $testdata, $customerManager, $customerAddressManager->createItem() );
58
-		$this->addCustomerAddressData( $testdata, $customerAddressManager, $parentIds );
57
+		$parentIds = $this->addCustomerData($testdata, $customerManager, $customerAddressManager->createItem());
58
+		$this->addCustomerAddressData($testdata, $customerAddressManager, $parentIds);
59 59
 
60 60
 		$this->conn->commit();
61 61
 
62 62
 
63
-		$this->status( 'done' );
63
+		$this->status('done');
64 64
 	}
65 65
 
66 66
 
@@ -70,17 +70,17 @@  discard block
 block discarded – undo
70 70
 	 * @param \Aimeos\MShop\Common\Manager\Iface $customerManager Customer manager
71 71
 	 * @param \Aimeos\MShop\Common\Manager\Iface $customerAddressManager Customer address manager
72 72
 	 */
73
-	protected function cleanupCustomerData( \Aimeos\MShop\Common\Manager\Iface $customerManager, \Aimeos\MShop\Common\Manager\Iface $customerAddressManager )
73
+	protected function cleanupCustomerData(\Aimeos\MShop\Common\Manager\Iface $customerManager, \Aimeos\MShop\Common\Manager\Iface $customerAddressManager)
74 74
 	{
75 75
 		$search = $customerManager->createSearch();
76
-		$search->setConditions( $search->compare( '=~', 'customer.code', 'unitCustomer' ) );
77
-		$customerItems = $customerManager->searchItems( $search );
76
+		$search->setConditions($search->compare('=~', 'customer.code', 'unitCustomer'));
77
+		$customerItems = $customerManager->searchItems($search);
78 78
 
79 79
 		$search = $customerAddressManager->createSearch();
80
-		$search->setConditions( $search->compare( '=~', 'customer.address.email', 'unitCustomer' ) );
81
-		$addressItems = $customerAddressManager->searchItems( $search );
80
+		$search->setConditions($search->compare('=~', 'customer.address.email', 'unitCustomer'));
81
+		$addressItems = $customerAddressManager->searchItems($search);
82 82
 
83
-		$customerAddressManager->deleteItems( array_keys( $addressItems ) );
84
-		$customerManager->deleteItems( array_keys( $customerItems ) );
83
+		$customerAddressManager->deleteItems(array_keys($addressItems));
84
+		$customerManager->deleteItems(array_keys($customerItems));
85 85
 	}
86 86
 }
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
@@ -24,8 +24,8 @@  discard block
 block discarded – undo
24 24
 	{
25 25
 		$this->context = \TestHelper::getContext();
26 26
 		$this->editor = $this->context->getEditor();
27
-		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $this->context, 'Laravel' );
28
-		$this->object = $manager->getSubManager( 'lists', 'Laravel' );
27
+		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager($this->context, 'Laravel');
28
+		$this->object = $manager->getSubManager('lists', 'Laravel');
29 29
 	}
30 30
 
31 31
 
@@ -37,36 +37,36 @@  discard block
 block discarded – undo
37 37
 	 */
38 38
 	protected function tearDown()
39 39
 	{
40
-		unset( $this->object, $this->context );
40
+		unset($this->object, $this->context);
41 41
 	}
42 42
 
43 43
 
44 44
 	public function testCleanup()
45 45
 	{
46
-		$this->object->cleanup( array( -1 ) );
46
+		$this->object->cleanup(array( -1 ));
47 47
 	}
48 48
 
49 49
 
50 50
 	public function testAggregate()
51 51
 	{
52
-		$search = $this->object->createSearch( true );
52
+		$search = $this->object->createSearch(true);
53 53
 		$expr = array(
54 54
 			$search->getConditions(),
55
-			$search->compare( '==', 'customer.lists.editor', 'ai-laravel:unittest' ),
55
+			$search->compare('==', 'customer.lists.editor', 'ai-laravel:unittest'),
56 56
 		);
57
-		$search->setConditions( $search->combine( '&&', $expr ) );
57
+		$search->setConditions($search->combine('&&', $expr));
58 58
 
59
-		$result = $this->object->aggregate( $search, 'customer.lists.domain' );
59
+		$result = $this->object->aggregate($search, 'customer.lists.domain');
60 60
 
61
-		$this->assertEquals( 1, count( $result ) );
62
-		$this->assertArrayHasKey( 'text', $result );
63
-		$this->assertEquals( 4, $result['text'] );
61
+		$this->assertEquals(1, count($result));
62
+		$this->assertArrayHasKey('text', $result);
63
+		$this->assertEquals(4, $result['text']);
64 64
 	}
65 65
 
66 66
 
67 67
 	public function testCreateItem()
68 68
 	{
69
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $this->object->createItem() );
69
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $this->object->createItem());
70 70
 	}
71 71
 
72 72
 
@@ -74,13 +74,13 @@  discard block
 block discarded – undo
74 74
 	{
75 75
 		$search = $this->object->createSearch();
76 76
 		$search->setSlice(0, 1);
77
-		$results = $this->object->searchItems( $search );
77
+		$results = $this->object->searchItems($search);
78 78
 
79
-		if( ( $item = reset( $results ) ) === false ) {
80
-			throw new \RuntimeException( 'No item found' );
79
+		if (($item = reset($results)) === false) {
80
+			throw new \RuntimeException('No item found');
81 81
 		}
82 82
 
83
-		$this->assertEquals( $item, $this->object->getItem( $item->getId() ) );
83
+		$this->assertEquals($item, $this->object->getItem($item->getId()));
84 84
 	}
85 85
 
86 86
 
@@ -88,144 +88,144 @@  discard block
 block discarded – undo
88 88
 	{
89 89
 		$search = $this->object->createSearch();
90 90
 		$search->setSlice(0, 1);
91
-		$items = $this->object->searchItems( $search );
91
+		$items = $this->object->searchItems($search);
92 92
 
93
-		if( ( $item = reset( $items ) ) === false ) {
94
-			throw new \RuntimeException( 'No item found' );
93
+		if (($item = reset($items)) === false) {
94
+			throw new \RuntimeException('No item found');
95 95
 		}
96 96
 
97
-		$item->setId( null );
98
-		$item->setDomain( 'unittest' );
99
-		$this->object->saveItem( $item );
100
-		$itemSaved = $this->object->getItem( $item->getId() );
97
+		$item->setId(null);
98
+		$item->setDomain('unittest');
99
+		$this->object->saveItem($item);
100
+		$itemSaved = $this->object->getItem($item->getId());
101 101
 
102 102
 		$itemExp = clone $itemSaved;
103
-		$itemExp->setDomain( 'unittest2' );
104
-		$this->object->saveItem( $itemExp );
105
-		$itemUpd = $this->object->getItem( $itemExp->getId() );
106
-
107
-		$this->object->deleteItem( $itemSaved->getId() );
108
-
109
-
110
-		$this->assertTrue( $item->getId() !== null );
111
-		$this->assertTrue( $itemSaved->getType() !== null );
112
-		$this->assertEquals( $item->getId(), $itemSaved->getId() );
113
-		$this->assertEquals( $item->getSiteId(), $itemSaved->getSiteId() );
114
-		$this->assertEquals( $item->getParentId(), $itemSaved->getParentId() );
115
-		$this->assertEquals( $item->getTypeId(), $itemSaved->getTypeId() );
116
-		$this->assertEquals( $item->getRefId(), $itemSaved->getRefId() );
117
-		$this->assertEquals( $item->getDomain(), $itemSaved->getDomain() );
118
-		$this->assertEquals( $item->getDateStart(), $itemSaved->getDateStart() );
119
-		$this->assertEquals( $item->getDateEnd(), $itemSaved->getDateEnd() );
120
-		$this->assertEquals( $item->getPosition(), $itemSaved->getPosition() );
121
-		$this->assertEquals( $this->editor, $itemSaved->getEditor() );
103
+		$itemExp->setDomain('unittest2');
104
+		$this->object->saveItem($itemExp);
105
+		$itemUpd = $this->object->getItem($itemExp->getId());
106
+
107
+		$this->object->deleteItem($itemSaved->getId());
108
+
109
+
110
+		$this->assertTrue($item->getId() !== null);
111
+		$this->assertTrue($itemSaved->getType() !== null);
112
+		$this->assertEquals($item->getId(), $itemSaved->getId());
113
+		$this->assertEquals($item->getSiteId(), $itemSaved->getSiteId());
114
+		$this->assertEquals($item->getParentId(), $itemSaved->getParentId());
115
+		$this->assertEquals($item->getTypeId(), $itemSaved->getTypeId());
116
+		$this->assertEquals($item->getRefId(), $itemSaved->getRefId());
117
+		$this->assertEquals($item->getDomain(), $itemSaved->getDomain());
118
+		$this->assertEquals($item->getDateStart(), $itemSaved->getDateStart());
119
+		$this->assertEquals($item->getDateEnd(), $itemSaved->getDateEnd());
120
+		$this->assertEquals($item->getPosition(), $itemSaved->getPosition());
121
+		$this->assertEquals($this->editor, $itemSaved->getEditor());
122 122
 		$this->assertStringStartsWith(date('Y-m-d', time()), $itemSaved->getTimeCreated());
123 123
 		$this->assertStringStartsWith(date('Y-m-d', time()), $itemSaved->getTimeModified());
124 124
 
125
-		$this->assertEquals( $this->editor, $itemSaved->getEditor() );
126
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated() );
127
-		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified() );
128
-
129
-		$this->assertTrue( $itemUpd->getType() !== null );
130
-		$this->assertEquals( $itemExp->getId(), $itemUpd->getId() );
131
-		$this->assertEquals( $itemExp->getSiteId(), $itemUpd->getSiteId() );
132
-		$this->assertEquals( $itemExp->getParentId(), $itemUpd->getParentId() );
133
-		$this->assertEquals( $itemExp->getTypeId(), $itemUpd->getTypeId() );
134
-		$this->assertEquals( $itemExp->getRefId(), $itemUpd->getRefId() );
135
-		$this->assertEquals( $itemExp->getDomain(), $itemUpd->getDomain() );
136
-		$this->assertEquals( $itemExp->getDateStart(), $itemUpd->getDateStart() );
137
-		$this->assertEquals( $itemExp->getDateEnd(), $itemUpd->getDateEnd() );
138
-		$this->assertEquals( $itemExp->getPosition(), $itemUpd->getPosition() );
139
-
140
-		$this->assertEquals( $this->editor, $itemUpd->getEditor() );
141
-		$this->assertEquals( $itemExp->getTimeCreated(), $itemUpd->getTimeCreated() );
142
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified() );
125
+		$this->assertEquals($this->editor, $itemSaved->getEditor());
126
+		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated());
127
+		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified());
128
+
129
+		$this->assertTrue($itemUpd->getType() !== null);
130
+		$this->assertEquals($itemExp->getId(), $itemUpd->getId());
131
+		$this->assertEquals($itemExp->getSiteId(), $itemUpd->getSiteId());
132
+		$this->assertEquals($itemExp->getParentId(), $itemUpd->getParentId());
133
+		$this->assertEquals($itemExp->getTypeId(), $itemUpd->getTypeId());
134
+		$this->assertEquals($itemExp->getRefId(), $itemUpd->getRefId());
135
+		$this->assertEquals($itemExp->getDomain(), $itemUpd->getDomain());
136
+		$this->assertEquals($itemExp->getDateStart(), $itemUpd->getDateStart());
137
+		$this->assertEquals($itemExp->getDateEnd(), $itemUpd->getDateEnd());
138
+		$this->assertEquals($itemExp->getPosition(), $itemUpd->getPosition());
139
+
140
+		$this->assertEquals($this->editor, $itemUpd->getEditor());
141
+		$this->assertEquals($itemExp->getTimeCreated(), $itemUpd->getTimeCreated());
142
+		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified());
143 143
 
144 144
 		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
145
-		$this->object->getItem( $itemSaved->getId() );
145
+		$this->object->getItem($itemSaved->getId());
146 146
 	}
147 147
 
148 148
 
149 149
 	public function testMoveItemLastToFront()
150 150
 	{
151 151
 		$listItems = $this->getListItems();
152
-		$this->assertGreaterThan( 1, count( $listItems ) );
152
+		$this->assertGreaterThan(1, count($listItems));
153 153
 
154
-		if( ( $first = reset( $listItems ) ) === false ) {
155
-			throw new \RuntimeException( 'No first customer list item' );
154
+		if (($first = reset($listItems)) === false) {
155
+			throw new \RuntimeException('No first customer list item');
156 156
 		}
157 157
 
158
-		if( ( $last = end( $listItems ) ) === false ) {
159
-			throw new \RuntimeException( 'No last customer list item' );
158
+		if (($last = end($listItems)) === false) {
159
+			throw new \RuntimeException('No last customer list item');
160 160
 		}
161 161
 
162
-		$this->object->moveItem( $last->getId(), $first->getId() );
162
+		$this->object->moveItem($last->getId(), $first->getId());
163 163
 
164
-		$newFirst = $this->object->getItem( $last->getId() );
165
-		$newSecond = $this->object->getItem( $first->getId() );
164
+		$newFirst = $this->object->getItem($last->getId());
165
+		$newSecond = $this->object->getItem($first->getId());
166 166
 
167
-		$this->object->moveItem( $last->getId() );
167
+		$this->object->moveItem($last->getId());
168 168
 
169
-		$this->assertEquals( 1, $newFirst->getPosition() );
170
-		$this->assertEquals( 2, $newSecond->getPosition() );
169
+		$this->assertEquals(1, $newFirst->getPosition());
170
+		$this->assertEquals(2, $newSecond->getPosition());
171 171
 	}
172 172
 
173 173
 
174 174
 	public function testMoveItemFirstToLast()
175 175
 	{
176 176
 		$listItems = $this->getListItems();
177
-		$this->assertGreaterThan( 1, count( $listItems ) );
177
+		$this->assertGreaterThan(1, count($listItems));
178 178
 
179
-		if( ( $first = reset( $listItems ) ) === false ) {
180
-			throw new \RuntimeException( 'No first customer list item' );
179
+		if (($first = reset($listItems)) === false) {
180
+			throw new \RuntimeException('No first customer list item');
181 181
 		}
182 182
 
183
-		if( ( $second = next( $listItems ) ) === false ) {
184
-			throw new \RuntimeException( 'No second customer list item' );
183
+		if (($second = next($listItems)) === false) {
184
+			throw new \RuntimeException('No second customer list item');
185 185
 		}
186 186
 
187
-		if( ( $last = end( $listItems ) ) === false ) {
188
-			throw new \RuntimeException( 'No last customer list item' );
187
+		if (($last = end($listItems)) === false) {
188
+			throw new \RuntimeException('No last customer list item');
189 189
 		}
190 190
 
191
-		$this->object->moveItem( $first->getId() );
191
+		$this->object->moveItem($first->getId());
192 192
 
193
-		$newBefore = $this->object->getItem( $last->getId() );
194
-		$newLast = $this->object->getItem( $first->getId() );
193
+		$newBefore = $this->object->getItem($last->getId());
194
+		$newLast = $this->object->getItem($first->getId());
195 195
 
196
-		$this->object->moveItem( $first->getId(), $second->getId() );
196
+		$this->object->moveItem($first->getId(), $second->getId());
197 197
 
198
-		$this->assertEquals( $last->getPosition() - 1, $newBefore->getPosition() );
199
-		$this->assertEquals( $last->getPosition(), $newLast->getPosition() );
198
+		$this->assertEquals($last->getPosition() - 1, $newBefore->getPosition());
199
+		$this->assertEquals($last->getPosition(), $newLast->getPosition());
200 200
 	}
201 201
 
202 202
 
203 203
 	public function testMoveItemFirstUp()
204 204
 	{
205 205
 		$listItems = $this->getListItems();
206
-		$this->assertGreaterThan( 1, count( $listItems ) );
206
+		$this->assertGreaterThan(1, count($listItems));
207 207
 
208
-		if( ( $first = reset( $listItems ) ) === false ) {
209
-			throw new \RuntimeException( 'No first customer list item' );
208
+		if (($first = reset($listItems)) === false) {
209
+			throw new \RuntimeException('No first customer list item');
210 210
 		}
211 211
 
212
-		if( ( $second = next( $listItems ) ) === false ) {
213
-			throw new \RuntimeException( 'No second customer list item' );
212
+		if (($second = next($listItems)) === false) {
213
+			throw new \RuntimeException('No second customer list item');
214 214
 		}
215 215
 
216
-		if( ( $last = end( $listItems ) ) === false ) {
217
-			throw new \RuntimeException( 'No last customer list item' );
216
+		if (($last = end($listItems)) === false) {
217
+			throw new \RuntimeException('No last customer list item');
218 218
 		}
219 219
 
220
-		$this->object->moveItem( $first->getId(), $last->getId() );
220
+		$this->object->moveItem($first->getId(), $last->getId());
221 221
 
222
-		$newLast = $this->object->getItem( $last->getId() );
223
-		$newUp = $this->object->getItem( $first->getId() );
222
+		$newLast = $this->object->getItem($last->getId());
223
+		$newUp = $this->object->getItem($first->getId());
224 224
 
225
-		$this->object->moveItem( $first->getId(), $second->getId() );
225
+		$this->object->moveItem($first->getId(), $second->getId());
226 226
 
227
-		$this->assertEquals( $last->getPosition() - 1, $newUp->getPosition() );
228
-		$this->assertEquals( $last->getPosition(), $newLast->getPosition() );
227
+		$this->assertEquals($last->getPosition() - 1, $newUp->getPosition());
228
+		$this->assertEquals($last->getPosition(), $newLast->getPosition());
229 229
 	}
230 230
 
231 231
 
@@ -235,39 +235,39 @@  discard block
 block discarded – undo
235 235
 		$search = $this->object->createSearch();
236 236
 
237 237
 		$expr = array();
238
-		$expr[] = $search->compare( '!=', 'customer.lists.id', null );
239
-		$expr[] = $search->compare( '!=', 'customer.lists.siteid', null );
240
-		$expr[] = $search->compare( '>', 'customer.lists.parentid', 0 );
241
-		$expr[] = $search->compare( '==', 'customer.lists.domain', 'text' );
242
-		$expr[] = $search->compare( '>', 'customer.lists.typeid', 0 );
243
-		$expr[] = $search->compare( '>', 'customer.lists.refid', 0 );
244
-		$expr[] = $search->compare( '==', 'customer.lists.datestart', '2010-01-01 00:00:00' );
245
-		$expr[] = $search->compare( '==', 'customer.lists.dateend', '2100-01-01 00:00:00' );
246
-		$expr[] = $search->compare( '!=', 'customer.lists.config', null );
247
-		$expr[] = $search->compare( '>', 'customer.lists.position', 1 );
248
-		$expr[] = $search->compare( '==', 'customer.lists.status', 1 );
249
-		$expr[] = $search->compare( '>=', 'customer.lists.mtime', '1970-01-01 00:00:00' );
250
-		$expr[] = $search->compare( '>=', 'customer.lists.ctime', '1970-01-01 00:00:00' );
251
-		$expr[] = $search->compare( '==', 'customer.lists.editor', $this->editor );
252
-
253
-		$expr[] = $search->compare( '!=', 'customer.lists.type.id', 0 );
254
-		$expr[] = $search->compare( '!=', 'customer.lists.type.siteid', null );
255
-		$expr[] = $search->compare( '==', 'customer.lists.type.code', 'default' );
256
-		$expr[] = $search->compare( '==', 'customer.lists.type.domain', 'text' );
257
-		$expr[] = $search->compare( '==', 'customer.lists.type.label', 'Standard' );
258
-		$expr[] = $search->compare( '==', 'customer.lists.type.status', 1 );
259
-		$expr[] = $search->compare( '>=', 'customer.lists.type.mtime', '1970-01-01 00:00:00' );
260
-		$expr[] = $search->compare( '>=', 'customer.lists.type.ctime', '1970-01-01 00:00:00' );
261
-		$expr[] = $search->compare( '==', 'customer.lists.type.editor', $this->editor );
262
-
263
-		$search->setConditions( $search->combine( '&&', $expr ) );
238
+		$expr[] = $search->compare('!=', 'customer.lists.id', null);
239
+		$expr[] = $search->compare('!=', 'customer.lists.siteid', null);
240
+		$expr[] = $search->compare('>', 'customer.lists.parentid', 0);
241
+		$expr[] = $search->compare('==', 'customer.lists.domain', 'text');
242
+		$expr[] = $search->compare('>', 'customer.lists.typeid', 0);
243
+		$expr[] = $search->compare('>', 'customer.lists.refid', 0);
244
+		$expr[] = $search->compare('==', 'customer.lists.datestart', '2010-01-01 00:00:00');
245
+		$expr[] = $search->compare('==', 'customer.lists.dateend', '2100-01-01 00:00:00');
246
+		$expr[] = $search->compare('!=', 'customer.lists.config', null);
247
+		$expr[] = $search->compare('>', 'customer.lists.position', 1);
248
+		$expr[] = $search->compare('==', 'customer.lists.status', 1);
249
+		$expr[] = $search->compare('>=', 'customer.lists.mtime', '1970-01-01 00:00:00');
250
+		$expr[] = $search->compare('>=', 'customer.lists.ctime', '1970-01-01 00:00:00');
251
+		$expr[] = $search->compare('==', 'customer.lists.editor', $this->editor);
252
+
253
+		$expr[] = $search->compare('!=', 'customer.lists.type.id', 0);
254
+		$expr[] = $search->compare('!=', 'customer.lists.type.siteid', null);
255
+		$expr[] = $search->compare('==', 'customer.lists.type.code', 'default');
256
+		$expr[] = $search->compare('==', 'customer.lists.type.domain', 'text');
257
+		$expr[] = $search->compare('==', 'customer.lists.type.label', 'Standard');
258
+		$expr[] = $search->compare('==', 'customer.lists.type.status', 1);
259
+		$expr[] = $search->compare('>=', 'customer.lists.type.mtime', '1970-01-01 00:00:00');
260
+		$expr[] = $search->compare('>=', 'customer.lists.type.ctime', '1970-01-01 00:00:00');
261
+		$expr[] = $search->compare('==', 'customer.lists.type.editor', $this->editor);
262
+
263
+		$search->setConditions($search->combine('&&', $expr));
264 264
 		$search->setSlice(0, 1);
265
-		$results = $this->object->searchItems( $search, array(), $total );
266
-		$this->assertEquals( 1, count( $results ) );
267
-		$this->assertEquals( 2, $total );
265
+		$results = $this->object->searchItems($search, array(), $total);
266
+		$this->assertEquals(1, count($results));
267
+		$this->assertEquals(2, $total);
268 268
 
269
-		foreach($results as $itemId => $item) {
270
-			$this->assertEquals( $itemId, $item->getId() );
269
+		foreach ($results as $itemId => $item) {
270
+			$this->assertEquals($itemId, $item->getId());
271 271
 		}
272 272
 	}
273 273
 
@@ -275,8 +275,8 @@  discard block
 block discarded – undo
275 275
 	public function testSearchItemsNoCriteria()
276 276
 	{
277 277
 		$search = $this->object->createSearch();
278
-		$search->setConditions( $search->compare( '==', 'customer.lists.editor', $this->editor ) );
279
-		$this->assertEquals( 4, count( $this->object->searchItems($search) ) );
278
+		$search->setConditions($search->compare('==', 'customer.lists.editor', $this->editor));
279
+		$this->assertEquals(4, count($this->object->searchItems($search)));
280 280
 	}
281 281
 
282 282
 
@@ -284,48 +284,48 @@  discard block
 block discarded – undo
284 284
 	{
285 285
 		$search = $this->object->createSearch(true);
286 286
 		$conditions = array(
287
-			$search->compare( '==', 'customer.lists.editor', $this->editor ),
287
+			$search->compare('==', 'customer.lists.editor', $this->editor),
288 288
 			$search->getConditions()
289 289
 		);
290
-		$search->setConditions( $search->combine( '&&', $conditions ) );
291
-		$this->assertEquals( 4, count( $this->object->searchItems($search) ) );
290
+		$search->setConditions($search->combine('&&', $conditions));
291
+		$this->assertEquals(4, count($this->object->searchItems($search)));
292 292
 	}
293 293
 
294 294
 
295 295
 	public function testGetSubManager()
296 296
 	{
297
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type') );
298
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type', 'Standard') );
297
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type'));
298
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type', '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
 	protected function getListItems()
306 306
 	{
307
-		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $this->context, 'Laravel' );
307
+		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager($this->context, 'Laravel');
308 308
 
309 309
 		$search = $manager->createSearch();
310
-		$search->setConditions( $search->compare( '==', 'customer.code', 'unitCustomer3' ) );
311
-		$search->setSlice( 0, 1 );
310
+		$search->setConditions($search->compare('==', 'customer.code', 'unitCustomer3'));
311
+		$search->setSlice(0, 1);
312 312
 
313
-		$results = $manager->searchItems( $search );
313
+		$results = $manager->searchItems($search);
314 314
 
315
-		if( ( $item = reset( $results ) ) === false ) {
316
-			throw new \RuntimeException( 'No customer item found' );
315
+		if (($item = reset($results)) === false) {
316
+			throw new \RuntimeException('No customer item found');
317 317
 		}
318 318
 
319 319
 		$search = $this->object->createSearch();
320 320
 		$expr = array(
321
-			$search->compare( '==', 'customer.lists.parentid', $item->getId() ),
322
-			$search->compare( '==', 'customer.lists.domain', 'text' ),
323
-			$search->compare( '==', 'customer.lists.editor', $this->editor ),
324
-			$search->compare( '==', 'customer.lists.type.code', 'default' ),
321
+			$search->compare('==', 'customer.lists.parentid', $item->getId()),
322
+			$search->compare('==', 'customer.lists.domain', 'text'),
323
+			$search->compare('==', 'customer.lists.editor', $this->editor),
324
+			$search->compare('==', 'customer.lists.type.code', 'default'),
325 325
 		);
326
-		$search->setConditions( $search->combine( '&&', $expr ) );
327
-		$search->setSortations( array( $search->sort( '+', 'customer.lists.position' ) ) );
326
+		$search->setConditions($search->combine('&&', $expr));
327
+		$search->setSortations(array($search->sort('+', 'customer.lists.position')));
328 328
 
329
-		return $this->object->searchItems( $search );
329
+		return $this->object->searchItems($search);
330 330
 	}
331 331
 }
Please login to merge, or discard this patch.
lib/custom/setup/default/schema/customer.php 1 patch
Spacing   +131 added lines, -131 removed lines patch added patch discarded remove patch
@@ -8,152 +8,152 @@
 block discarded – undo
8 8
 
9 9
 return array(
10 10
 	'table' => array(
11
-		'users' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
12
-
13
-			$table = $schema->createTable( 'users' );
14
-
15
-			$table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) );
16
-			$table->addColumn( 'label', 'string', array( 'length' => 255, 'default' => '' ) );
17
-			$table->addColumn( 'name', 'string', array( 'length' => 255 ) );
18
-			$table->addColumn( 'remember_token', 'string', array( 'length' => 100, 'notnull' => false ) );
19
-			$table->addColumn( 'salutation', 'string', array( 'length' => 8, 'default' => '' ) );
20
-			$table->addColumn( 'company', 'string', array( 'length' => 100, 'default' => '' ) );
21
-			$table->addColumn( 'vatid', 'string', array( 'length' => 32, 'default' => '' ) );
22
-			$table->addColumn( 'title', 'string', array( 'length' => 64, 'default' => '' ) );
23
-			$table->addColumn( 'firstname', 'string', array( 'length' => 64, 'default' => '' ) );
24
-			$table->addColumn( 'lastname', 'string', array( 'length' => 64, 'default' => '' ) );
25
-			$table->addColumn( 'address1', 'string', array( 'length' => 200, 'default' => '' ) );
26
-			$table->addColumn( 'address2', 'string', array( 'length' => 200, 'default' => '' ) );
27
-			$table->addColumn( 'address3', 'string', array( 'length' => 200, 'default' => '' ) );
28
-			$table->addColumn( 'postal', 'string', array( 'length' => 16, 'default' => '' ) );
29
-			$table->addColumn( 'city', 'string', array( 'length' => 200, 'default' => '' ) );
30
-			$table->addColumn( 'state', 'string', array( 'length' => 200, 'default' => '' ) );
31
-			$table->addColumn( 'langid', 'string', array( 'length' => 5, 'notnull' => false ) );
32
-			$table->addColumn( 'countryid', 'string', array( 'length' => 2, 'notnull' => false, 'fixed' => true ) );
33
-			$table->addColumn( 'telephone', 'string', array( 'length' => 32, 'default' => '' ) );
34
-			$table->addColumn( 'telefax', 'string', array( 'length' => 32, 'default' => '' ) );
35
-			$table->addColumn( 'website', 'string', array( 'length' => 255, 'default' => '' ) );
36
-			$table->addColumn( 'email', 'string', array( 'length' => 255 ) );
37
-			$table->addColumn( 'password', 'string', array( 'length' => 255 ) );
38
-			$table->addColumn( 'longitude', 'decimal', array( 'precision' => 8, 'scale' => 6, 'notnull' => false ) );
39
-			$table->addColumn( 'latitude', 'decimal', array( 'precision' => 8, 'scale' => 6, 'notnull' => false ) );
40
-			$table->addColumn( 'birthday', 'date', array( 'notnull' => false ) );
41
-			$table->addColumn( 'vdate', 'date', array( 'notnull' => false ) );
42
-			$table->addColumn( 'status', 'smallint', array( 'default' => 1 ) );
43
-			$table->addColumn( 'updated_at', 'datetime', array() );
44
-			$table->addColumn( 'created_at', 'datetime', array() );
45
-			$table->addColumn( 'editor', 'string', array('length' => 255, 'default' => '' ) );
46
-
47
-			$table->setPrimaryKey( array( 'id' ), 'pk_lvusr_id' );
48
-			$table->addUniqueIndex( array( 'email' ), 'unq_lvusr_email' );
49
-			$table->addIndex( array( 'langid' ), 'idx_lvusr_langid' );
50
-			$table->addIndex( array( 'lastname', 'firstname' ), 'idx_lvusr_last_first' );
51
-			$table->addIndex( array( 'postal', 'address1' ), 'idx_lvusr_post_addr1' );
52
-			$table->addIndex( array( 'postal', 'city' ), 'idx_lvusr_post_city' );
53
-			$table->addIndex( array( 'lastname' ), 'idx_lvusr_lastname' );
54
-			$table->addIndex( array( 'address1' ), 'idx_lvusr_address1' );
55
-			$table->addIndex( array( 'city' ), 'idx_lvusr_city' );
11
+		'users' => function(\Doctrine\DBAL\Schema\Schema $schema) {
12
+
13
+			$table = $schema->createTable('users');
14
+
15
+			$table->addColumn('id', 'integer', array('autoincrement' => true));
16
+			$table->addColumn('label', 'string', array('length' => 255, 'default' => ''));
17
+			$table->addColumn('name', 'string', array('length' => 255));
18
+			$table->addColumn('remember_token', 'string', array('length' => 100, 'notnull' => false));
19
+			$table->addColumn('salutation', 'string', array('length' => 8, 'default' => ''));
20
+			$table->addColumn('company', 'string', array('length' => 100, 'default' => ''));
21
+			$table->addColumn('vatid', 'string', array('length' => 32, 'default' => ''));
22
+			$table->addColumn('title', 'string', array('length' => 64, 'default' => ''));
23
+			$table->addColumn('firstname', 'string', array('length' => 64, 'default' => ''));
24
+			$table->addColumn('lastname', 'string', array('length' => 64, 'default' => ''));
25
+			$table->addColumn('address1', 'string', array('length' => 200, 'default' => ''));
26
+			$table->addColumn('address2', 'string', array('length' => 200, 'default' => ''));
27
+			$table->addColumn('address3', 'string', array('length' => 200, 'default' => ''));
28
+			$table->addColumn('postal', 'string', array('length' => 16, 'default' => ''));
29
+			$table->addColumn('city', 'string', array('length' => 200, 'default' => ''));
30
+			$table->addColumn('state', 'string', array('length' => 200, 'default' => ''));
31
+			$table->addColumn('langid', 'string', array('length' => 5, 'notnull' => false));
32
+			$table->addColumn('countryid', 'string', array('length' => 2, 'notnull' => false, 'fixed' => true));
33
+			$table->addColumn('telephone', 'string', array('length' => 32, 'default' => ''));
34
+			$table->addColumn('telefax', 'string', array('length' => 32, 'default' => ''));
35
+			$table->addColumn('website', 'string', array('length' => 255, 'default' => ''));
36
+			$table->addColumn('email', 'string', array('length' => 255));
37
+			$table->addColumn('password', 'string', array('length' => 255));
38
+			$table->addColumn('longitude', 'decimal', array('precision' => 8, 'scale' => 6, 'notnull' => false));
39
+			$table->addColumn('latitude', 'decimal', array('precision' => 8, 'scale' => 6, 'notnull' => false));
40
+			$table->addColumn('birthday', 'date', array('notnull' => false));
41
+			$table->addColumn('vdate', 'date', array('notnull' => false));
42
+			$table->addColumn('status', 'smallint', array('default' => 1));
43
+			$table->addColumn('updated_at', 'datetime', array());
44
+			$table->addColumn('created_at', 'datetime', array());
45
+			$table->addColumn('editor', 'string', array('length' => 255, 'default' => ''));
46
+
47
+			$table->setPrimaryKey(array('id'), 'pk_lvusr_id');
48
+			$table->addUniqueIndex(array('email'), 'unq_lvusr_email');
49
+			$table->addIndex(array('langid'), 'idx_lvusr_langid');
50
+			$table->addIndex(array('lastname', 'firstname'), 'idx_lvusr_last_first');
51
+			$table->addIndex(array('postal', 'address1'), 'idx_lvusr_post_addr1');
52
+			$table->addIndex(array('postal', 'city'), 'idx_lvusr_post_city');
53
+			$table->addIndex(array('lastname'), 'idx_lvusr_lastname');
54
+			$table->addIndex(array('address1'), 'idx_lvusr_address1');
55
+			$table->addIndex(array('city'), 'idx_lvusr_city');
56 56
 
57 57
 			return $schema;
58 58
 		},
59 59
 
60
-		'users_address' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
61
-
62
-			$table = $schema->createTable( 'users_address' );
63
-
64
-			$table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) );
65
-			$table->addColumn( 'siteid', 'integer', array() );
66
-			$table->addColumn( 'parentid', 'integer', array() );
67
-			$table->addColumn( 'company', 'string', array( 'length' => 100 ) );
68
-			$table->addColumn( 'vatid', 'string', array( 'length' => 32 ) );
69
-			$table->addColumn( 'salutation', 'string', array( 'length' => 8 ) );
70
-			$table->addColumn( 'title', 'string', array( 'length' => 64 ) );
71
-			$table->addColumn( 'firstname', 'string', array( 'length' => 64 ) );
72
-			$table->addColumn( 'lastname', 'string', array( 'length' => 64 ) );
73
-			$table->addColumn( 'address1', 'string', array( 'length' => 200 ) );
74
-			$table->addColumn( 'address2', 'string', array( 'length' => 200 ) );
75
-			$table->addColumn( 'address3', 'string', array( 'length' => 200 ) );
76
-			$table->addColumn( 'postal', 'string', array( 'length' => 16 ) );
77
-			$table->addColumn( 'city', 'string', array( 'length' => 200 ) );
78
-			$table->addColumn( 'state', 'string', array( 'length' => 200 ) );
79
-			$table->addColumn( 'langid', 'string', array( 'length' => 5, 'notnull' => false ) );
80
-			$table->addColumn( 'countryid', 'string', array( 'length' => 2, 'notnull' => false, 'fixed' => true ) );
81
-			$table->addColumn( 'telephone', 'string', array( 'length' => 32 ) );
82
-			$table->addColumn( 'email', 'string', array( 'length' => 255 ) );
83
-			$table->addColumn( 'telefax', 'string', array( 'length' => 255 ) );
84
-			$table->addColumn( 'website', 'string', array( 'length' => 255 ) );
85
-			$table->addColumn( 'longitude', 'decimal', array( 'precision' => 8, 'scale' => 6, 'notnull' => false ) );
86
-			$table->addColumn( 'latitude', 'decimal', array( 'precision' => 8, 'scale' => 6, 'notnull' => false ) );
87
-			$table->addColumn( 'flag', 'integer', array() );
88
-			$table->addColumn( 'pos', 'smallint', array() );
89
-			$table->addColumn( 'mtime', 'datetime', array() );
90
-			$table->addColumn( 'ctime', 'datetime', array() );
91
-			$table->addColumn( 'editor', 'string', array('length' => 255 ) );
92
-
93
-			$table->setPrimaryKey( array( 'id' ), 'pk_lvuad_id' );
94
-			$table->addIndex( array( 'parentid' ), 'idx_lvuad_pid' );
95
-			$table->addIndex( array( 'lastname', 'firstname' ), 'idx_lvuad_last_first' );
96
-			$table->addIndex( array( 'postal', 'address1' ), 'idx_lvuad_post_addr1' );
97
-			$table->addIndex( array( 'postal', 'city' ), 'idx_lvuad_post_city' );
98
-			$table->addIndex( array( 'address1' ), 'idx_lvusr_address1' );
99
-			$table->addIndex( array( 'city' ), 'idx_lvuad_city' );
100
-			$table->addIndex( array( 'email' ), 'idx_lvuad_email' );
60
+		'users_address' => function(\Doctrine\DBAL\Schema\Schema $schema) {
61
+
62
+			$table = $schema->createTable('users_address');
63
+
64
+			$table->addColumn('id', 'integer', array('autoincrement' => true));
65
+			$table->addColumn('siteid', 'integer', array());
66
+			$table->addColumn('parentid', 'integer', array());
67
+			$table->addColumn('company', 'string', array('length' => 100));
68
+			$table->addColumn('vatid', 'string', array('length' => 32));
69
+			$table->addColumn('salutation', 'string', array('length' => 8));
70
+			$table->addColumn('title', 'string', array('length' => 64));
71
+			$table->addColumn('firstname', 'string', array('length' => 64));
72
+			$table->addColumn('lastname', 'string', array('length' => 64));
73
+			$table->addColumn('address1', 'string', array('length' => 200));
74
+			$table->addColumn('address2', 'string', array('length' => 200));
75
+			$table->addColumn('address3', 'string', array('length' => 200));
76
+			$table->addColumn('postal', 'string', array('length' => 16));
77
+			$table->addColumn('city', 'string', array('length' => 200));
78
+			$table->addColumn('state', 'string', array('length' => 200));
79
+			$table->addColumn('langid', 'string', array('length' => 5, 'notnull' => false));
80
+			$table->addColumn('countryid', 'string', array('length' => 2, 'notnull' => false, 'fixed' => true));
81
+			$table->addColumn('telephone', 'string', array('length' => 32));
82
+			$table->addColumn('email', 'string', array('length' => 255));
83
+			$table->addColumn('telefax', 'string', array('length' => 255));
84
+			$table->addColumn('website', 'string', array('length' => 255));
85
+			$table->addColumn('longitude', 'decimal', array('precision' => 8, 'scale' => 6, 'notnull' => false));
86
+			$table->addColumn('latitude', 'decimal', array('precision' => 8, 'scale' => 6, 'notnull' => false));
87
+			$table->addColumn('flag', 'integer', array());
88
+			$table->addColumn('pos', 'smallint', array());
89
+			$table->addColumn('mtime', 'datetime', array());
90
+			$table->addColumn('ctime', 'datetime', array());
91
+			$table->addColumn('editor', 'string', array('length' => 255));
92
+
93
+			$table->setPrimaryKey(array('id'), 'pk_lvuad_id');
94
+			$table->addIndex(array('parentid'), 'idx_lvuad_pid');
95
+			$table->addIndex(array('lastname', 'firstname'), 'idx_lvuad_last_first');
96
+			$table->addIndex(array('postal', 'address1'), 'idx_lvuad_post_addr1');
97
+			$table->addIndex(array('postal', 'city'), 'idx_lvuad_post_city');
98
+			$table->addIndex(array('address1'), 'idx_lvusr_address1');
99
+			$table->addIndex(array('city'), 'idx_lvuad_city');
100
+			$table->addIndex(array('email'), 'idx_lvuad_email');
101 101
 
102 102
 			return $schema;
103 103
 		},
104 104
 
105
-		'users_list_type' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
105
+		'users_list_type' => function(\Doctrine\DBAL\Schema\Schema $schema) {
106 106
 
107
-			$table = $schema->createTable( 'users_list_type' );
107
+			$table = $schema->createTable('users_list_type');
108 108
 
109
-			$table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) );
110
-			$table->addColumn( 'siteid', 'integer', array() );
111
-			$table->addColumn( 'domain', 'string', array( 'length' => 32 ) );
112
-			$table->addColumn( 'code', 'string', array( 'length' => 32 ) );
113
-			$table->addColumn( 'label', 'string', array( 'length' => 255 ) );
114
-			$table->addColumn( 'status', 'smallint', array() );
115
-			$table->addColumn( 'mtime', 'datetime', array() );
116
-			$table->addColumn( 'ctime', 'datetime', array() );
117
-			$table->addColumn( 'editor', 'string', array( 'length' => 255 ) );
109
+			$table->addColumn('id', 'integer', array('autoincrement' => true));
110
+			$table->addColumn('siteid', 'integer', array());
111
+			$table->addColumn('domain', 'string', array('length' => 32));
112
+			$table->addColumn('code', 'string', array('length' => 32));
113
+			$table->addColumn('label', 'string', array('length' => 255));
114
+			$table->addColumn('status', 'smallint', array());
115
+			$table->addColumn('mtime', 'datetime', array());
116
+			$table->addColumn('ctime', 'datetime', array());
117
+			$table->addColumn('editor', 'string', array('length' => 255));
118 118
 
119
-			$table->setPrimaryKey( array( 'id' ), 'pk_lvulity_id' );
120
-			$table->addUniqueIndex( array( 'siteid', 'domain', 'code' ), 'unq_lvulity_sid_dom_code' );
121
-			$table->addIndex( array( 'siteid', 'status' ), 'idx_lvulity_sid_status' );
122
-			$table->addIndex( array( 'siteid', 'label' ), 'idx_lvulity_sid_label' );
123
-			$table->addIndex( array( 'siteid', 'code' ), 'idx_lvulity_sid_code' );
119
+			$table->setPrimaryKey(array('id'), 'pk_lvulity_id');
120
+			$table->addUniqueIndex(array('siteid', 'domain', 'code'), 'unq_lvulity_sid_dom_code');
121
+			$table->addIndex(array('siteid', 'status'), 'idx_lvulity_sid_status');
122
+			$table->addIndex(array('siteid', 'label'), 'idx_lvulity_sid_label');
123
+			$table->addIndex(array('siteid', 'code'), 'idx_lvulity_sid_code');
124 124
 
125 125
 			return $schema;
126 126
 		},
127 127
 
128
-		'users_list' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
129
-
130
-			$table = $schema->createTable( 'users_list' );
131
-
132
-			$table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) );
133
-			$table->addColumn( 'parentid', 'integer', array() );
134
-			$table->addColumn( 'siteid', 'integer', array() );
135
-			$table->addColumn( 'typeid', 'integer', array() );
136
-			$table->addColumn( 'domain', 'string', array( 'length' => 32 ) );
137
-			$table->addColumn( 'refid', 'string', array( 'length' => 32 ) );
138
-			$table->addColumn( 'start', 'datetime', array( 'notnull' => false ) );
139
-			$table->addColumn( 'end', 'datetime', array( 'notnull' => false ) );
140
-			$table->addColumn( 'config', 'text', array( 'length' => 0xffff ) );
141
-			$table->addColumn( 'pos', 'integer', array() );
142
-			$table->addColumn( 'status', 'smallint', array() );
143
-			$table->addColumn( 'mtime', 'datetime', array() );
144
-			$table->addColumn( 'ctime', 'datetime', array() );
145
-			$table->addColumn( 'editor', 'string', array( 'length' => 255 ) );
146
-
147
-			$table->setPrimaryKey( array( 'id' ), 'pk_lvuli_id' );
148
-			$table->addUniqueIndex( array( 'siteid', 'domain', 'refid', 'typeid', 'parentid' ), 'unq_lvuli_sid_dm_rid_tid_pid' );
149
-			$table->addIndex( array( 'siteid', 'status', 'start', 'end' ), 'idx_lvuli_sid_stat_start_end' );
150
-			$table->addIndex( array( 'parentid', 'siteid', 'refid', 'domain', 'typeid' ), 'idx_lvuli_pid_sid_rid_dom_tid' );
151
-			$table->addIndex( array( 'parentid', 'siteid', 'start' ), 'idx_lvuli_pid_sid_start' );
152
-			$table->addIndex( array( 'parentid', 'siteid', 'end' ), 'idx_lvuli_pid_sid_end' );
153
-			$table->addIndex( array( 'parentid', 'siteid', 'pos' ), 'idx_lvuli_pid_sid_pos' );
154
-
155
-			$table->addForeignKeyConstraint( 'users_list_type', array( 'typeid' ), array( 'id' ),
156
-				array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_lvuli_typeid' );
128
+		'users_list' => function(\Doctrine\DBAL\Schema\Schema $schema) {
129
+
130
+			$table = $schema->createTable('users_list');
131
+
132
+			$table->addColumn('id', 'integer', array('autoincrement' => true));
133
+			$table->addColumn('parentid', 'integer', array());
134
+			$table->addColumn('siteid', 'integer', array());
135
+			$table->addColumn('typeid', 'integer', array());
136
+			$table->addColumn('domain', 'string', array('length' => 32));
137
+			$table->addColumn('refid', 'string', array('length' => 32));
138
+			$table->addColumn('start', 'datetime', array('notnull' => false));
139
+			$table->addColumn('end', 'datetime', array('notnull' => false));
140
+			$table->addColumn('config', 'text', array('length' => 0xffff));
141
+			$table->addColumn('pos', 'integer', array());
142
+			$table->addColumn('status', 'smallint', array());
143
+			$table->addColumn('mtime', 'datetime', array());
144
+			$table->addColumn('ctime', 'datetime', array());
145
+			$table->addColumn('editor', 'string', array('length' => 255));
146
+
147
+			$table->setPrimaryKey(array('id'), 'pk_lvuli_id');
148
+			$table->addUniqueIndex(array('siteid', 'domain', 'refid', 'typeid', 'parentid'), 'unq_lvuli_sid_dm_rid_tid_pid');
149
+			$table->addIndex(array('siteid', 'status', 'start', 'end'), 'idx_lvuli_sid_stat_start_end');
150
+			$table->addIndex(array('parentid', 'siteid', 'refid', 'domain', 'typeid'), 'idx_lvuli_pid_sid_rid_dom_tid');
151
+			$table->addIndex(array('parentid', 'siteid', 'start'), 'idx_lvuli_pid_sid_start');
152
+			$table->addIndex(array('parentid', 'siteid', 'end'), 'idx_lvuli_pid_sid_end');
153
+			$table->addIndex(array('parentid', 'siteid', 'pos'), 'idx_lvuli_pid_sid_pos');
154
+
155
+			$table->addForeignKeyConstraint('users_list_type', array('typeid'), array('id'),
156
+				array('onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE'), 'fk_lvuli_typeid');
157 157
 
158 158
 			return $schema;
159 159
 		},
Please login to merge, or discard this patch.