Completed
Push — master ( 4d4e0c...9bc9fa )
by Aimeos
01:53
created
lib/custom/tests/bootstrap.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -4,17 +4,17 @@
 block discarded – undo
4 4
  * Set error reporting to maximum
5 5
  */
6 6
 error_reporting( -1 );
7
-ini_set( 'display_errors', true );
7
+ini_set('display_errors', true);
8 8
 
9
-date_default_timezone_set( 'UTC' );
9
+date_default_timezone_set('UTC');
10 10
 
11 11
 /*
12 12
  * Set locale settings to reasonable defaults
13 13
  */
14
-setlocale( LC_ALL, 'en_US.UTF-8' );
15
-setlocale( LC_CTYPE, 'en_US.UTF-8' );
16
-setlocale( LC_NUMERIC, 'POSIX' );
17
-setlocale( LC_TIME, 'POSIX' );
14
+setlocale(LC_ALL, 'en_US.UTF-8');
15
+setlocale(LC_CTYPE, 'en_US.UTF-8');
16
+setlocale(LC_NUMERIC, 'POSIX');
17
+setlocale(LC_TIME, 'POSIX');
18 18
 
19 19
 
20 20
 require_once 'TestHelper.php';
Please login to merge, or discard this patch.
lib/custom/src/MShop/Customer/Manager/FosUser.php 3 patches
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -332,8 +332,7 @@  discard block
 block discarded – undo
332 332
 				 * @see mshop/customer/manager/fosuser/count
333 333
 				 */
334 334
 				$path = 'mshop/customer/manager/fosuser/insert';
335
-			}
336
-			else
335
+			} else
337 336
 			{
338 337
 				/** mshop/customer/manager/fosuser/update
339 338
 				 * Updates an existing customer record in the database
@@ -441,8 +440,7 @@  discard block
 block discarded – undo
441 440
 			}
442 441
 
443 442
 			$dbm->release( $conn, $dbname );
444
-		}
445
-		catch( \Exception $e )
443
+		} catch( \Exception $e )
446 444
 		{
447 445
 			$dbm->release( $conn, $dbname );
448 446
 			throw $e;
@@ -478,8 +476,7 @@  discard block
 block discarded – undo
478 476
 			}
479 477
 
480 478
 			$dbm->release( $conn, $dbname );
481
-		}
482
-		catch( \Exception $e )
479
+		} catch( \Exception $e )
483 480
 		{
484 481
 			$dbm->release( $conn, $dbname  );
485 482
 			throw $e;
Please login to merge, or discard this patch.
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
 	/**
227 227
 	 * Removes old entries from the storage.
228 228
 	 *
229
-	 * @param array $siteids List of IDs for sites whose entries should be deleted
229
+	 * @param integer[] $siteids List of IDs for sites whose entries should be deleted
230 230
 	 */
231 231
 	public function cleanup( array $siteids )
232 232
 	{
@@ -494,7 +494,7 @@  discard block
 block discarded – undo
494 494
 	 *
495 495
 	 * @param string $manager Name of the sub manager type in lower case
496 496
 	 * @param string|null $name Name of the implementation, will be from configuration (or Default) if null
497
-	 * @return mixed Manager for different extensions, e.g stock, tags, locations, etc.
497
+	 * @return \Aimeos\MShop\Common\Manager\Iface Manager for different extensions, e.g stock, tags, locations, etc.
498 498
 	 */
499 499
 	public function getSubManager( $manager, $name = null )
500 500
 	{
Please login to merge, or discard this patch.
Spacing   +86 added lines, -86 removed lines patch added patch discarded remove patch
@@ -243,13 +243,13 @@  discard block
 block discarded – undo
243 243
 	 *
244 244
 	 * @param array $siteids List of IDs for sites whose entries should be deleted
245 245
 	 */
246
-	public function cleanup( array $siteids )
246
+	public function cleanup(array $siteids)
247 247
 	{
248 248
 		$path = 'mshop/customer/manager/submanagers';
249 249
 		$default = ['address', 'group', 'lists', 'property'];
250 250
 
251
-		foreach( $this->getContext()->getConfig()->get( $path, $default ) as $domain ) {
252
-			$this->getObject()->getSubManager( $domain )->cleanup( $siteids );
251
+		foreach ($this->getContext()->getConfig()->get($path, $default) as $domain) {
252
+			$this->getObject()->getSubManager($domain)->cleanup($siteids);
253 253
 		}
254 254
 	}
255 255
 
@@ -259,10 +259,10 @@  discard block
 block discarded – undo
259 259
 	 *
260 260
 	 * @param array $ids List of IDs
261 261
 	 */
262
-	public function deleteItems( array $ids )
262
+	public function deleteItems(array $ids)
263 263
 	{
264 264
 		$path = 'mshop/customer/manager/fosuser/delete';
265
-		$this->deleteItemsBase( $ids, $path, false );
265
+		$this->deleteItemsBase($ids, $path, false);
266 266
 	}
267 267
 
268 268
 
@@ -272,12 +272,12 @@  discard block
 block discarded – undo
272 272
 	 * @param boolean $withsub Return also attributes of sub-managers if true
273 273
 	 * @return array List of attribute items implementing \Aimeos\MW\Criteria\Attribute\Iface
274 274
 	 */
275
-	public function getSearchAttributes( $withsub = true )
275
+	public function getSearchAttributes($withsub = true)
276 276
 	{
277 277
 		$path = 'mshop/customer/manager/submanagers';
278 278
 		$default = ['address', 'group', 'lists', 'property'];
279 279
 
280
-		return $this->getSearchAttributesBase( $this->searchConfig, $path, $default, $withsub );
280
+		return $this->getSearchAttributesBase($this->searchConfig, $path, $default, $withsub);
281 281
 	}
282 282
 
283 283
 
@@ -288,29 +288,29 @@  discard block
 block discarded – undo
288 288
 	 * @param boolean $fetch True if the new ID should be returned in the item
289 289
 	 * @return \Aimeos\MShop\Common\Item\Iface $item Updated item including the generated ID
290 290
 	 */
291
-	public function saveItem( \Aimeos\MShop\Common\Item\Iface $item, $fetch = true )
291
+	public function saveItem(\Aimeos\MShop\Common\Item\Iface $item, $fetch = true)
292 292
 	{
293
-		self::checkClass( '\\Aimeos\\MShop\\Customer\\Item\\FosUser', $item );
293
+		self::checkClass('\\Aimeos\\MShop\\Customer\\Item\\FosUser', $item);
294 294
 
295
-		if( !$item->isModified() )
295
+		if (!$item->isModified())
296 296
 		{
297
-			$item = $this->savePropertyItems( $item, 'customer' );
298
-			$item = $this->saveAddressItems( $item, 'customer' );
299
-			return $this->saveListItems( $item, 'customer' );
297
+			$item = $this->savePropertyItems($item, 'customer');
298
+			$item = $this->saveAddressItems($item, 'customer');
299
+			return $this->saveListItems($item, 'customer');
300 300
 		}
301 301
 
302 302
 		$context = $this->getContext();
303 303
 		$dbm = $context->getDatabaseManager();
304 304
 		$dbname = $this->getResourceName();
305
-		$conn = $dbm->acquire( $dbname );
305
+		$conn = $dbm->acquire($dbname);
306 306
 
307 307
 		try
308 308
 		{
309 309
 			$id = $item->getId();
310
-			$date = date( 'Y-m-d H:i:s' );
310
+			$date = date('Y-m-d H:i:s');
311 311
 			$billingAddress = $item->getPaymentAddress();
312 312
 
313
-			if( $id === null )
313
+			if ($id === null)
314 314
 			{
315 315
 				/** mshop/customer/manager/fosuser/insert
316 316
 				 * Inserts a new customer record into the database table
@@ -374,51 +374,51 @@  discard block
 block discarded – undo
374 374
 				$path = 'mshop/customer/manager/fosuser/update';
375 375
 			}
376 376
 
377
-			$stmt = $this->getCachedStatement( $conn, $path );
378
-
379
-			$stmt->bind( 1, $context->getLocale()->getSiteId(), \Aimeos\MW\DB\Statement\Base::PARAM_INT );
380
-			$stmt->bind( 2, $item->getCode() ); // canonical username
381
-			$stmt->bind( 3, $item->getCode() ); // username
382
-			$stmt->bind( 4, $billingAddress->getCompany() );
383
-			$stmt->bind( 5, $billingAddress->getVatID() );
384
-			$stmt->bind( 6, $billingAddress->getSalutation() );
385
-			$stmt->bind( 7, $billingAddress->getTitle() );
386
-			$stmt->bind( 8, $billingAddress->getFirstname() );
387
-			$stmt->bind( 9, $billingAddress->getLastname() );
388
-			$stmt->bind( 10, $billingAddress->getAddress1() );
389
-			$stmt->bind( 11, $billingAddress->getAddress2() );
390
-			$stmt->bind( 12, $billingAddress->getAddress3() );
391
-			$stmt->bind( 13, $billingAddress->getPostal() );
392
-			$stmt->bind( 14, $billingAddress->getCity() );
393
-			$stmt->bind( 15, $billingAddress->getState() );
394
-			$stmt->bind( 16, $billingAddress->getCountryId() );
395
-			$stmt->bind( 17, $billingAddress->getLanguageId() );
396
-			$stmt->bind( 18, $billingAddress->getTelephone() );
397
-			$stmt->bind( 19, $billingAddress->getEmail() );
398
-			$stmt->bind( 20, $billingAddress->getEmail() );
399
-			$stmt->bind( 21, $billingAddress->getTelefax() );
400
-			$stmt->bind( 22, $billingAddress->getWebsite() );
401
-			$stmt->bind( 23, $billingAddress->getLongitude() );
402
-			$stmt->bind( 24, $billingAddress->getLatitude() );
403
-			$stmt->bind( 25, $item->getBirthday() );
404
-			$stmt->bind( 26, ( $item->getStatus() > 0 ? true : false ), \Aimeos\MW\DB\Statement\Base::PARAM_BOOL );
405
-			$stmt->bind( 27, $item->getDateVerified() );
406
-			$stmt->bind( 28, $item->getPassword() );
407
-			$stmt->bind( 29, $date ); // Modification time
408
-			$stmt->bind( 30, $context->getEditor() );
409
-			$stmt->bind( 31, serialize( $item->getRoles() ) );
410
-			$stmt->bind( 32, $item->getSalt() );
411
-
412
-			if( $id !== null ) {
413
-				$stmt->bind( 33, $id, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
414
-				$item->setId( $id );
377
+			$stmt = $this->getCachedStatement($conn, $path);
378
+
379
+			$stmt->bind(1, $context->getLocale()->getSiteId(), \Aimeos\MW\DB\Statement\Base::PARAM_INT);
380
+			$stmt->bind(2, $item->getCode()); // canonical username
381
+			$stmt->bind(3, $item->getCode()); // username
382
+			$stmt->bind(4, $billingAddress->getCompany());
383
+			$stmt->bind(5, $billingAddress->getVatID());
384
+			$stmt->bind(6, $billingAddress->getSalutation());
385
+			$stmt->bind(7, $billingAddress->getTitle());
386
+			$stmt->bind(8, $billingAddress->getFirstname());
387
+			$stmt->bind(9, $billingAddress->getLastname());
388
+			$stmt->bind(10, $billingAddress->getAddress1());
389
+			$stmt->bind(11, $billingAddress->getAddress2());
390
+			$stmt->bind(12, $billingAddress->getAddress3());
391
+			$stmt->bind(13, $billingAddress->getPostal());
392
+			$stmt->bind(14, $billingAddress->getCity());
393
+			$stmt->bind(15, $billingAddress->getState());
394
+			$stmt->bind(16, $billingAddress->getCountryId());
395
+			$stmt->bind(17, $billingAddress->getLanguageId());
396
+			$stmt->bind(18, $billingAddress->getTelephone());
397
+			$stmt->bind(19, $billingAddress->getEmail());
398
+			$stmt->bind(20, $billingAddress->getEmail());
399
+			$stmt->bind(21, $billingAddress->getTelefax());
400
+			$stmt->bind(22, $billingAddress->getWebsite());
401
+			$stmt->bind(23, $billingAddress->getLongitude());
402
+			$stmt->bind(24, $billingAddress->getLatitude());
403
+			$stmt->bind(25, $item->getBirthday());
404
+			$stmt->bind(26, ($item->getStatus() > 0 ? true : false), \Aimeos\MW\DB\Statement\Base::PARAM_BOOL);
405
+			$stmt->bind(27, $item->getDateVerified());
406
+			$stmt->bind(28, $item->getPassword());
407
+			$stmt->bind(29, $date); // Modification time
408
+			$stmt->bind(30, $context->getEditor());
409
+			$stmt->bind(31, serialize($item->getRoles()));
410
+			$stmt->bind(32, $item->getSalt());
411
+
412
+			if ($id !== null) {
413
+				$stmt->bind(33, $id, \Aimeos\MW\DB\Statement\Base::PARAM_INT);
414
+				$item->setId($id);
415 415
 			} else {
416
-				$stmt->bind( 33, $date ); // Creation time
416
+				$stmt->bind(33, $date); // Creation time
417 417
 			}
418 418
 
419 419
 			$stmt->execute()->finish();
420 420
 
421
-			if( $id === null && $fetch === true )
421
+			if ($id === null && $fetch === true)
422 422
 			{
423 423
 				/** mshop/customer/manager/fosuser/newid
424 424
 				 * Retrieves the ID generated by the database when inserting a new record
@@ -451,22 +451,22 @@  discard block
 block discarded – undo
451 451
 				 * @see mshop/customer/manager/fosuser/count
452 452
 				 */
453 453
 				$path = 'mshop/customer/manager/fosuser/newid';
454
-				$item->setId( $this->newId( $conn, $path ) );
454
+				$item->setId($this->newId($conn, $path));
455 455
 			}
456 456
 
457
-			$dbm->release( $conn, $dbname );
457
+			$dbm->release($conn, $dbname);
458 458
 		}
459
-		catch( \Exception $e )
459
+		catch (\Exception $e)
460 460
 		{
461
-			$dbm->release( $conn, $dbname );
461
+			$dbm->release($conn, $dbname);
462 462
 			throw $e;
463 463
 		}
464 464
 
465
-		$this->addGroups( $item );
465
+		$this->addGroups($item);
466 466
 
467
-		$item = $this->savePropertyItems( $item, 'customer' );
468
-		$item = $this->saveAddressItems( $item, 'customer' );
469
-		return $this->saveListItems( $item, 'customer' );
467
+		$item = $this->savePropertyItems($item, 'customer');
468
+		$item = $this->saveAddressItems($item, 'customer');
469
+		return $this->saveListItems($item, 'customer');
470 470
 	}
471 471
 
472 472
 
@@ -478,11 +478,11 @@  discard block
 block discarded – undo
478 478
 	 * @return array List of items implementing \Aimeos\MShop\Customer\Item\Iface
479 479
 	 * @throws \Aimeos\MShop\Customer\Exception If creating items failed
480 480
 	 */
481
-	public function searchItems( \Aimeos\MW\Criteria\Iface $search, array $ref = [], &$total = null )
481
+	public function searchItems(\Aimeos\MW\Criteria\Iface $search, array $ref = [], &$total = null)
482 482
 	{
483 483
 		$dbm = $this->getContext()->getDatabaseManager();
484 484
 		$dbname = $this->getResourceName();
485
-		$conn = $dbm->acquire( $dbname );
485
+		$conn = $dbm->acquire($dbname);
486 486
 		$map = [];
487 487
 
488 488
 		try
@@ -490,32 +490,32 @@  discard block
 block discarded – undo
490 490
 			$level = \Aimeos\MShop\Locale\Manager\Base::SITE_ALL;
491 491
 			$cfgPathSearch = 'mshop/customer/manager/fosuser/search';
492 492
 			$cfgPathCount = 'mshop/customer/manager/fosuser/count';
493
-			$required = array( 'customer' );
493
+			$required = array('customer');
494 494
 
495
-			$results = $this->searchItemsBase( $conn, $search, $cfgPathSearch, $cfgPathCount, $required, $total, $level );
496
-			while( ( $row = $results->fetch() ) !== false ) {
497
-				$map[ $row['customer.id'] ] = $row;
495
+			$results = $this->searchItemsBase($conn, $search, $cfgPathSearch, $cfgPathCount, $required, $total, $level);
496
+			while (($row = $results->fetch()) !== false) {
497
+				$map[$row['customer.id']] = $row;
498 498
 			}
499 499
 
500
-			$dbm->release( $conn, $dbname );
500
+			$dbm->release($conn, $dbname);
501 501
 		}
502
-		catch( \Exception $e )
502
+		catch (\Exception $e)
503 503
 		{
504
-			$dbm->release( $conn, $dbname  );
504
+			$dbm->release($conn, $dbname);
505 505
 			throw $e;
506 506
 		}
507 507
 
508 508
 		$addrItems = [];
509
-		if( in_array( 'customer/address', $ref, true ) ) {
510
-			$addrItems = $this->getAddressItems( array_keys( $map ), 'customer' );
509
+		if (in_array('customer/address', $ref, true)) {
510
+			$addrItems = $this->getAddressItems(array_keys($map), 'customer');
511 511
 		}
512 512
 
513 513
 		$propItems = [];
514
-		if( in_array( 'customer/property', $ref, true ) ) {
515
-			$propItems = $this->getPropertyItems( array_keys( $map ), 'customer' );
514
+		if (in_array('customer/property', $ref, true)) {
515
+			$propItems = $this->getPropertyItems(array_keys($map), 'customer');
516 516
 		}
517 517
 
518
-		return $this->buildItems( $map, $ref, 'customer', $addrItems, $propItems );
518
+		return $this->buildItems($map, $ref, 'customer', $addrItems, $propItems);
519 519
 	}
520 520
 
521 521
 
@@ -526,9 +526,9 @@  discard block
 block discarded – undo
526 526
 	 * @param string|null $name Name of the implementation, will be from configuration (or Default) if null
527 527
 	 * @return mixed Manager for different extensions, e.g stock, tags, locations, etc.
528 528
 	 */
529
-	public function getSubManager( $manager, $name = null )
529
+	public function getSubManager($manager, $name = null)
530 530
 	{
531
-		return $this->getSubManagerBase( 'customer', $manager, ( $name === null ? 'FosUser' : $name ) );
531
+		return $this->getSubManagerBase('customer', $manager, ($name === null ? 'FosUser' : $name));
532 532
 	}
533 533
 
534 534
 
@@ -542,15 +542,15 @@  discard block
 block discarded – undo
542 542
 	 * @param array $propItems List of property items of the customer item
543 543
 	 * @return \Aimeos\MShop\Customer\Item\Iface New customer item
544 544
 	 */
545
-	protected function createItemBase( array $values = [], array $listItems = [], array $refItems = [],
546
-		array $addresses = [], array $propItems = [] )
545
+	protected function createItemBase(array $values = [], array $listItems = [], array $refItems = [],
546
+		array $addresses = [], array $propItems = [])
547 547
 	{
548
-		if( !isset( $this->addressManager ) ) {
549
-			$this->addressManager = $this->getObject()->getSubManager( 'address' );
548
+		if (!isset($this->addressManager)) {
549
+			$this->addressManager = $this->getObject()->getSubManager('address');
550 550
 		}
551 551
 
552
-		if( isset( $values['roles'] ) ) {
553
-			$values['roles'] = unserialize( $values['roles'] );
552
+		if (isset($values['roles'])) {
553
+			$values['roles'] = unserialize($values['roles']);
554 554
 		}
555 555
 
556 556
 		$helper = $this->getPasswordHelper();
Please login to merge, or discard this patch.
lib/custom/setup/FosuserAddIndexes.php 2 patches
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 	 */
45 45
 	public function getPostDependencies()
46 46
 	{
47
-		return array( 'TablesCreateFosUser' );
47
+		return array('TablesCreateFosUser');
48 48
 	}
49 49
 
50 50
 
@@ -53,23 +53,23 @@  discard block
 block discarded – undo
53 53
 	 */
54 54
 	public function migrate()
55 55
 	{
56
-		$this->msg( 'Adding indexes from "fos_user"', 0 ); $this->status( '' );
56
+		$this->msg('Adding indexes from "fos_user"', 0); $this->status('');
57 57
 
58
-		$schema = $this->getSchema( 'db-customer' );
58
+		$schema = $this->getSchema('db-customer');
59 59
 
60
-		foreach( $this->list as $idx => $stmt )
60
+		foreach ($this->list as $idx => $stmt)
61 61
 		{
62
-			$this->msg( sprintf( 'Checking index "%1$s"', $idx ), 0 );
62
+			$this->msg(sprintf('Checking index "%1$s"', $idx), 0);
63 63
 
64
-			if( $schema->tableExists( 'fos_user' ) === true
65
-				&& $schema->indexExists( 'fos_user', $idx ) === false )
64
+			if ($schema->tableExists('fos_user') === true
65
+				&& $schema->indexExists('fos_user', $idx) === false)
66 66
 			{
67
-				$this->execute( $stmt );
68
-				$this->status( 'done' );
67
+				$this->execute($stmt);
68
+				$this->status('done');
69 69
 			}
70 70
 			else
71 71
 			{
72
-				$this->status( 'OK' );
72
+				$this->status('OK');
73 73
 			}
74 74
 		}
75 75
 	}
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -66,8 +66,7 @@
 block discarded – undo
66 66
 			{
67 67
 				$this->execute( $stmt );
68 68
 				$this->status( 'done' );
69
-			}
70
-			else
69
+			} else
71 70
 			{
72 71
 				$this->status( 'OK' );
73 72
 			}
Please login to merge, or discard this patch.
lib/custom/src/MShop/Customer/Manager/Address/FosUser.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -249,7 +249,7 @@
 block discarded – undo
249 249
 	 *
250 250
 	 * @param string $manager Name of the sub manager type in lower case
251 251
 	 * @param string|null $name Name of the implementation, will be from configuration (or Default) if null
252
-	 * @return mixed Manager for different extensions, e.g stock, tags, locations, etc.
252
+	 * @return \Aimeos\MShop\Common\Manager\Iface Manager for different extensions, e.g stock, tags, locations, etc.
253 253
 	 */
254 254
 	public function getSubManager( $manager, $name = null )
255 255
 	{
Please login to merge, or discard this patch.
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 			'label' => 'Customer address ID',
26 26
 			'code' => 'customer.address.id',
27 27
 			'internalcode' => 'fosad."id"',
28
-			'internaldeps' => array( 'LEFT JOIN "fos_user_address" AS fosad ON ( fos."id" = fosad."parentid" )' ),
28
+			'internaldeps' => array('LEFT JOIN "fos_user_address" AS fosad ON ( fos."id" = fosad."parentid" )'),
29 29
 			'type' => 'integer',
30 30
 			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT,
31 31
 			'public' => false,
@@ -222,14 +222,14 @@  discard block
 block discarded – undo
222 222
 	 *
223 223
 	 * @param array $siteids List of IDs for sites whose entries should be deleted
224 224
 	 */
225
-	public function cleanup( array $siteids )
225
+	public function cleanup(array $siteids)
226 226
 	{
227 227
 		$path = 'mshop/customer/manager/address/submanagers';
228
-		foreach( $this->getContext()->getConfig()->get( $path, [] ) as $domain ) {
229
-			$this->getObject()->getSubManager( $domain )->cleanup( $siteids );
228
+		foreach ($this->getContext()->getConfig()->get($path, []) as $domain) {
229
+			$this->getObject()->getSubManager($domain)->cleanup($siteids);
230 230
 		}
231 231
 
232
-		$this->cleanupBase( $siteids, 'mshop/customer/manager/lists/fosuser/delete' );
232
+		$this->cleanupBase($siteids, 'mshop/customer/manager/lists/fosuser/delete');
233 233
 	}
234 234
 
235 235
 
@@ -239,11 +239,11 @@  discard block
 block discarded – undo
239 239
 	 * @param boolean $withsub Return also attributes of sub-managers if true
240 240
 	 * @return array List of attribute items implementing \Aimeos\MW\Criteria\Attribute\Iface
241 241
 	 */
242
-	public function getSearchAttributes( $withsub = true )
242
+	public function getSearchAttributes($withsub = true)
243 243
 	{
244 244
 		$path = 'mshop/customer/manager/address/submanagers';
245 245
 
246
-		return $this->getSearchAttributesBase( $this->searchConfig, $path, [], $withsub );
246
+		return $this->getSearchAttributesBase($this->searchConfig, $path, [], $withsub);
247 247
 	}
248 248
 
249 249
 
@@ -254,9 +254,9 @@  discard block
 block discarded – undo
254 254
 	 * @param string|null $name Name of the implementation, will be from configuration (or Default) if null
255 255
 	 * @return mixed Manager for different extensions, e.g stock, tags, locations, etc.
256 256
 	 */
257
-	public function getSubManager( $manager, $name = null )
257
+	public function getSubManager($manager, $name = null)
258 258
 	{
259
-		return $this->getSubManagerBase( 'customer', 'address/' . $manager, ( $name === null ? 'FosUser' : $name ) );
259
+		return $this->getSubManagerBase('customer', 'address/' . $manager, ($name === null ? 'FosUser' : $name));
260 260
 	}
261 261
 
262 262
 
Please login to merge, or discard this patch.
lib/custom/src/MShop/Customer/Item/FosUser.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -98,7 +98,7 @@
 block discarded – undo
98 98
 	/**
99 99
 	 * Sets the associated user roles
100 100
 	 *
101
-	 * @param array $roles List of Symfony roles
101
+	 * @param string[] $roles List of Symfony roles
102 102
 	 */
103 103
 	public function setRoles( array $roles )
104 104
 	{
Please login to merge, or discard this patch.
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -32,11 +32,11 @@  discard block
 block discarded – undo
32 32
 	 * @param \Aimeos\MShop\Common\Item\Iface[] $refItems List of referenced items
33 33
 	 * @param \Aimeos\MShop\Common\Item\Helper\Password\Iface|null $helper Password encryption helper object
34 34
 	 */
35
-	public function __construct( \Aimeos\MShop\Common\Item\Address\Iface $address,
35
+	public function __construct(\Aimeos\MShop\Common\Item\Address\Iface $address,
36 36
 		array $values = [], array $listItems = [], array $refItems = [], $salt = '',
37
-		\Aimeos\MShop\Common\Item\Helper\Password\Iface $helper = null, array $addresses = [], array $propItems = [] )
37
+		\Aimeos\MShop\Common\Item\Helper\Password\Iface $helper = null, array $addresses = [], array $propItems = [])
38 38
 	{
39
-		parent::__construct( $address, $values, $listItems, $refItems, $salt, $helper, $addresses, $propItems, $propItems );
39
+		parent::__construct($address, $values, $listItems, $refItems, $salt, $helper, $addresses, $propItems, $propItems);
40 40
 
41 41
 		$this->values = $values;
42 42
 		$this->helper = $helper;
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
 	 */
52 52
 	public function getPassword()
53 53
 	{
54
-		if( isset( $this->values['customer.password'] ) ) {
54
+		if (isset($this->values['customer.password'])) {
55 55
 			return (string) $this->values['customer.password'];
56 56
 		}
57 57
 
@@ -65,12 +65,12 @@  discard block
 block discarded – undo
65 65
 	 * @param string $value Password of the customer item
66 66
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item for chaining method calls
67 67
 	 */
68
-	public function setPassword( $value )
68
+	public function setPassword($value)
69 69
 	{
70
-		if( (string) $value !== $this->getPassword() )
70
+		if ((string) $value !== $this->getPassword())
71 71
 		{
72
-			if( $this->helper !== null ) {
73
-				$value = $this->helper->encode( $value, $this->getSalt() );
72
+			if ($this->helper !== null) {
73
+				$value = $this->helper->encode($value, $this->getSalt());
74 74
 			}
75 75
 
76 76
 			$this->values['customer.password'] = (string) $value;
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
 	 */
89 89
 	public function getRoles()
90 90
 	{
91
-		if( isset( $this->values['roles'] ) ) {
91
+		if (isset($this->values['roles'])) {
92 92
 			return (array) $this->values['roles'];
93 93
 		}
94 94
 
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
 	 *
102 102
 	 * @param array $roles List of Symfony roles
103 103
 	 */
104
-	public function setRoles( array $roles )
104
+	public function setRoles(array $roles)
105 105
 	{
106 106
 		$this->values['roles'] = $roles;
107 107
 		$this->setModified();
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
 	 */
118 118
 	public function getSalt()
119 119
 	{
120
-		if( isset( $this->values['salt'] ) ) {
120
+		if (isset($this->values['salt'])) {
121 121
 			return $this->values['salt'];
122 122
 		}
123 123
 
@@ -130,9 +130,9 @@  discard block
 block discarded – undo
130 130
 	 *
131 131
 	 * @param string $value Password salt
132 132
 	 */
133
-	public function setSalt( $value )
133
+	public function setSalt($value)
134 134
 	{
135
-		if( (string) $value !== $this->getSalt() )
135
+		if ((string) $value !== $this->getSalt())
136 136
 		{
137 137
 			$this->values['salt'] = (string) $value;
138 138
 			$this->setModified();
Please login to merge, or discard this patch.
lib/custom/src/MShop/Customer/Manager/Lists/FosUser.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -249,7 +249,7 @@
 block discarded – undo
249 249
 	 *
250 250
 	 * @param string $manager Name of the sub manager type in lower case
251 251
 	 * @param string|null $name Name of the implementation, will be from configuration (or Default) if null
252
-	 * @return mixed Manager for different extensions, e.g stock, tags, locations, etc.
252
+	 * @return \Aimeos\MShop\Common\Manager\Iface Manager for different extensions, e.g stock, tags, locations, etc.
253 253
 	 */
254 254
 	public function getSubManager( $manager, $name = null )
255 255
 	{
Please login to merge, or discard this patch.
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 		'customer.lists.id'=> array(
26 26
 			'code'=>'customer.lists.id',
27 27
 			'internalcode'=>'fosli."id"',
28
-			'internaldeps' => array( 'LEFT JOIN "fos_user_list" AS fosli ON ( fos."id" = fosli."parentid" )' ),
28
+			'internaldeps' => array('LEFT JOIN "fos_user_list" AS fosli ON ( fos."id" = fosli."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
 block discarded – undo
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/fosuser/delete' );
143
+		$this->cleanupBase($siteids, 'mshop/customer/manager/lists/fosuser/delete');
144 144
 	}
145 145
 
146 146
 
@@ -150,11 +150,11 @@  discard block
 block discarded – undo
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
 block discarded – undo
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 ? 'FosUser' : $name ) );
170
+		return $this->getSubManagerBase('customer', 'lists/' . $manager, ($name === null ? 'FosUser' : $name));
171 171
 	}
172 172
 
173 173
 
Please login to merge, or discard this patch.
lib/custom/src/MShop/Customer/Manager/Lists/Type/FosUser.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -249,7 +249,7 @@
 block discarded – undo
249 249
 	 *
250 250
 	 * @param string $manager Name of the sub manager type in lower case
251 251
 	 * @param string|null $name Name of the implementation, will be from configuration (or Default) if null
252
-	 * @return mixed Manager for different extensions, e.g stock, tags, locations, etc.
252
+	 * @return \Aimeos\MShop\Common\Manager\Iface Manager for different extensions, e.g stock, tags, locations, etc.
253 253
 	 */
254 254
 	public function getSubManager( $manager, $name = null )
255 255
 	{
Please login to merge, or discard this patch.
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 		'customer.lists.type.id' => array(
26 26
 			'code'=>'customer.lists.type.id',
27 27
 			'internalcode'=>'foslity."id"',
28
-			'internaldeps'=>array( 'LEFT JOIN "fos_user_list_type" AS foslity ON ( fosli."typeid" = foslity."id" )' ),
28
+			'internaldeps'=>array('LEFT JOIN "fos_user_list_type" AS foslity ON ( fosli."typeid" = foslity."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
 block discarded – undo
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/fosuser/delete' );
106
+		$this->cleanupBase($siteids, 'mshop/customer/manager/lists/type/fosuser/delete');
107 107
 	}
108 108
 
109 109
 
@@ -113,11 +113,11 @@  discard block
 block discarded – undo
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
 block discarded – undo
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 ? 'FosUser' : $name ) );
133
+		return $this->getSubManagerBase('customer', 'lists/type/' . $manager, ($name === null ? 'FosUser' : $name));
134 134
 	}
135 135
 
136 136
 
Please login to merge, or discard this patch.
lib/custom/tests/TestHelper.php 1 patch
Spacing   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -18,14 +18,14 @@  discard block
 block discarded – undo
18 18
 
19 19
 		$includepaths = $aimeos->getIncludePaths();
20 20
 		$includepaths[] = get_include_path();
21
-		set_include_path( implode( PATH_SEPARATOR, $includepaths ) );
21
+		set_include_path(implode(PATH_SEPARATOR, $includepaths));
22 22
 	}
23 23
 
24 24
 
25
-	public static function getContext( $site = 'unittest' )
25
+	public static function getContext($site = 'unittest')
26 26
 	{
27
-		if( !isset( self::$context[$site] ) ) {
28
-			self::$context[$site] = self::createContext( $site );
27
+		if (!isset(self::$context[$site])) {
28
+			self::$context[$site] = self::createContext($site);
29 29
 		}
30 30
 
31 31
 		return clone self::$context[$site];
@@ -34,13 +34,13 @@  discard block
 block discarded – undo
34 34
 
35 35
 	private static function getAimeos()
36 36
 	{
37
-		if( !isset( self::$aimeos ) )
37
+		if (!isset(self::$aimeos))
38 38
 		{
39 39
 			require_once 'Bootstrap.php';
40
-			spl_autoload_register( 'Aimeos\\Bootstrap::autoload' );
40
+			spl_autoload_register('Aimeos\\Bootstrap::autoload');
41 41
 
42
-			$extdir = dirname( dirname( dirname( __DIR__ ) ) );
43
-			self::$aimeos = new \Aimeos\Bootstrap( array( $extdir ), true );
42
+			$extdir = dirname(dirname(dirname(__DIR__)));
43
+			self::$aimeos = new \Aimeos\Bootstrap(array($extdir), true);
44 44
 		}
45 45
 
46 46
 		return self::$aimeos;
@@ -50,45 +50,45 @@  discard block
 block discarded – undo
50 50
 	/**
51 51
 	 * @param string $site
52 52
 	 */
53
-	private static function createContext( $site )
53
+	private static function createContext($site)
54 54
 	{
55 55
 		$ctx = new \Aimeos\MShop\Context\Item\Standard();
56 56
 		$aimeos = self::getAimeos();
57 57
 
58 58
 
59
-		$paths = $aimeos->getConfigPaths( 'mysql' );
59
+		$paths = $aimeos->getConfigPaths('mysql');
60 60
 		$paths[] = __DIR__ . DIRECTORY_SEPARATOR . 'config';
61 61
 
62
-		$conf = new \Aimeos\MW\Config\PHPArray( [], $paths );
63
-		$ctx->setConfig( $conf );
62
+		$conf = new \Aimeos\MW\Config\PHPArray([], $paths);
63
+		$ctx->setConfig($conf);
64 64
 
65 65
 
66
-		$dbm = new \Aimeos\MW\DB\Manager\PDO( $conf );
67
-		$ctx->setDatabaseManager( $dbm );
66
+		$dbm = new \Aimeos\MW\DB\Manager\PDO($conf);
67
+		$ctx->setDatabaseManager($dbm);
68 68
 
69 69
 
70
-		$logger = new \Aimeos\MW\Logger\File( $site . '.log', \Aimeos\MW\Logger\Base::DEBUG );
71
-		$ctx->setLogger( $logger );
70
+		$logger = new \Aimeos\MW\Logger\File($site . '.log', \Aimeos\MW\Logger\Base::DEBUG);
71
+		$ctx->setLogger($logger);
72 72
 
73 73
 
74 74
 		$cache = new \Aimeos\MW\Cache\None();
75
-		$ctx->setCache( $cache );
75
+		$ctx->setCache($cache);
76 76
 
77 77
 
78
-		$i18n = new \Aimeos\MW\Translation\None( 'de' );
79
-		$ctx->setI18n( array( 'de' => $i18n ) );
78
+		$i18n = new \Aimeos\MW\Translation\None('de');
79
+		$ctx->setI18n(array('de' => $i18n));
80 80
 
81 81
 
82 82
 		$session = new \Aimeos\MW\Session\None();
83
-		$ctx->setSession( $session );
83
+		$ctx->setSession($session);
84 84
 
85 85
 
86
-		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $ctx );
87
-		$localeItem = $localeManager->bootstrap( $site, '', '', false );
86
+		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($ctx);
87
+		$localeItem = $localeManager->bootstrap($site, '', '', false);
88 88
 
89
-		$ctx->setLocale( $localeItem );
89
+		$ctx->setLocale($localeItem);
90 90
 
91
-		$ctx->setEditor( 'ai-fosuser:unittest' );
91
+		$ctx->setEditor('ai-fosuser:unittest');
92 92
 
93 93
 		return $ctx;
94 94
 	}
Please login to merge, or discard this patch.
lib/custom/tests/MShop/Customer/Manager/Lists/FosUserTest.php 1 patch
Spacing   +151 added lines, -151 removed lines patch added patch discarded remove patch
@@ -18,43 +18,43 @@  discard block
 block discarded – undo
18 18
 	{
19 19
 		$this->context = \TestHelper::getContext();
20 20
 		$this->editor = $this->context->getEditor();
21
-		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $this->context, 'FosUser' );
22
-		$this->object = $manager->getSubManager( 'lists', 'FosUser' );
21
+		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager($this->context, 'FosUser');
22
+		$this->object = $manager->getSubManager('lists', 'FosUser');
23 23
 	}
24 24
 
25 25
 
26 26
 	protected function tearDown()
27 27
 	{
28
-		unset( $this->object, $this->context );
28
+		unset($this->object, $this->context);
29 29
 	}
30 30
 
31 31
 
32 32
 	public function testCleanup()
33 33
 	{
34
-		$this->object->cleanup( array( -1 ) );
34
+		$this->object->cleanup(array( -1 ));
35 35
 	}
36 36
 
37 37
 
38 38
 	public function testAggregate()
39 39
 	{
40
-		$search = $this->object->createSearch( true );
40
+		$search = $this->object->createSearch(true);
41 41
 		$expr = array(
42 42
 			$search->getConditions(),
43
-			$search->compare( '==', 'customer.lists.editor', 'ai-fosuser:unittest' ),
43
+			$search->compare('==', 'customer.lists.editor', 'ai-fosuser:unittest'),
44 44
 		);
45
-		$search->setConditions( $search->combine( '&&', $expr ) );
45
+		$search->setConditions($search->combine('&&', $expr));
46 46
 
47
-		$result = $this->object->aggregate( $search, 'customer.lists.domain' );
47
+		$result = $this->object->aggregate($search, 'customer.lists.domain');
48 48
 
49
-		$this->assertEquals( 1, count( $result ) );
50
-		$this->assertArrayHasKey( 'text', $result );
51
-		$this->assertEquals( 4, $result['text'] );
49
+		$this->assertEquals(1, count($result));
50
+		$this->assertArrayHasKey('text', $result);
51
+		$this->assertEquals(4, $result['text']);
52 52
 	}
53 53
 
54 54
 
55 55
 	public function testCreateItem()
56 56
 	{
57
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $this->object->createItem() );
57
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $this->object->createItem());
58 58
 	}
59 59
 
60 60
 
@@ -62,13 +62,13 @@  discard block
 block discarded – undo
62 62
 	{
63 63
 		$search = $this->object->createSearch();
64 64
 		$search->setSlice(0, 1);
65
-		$results = $this->object->searchItems( $search );
65
+		$results = $this->object->searchItems($search);
66 66
 
67
-		if( ( $item = reset( $results ) ) === false ) {
68
-			throw new \RuntimeException( 'No item found' );
67
+		if (($item = reset($results)) === false) {
68
+			throw new \RuntimeException('No item found');
69 69
 		}
70 70
 
71
-		$this->assertEquals( $item, $this->object->getItem( $item->getId() ) );
71
+		$this->assertEquals($item, $this->object->getItem($item->getId()));
72 72
 	}
73 73
 
74 74
 
@@ -76,147 +76,147 @@  discard block
 block discarded – undo
76 76
 	{
77 77
 		$search = $this->object->createSearch();
78 78
 		$search->setSlice(0, 1);
79
-		$items = $this->object->searchItems( $search );
79
+		$items = $this->object->searchItems($search);
80 80
 
81
-		if( ( $item = reset( $items ) ) === false ) {
82
-			throw new \RuntimeException( 'No item found' );
81
+		if (($item = reset($items)) === false) {
82
+			throw new \RuntimeException('No item found');
83 83
 		}
84 84
 
85
-		$item->setId( null );
86
-		$item->setDomain( 'unittest' );
87
-		$resultSaved = $this->object->saveItem( $item );
88
-		$itemSaved = $this->object->getItem( $item->getId() );
85
+		$item->setId(null);
86
+		$item->setDomain('unittest');
87
+		$resultSaved = $this->object->saveItem($item);
88
+		$itemSaved = $this->object->getItem($item->getId());
89 89
 
90 90
 		$itemExp = clone $itemSaved;
91
-		$itemExp->setDomain( 'unittest2' );
92
-		$resultUpd = $this->object->saveItem( $itemExp );
93
-		$itemUpd = $this->object->getItem( $itemExp->getId() );
94
-
95
-		$this->object->deleteItem( $itemSaved->getId() );
96
-
97
-
98
-		$this->assertTrue( $item->getId() !== null );
99
-		$this->assertTrue( $itemSaved->getType() !== null );
100
-		$this->assertEquals( $item->getId(), $itemSaved->getId() );
101
-		$this->assertEquals( $item->getSiteId(), $itemSaved->getSiteId() );
102
-		$this->assertEquals( $item->getParentId(), $itemSaved->getParentId() );
103
-		$this->assertEquals( $item->getTypeId(), $itemSaved->getTypeId() );
104
-		$this->assertEquals( $item->getRefId(), $itemSaved->getRefId() );
105
-		$this->assertEquals( $item->getDomain(), $itemSaved->getDomain() );
106
-		$this->assertEquals( $item->getDateStart(), $itemSaved->getDateStart() );
107
-		$this->assertEquals( $item->getDateEnd(), $itemSaved->getDateEnd() );
108
-		$this->assertEquals( $item->getPosition(), $itemSaved->getPosition() );
109
-		$this->assertEquals( $this->editor, $itemSaved->getEditor() );
91
+		$itemExp->setDomain('unittest2');
92
+		$resultUpd = $this->object->saveItem($itemExp);
93
+		$itemUpd = $this->object->getItem($itemExp->getId());
94
+
95
+		$this->object->deleteItem($itemSaved->getId());
96
+
97
+
98
+		$this->assertTrue($item->getId() !== null);
99
+		$this->assertTrue($itemSaved->getType() !== null);
100
+		$this->assertEquals($item->getId(), $itemSaved->getId());
101
+		$this->assertEquals($item->getSiteId(), $itemSaved->getSiteId());
102
+		$this->assertEquals($item->getParentId(), $itemSaved->getParentId());
103
+		$this->assertEquals($item->getTypeId(), $itemSaved->getTypeId());
104
+		$this->assertEquals($item->getRefId(), $itemSaved->getRefId());
105
+		$this->assertEquals($item->getDomain(), $itemSaved->getDomain());
106
+		$this->assertEquals($item->getDateStart(), $itemSaved->getDateStart());
107
+		$this->assertEquals($item->getDateEnd(), $itemSaved->getDateEnd());
108
+		$this->assertEquals($item->getPosition(), $itemSaved->getPosition());
109
+		$this->assertEquals($this->editor, $itemSaved->getEditor());
110 110
 		$this->assertStringStartsWith(date('Y-m-d', time()), $itemSaved->getTimeCreated());
111 111
 		$this->assertStringStartsWith(date('Y-m-d', time()), $itemSaved->getTimeModified());
112 112
 
113
-		$this->assertEquals( $this->editor, $itemSaved->getEditor() );
114
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated() );
115
-		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified() );
113
+		$this->assertEquals($this->editor, $itemSaved->getEditor());
114
+		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated());
115
+		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified());
116 116
 
117
-		$this->assertTrue( $itemUpd->getType() !== null );
118
-		$this->assertEquals( $itemExp->getId(), $itemUpd->getId() );
119
-		$this->assertEquals( $itemExp->getSiteId(), $itemUpd->getSiteId() );
120
-		$this->assertEquals( $itemExp->getParentId(), $itemUpd->getParentId() );
121
-		$this->assertEquals( $itemExp->getTypeId(), $itemUpd->getTypeId() );
122
-		$this->assertEquals( $itemExp->getRefId(), $itemUpd->getRefId() );
123
-		$this->assertEquals( $itemExp->getDomain(), $itemUpd->getDomain() );
124
-		$this->assertEquals( $itemExp->getDateStart(), $itemUpd->getDateStart() );
125
-		$this->assertEquals( $itemExp->getDateEnd(), $itemUpd->getDateEnd() );
126
-		$this->assertEquals( $itemExp->getPosition(), $itemUpd->getPosition() );
117
+		$this->assertTrue($itemUpd->getType() !== null);
118
+		$this->assertEquals($itemExp->getId(), $itemUpd->getId());
119
+		$this->assertEquals($itemExp->getSiteId(), $itemUpd->getSiteId());
120
+		$this->assertEquals($itemExp->getParentId(), $itemUpd->getParentId());
121
+		$this->assertEquals($itemExp->getTypeId(), $itemUpd->getTypeId());
122
+		$this->assertEquals($itemExp->getRefId(), $itemUpd->getRefId());
123
+		$this->assertEquals($itemExp->getDomain(), $itemUpd->getDomain());
124
+		$this->assertEquals($itemExp->getDateStart(), $itemUpd->getDateStart());
125
+		$this->assertEquals($itemExp->getDateEnd(), $itemUpd->getDateEnd());
126
+		$this->assertEquals($itemExp->getPosition(), $itemUpd->getPosition());
127 127
 
128
-		$this->assertEquals( $this->editor, $itemUpd->getEditor() );
129
-		$this->assertEquals( $itemExp->getTimeCreated(), $itemUpd->getTimeCreated() );
130
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified() );
128
+		$this->assertEquals($this->editor, $itemUpd->getEditor());
129
+		$this->assertEquals($itemExp->getTimeCreated(), $itemUpd->getTimeCreated());
130
+		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified());
131 131
 
132
-		$this->assertInstanceOf( '\Aimeos\MShop\Common\Item\Iface', $resultSaved );
133
-		$this->assertInstanceOf( '\Aimeos\MShop\Common\Item\Iface', $resultUpd );
132
+		$this->assertInstanceOf('\Aimeos\MShop\Common\Item\Iface', $resultSaved);
133
+		$this->assertInstanceOf('\Aimeos\MShop\Common\Item\Iface', $resultUpd);
134 134
 
135 135
 		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
136
-		$this->object->getItem( $itemSaved->getId() );
136
+		$this->object->getItem($itemSaved->getId());
137 137
 	}
138 138
 
139 139
 
140 140
 	public function testMoveItemLastToFront()
141 141
 	{
142 142
 		$listItems = $this->getListItems();
143
-		$this->assertGreaterThan( 1, count( $listItems ) );
143
+		$this->assertGreaterThan(1, count($listItems));
144 144
 
145
-		if( ( $first = reset( $listItems ) ) === false ) {
146
-			throw new \RuntimeException( 'No first customer list item' );
145
+		if (($first = reset($listItems)) === false) {
146
+			throw new \RuntimeException('No first customer list item');
147 147
 		}
148 148
 
149
-		if( ( $last = end( $listItems ) ) === false ) {
150
-			throw new \RuntimeException( 'No last customer list item' );
149
+		if (($last = end($listItems)) === false) {
150
+			throw new \RuntimeException('No last customer list item');
151 151
 		}
152 152
 
153
-		$this->object->moveItem( $last->getId(), $first->getId() );
153
+		$this->object->moveItem($last->getId(), $first->getId());
154 154
 
155
-		$newFirst = $this->object->getItem( $last->getId() );
156
-		$newSecond = $this->object->getItem( $first->getId() );
155
+		$newFirst = $this->object->getItem($last->getId());
156
+		$newSecond = $this->object->getItem($first->getId());
157 157
 
158
-		$this->object->moveItem( $last->getId() );
158
+		$this->object->moveItem($last->getId());
159 159
 
160
-		$this->assertEquals( 1, $newFirst->getPosition() );
161
-		$this->assertEquals( 2, $newSecond->getPosition() );
160
+		$this->assertEquals(1, $newFirst->getPosition());
161
+		$this->assertEquals(2, $newSecond->getPosition());
162 162
 	}
163 163
 
164 164
 
165 165
 	public function testMoveItemFirstToLast()
166 166
 	{
167 167
 		$listItems = $this->getListItems();
168
-		$this->assertGreaterThan( 1, count( $listItems ) );
168
+		$this->assertGreaterThan(1, count($listItems));
169 169
 
170
-		if( ( $first = reset( $listItems ) ) === false ) {
171
-			throw new \RuntimeException( 'No first customer list item' );
170
+		if (($first = reset($listItems)) === false) {
171
+			throw new \RuntimeException('No first customer list item');
172 172
 		}
173 173
 
174
-		if( ( $second = next( $listItems ) ) === false ) {
175
-			throw new \RuntimeException( 'No second customer list item' );
174
+		if (($second = next($listItems)) === false) {
175
+			throw new \RuntimeException('No second customer list item');
176 176
 		}
177 177
 
178
-		if( ( $last = end( $listItems ) ) === false ) {
179
-			throw new \RuntimeException( 'No last customer list item' );
178
+		if (($last = end($listItems)) === false) {
179
+			throw new \RuntimeException('No last customer list item');
180 180
 		}
181 181
 
182
-		$this->object->moveItem( $first->getId() );
182
+		$this->object->moveItem($first->getId());
183 183
 
184
-		$newBefore = $this->object->getItem( $last->getId() );
185
-		$newLast = $this->object->getItem( $first->getId() );
184
+		$newBefore = $this->object->getItem($last->getId());
185
+		$newLast = $this->object->getItem($first->getId());
186 186
 
187
-		$this->object->moveItem( $first->getId(), $second->getId() );
187
+		$this->object->moveItem($first->getId(), $second->getId());
188 188
 
189
-		$this->assertEquals( $last->getPosition() - 1, $newBefore->getPosition() );
190
-		$this->assertEquals( $last->getPosition(), $newLast->getPosition() );
189
+		$this->assertEquals($last->getPosition() - 1, $newBefore->getPosition());
190
+		$this->assertEquals($last->getPosition(), $newLast->getPosition());
191 191
 	}
192 192
 
193 193
 
194 194
 	public function testMoveItemFirstUp()
195 195
 	{
196 196
 		$listItems = $this->getListItems();
197
-		$this->assertGreaterThan( 1, count( $listItems ) );
197
+		$this->assertGreaterThan(1, count($listItems));
198 198
 
199
-		if( ( $first = reset( $listItems ) ) === false ) {
200
-			throw new \RuntimeException( 'No first customer list item' );
199
+		if (($first = reset($listItems)) === false) {
200
+			throw new \RuntimeException('No first customer list item');
201 201
 		}
202 202
 
203
-		if( ( $second = next( $listItems ) ) === false ) {
204
-			throw new \RuntimeException( 'No second customer list item' );
203
+		if (($second = next($listItems)) === false) {
204
+			throw new \RuntimeException('No second customer list item');
205 205
 		}
206 206
 
207
-		if( ( $last = end( $listItems ) ) === false ) {
208
-			throw new \RuntimeException( 'No last customer list item' );
207
+		if (($last = end($listItems)) === false) {
208
+			throw new \RuntimeException('No last customer list item');
209 209
 		}
210 210
 
211
-		$this->object->moveItem( $first->getId(), $last->getId() );
211
+		$this->object->moveItem($first->getId(), $last->getId());
212 212
 
213
-		$newLast = $this->object->getItem( $last->getId() );
214
-		$newUp = $this->object->getItem( $first->getId() );
213
+		$newLast = $this->object->getItem($last->getId());
214
+		$newUp = $this->object->getItem($first->getId());
215 215
 
216
-		$this->object->moveItem( $first->getId(), $second->getId() );
216
+		$this->object->moveItem($first->getId(), $second->getId());
217 217
 
218
-		$this->assertEquals( $last->getPosition() - 1, $newUp->getPosition() );
219
-		$this->assertEquals( $last->getPosition(), $newLast->getPosition() );
218
+		$this->assertEquals($last->getPosition() - 1, $newUp->getPosition());
219
+		$this->assertEquals($last->getPosition(), $newLast->getPosition());
220 220
 	}
221 221
 
222 222
 
@@ -226,39 +226,39 @@  discard block
 block discarded – undo
226 226
 		$search = $this->object->createSearch();
227 227
 
228 228
 		$expr = [];
229
-		$expr[] = $search->compare( '!=', 'customer.lists.id', null );
230
-		$expr[] = $search->compare( '!=', 'customer.lists.siteid', null );
231
-		$expr[] = $search->compare( '>', 'customer.lists.parentid', 0 );
232
-		$expr[] = $search->compare( '==', 'customer.lists.domain', 'text' );
233
-		$expr[] = $search->compare( '>', 'customer.lists.typeid', 0 );
234
-		$expr[] = $search->compare( '>', 'customer.lists.refid', 0 );
235
-		$expr[] = $search->compare( '==', 'customer.lists.datestart', '2010-01-01 00:00:00' );
236
-		$expr[] = $search->compare( '==', 'customer.lists.dateend', '2100-01-01 00:00:00' );
237
-		$expr[] = $search->compare( '!=', 'customer.lists.config', null );
238
-		$expr[] = $search->compare( '>', 'customer.lists.position', 1 );
239
-		$expr[] = $search->compare( '==', 'customer.lists.status', 1 );
240
-		$expr[] = $search->compare( '>=', 'customer.lists.mtime', '1970-01-01 00:00:00' );
241
-		$expr[] = $search->compare( '>=', 'customer.lists.ctime', '1970-01-01 00:00:00' );
242
-		$expr[] = $search->compare( '==', 'customer.lists.editor', $this->editor );
243
-
244
-		$expr[] = $search->compare( '!=', 'customer.lists.type.id', 0 );
245
-		$expr[] = $search->compare( '!=', 'customer.lists.type.siteid', null );
246
-		$expr[] = $search->compare( '==', 'customer.lists.type.code', 'default' );
247
-		$expr[] = $search->compare( '==', 'customer.lists.type.domain', 'text' );
248
-		$expr[] = $search->compare( '==', 'customer.lists.type.label', 'Standard' );
249
-		$expr[] = $search->compare( '==', 'customer.lists.type.status', 1 );
250
-		$expr[] = $search->compare( '>=', 'customer.lists.type.mtime', '1970-01-01 00:00:00' );
251
-		$expr[] = $search->compare( '>=', 'customer.lists.type.ctime', '1970-01-01 00:00:00' );
252
-		$expr[] = $search->compare( '==', 'customer.lists.type.editor', $this->editor );
253
-
254
-		$search->setConditions( $search->combine( '&&', $expr ) );
229
+		$expr[] = $search->compare('!=', 'customer.lists.id', null);
230
+		$expr[] = $search->compare('!=', 'customer.lists.siteid', null);
231
+		$expr[] = $search->compare('>', 'customer.lists.parentid', 0);
232
+		$expr[] = $search->compare('==', 'customer.lists.domain', 'text');
233
+		$expr[] = $search->compare('>', 'customer.lists.typeid', 0);
234
+		$expr[] = $search->compare('>', 'customer.lists.refid', 0);
235
+		$expr[] = $search->compare('==', 'customer.lists.datestart', '2010-01-01 00:00:00');
236
+		$expr[] = $search->compare('==', 'customer.lists.dateend', '2100-01-01 00:00:00');
237
+		$expr[] = $search->compare('!=', 'customer.lists.config', null);
238
+		$expr[] = $search->compare('>', 'customer.lists.position', 1);
239
+		$expr[] = $search->compare('==', 'customer.lists.status', 1);
240
+		$expr[] = $search->compare('>=', 'customer.lists.mtime', '1970-01-01 00:00:00');
241
+		$expr[] = $search->compare('>=', 'customer.lists.ctime', '1970-01-01 00:00:00');
242
+		$expr[] = $search->compare('==', 'customer.lists.editor', $this->editor);
243
+
244
+		$expr[] = $search->compare('!=', 'customer.lists.type.id', 0);
245
+		$expr[] = $search->compare('!=', 'customer.lists.type.siteid', null);
246
+		$expr[] = $search->compare('==', 'customer.lists.type.code', 'default');
247
+		$expr[] = $search->compare('==', 'customer.lists.type.domain', 'text');
248
+		$expr[] = $search->compare('==', 'customer.lists.type.label', 'Standard');
249
+		$expr[] = $search->compare('==', 'customer.lists.type.status', 1);
250
+		$expr[] = $search->compare('>=', 'customer.lists.type.mtime', '1970-01-01 00:00:00');
251
+		$expr[] = $search->compare('>=', 'customer.lists.type.ctime', '1970-01-01 00:00:00');
252
+		$expr[] = $search->compare('==', 'customer.lists.type.editor', $this->editor);
253
+
254
+		$search->setConditions($search->combine('&&', $expr));
255 255
 		$search->setSlice(0, 1);
256
-		$results = $this->object->searchItems( $search, [], $total );
257
-		$this->assertEquals( 1, count( $results ) );
258
-		$this->assertEquals( 2, $total );
256
+		$results = $this->object->searchItems($search, [], $total);
257
+		$this->assertEquals(1, count($results));
258
+		$this->assertEquals(2, $total);
259 259
 
260
-		foreach($results as $itemId => $item) {
261
-			$this->assertEquals( $itemId, $item->getId() );
260
+		foreach ($results as $itemId => $item) {
261
+			$this->assertEquals($itemId, $item->getId());
262 262
 		}
263 263
 	}
264 264
 
@@ -266,8 +266,8 @@  discard block
 block discarded – undo
266 266
 	public function testSearchItemsNoCriteria()
267 267
 	{
268 268
 		$search = $this->object->createSearch();
269
-		$search->setConditions( $search->compare( '==', 'customer.lists.editor', $this->editor ) );
270
-		$this->assertEquals( 4, count( $this->object->searchItems($search) ) );
269
+		$search->setConditions($search->compare('==', 'customer.lists.editor', $this->editor));
270
+		$this->assertEquals(4, count($this->object->searchItems($search)));
271 271
 	}
272 272
 
273 273
 
@@ -275,48 +275,48 @@  discard block
 block discarded – undo
275 275
 	{
276 276
 		$search = $this->object->createSearch(true);
277 277
 		$conditions = array(
278
-			$search->compare( '==', 'customer.lists.editor', $this->editor ),
278
+			$search->compare('==', 'customer.lists.editor', $this->editor),
279 279
 			$search->getConditions()
280 280
 		);
281
-		$search->setConditions( $search->combine( '&&', $conditions ) );
282
-		$this->assertEquals( 4, count( $this->object->searchItems($search) ) );
281
+		$search->setConditions($search->combine('&&', $conditions));
282
+		$this->assertEquals(4, count($this->object->searchItems($search)));
283 283
 	}
284 284
 
285 285
 
286 286
 	public function testGetSubManager()
287 287
 	{
288
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type') );
289
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type', 'Standard') );
288
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type'));
289
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type', 'Standard'));
290 290
 
291
-		$this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
292
-		$this->object->getSubManager( 'unknown' );
291
+		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
292
+		$this->object->getSubManager('unknown');
293 293
 	}
294 294
 
295 295
 
296 296
 	protected function getListItems()
297 297
 	{
298
-		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $this->context, 'FosUser' );
298
+		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager($this->context, 'FosUser');
299 299
 
300 300
 		$search = $manager->createSearch();
301
-		$search->setConditions( $search->compare( '==', 'customer.code', 'UTC003' ) );
302
-		$search->setSlice( 0, 1 );
301
+		$search->setConditions($search->compare('==', 'customer.code', 'UTC003'));
302
+		$search->setSlice(0, 1);
303 303
 
304
-		$results = $manager->searchItems( $search );
304
+		$results = $manager->searchItems($search);
305 305
 
306
-		if( ( $item = reset( $results ) ) === false ) {
307
-			throw new \RuntimeException( 'No customer item found' );
306
+		if (($item = reset($results)) === false) {
307
+			throw new \RuntimeException('No customer item found');
308 308
 		}
309 309
 
310 310
 		$search = $this->object->createSearch();
311 311
 		$expr = array(
312
-			$search->compare( '==', 'customer.lists.parentid', $item->getId() ),
313
-			$search->compare( '==', 'customer.lists.domain', 'text' ),
314
-			$search->compare( '==', 'customer.lists.editor', $this->editor ),
315
-			$search->compare( '==', 'customer.lists.type.code', 'default' ),
312
+			$search->compare('==', 'customer.lists.parentid', $item->getId()),
313
+			$search->compare('==', 'customer.lists.domain', 'text'),
314
+			$search->compare('==', 'customer.lists.editor', $this->editor),
315
+			$search->compare('==', 'customer.lists.type.code', 'default'),
316 316
 		);
317
-		$search->setConditions( $search->combine( '&&', $expr ) );
318
-		$search->setSortations( array( $search->sort( '+', 'customer.lists.position' ) ) );
317
+		$search->setConditions($search->combine('&&', $expr));
318
+		$search->setSortations(array($search->sort('+', 'customer.lists.position')));
319 319
 
320
-		return $this->object->searchItems( $search );
320
+		return $this->object->searchItems($search);
321 321
 	}
322 322
 }
Please login to merge, or discard this patch.