@@ -21,13 +21,13 @@ discard block |
||
21 | 21 | */ |
22 | 22 | protected function setUp() |
23 | 23 | { |
24 | - if( !interface_exists( '\\Illuminate\\Contracts\\Routing\\UrlGenerator' ) ) { |
|
25 | - $this->markTestSkipped( '\\Illuminate\\Contracts\\Routing\\UrlGenerator is not available' ); |
|
24 | + if (!interface_exists('\\Illuminate\\Contracts\\Routing\\UrlGenerator')) { |
|
25 | + $this->markTestSkipped('\\Illuminate\\Contracts\\Routing\\UrlGenerator is not available'); |
|
26 | 26 | } |
27 | 27 | |
28 | 28 | $view = new \Aimeos\MW\View\Standard(); |
29 | - $this->mock = $this->getMockBuilder( '\\Illuminate\\Contracts\\Routing\\UrlGenerator' )->getMock(); |
|
30 | - $this->object = new \Aimeos\MW\View\Helper\Url\Laravel5( $view, $this->mock, [] ); |
|
29 | + $this->mock = $this->getMockBuilder('\\Illuminate\\Contracts\\Routing\\UrlGenerator')->getMock(); |
|
30 | + $this->object = new \Aimeos\MW\View\Helper\Url\Laravel5($view, $this->mock, []); |
|
31 | 31 | } |
32 | 32 | |
33 | 33 | |
@@ -39,25 +39,25 @@ discard block |
||
39 | 39 | */ |
40 | 40 | protected function tearDown() |
41 | 41 | { |
42 | - unset( $this->object, $this->mock ); |
|
42 | + unset($this->object, $this->mock); |
|
43 | 43 | } |
44 | 44 | |
45 | 45 | |
46 | 46 | public function testTransform() |
47 | 47 | { |
48 | - $this->mock->expects( $this->once() )->method( 'route' ) |
|
49 | - ->with( $this->equalTo( 'route'), $this->equalTo( array( 'key' => 'value' ) ), $this->equalTo( false ) ); |
|
48 | + $this->mock->expects($this->once())->method('route') |
|
49 | + ->with($this->equalTo('route'), $this->equalTo(array('key' => 'value')), $this->equalTo(false)); |
|
50 | 50 | |
51 | - $this->object->transform( 'route', 'catalog', 'lists', array( 'key' => 'value' ) ); |
|
51 | + $this->object->transform('route', 'catalog', 'lists', array('key' => 'value')); |
|
52 | 52 | } |
53 | 53 | |
54 | 54 | |
55 | 55 | public function testTransformAbsolute() |
56 | 56 | { |
57 | - $this->mock->expects( $this->once() )->method( 'route' ) |
|
58 | - ->with( $this->equalTo( 'route'), $this->equalTo( [] ), $this->equalTo( true ) ); |
|
57 | + $this->mock->expects($this->once())->method('route') |
|
58 | + ->with($this->equalTo('route'), $this->equalTo([]), $this->equalTo(true)); |
|
59 | 59 | |
60 | - $options = array( 'absoluteUri' => true ); |
|
61 | - $this->object->transform( 'route', 'catalog', 'lists', [], [], $options ); |
|
60 | + $options = array('absoluteUri' => true); |
|
61 | + $this->object->transform('route', 'catalog', 'lists', [], [], $options); |
|
62 | 62 | } |
63 | 63 | } |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | 'customer.lists.type.id' => array( |
26 | 26 | 'code'=>'customer.lists.type.id', |
27 | 27 | 'internalcode'=>'lvulity."id"', |
28 | - 'internaldeps'=>array( 'LEFT JOIN "users_list_type" AS lvulity ON ( lvuli."typeid" = lvulity."id" )' ), |
|
28 | + 'internaldeps'=>array('LEFT JOIN "users_list_type" AS lvulity ON ( lvuli."typeid" = lvulity."id" )'), |
|
29 | 29 | 'label'=>'Customer list type ID', |
30 | 30 | 'type'=> 'integer', |
31 | 31 | 'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT, |
@@ -96,14 +96,14 @@ discard block |
||
96 | 96 | * |
97 | 97 | * @param array $siteids List of IDs for sites whose entries should be deleted |
98 | 98 | */ |
99 | - public function cleanup( array $siteids ) |
|
99 | + public function cleanup(array $siteids) |
|
100 | 100 | { |
101 | 101 | $path = 'mshop/customer/manager/lists/type/submanagers'; |
102 | - foreach( $this->getContext()->getConfig()->get( $path, [] ) as $domain ) { |
|
103 | - $this->getObject()->getSubManager( $domain )->cleanup( $siteids ); |
|
102 | + foreach ($this->getContext()->getConfig()->get($path, []) as $domain) { |
|
103 | + $this->getObject()->getSubManager($domain)->cleanup($siteids); |
|
104 | 104 | } |
105 | 105 | |
106 | - $this->cleanupBase( $siteids, 'mshop/customer/manager/lists/type/laravel/delete' ); |
|
106 | + $this->cleanupBase($siteids, 'mshop/customer/manager/lists/type/laravel/delete'); |
|
107 | 107 | } |
108 | 108 | |
109 | 109 | |
@@ -113,11 +113,11 @@ discard block |
||
113 | 113 | * @param boolean $withsub Return also attributes of sub-managers if true |
114 | 114 | * @return array List of attribute items implementing \Aimeos\MW\Criteria\Attribute\Iface |
115 | 115 | */ |
116 | - public function getSearchAttributes( $withsub = true ) |
|
116 | + public function getSearchAttributes($withsub = true) |
|
117 | 117 | { |
118 | 118 | $path = 'mshop/customer/manager/lists/type/submanagers'; |
119 | 119 | |
120 | - return $this->getSearchAttributesBase( $this->searchConfig, $path, [], $withsub ); |
|
120 | + return $this->getSearchAttributesBase($this->searchConfig, $path, [], $withsub); |
|
121 | 121 | } |
122 | 122 | |
123 | 123 | |
@@ -128,9 +128,9 @@ discard block |
||
128 | 128 | * @param string|null $name Name of the implementation, will be from configuration (or Default) if null |
129 | 129 | * @return mixed Manager for different extensions, e.g stock, tags, locations, etc. |
130 | 130 | */ |
131 | - public function getSubManager( $manager, $name = null ) |
|
131 | + public function getSubManager($manager, $name = null) |
|
132 | 132 | { |
133 | - return $this->getSubManagerBase( 'customer', 'lists/type/' . $manager, ( $name === null ? 'Laravel' : $name ) ); |
|
133 | + return $this->getSubManagerBase('customer', 'lists/type/'.$manager, ($name === null ? 'Laravel' : $name)); |
|
134 | 134 | } |
135 | 135 | |
136 | 136 |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | 'customer.lists.id'=> array( |
26 | 26 | 'code'=>'customer.lists.id', |
27 | 27 | 'internalcode'=>'lvuli."id"', |
28 | - 'internaldeps' => array( 'LEFT JOIN "users_list" AS lvuli ON ( lvu."id" = lvuli."parentid" )' ), |
|
28 | + 'internaldeps' => array('LEFT JOIN "users_list" AS lvuli ON ( lvu."id" = lvuli."parentid" )'), |
|
29 | 29 | 'label'=>'Customer list ID', |
30 | 30 | 'type'=> 'integer', |
31 | 31 | 'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_INT, |
@@ -133,14 +133,14 @@ discard block |
||
133 | 133 | * |
134 | 134 | * @param array $siteids List of IDs for sites whose entries should be deleted |
135 | 135 | */ |
136 | - public function cleanup( array $siteids ) |
|
136 | + public function cleanup(array $siteids) |
|
137 | 137 | { |
138 | 138 | $path = 'mshop/customer/manager/lists/submanagers'; |
139 | - foreach( $this->getContext()->getConfig()->get( $path, array( 'type' ) ) as $domain ) { |
|
140 | - $this->getObject()->getSubManager( $domain )->cleanup( $siteids ); |
|
139 | + foreach ($this->getContext()->getConfig()->get($path, array('type')) as $domain) { |
|
140 | + $this->getObject()->getSubManager($domain)->cleanup($siteids); |
|
141 | 141 | } |
142 | 142 | |
143 | - $this->cleanupBase( $siteids, 'mshop/customer/manager/lists/laravel/delete' ); |
|
143 | + $this->cleanupBase($siteids, 'mshop/customer/manager/lists/laravel/delete'); |
|
144 | 144 | } |
145 | 145 | |
146 | 146 | |
@@ -150,11 +150,11 @@ discard block |
||
150 | 150 | * @param boolean $withsub Return also attributes of sub-managers if true |
151 | 151 | * @return array List of attribute items implementing \Aimeos\MW\Criteria\Attribute\Iface |
152 | 152 | */ |
153 | - public function getSearchAttributes( $withsub = true ) |
|
153 | + public function getSearchAttributes($withsub = true) |
|
154 | 154 | { |
155 | 155 | $path = 'mshop/customer/manager/lists/submanagers'; |
156 | 156 | |
157 | - return $this->getSearchAttributesBase( $this->searchConfig, $path, array( 'type' ), $withsub ); |
|
157 | + return $this->getSearchAttributesBase($this->searchConfig, $path, array('type'), $withsub); |
|
158 | 158 | } |
159 | 159 | |
160 | 160 | |
@@ -165,9 +165,9 @@ discard block |
||
165 | 165 | * @param string|null $name Name of the implementation, will be from configuration (or Default) if null |
166 | 166 | * @return mixed Manager for different extensions, e.g stock, tags, locations, etc. |
167 | 167 | */ |
168 | - public function getSubManager( $manager, $name = null ) |
|
168 | + public function getSubManager($manager, $name = null) |
|
169 | 169 | { |
170 | - return $this->getSubManagerBase( 'customer', 'lists/' . $manager, ( $name === null ? 'Laravel' : $name ) ); |
|
170 | + return $this->getSubManagerBase('customer', 'lists/'.$manager, ($name === null ? 'Laravel' : $name)); |
|
171 | 171 | } |
172 | 172 | |
173 | 173 |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | 'label' => 'Customer address ID', |
27 | 27 | 'code' => 'customer.address.id', |
28 | 28 | 'internalcode' => 'lvuad."id"', |
29 | - 'internaldeps' => array( 'LEFT JOIN "users_address" AS lvuad ON ( lvu."id" = lvuad."parentid" )' ), |
|
29 | + 'internaldeps' => array('LEFT JOIN "users_address" AS lvuad ON ( lvu."id" = lvuad."parentid" )'), |
|
30 | 30 | 'type' => 'integer', |
31 | 31 | 'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT, |
32 | 32 | 'public' => false, |
@@ -223,11 +223,11 @@ discard block |
||
223 | 223 | * |
224 | 224 | * @param array $siteids List of IDs for sites whose entries should be deleted |
225 | 225 | */ |
226 | - public function cleanup( array $siteids ) |
|
226 | + public function cleanup(array $siteids) |
|
227 | 227 | { |
228 | 228 | $path = 'mshop/customer/manager/address/submanagers'; |
229 | - foreach( $this->getContext()->getConfig()->get( $path, [] ) as $domain ) { |
|
230 | - $this->getObject()->getSubManager( $domain )->cleanup( $siteids ); |
|
229 | + foreach ($this->getContext()->getConfig()->get($path, []) as $domain) { |
|
230 | + $this->getObject()->getSubManager($domain)->cleanup($siteids); |
|
231 | 231 | } |
232 | 232 | } |
233 | 233 | |
@@ -237,10 +237,10 @@ discard block |
||
237 | 237 | * |
238 | 238 | * @param array $ids List of IDs |
239 | 239 | */ |
240 | - public function deleteItems( array $ids ) |
|
240 | + public function deleteItems(array $ids) |
|
241 | 241 | { |
242 | 242 | $path = 'mshop/customer/manager/address/laravel/delete'; |
243 | - $this->deleteItemsBase( $ids, $path, false ); |
|
243 | + $this->deleteItemsBase($ids, $path, false); |
|
244 | 244 | } |
245 | 245 | |
246 | 246 | |
@@ -250,11 +250,11 @@ discard block |
||
250 | 250 | * @param boolean $withsub Return also attributes of sub-managers if true |
251 | 251 | * @return array List of attribute items implementing \Aimeos\MW\Criteria\Attribute\Iface |
252 | 252 | */ |
253 | - public function getSearchAttributes( $withsub = true ) |
|
253 | + public function getSearchAttributes($withsub = true) |
|
254 | 254 | { |
255 | 255 | $path = 'mshop/customer/manager/address/submanagers'; |
256 | 256 | |
257 | - return $this->getSearchAttributesBase( $this->searchConfig, $path, [], $withsub ); |
|
257 | + return $this->getSearchAttributesBase($this->searchConfig, $path, [], $withsub); |
|
258 | 258 | } |
259 | 259 | |
260 | 260 | |
@@ -265,9 +265,9 @@ discard block |
||
265 | 265 | * @param string|null $name Name of the implementation, will be from configuration (or Default) if null |
266 | 266 | * @return mixed Manager for different extensions, e.g stock, tags, locations, etc. |
267 | 267 | */ |
268 | - public function getSubManager( $manager, $name = null ) |
|
268 | + public function getSubManager($manager, $name = null) |
|
269 | 269 | { |
270 | - return $this->getSubManagerBase( 'customer', 'address/' . $manager, ( $name === null ? 'Laravel' : $name ) ); |
|
270 | + return $this->getSubManagerBase('customer', 'address/'.$manager, ($name === null ? 'Laravel' : $name)); |
|
271 | 271 | } |
272 | 272 | |
273 | 273 |
@@ -240,11 +240,11 @@ discard block |
||
240 | 240 | * |
241 | 241 | * @param array $siteids List of IDs for sites whose entries should be deleted |
242 | 242 | */ |
243 | - public function cleanup( array $siteids ) |
|
243 | + public function cleanup(array $siteids) |
|
244 | 244 | { |
245 | 245 | $path = 'mshop/customer/manager/submanagers'; |
246 | - foreach( $this->getContext()->getConfig()->get( $path, array( 'address', 'lists' ) ) as $domain ) { |
|
247 | - $this->getObject()->getSubManager( $domain )->cleanup( $siteids ); |
|
246 | + foreach ($this->getContext()->getConfig()->get($path, array('address', 'lists')) as $domain) { |
|
247 | + $this->getObject()->getSubManager($domain)->cleanup($siteids); |
|
248 | 248 | } |
249 | 249 | } |
250 | 250 | |
@@ -265,10 +265,10 @@ discard block |
||
265 | 265 | * |
266 | 266 | * @param array $ids List of IDs |
267 | 267 | */ |
268 | - public function deleteItems( array $ids ) |
|
268 | + public function deleteItems(array $ids) |
|
269 | 269 | { |
270 | 270 | $path = 'mshop/customer/manager/laravel/delete'; |
271 | - $this->deleteItemsBase( $ids, $path, false ); |
|
271 | + $this->deleteItemsBase($ids, $path, false); |
|
272 | 272 | } |
273 | 273 | |
274 | 274 | |
@@ -278,11 +278,11 @@ discard block |
||
278 | 278 | * @param boolean $withsub Return also attributes of sub-managers if true |
279 | 279 | * @return array List of attribute items implementing \Aimeos\MW\Criteria\Attribute\Iface |
280 | 280 | */ |
281 | - public function getSearchAttributes( $withsub = true ) |
|
281 | + public function getSearchAttributes($withsub = true) |
|
282 | 282 | { |
283 | 283 | $path = 'mshop/customer/manager/submanagers'; |
284 | 284 | |
285 | - return $this->getSearchAttributesBase( $this->searchConfig, $path, array( 'address', 'lists' ), $withsub ); |
|
285 | + return $this->getSearchAttributesBase($this->searchConfig, $path, array('address', 'lists'), $withsub); |
|
286 | 286 | } |
287 | 287 | |
288 | 288 | |
@@ -292,27 +292,27 @@ discard block |
||
292 | 292 | * @param \Aimeos\MShop\Customer\Item\Iface $item Customer item object |
293 | 293 | * @param boolean $fetch True if the new ID should be returned in the item |
294 | 294 | */ |
295 | - public function saveItem( \Aimeos\MShop\Common\Item\Iface $item, $fetch = true ) |
|
295 | + public function saveItem(\Aimeos\MShop\Common\Item\Iface $item, $fetch = true) |
|
296 | 296 | { |
297 | 297 | $iface = '\\Aimeos\\MShop\\Customer\\Item\\Iface'; |
298 | - if( !( $item instanceof $iface ) ) { |
|
299 | - throw new \Aimeos\MShop\Customer\Exception( sprintf( 'Object is not of required type "%1$s"', $iface ) ); |
|
298 | + if (!($item instanceof $iface)) { |
|
299 | + throw new \Aimeos\MShop\Customer\Exception(sprintf('Object is not of required type "%1$s"', $iface)); |
|
300 | 300 | } |
301 | 301 | |
302 | - if( !$item->isModified() ) { return; } |
|
302 | + if (!$item->isModified()) { return; } |
|
303 | 303 | |
304 | 304 | $context = $this->getContext(); |
305 | 305 | $dbm = $context->getDatabaseManager(); |
306 | 306 | $dbname = $this->getResourceName(); |
307 | - $conn = $dbm->acquire( $dbname ); |
|
307 | + $conn = $dbm->acquire($dbname); |
|
308 | 308 | |
309 | 309 | try |
310 | 310 | { |
311 | 311 | $id = $item->getId(); |
312 | - $date = date( 'Y-m-d H:i:s' ); |
|
312 | + $date = date('Y-m-d H:i:s'); |
|
313 | 313 | $billingAddress = $item->getPaymentAddress(); |
314 | 314 | |
315 | - if( $id === null ) |
|
315 | + if ($id === null) |
|
316 | 316 | { |
317 | 317 | /** mshop/customer/manager/laravel/insert |
318 | 318 | * Inserts a new customer record into the database table |
@@ -376,47 +376,47 @@ discard block |
||
376 | 376 | $path = 'mshop/customer/manager/laravel/update'; |
377 | 377 | } |
378 | 378 | |
379 | - $stmt = $this->getCachedStatement( $conn, $path ); |
|
380 | - |
|
381 | - $stmt->bind( 1, $item->getCode() ); |
|
382 | - $stmt->bind( 2, $billingAddress->getCompany() ); |
|
383 | - $stmt->bind( 3, $billingAddress->getVatID() ); |
|
384 | - $stmt->bind( 4, $billingAddress->getSalutation() ); |
|
385 | - $stmt->bind( 5, $billingAddress->getTitle() ); |
|
386 | - $stmt->bind( 6, $billingAddress->getFirstname() ); |
|
387 | - $stmt->bind( 7, $billingAddress->getLastname() ); |
|
388 | - $stmt->bind( 8, $billingAddress->getAddress1() ); |
|
389 | - $stmt->bind( 9, $billingAddress->getAddress2() ); |
|
390 | - $stmt->bind( 10, $billingAddress->getAddress3() ); |
|
391 | - $stmt->bind( 11, $billingAddress->getPostal() ); |
|
392 | - $stmt->bind( 12, $billingAddress->getCity() ); |
|
393 | - $stmt->bind( 13, $billingAddress->getState() ); |
|
394 | - $stmt->bind( 14, $billingAddress->getCountryId() ); |
|
395 | - $stmt->bind( 15, $billingAddress->getLanguageId() ); |
|
396 | - $stmt->bind( 16, $billingAddress->getTelephone() ); |
|
397 | - $stmt->bind( 17, $billingAddress->getTelefax() ); |
|
398 | - $stmt->bind( 18, $billingAddress->getWebsite() ); |
|
399 | - $stmt->bind( 19, $billingAddress->getEmail() ); |
|
400 | - $stmt->bind( 20, $billingAddress->getLongitude() ); |
|
401 | - $stmt->bind( 21, $billingAddress->getLatitude() ); |
|
402 | - $stmt->bind( 22, $item->getLabel() ); |
|
403 | - $stmt->bind( 23, $item->getBirthday() ); |
|
404 | - $stmt->bind( 24, $item->getStatus(), \Aimeos\MW\DB\Statement\Base::PARAM_INT ); |
|
405 | - $stmt->bind( 25, $item->getDateVerified() ); |
|
406 | - $stmt->bind( 26, $item->getPassword() ); |
|
407 | - $stmt->bind( 27, $date ); // Modification time |
|
408 | - $stmt->bind( 28, $context->getEditor() ); |
|
409 | - |
|
410 | - if( $id !== null ) { |
|
411 | - $stmt->bind( 29, $id, \Aimeos\MW\DB\Statement\Base::PARAM_INT ); |
|
412 | - $item->setId( $id ); |
|
379 | + $stmt = $this->getCachedStatement($conn, $path); |
|
380 | + |
|
381 | + $stmt->bind(1, $item->getCode()); |
|
382 | + $stmt->bind(2, $billingAddress->getCompany()); |
|
383 | + $stmt->bind(3, $billingAddress->getVatID()); |
|
384 | + $stmt->bind(4, $billingAddress->getSalutation()); |
|
385 | + $stmt->bind(5, $billingAddress->getTitle()); |
|
386 | + $stmt->bind(6, $billingAddress->getFirstname()); |
|
387 | + $stmt->bind(7, $billingAddress->getLastname()); |
|
388 | + $stmt->bind(8, $billingAddress->getAddress1()); |
|
389 | + $stmt->bind(9, $billingAddress->getAddress2()); |
|
390 | + $stmt->bind(10, $billingAddress->getAddress3()); |
|
391 | + $stmt->bind(11, $billingAddress->getPostal()); |
|
392 | + $stmt->bind(12, $billingAddress->getCity()); |
|
393 | + $stmt->bind(13, $billingAddress->getState()); |
|
394 | + $stmt->bind(14, $billingAddress->getCountryId()); |
|
395 | + $stmt->bind(15, $billingAddress->getLanguageId()); |
|
396 | + $stmt->bind(16, $billingAddress->getTelephone()); |
|
397 | + $stmt->bind(17, $billingAddress->getTelefax()); |
|
398 | + $stmt->bind(18, $billingAddress->getWebsite()); |
|
399 | + $stmt->bind(19, $billingAddress->getEmail()); |
|
400 | + $stmt->bind(20, $billingAddress->getLongitude()); |
|
401 | + $stmt->bind(21, $billingAddress->getLatitude()); |
|
402 | + $stmt->bind(22, $item->getLabel()); |
|
403 | + $stmt->bind(23, $item->getBirthday()); |
|
404 | + $stmt->bind(24, $item->getStatus(), \Aimeos\MW\DB\Statement\Base::PARAM_INT); |
|
405 | + $stmt->bind(25, $item->getDateVerified()); |
|
406 | + $stmt->bind(26, $item->getPassword()); |
|
407 | + $stmt->bind(27, $date); // Modification time |
|
408 | + $stmt->bind(28, $context->getEditor()); |
|
409 | + |
|
410 | + if ($id !== null) { |
|
411 | + $stmt->bind(29, $id, \Aimeos\MW\DB\Statement\Base::PARAM_INT); |
|
412 | + $item->setId($id); |
|
413 | 413 | } else { |
414 | - $stmt->bind( 29, $date ); // Creation time |
|
414 | + $stmt->bind(29, $date); // Creation time |
|
415 | 415 | } |
416 | 416 | |
417 | 417 | $stmt->execute()->finish(); |
418 | 418 | |
419 | - if( $id === null && $fetch === true ) |
|
419 | + if ($id === null && $fetch === true) |
|
420 | 420 | { |
421 | 421 | /** mshop/customer/manager/laravel/newid |
422 | 422 | * Retrieves the ID generated by the database when inserting a new record |
@@ -449,14 +449,14 @@ discard block |
||
449 | 449 | * @see mshop/customer/manager/laravel/count |
450 | 450 | */ |
451 | 451 | $path = 'mshop/customer/manager/laravel/newid'; |
452 | - $item->setId( $this->newId( $conn, $path ) ); |
|
452 | + $item->setId($this->newId($conn, $path)); |
|
453 | 453 | } |
454 | 454 | |
455 | - $dbm->release( $conn, $dbname ); |
|
455 | + $dbm->release($conn, $dbname); |
|
456 | 456 | } |
457 | - catch( \Exception $e ) |
|
457 | + catch (\Exception $e) |
|
458 | 458 | { |
459 | - $dbm->release( $conn, $dbname ); |
|
459 | + $dbm->release($conn, $dbname); |
|
460 | 460 | throw $e; |
461 | 461 | } |
462 | 462 | } |
@@ -470,11 +470,11 @@ discard block |
||
470 | 470 | * @return array List of items implementing \Aimeos\MShop\Customer\Item\Iface |
471 | 471 | * @throws \Aimeos\MShop\Customer\Exception If creating items failed |
472 | 472 | */ |
473 | - public function searchItems( \Aimeos\MW\Criteria\Iface $search, array $ref = [], &$total = null ) |
|
473 | + public function searchItems(\Aimeos\MW\Criteria\Iface $search, array $ref = [], &$total = null) |
|
474 | 474 | { |
475 | 475 | $dbm = $this->getContext()->getDatabaseManager(); |
476 | 476 | $dbname = $this->getResourceName(); |
477 | - $conn = $dbm->acquire( $dbname ); |
|
477 | + $conn = $dbm->acquire($dbname); |
|
478 | 478 | $map = []; |
479 | 479 | |
480 | 480 | try |
@@ -482,27 +482,27 @@ discard block |
||
482 | 482 | $level = \Aimeos\MShop\Locale\Manager\Base::SITE_ALL; |
483 | 483 | $cfgPathSearch = 'mshop/customer/manager/laravel/search'; |
484 | 484 | $cfgPathCount = 'mshop/customer/manager/laravel/count'; |
485 | - $required = array( 'customer' ); |
|
485 | + $required = array('customer'); |
|
486 | 486 | |
487 | - $results = $this->searchItemsBase( $conn, $search, $cfgPathSearch, $cfgPathCount, $required, $total, $level ); |
|
488 | - while( ( $row = $results->fetch() ) !== false ) { |
|
489 | - $map[ $row['customer.id'] ] = $row; |
|
487 | + $results = $this->searchItemsBase($conn, $search, $cfgPathSearch, $cfgPathCount, $required, $total, $level); |
|
488 | + while (($row = $results->fetch()) !== false) { |
|
489 | + $map[$row['customer.id']] = $row; |
|
490 | 490 | } |
491 | 491 | |
492 | - $dbm->release( $conn, $dbname ); |
|
492 | + $dbm->release($conn, $dbname); |
|
493 | 493 | } |
494 | - catch( \Exception $e ) |
|
494 | + catch (\Exception $e) |
|
495 | 495 | { |
496 | - $dbm->release( $conn, $dbname ); |
|
496 | + $dbm->release($conn, $dbname); |
|
497 | 497 | throw $e; |
498 | 498 | } |
499 | 499 | |
500 | 500 | $addrItems = []; |
501 | - if( in_array( 'address', $ref, true ) ) { |
|
502 | - $addrItems = $this->getAddressItems( array_keys( $map ) ); |
|
501 | + if (in_array('address', $ref, true)) { |
|
502 | + $addrItems = $this->getAddressItems(array_keys($map)); |
|
503 | 503 | } |
504 | 504 | |
505 | - return $this->buildItems( $map, $ref, 'customer', $addrItems ); |
|
505 | + return $this->buildItems($map, $ref, 'customer', $addrItems); |
|
506 | 506 | } |
507 | 507 | |
508 | 508 | |
@@ -513,8 +513,8 @@ discard block |
||
513 | 513 | * @param string|null $name Name of the implementation, will be from configuration (or Default) if null |
514 | 514 | * @return mixed Manager for different extensions, e.g stock, tags, locations, etc. |
515 | 515 | */ |
516 | - public function getSubManager( $manager, $name = null ) |
|
516 | + public function getSubManager($manager, $name = null) |
|
517 | 517 | { |
518 | - return $this->getSubManagerBase( 'customer', $manager, ( $name === null ? 'Laravel' : $name ) ); |
|
518 | + return $this->getSubManagerBase('customer', $manager, ($name === null ? 'Laravel' : $name)); |
|
519 | 519 | } |
520 | 520 | } |
@@ -8,152 +8,152 @@ |
||
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', [] ); |
|
44 | - $table->addColumn( 'created_at', 'datetime', [] ); |
|
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', []); |
|
44 | + $table->addColumn('created_at', 'datetime', []); |
|
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', [] ); |
|
66 | - $table->addColumn( 'parentid', 'integer', [] ); |
|
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', [] ); |
|
88 | - $table->addColumn( 'pos', 'smallint', [] ); |
|
89 | - $table->addColumn( 'mtime', 'datetime', [] ); |
|
90 | - $table->addColumn( 'ctime', 'datetime', [] ); |
|
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_lvuad_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', []); |
|
66 | + $table->addColumn('parentid', 'integer', []); |
|
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', []); |
|
88 | + $table->addColumn('pos', 'smallint', []); |
|
89 | + $table->addColumn('mtime', 'datetime', []); |
|
90 | + $table->addColumn('ctime', 'datetime', []); |
|
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_lvuad_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', [] ); |
|
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', [] ); |
|
115 | - $table->addColumn( 'mtime', 'datetime', [] ); |
|
116 | - $table->addColumn( 'ctime', 'datetime', [] ); |
|
117 | - $table->addColumn( 'editor', 'string', array( 'length' => 255 ) ); |
|
109 | + $table->addColumn('id', 'integer', array('autoincrement' => true)); |
|
110 | + $table->addColumn('siteid', 'integer', []); |
|
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', []); |
|
115 | + $table->addColumn('mtime', 'datetime', []); |
|
116 | + $table->addColumn('ctime', 'datetime', []); |
|
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', [] ); |
|
134 | - $table->addColumn( 'siteid', 'integer', [] ); |
|
135 | - $table->addColumn( 'typeid', 'integer', [] ); |
|
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', [] ); |
|
142 | - $table->addColumn( 'status', 'smallint', [] ); |
|
143 | - $table->addColumn( 'mtime', 'datetime', [] ); |
|
144 | - $table->addColumn( 'ctime', 'datetime', [] ); |
|
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', []); |
|
134 | + $table->addColumn('siteid', 'integer', []); |
|
135 | + $table->addColumn('typeid', 'integer', []); |
|
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', []); |
|
142 | + $table->addColumn('status', 'smallint', []); |
|
143 | + $table->addColumn('mtime', 'datetime', []); |
|
144 | + $table->addColumn('ctime', 'datetime', []); |
|
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 | }, |
@@ -12,50 +12,50 @@ |
||
12 | 12 | |
13 | 13 | protected function setUp() |
14 | 14 | { |
15 | - if( !class_exists( '\Illuminate\Filesystem\FilesystemManager' ) ) { |
|
16 | - $this->markTestSkipped( 'Install the Laravel framework first' ); |
|
15 | + if (!class_exists('\Illuminate\Filesystem\FilesystemManager')) { |
|
16 | + $this->markTestSkipped('Install the Laravel framework first'); |
|
17 | 17 | } |
18 | 18 | |
19 | - $this->storage = $this->getMockBuilder( '\Illuminate\Filesystem\FilesystemManager' ) |
|
20 | - ->setMethods( array( 'get' ) ) |
|
19 | + $this->storage = $this->getMockBuilder('\Illuminate\Filesystem\FilesystemManager') |
|
20 | + ->setMethods(array('get')) |
|
21 | 21 | ->disableOriginalConstructor() |
22 | 22 | ->getMock(); |
23 | 23 | |
24 | - $this->config = new \Aimeos\MW\Config\Decorator\Memory( new \Aimeos\MW\Config\PHPArray( [], [] ) ); |
|
25 | - $this->object = new \Aimeos\MW\Filesystem\Manager\Laravel( $this->storage, $this->config, sys_get_temp_dir() ); |
|
24 | + $this->config = new \Aimeos\MW\Config\Decorator\Memory(new \Aimeos\MW\Config\PHPArray([], [])); |
|
25 | + $this->object = new \Aimeos\MW\Filesystem\Manager\Laravel($this->storage, $this->config, sys_get_temp_dir()); |
|
26 | 26 | } |
27 | 27 | |
28 | 28 | |
29 | 29 | protected function tearDown() |
30 | 30 | { |
31 | - unset( $this->config, $this->object, $this->storage ); |
|
31 | + unset($this->config, $this->object, $this->storage); |
|
32 | 32 | } |
33 | 33 | |
34 | 34 | |
35 | 35 | public function testGet() |
36 | 36 | { |
37 | - $fs = $this->getMockBuilder( 'Illuminate\Contracts\Filesystem\Filesystem' ) |
|
37 | + $fs = $this->getMockBuilder('Illuminate\Contracts\Filesystem\Filesystem') |
|
38 | 38 | ->disableOriginalConstructor() |
39 | 39 | ->getMock(); |
40 | 40 | |
41 | - $this->storage->expects( $this->once() )->method( 'get' ) |
|
42 | - ->will( $this->returnValue( $fs ) ); |
|
41 | + $this->storage->expects($this->once())->method('get') |
|
42 | + ->will($this->returnValue($fs)); |
|
43 | 43 | |
44 | - $this->config->set( 'resource/fs-media', 'local' ); |
|
45 | - $this->assertInstanceof( 'Aimeos\MW\Filesystem\Iface', $this->object->get( 'fs-media' ) ); |
|
44 | + $this->config->set('resource/fs-media', 'local'); |
|
45 | + $this->assertInstanceof('Aimeos\MW\Filesystem\Iface', $this->object->get('fs-media')); |
|
46 | 46 | } |
47 | 47 | |
48 | 48 | |
49 | 49 | public function testGetFallback() |
50 | 50 | { |
51 | - $this->config->set( 'resource/fs', array( 'adapter' => 'Standard', 'basedir' => __DIR__ ) ); |
|
52 | - $this->assertInstanceof( 'Aimeos\MW\Filesystem\Iface', $this->object->get( 'fs-media' ) ); |
|
51 | + $this->config->set('resource/fs', array('adapter' => 'Standard', 'basedir' => __DIR__)); |
|
52 | + $this->assertInstanceof('Aimeos\MW\Filesystem\Iface', $this->object->get('fs-media')); |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | |
56 | 56 | public function testGetException() |
57 | 57 | { |
58 | - $this->expectException( 'Aimeos\MW\Filesystem\Exception' ); |
|
59 | - $this->object->get( 'fs-media' ); |
|
58 | + $this->expectException('Aimeos\MW\Filesystem\Exception'); |
|
59 | + $this->object->get('fs-media'); |
|
60 | 60 | } |
61 | 61 | } |
@@ -11,348 +11,348 @@ |
||
11 | 11 | |
12 | 12 | protected function setUp() |
13 | 13 | { |
14 | - if( !interface_exists( '\\Illuminate\\Contracts\\Filesystem\\Filesystem' ) ) { |
|
15 | - $this->markTestSkipped( 'Install Laravel framework first' ); |
|
14 | + if (!interface_exists('\\Illuminate\\Contracts\\Filesystem\\Filesystem')) { |
|
15 | + $this->markTestSkipped('Install Laravel framework first'); |
|
16 | 16 | } |
17 | 17 | |
18 | - $this->mock = $this->getMockBuilder( '\\Illuminate\\Contracts\\Filesystem\\Filesystem' ) |
|
18 | + $this->mock = $this->getMockBuilder('\\Illuminate\\Contracts\\Filesystem\\Filesystem') |
|
19 | 19 | ->disableOriginalConstructor() |
20 | 20 | ->getMock(); |
21 | 21 | |
22 | - $this->object = new \Aimeos\MW\Filesystem\Laravel( $this->mock, sys_get_temp_dir() ); |
|
22 | + $this->object = new \Aimeos\MW\Filesystem\Laravel($this->mock, sys_get_temp_dir()); |
|
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 testIsdir() |
33 | 33 | { |
34 | - $this->mock->expects( $this->once() )->method( 'directories' ) |
|
35 | - ->will( $this->returnValue( array( 't', 'test', 'es' ) ) ); |
|
34 | + $this->mock->expects($this->once())->method('directories') |
|
35 | + ->will($this->returnValue(array('t', 'test', 'es'))); |
|
36 | 36 | |
37 | - $this->assertTrue( $this->object->isdir( 'test' ) ); |
|
37 | + $this->assertTrue($this->object->isdir('test')); |
|
38 | 38 | } |
39 | 39 | |
40 | 40 | |
41 | 41 | public function testIsdirFalse() |
42 | 42 | { |
43 | - $this->mock->expects( $this->once() )->method( 'directories' ) |
|
44 | - ->will( $this->returnValue( array( 't', 'es' ) ) ); |
|
43 | + $this->mock->expects($this->once())->method('directories') |
|
44 | + ->will($this->returnValue(array('t', 'es'))); |
|
45 | 45 | |
46 | - $this->assertFalse( $this->object->isdir( 'test' ) ); |
|
46 | + $this->assertFalse($this->object->isdir('test')); |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | |
50 | 50 | public function testMkdir() |
51 | 51 | { |
52 | - $this->mock->expects( $this->once() )->method( 'makeDirectory' ); |
|
52 | + $this->mock->expects($this->once())->method('makeDirectory'); |
|
53 | 53 | |
54 | - $this->object->mkdir( 'test' ); |
|
54 | + $this->object->mkdir('test'); |
|
55 | 55 | } |
56 | 56 | |
57 | 57 | |
58 | 58 | public function testMkdirException() |
59 | 59 | { |
60 | - $this->mock->expects( $this->once() )->method( 'makeDirectory' ) |
|
61 | - ->will( $this->throwException( new \RuntimeException() ) ); |
|
60 | + $this->mock->expects($this->once())->method('makeDirectory') |
|
61 | + ->will($this->throwException(new \RuntimeException())); |
|
62 | 62 | |
63 | - $this->expectException( '\Aimeos\MW\Filesystem\Exception' ); |
|
64 | - $this->object->mkdir( 'test' ); |
|
63 | + $this->expectException('\Aimeos\MW\Filesystem\Exception'); |
|
64 | + $this->object->mkdir('test'); |
|
65 | 65 | } |
66 | 66 | |
67 | 67 | |
68 | 68 | public function testRmdir() |
69 | 69 | { |
70 | - $this->mock->expects( $this->once() )->method( 'deleteDirectory' ); |
|
70 | + $this->mock->expects($this->once())->method('deleteDirectory'); |
|
71 | 71 | |
72 | - $this->object->rmdir( 'test' ); |
|
72 | + $this->object->rmdir('test'); |
|
73 | 73 | } |
74 | 74 | |
75 | 75 | |
76 | 76 | public function testRmdirException() |
77 | 77 | { |
78 | - $this->mock->expects( $this->once() )->method( 'deleteDirectory' ) |
|
79 | - ->will( $this->throwException( new \RuntimeException() ) ); |
|
78 | + $this->mock->expects($this->once())->method('deleteDirectory') |
|
79 | + ->will($this->throwException(new \RuntimeException())); |
|
80 | 80 | |
81 | - $this->expectException( '\Aimeos\MW\Filesystem\Exception' ); |
|
82 | - $this->object->rmdir( 'test' ); |
|
81 | + $this->expectException('\Aimeos\MW\Filesystem\Exception'); |
|
82 | + $this->object->rmdir('test'); |
|
83 | 83 | } |
84 | 84 | |
85 | 85 | |
86 | 86 | public function testScan() |
87 | 87 | { |
88 | - $list = array( 't', 'es', 'st' ); |
|
88 | + $list = array('t', 'es', 'st'); |
|
89 | 89 | |
90 | - $this->mock->expects( $this->once() )->method( 'directories' ) |
|
91 | - ->will( $this->returnValue( array( 't', 'es' ) ) ); |
|
90 | + $this->mock->expects($this->once())->method('directories') |
|
91 | + ->will($this->returnValue(array('t', 'es'))); |
|
92 | 92 | |
93 | - $this->mock->expects( $this->once() )->method( 'files' ) |
|
94 | - ->will( $this->returnValue( array( 'st' ) ) ); |
|
93 | + $this->mock->expects($this->once())->method('files') |
|
94 | + ->will($this->returnValue(array('st'))); |
|
95 | 95 | |
96 | 96 | $result = $this->object->scan(); |
97 | 97 | |
98 | - $this->assertInternalType( 'array', $result ); |
|
98 | + $this->assertInternalType('array', $result); |
|
99 | 99 | |
100 | - foreach( $result as $entry ) { |
|
101 | - $this->assertTrue( in_array( $entry, $list ) ); |
|
100 | + foreach ($result as $entry) { |
|
101 | + $this->assertTrue(in_array($entry, $list)); |
|
102 | 102 | } |
103 | 103 | } |
104 | 104 | |
105 | 105 | |
106 | 106 | public function testScanException() |
107 | 107 | { |
108 | - $this->mock->expects( $this->once() )->method( 'directories' ) |
|
109 | - ->will( $this->throwException( new \RuntimeException() ) ); |
|
108 | + $this->mock->expects($this->once())->method('directories') |
|
109 | + ->will($this->throwException(new \RuntimeException())); |
|
110 | 110 | |
111 | - $this->expectException( '\Aimeos\MW\Filesystem\Exception' ); |
|
112 | - $this->object->scan( 'test' ); |
|
111 | + $this->expectException('\Aimeos\MW\Filesystem\Exception'); |
|
112 | + $this->object->scan('test'); |
|
113 | 113 | } |
114 | 114 | |
115 | 115 | |
116 | 116 | public function testSize() |
117 | 117 | { |
118 | - $this->mock->expects( $this->once() )->method( 'size' ) |
|
119 | - ->will( $this->returnValue( 4 ) ); |
|
118 | + $this->mock->expects($this->once())->method('size') |
|
119 | + ->will($this->returnValue(4)); |
|
120 | 120 | |
121 | - $result = $this->object->size( 'test' ); |
|
121 | + $result = $this->object->size('test'); |
|
122 | 122 | |
123 | - $this->assertEquals( 4, $result ); |
|
123 | + $this->assertEquals(4, $result); |
|
124 | 124 | } |
125 | 125 | |
126 | 126 | |
127 | 127 | public function testSizeException() |
128 | 128 | { |
129 | - $this->mock->expects( $this->once() )->method( 'size' ) |
|
130 | - ->will( $this->throwException( new \RuntimeException() ) ); |
|
129 | + $this->mock->expects($this->once())->method('size') |
|
130 | + ->will($this->throwException(new \RuntimeException())); |
|
131 | 131 | |
132 | - $this->expectException( '\Aimeos\MW\Filesystem\Exception' ); |
|
133 | - $this->object->size( 'test' ); |
|
132 | + $this->expectException('\Aimeos\MW\Filesystem\Exception'); |
|
133 | + $this->object->size('test'); |
|
134 | 134 | } |
135 | 135 | |
136 | 136 | |
137 | 137 | public function testTime() |
138 | 138 | { |
139 | - $this->mock->expects( $this->once() )->method( 'lastModified' ) |
|
140 | - ->will( $this->returnValue( 1 ) ); |
|
139 | + $this->mock->expects($this->once())->method('lastModified') |
|
140 | + ->will($this->returnValue(1)); |
|
141 | 141 | |
142 | - $result = $this->object->time( 'test' ); |
|
142 | + $result = $this->object->time('test'); |
|
143 | 143 | |
144 | - $this->assertGreaterThan( 0, $result ); |
|
144 | + $this->assertGreaterThan(0, $result); |
|
145 | 145 | } |
146 | 146 | |
147 | 147 | |
148 | 148 | public function testTimeException() |
149 | 149 | { |
150 | - $this->mock->expects( $this->once() )->method( 'lastModified' ) |
|
151 | - ->will( $this->throwException( new \RuntimeException() ) ); |
|
150 | + $this->mock->expects($this->once())->method('lastModified') |
|
151 | + ->will($this->throwException(new \RuntimeException())); |
|
152 | 152 | |
153 | - $this->expectException( '\Aimeos\MW\Filesystem\Exception' ); |
|
154 | - $this->object->time( 'test' ); |
|
153 | + $this->expectException('\Aimeos\MW\Filesystem\Exception'); |
|
154 | + $this->object->time('test'); |
|
155 | 155 | } |
156 | 156 | |
157 | 157 | |
158 | 158 | public function testRm() |
159 | 159 | { |
160 | - $this->mock->expects( $this->once() )->method( 'delete' ); |
|
160 | + $this->mock->expects($this->once())->method('delete'); |
|
161 | 161 | |
162 | - $this->object->rm( 'test' ); |
|
162 | + $this->object->rm('test'); |
|
163 | 163 | } |
164 | 164 | |
165 | 165 | |
166 | 166 | public function testRmException() |
167 | 167 | { |
168 | - $this->mock->expects( $this->once() )->method( 'delete' ) |
|
169 | - ->will( $this->throwException( new \RuntimeException() ) ); |
|
168 | + $this->mock->expects($this->once())->method('delete') |
|
169 | + ->will($this->throwException(new \RuntimeException())); |
|
170 | 170 | |
171 | - $this->expectException( '\Aimeos\MW\Filesystem\Exception' ); |
|
172 | - $this->object->rm( 'test' ); |
|
171 | + $this->expectException('\Aimeos\MW\Filesystem\Exception'); |
|
172 | + $this->object->rm('test'); |
|
173 | 173 | } |
174 | 174 | |
175 | 175 | |
176 | 176 | public function testHas() |
177 | 177 | { |
178 | - $this->mock->expects( $this->once() )->method( 'exists' ) |
|
179 | - ->will( $this->returnValue( true ) ); |
|
178 | + $this->mock->expects($this->once())->method('exists') |
|
179 | + ->will($this->returnValue(true)); |
|
180 | 180 | |
181 | - $result = $this->object->has( 'test' ); |
|
181 | + $result = $this->object->has('test'); |
|
182 | 182 | |
183 | - $this->assertTrue( $result ); |
|
183 | + $this->assertTrue($result); |
|
184 | 184 | } |
185 | 185 | |
186 | 186 | |
187 | 187 | public function testHasFalse() |
188 | 188 | { |
189 | - $this->mock->expects( $this->once() )->method( 'exists' ) |
|
190 | - ->will( $this->returnValue( false ) ); |
|
189 | + $this->mock->expects($this->once())->method('exists') |
|
190 | + ->will($this->returnValue(false)); |
|
191 | 191 | |
192 | - $result = $this->object->has( 'test' ); |
|
192 | + $result = $this->object->has('test'); |
|
193 | 193 | |
194 | - $this->assertFalse( $result ); |
|
194 | + $this->assertFalse($result); |
|
195 | 195 | } |
196 | 196 | |
197 | 197 | |
198 | 198 | public function testRead() |
199 | 199 | { |
200 | - $this->mock->expects( $this->once() )->method( 'get' ) |
|
201 | - ->will( $this->returnValue( 'test' ) ); |
|
200 | + $this->mock->expects($this->once())->method('get') |
|
201 | + ->will($this->returnValue('test')); |
|
202 | 202 | |
203 | - $result = $this->object->read( 'file' ); |
|
203 | + $result = $this->object->read('file'); |
|
204 | 204 | |
205 | - $this->assertEquals( 'test', $result ); |
|
205 | + $this->assertEquals('test', $result); |
|
206 | 206 | } |
207 | 207 | |
208 | 208 | |
209 | 209 | public function testReadException() |
210 | 210 | { |
211 | - $this->mock->expects( $this->once() )->method( 'get' ) |
|
212 | - ->will( $this->throwException( new \RuntimeException() ) ); |
|
211 | + $this->mock->expects($this->once())->method('get') |
|
212 | + ->will($this->throwException(new \RuntimeException())); |
|
213 | 213 | |
214 | - $this->expectException( '\Aimeos\MW\Filesystem\Exception' ); |
|
215 | - $this->object->read( 'readinvalid' ); |
|
214 | + $this->expectException('\Aimeos\MW\Filesystem\Exception'); |
|
215 | + $this->object->read('readinvalid'); |
|
216 | 216 | } |
217 | 217 | |
218 | 218 | |
219 | 219 | public function testReadf() |
220 | 220 | { |
221 | - $this->mock->expects( $this->once() )->method( 'get' ) |
|
222 | - ->will( $this->returnValue( 'test' ) ); |
|
221 | + $this->mock->expects($this->once())->method('get') |
|
222 | + ->will($this->returnValue('test')); |
|
223 | 223 | |
224 | - $result = $this->object->readf( 'file' ); |
|
224 | + $result = $this->object->readf('file'); |
|
225 | 225 | |
226 | - $this->assertEquals( 'test', file_get_contents( $result ) ); |
|
227 | - unlink( $result ); |
|
226 | + $this->assertEquals('test', file_get_contents($result)); |
|
227 | + unlink($result); |
|
228 | 228 | } |
229 | 229 | |
230 | 230 | |
231 | 231 | public function testReads() |
232 | 232 | { |
233 | - $this->mock->expects( $this->once() )->method( 'get' ) |
|
234 | - ->will( $this->returnValue( 'test' ) ); |
|
233 | + $this->mock->expects($this->once())->method('get') |
|
234 | + ->will($this->returnValue('test')); |
|
235 | 235 | |
236 | - $handle = $this->object->reads( 'file' ); |
|
236 | + $handle = $this->object->reads('file'); |
|
237 | 237 | |
238 | - $this->assertInternalType( 'resource', $handle ); |
|
239 | - $this->assertEquals( 'test', fgets( $handle ) ); |
|
238 | + $this->assertInternalType('resource', $handle); |
|
239 | + $this->assertEquals('test', fgets($handle)); |
|
240 | 240 | |
241 | - fclose( $handle ); |
|
241 | + fclose($handle); |
|
242 | 242 | } |
243 | 243 | |
244 | 244 | |
245 | 245 | public function testReadsException() |
246 | 246 | { |
247 | - $this->mock->expects( $this->once() )->method( 'get' ) |
|
248 | - ->will( $this->throwException( new \RuntimeException() ) ); |
|
247 | + $this->mock->expects($this->once())->method('get') |
|
248 | + ->will($this->throwException(new \RuntimeException())); |
|
249 | 249 | |
250 | - $this->expectException( '\Aimeos\MW\Filesystem\Exception' ); |
|
251 | - $this->object->reads( 'readinvalid' ); |
|
250 | + $this->expectException('\Aimeos\MW\Filesystem\Exception'); |
|
251 | + $this->object->reads('readinvalid'); |
|
252 | 252 | } |
253 | 253 | |
254 | 254 | |
255 | 255 | public function testWrite() |
256 | 256 | { |
257 | - $this->mock->expects( $this->once() )->method( 'put' ); |
|
257 | + $this->mock->expects($this->once())->method('put'); |
|
258 | 258 | |
259 | - $this->object->write( 'file', 'test' ); |
|
259 | + $this->object->write('file', 'test'); |
|
260 | 260 | } |
261 | 261 | |
262 | 262 | |
263 | 263 | public function testWriteException() |
264 | 264 | { |
265 | - $this->mock->expects( $this->once() )->method( 'put' ) |
|
266 | - ->will( $this->throwException( new \RuntimeException() ) ); |
|
265 | + $this->mock->expects($this->once())->method('put') |
|
266 | + ->will($this->throwException(new \RuntimeException())); |
|
267 | 267 | |
268 | - $this->expectException( '\Aimeos\MW\Filesystem\Exception' ); |
|
269 | - $this->object->write( '', 'test' ); |
|
268 | + $this->expectException('\Aimeos\MW\Filesystem\Exception'); |
|
269 | + $this->object->write('', 'test'); |
|
270 | 270 | } |
271 | 271 | |
272 | 272 | |
273 | 273 | public function testWritef() |
274 | 274 | { |
275 | - $file = sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'file99'; |
|
276 | - file_put_contents( $file, 'test' ); |
|
275 | + $file = sys_get_temp_dir().DIRECTORY_SEPARATOR.'file99'; |
|
276 | + file_put_contents($file, 'test'); |
|
277 | 277 | |
278 | - $this->mock->expects( $this->once() )->method( 'put' ); |
|
278 | + $this->mock->expects($this->once())->method('put'); |
|
279 | 279 | |
280 | - $this->object->writef( 'file', $file ); |
|
280 | + $this->object->writef('file', $file); |
|
281 | 281 | |
282 | - unlink( $file ); |
|
282 | + unlink($file); |
|
283 | 283 | } |
284 | 284 | |
285 | 285 | |
286 | 286 | public function testWritefException() |
287 | 287 | { |
288 | - $this->expectException( '\Aimeos\MW\Filesystem\Exception' ); |
|
289 | - $this->object->writef( '', 'invalid' ); |
|
288 | + $this->expectException('\Aimeos\MW\Filesystem\Exception'); |
|
289 | + $this->object->writef('', 'invalid'); |
|
290 | 290 | } |
291 | 291 | |
292 | 292 | |
293 | 293 | public function testWrites() |
294 | 294 | { |
295 | - $this->mock->expects( $this->once() )->method( 'put' ); |
|
295 | + $this->mock->expects($this->once())->method('put'); |
|
296 | 296 | |
297 | - $handle = fopen( __FILE__, 'r' ); |
|
297 | + $handle = fopen(__FILE__, 'r'); |
|
298 | 298 | |
299 | - $this->object->writes( 'file', $handle ); |
|
299 | + $this->object->writes('file', $handle); |
|
300 | 300 | |
301 | - fclose( $handle ); |
|
301 | + fclose($handle); |
|
302 | 302 | } |
303 | 303 | |
304 | 304 | |
305 | 305 | public function testWritesException() |
306 | 306 | { |
307 | - $this->mock->expects( $this->once() )->method( 'put' ) |
|
308 | - ->will( $this->throwException( new \RuntimeException() ) ); |
|
307 | + $this->mock->expects($this->once())->method('put') |
|
308 | + ->will($this->throwException(new \RuntimeException())); |
|
309 | 309 | |
310 | - $handle = fopen( __FILE__, 'r' ); |
|
310 | + $handle = fopen(__FILE__, 'r'); |
|
311 | 311 | |
312 | - $this->expectException( '\Aimeos\MW\Filesystem\Exception' ); |
|
313 | - $this->object->writes( 'file', $handle ); |
|
312 | + $this->expectException('\Aimeos\MW\Filesystem\Exception'); |
|
313 | + $this->object->writes('file', $handle); |
|
314 | 314 | } |
315 | 315 | |
316 | 316 | |
317 | 317 | public function testWritesException2() |
318 | 318 | { |
319 | - $this->expectException( '\Aimeos\MW\Filesystem\Exception' ); |
|
320 | - $this->object->writes( 'file', null ); |
|
319 | + $this->expectException('\Aimeos\MW\Filesystem\Exception'); |
|
320 | + $this->object->writes('file', null); |
|
321 | 321 | } |
322 | 322 | |
323 | 323 | |
324 | 324 | public function testMove() |
325 | 325 | { |
326 | - $this->mock->expects( $this->once() )->method( 'move' ); |
|
326 | + $this->mock->expects($this->once())->method('move'); |
|
327 | 327 | |
328 | - $this->object->move( 'file1', 'file2' ); |
|
328 | + $this->object->move('file1', 'file2'); |
|
329 | 329 | } |
330 | 330 | |
331 | 331 | |
332 | 332 | public function testMoveException() |
333 | 333 | { |
334 | - $this->mock->expects( $this->once() )->method( 'move' ) |
|
335 | - ->will( $this->throwException( new \RuntimeException() ) ); |
|
334 | + $this->mock->expects($this->once())->method('move') |
|
335 | + ->will($this->throwException(new \RuntimeException())); |
|
336 | 336 | |
337 | - $this->expectException( '\Aimeos\MW\Filesystem\Exception' ); |
|
338 | - $this->object->move( 'file1', 'file2' ); |
|
337 | + $this->expectException('\Aimeos\MW\Filesystem\Exception'); |
|
338 | + $this->object->move('file1', 'file2'); |
|
339 | 339 | } |
340 | 340 | |
341 | 341 | |
342 | 342 | public function testCopy() |
343 | 343 | { |
344 | - $this->mock->expects( $this->once() )->method( 'copy' ); |
|
344 | + $this->mock->expects($this->once())->method('copy'); |
|
345 | 345 | |
346 | - $this->object->copy( 'file1', 'file2' ); |
|
346 | + $this->object->copy('file1', 'file2'); |
|
347 | 347 | } |
348 | 348 | |
349 | 349 | |
350 | 350 | public function testCopyException() |
351 | 351 | { |
352 | - $this->mock->expects( $this->once() )->method( 'copy' ) |
|
353 | - ->will( $this->throwException( new \RuntimeException() ) ); |
|
352 | + $this->mock->expects($this->once())->method('copy') |
|
353 | + ->will($this->throwException(new \RuntimeException())); |
|
354 | 354 | |
355 | - $this->expectException( '\Aimeos\MW\Filesystem\Exception' ); |
|
356 | - $this->object->copy( 'file1', 'file2' ); |
|
355 | + $this->expectException('\Aimeos\MW\Filesystem\Exception'); |
|
356 | + $this->object->copy('file1', 'file2'); |
|
357 | 357 | } |
358 | 358 | } |
@@ -20,12 +20,12 @@ discard block |
||
20 | 20 | */ |
21 | 21 | protected function setUp() |
22 | 22 | { |
23 | - if( interface_exists( '\\Illuminate\\Contracts\\Logging\\Log' ) === false ) { |
|
24 | - $this->markTestSkipped( 'Class \\Illuminate\\Contracts\\Logging\\Log not found' ); |
|
23 | + if (interface_exists('\\Illuminate\\Contracts\\Logging\\Log') === false) { |
|
24 | + $this->markTestSkipped('Class \\Illuminate\\Contracts\\Logging\\Log not found'); |
|
25 | 25 | } |
26 | 26 | |
27 | - $this->mock = $this->getMockBuilder( '\\Illuminate\\Contracts\\Logging\\Log' )->getMock(); |
|
28 | - $this->object = new \Aimeos\MW\Logger\Laravel5( $this->mock ); |
|
27 | + $this->mock = $this->getMockBuilder('\\Illuminate\\Contracts\\Logging\\Log')->getMock(); |
|
28 | + $this->object = new \Aimeos\MW\Logger\Laravel5($this->mock); |
|
29 | 29 | } |
30 | 30 | |
31 | 31 | |
@@ -37,42 +37,42 @@ discard block |
||
37 | 37 | */ |
38 | 38 | protected function tearDown() |
39 | 39 | { |
40 | - unset( $this->mock, $this->object ); |
|
40 | + unset($this->mock, $this->object); |
|
41 | 41 | } |
42 | 42 | |
43 | 43 | |
44 | 44 | public function testLog() |
45 | 45 | { |
46 | - $this->mock->expects( $this->once() )->method( 'log' ) |
|
47 | - ->with( $this->equalTo( 'msg' ), $this->equalTo( 'error' ) ); |
|
48 | - $this->object->log( 'msg' ); |
|
46 | + $this->mock->expects($this->once())->method('log') |
|
47 | + ->with($this->equalTo('msg'), $this->equalTo('error')); |
|
48 | + $this->object->log('msg'); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | |
52 | 52 | public function testNonScalarLog() |
53 | 53 | { |
54 | - $this->mock->expects( $this->once() )->method( 'log' ) |
|
55 | - ->with( $this->equalTo( '["error","error2",2]' ), $this->equalTo( 'error' ) ); |
|
56 | - $this->object->log( array( 'error', 'error2', 2 ) ); |
|
54 | + $this->mock->expects($this->once())->method('log') |
|
55 | + ->with($this->equalTo('["error","error2",2]'), $this->equalTo('error')); |
|
56 | + $this->object->log(array('error', 'error2', 2)); |
|
57 | 57 | } |
58 | 58 | |
59 | 59 | |
60 | 60 | public function testLogDebug() |
61 | 61 | { |
62 | - $this->object->log( 'emergency', \Aimeos\MW\Logger\Base::EMERG ); |
|
63 | - $this->object->log( 'alert', \Aimeos\MW\Logger\Base::ALERT ); |
|
64 | - $this->object->log( 'critical', \Aimeos\MW\Logger\Base::CRIT ); |
|
65 | - $this->object->log( 'error', \Aimeos\MW\Logger\Base::ERR ); |
|
66 | - $this->object->log( 'warning', \Aimeos\MW\Logger\Base::WARN ); |
|
67 | - $this->object->log( 'notice', \Aimeos\MW\Logger\Base::NOTICE ); |
|
68 | - $this->object->log( 'info', \Aimeos\MW\Logger\Base::INFO ); |
|
69 | - $this->object->log( 'debug', \Aimeos\MW\Logger\Base::DEBUG ); |
|
62 | + $this->object->log('emergency', \Aimeos\MW\Logger\Base::EMERG); |
|
63 | + $this->object->log('alert', \Aimeos\MW\Logger\Base::ALERT); |
|
64 | + $this->object->log('critical', \Aimeos\MW\Logger\Base::CRIT); |
|
65 | + $this->object->log('error', \Aimeos\MW\Logger\Base::ERR); |
|
66 | + $this->object->log('warning', \Aimeos\MW\Logger\Base::WARN); |
|
67 | + $this->object->log('notice', \Aimeos\MW\Logger\Base::NOTICE); |
|
68 | + $this->object->log('info', \Aimeos\MW\Logger\Base::INFO); |
|
69 | + $this->object->log('debug', \Aimeos\MW\Logger\Base::DEBUG); |
|
70 | 70 | } |
71 | 71 | |
72 | 72 | |
73 | 73 | public function testBadPriority() |
74 | 74 | { |
75 | - $this->expectException( '\\Aimeos\\MW\\Logger\\Exception' ); |
|
76 | - $this->object->log( 'error', -1 ); |
|
75 | + $this->expectException('\\Aimeos\\MW\\Logger\\Exception'); |
|
76 | + $this->object->log('error', -1); |
|
77 | 77 | } |
78 | 78 | } |