aimeos / ai-fosuser

lib/custom/tests/bootstrap.php

Spacing +6 added lines, -6 removed lines

@@ -4,17 +4,17 @@
  * Set error reporting to maximum
  */
 error_reporting( -1 );
-ini_set( 'display_errors', true );
+ini_set('display_errors', true);
 
-date_default_timezone_set( 'UTC' );
+date_default_timezone_set('UTC');
 
 /*
  * Set locale settings to reasonable defaults
  */
-setlocale( LC_ALL, 'en_US.UTF-8' );
-setlocale( LC_CTYPE, 'en_US.UTF-8' );
-setlocale( LC_NUMERIC, 'POSIX' );
-setlocale( LC_TIME, 'POSIX' );
+setlocale(LC_ALL, 'en_US.UTF-8');
+setlocale(LC_CTYPE, 'en_US.UTF-8');
+setlocale(LC_NUMERIC, 'POSIX');
+setlocale(LC_TIME, 'POSIX');
 
 
 require_once 'TestHelper.php';

lib/custom/setup/FosuserAddIndexes.php

Spacing +10 added lines, -10 removed lines

@@ -44,7 +44,7 @@ 
 	 */
 	public function getPostDependencies()
 	{
-		return array( 'TablesCreateFosUser' );
+		return array('TablesCreateFosUser');
 	}
 
 
@@ -53,23 +53,23 @@ 
 	 */
 	public function migrate()
 	{
-		$this->msg( 'Adding indexes from "fos_user"', 0 ); $this->status( '' );
+		$this->msg('Adding indexes from "fos_user"', 0); $this->status('');
 
-		$schema = $this->getSchema( 'db-customer' );
+		$schema = $this->getSchema('db-customer');
 
-		foreach( $this->list as $idx => $stmt )
+		foreach ($this->list as $idx => $stmt)
 		{
-			$this->msg( sprintf( 'Checking index "%1$s"', $idx ), 0 );
+			$this->msg(sprintf('Checking index "%1$s"', $idx), 0);
 
-			if( $schema->tableExists( 'fos_user' ) === true
-				&& $schema->indexExists( 'fos_user', $idx ) === false )
+			if ($schema->tableExists('fos_user') === true
+				&& $schema->indexExists('fos_user', $idx) === false)
 			{
-				$this->execute( $stmt );
-				$this->status( 'done' );
+				$this->execute($stmt);
+				$this->status('done');
 			}
 			else
 			{
-				$this->status( 'OK' );
+				$this->status('OK');
 			}
 		}
 	}

lib/custom/tests/TestHelper.php

Spacing +24 added lines, -24 removed lines

@@ -18,14 +18,14 @@ 
 
 		$includepaths = $aimeos->getIncludePaths();
 		$includepaths[] = get_include_path();
-		set_include_path( implode( PATH_SEPARATOR, $includepaths ) );
+		set_include_path(implode(PATH_SEPARATOR, $includepaths));
 	}
 
 
-	public static function getContext( $site = 'unittest' )
+	public static function getContext($site = 'unittest')
 	{
-		if( !isset( self::$context[$site] ) ) {
-			self::$context[$site] = self::createContext( $site );
+		if (!isset(self::$context[$site])) {
+			self::$context[$site] = self::createContext($site);
 		}
 
 		return clone self::$context[$site];
@@ -34,13 +34,13 @@ 
 
 	private static function getAimeos()
 	{
-		if( !isset( self::$aimeos ) )
+		if (!isset(self::$aimeos))
 		{
 			require_once 'Bootstrap.php';
-			spl_autoload_register( 'Aimeos\\Bootstrap::autoload' );
+			spl_autoload_register('Aimeos\\Bootstrap::autoload');
 
-			$extdir = dirname( dirname( dirname( __DIR__ ) ) );
-			self::$aimeos = new \Aimeos\Bootstrap( array( $extdir ), true );
+			$extdir = dirname(dirname(dirname(__DIR__)));
+			self::$aimeos = new \Aimeos\Bootstrap(array($extdir), true);
 		}
 
 		return self::$aimeos;
@@ -50,45 +50,45 @@ 
 	/**
 	 * @param string $site
 	 */
-	private static function createContext( $site )
+	private static function createContext($site)
 	{
 		$ctx = new \Aimeos\MShop\Context\Item\Standard();
 		$aimeos = self::getAimeos();
 
 
-		$paths = $aimeos->getConfigPaths( 'mysql' );
+		$paths = $aimeos->getConfigPaths('mysql');
 		$paths[] = __DIR__ . DIRECTORY_SEPARATOR . 'config';
 
-		$conf = new \Aimeos\MW\Config\PHPArray( [], $paths );
-		$ctx->setConfig( $conf );
+		$conf = new \Aimeos\MW\Config\PHPArray([], $paths);
+		$ctx->setConfig($conf);
 
 
-		$dbm = new \Aimeos\MW\DB\Manager\PDO( $conf );
-		$ctx->setDatabaseManager( $dbm );
+		$dbm = new \Aimeos\MW\DB\Manager\PDO($conf);
+		$ctx->setDatabaseManager($dbm);
 
 
-		$logger = new \Aimeos\MW\Logger\File( $site . '.log', \Aimeos\MW\Logger\Base::DEBUG );
-		$ctx->setLogger( $logger );
+		$logger = new \Aimeos\MW\Logger\File($site . '.log', \Aimeos\MW\Logger\Base::DEBUG);
+		$ctx->setLogger($logger);
 
 
 		$cache = new \Aimeos\MW\Cache\None();
-		$ctx->setCache( $cache );
+		$ctx->setCache($cache);
 
 
-		$i18n = new \Aimeos\MW\Translation\None( 'de' );
-		$ctx->setI18n( array( 'de' => $i18n ) );
+		$i18n = new \Aimeos\MW\Translation\None('de');
+		$ctx->setI18n(array('de' => $i18n));
 
 
 		$session = new \Aimeos\MW\Session\None();
-		$ctx->setSession( $session );
+		$ctx->setSession($session);
 
 
-		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $ctx );
-		$localeItem = $localeManager->bootstrap( $site, '', '', false );
+		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($ctx);
+		$localeItem = $localeManager->bootstrap($site, '', '', false);
 
-		$ctx->setLocale( $localeItem );
+		$ctx->setLocale($localeItem);
 
-		$ctx->setEditor( 'ai-fosuser:unittest' );
+		$ctx->setEditor('ai-fosuser:unittest');
 
 		return $ctx;
 	}

lib/custom/src/MShop/Customer/Manager/Lists/Type/FosUser.php

Spacing +9 added lines, -9 removed lines

@@ -25,7 +25,7 @@ 
 		'customer.lists.type.id' => array(
 			'code'=>'customer.lists.type.id',
 			'internalcode'=>'foslity."id"',
-			'internaldeps'=>array( 'LEFT JOIN "fos_user_list_type" AS foslity ON ( fosli."typeid" = foslity."id" )' ),
+			'internaldeps'=>array('LEFT JOIN "fos_user_list_type" AS foslity ON ( fosli."typeid" = foslity."id" )'),
 			'label'=>'Customer list type ID',
 			'type'=> 'integer',
 			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT,
@@ -96,14 +96,14 @@ 
 	 *
 	 * @param array $siteids List of IDs for sites whose entries should be deleted
 	 */
-	public function cleanup( array $siteids )
+	public function cleanup(array $siteids)
 	{
 		$path = 'mshop/customer/manager/lists/type/submanagers';
-		foreach( $this->getContext()->getConfig()->get( $path, [] ) as $domain ) {
-			$this->getObject()->getSubManager( $domain )->cleanup( $siteids );
+		foreach ($this->getContext()->getConfig()->get($path, []) as $domain) {
+			$this->getObject()->getSubManager($domain)->cleanup($siteids);
 		}
 
-		$this->cleanupBase( $siteids, 'mshop/customer/manager/lists/type/fosuser/delete' );
+		$this->cleanupBase($siteids, 'mshop/customer/manager/lists/type/fosuser/delete');
 	}
 
 
@@ -113,11 +113,11 @@ 
 	 * @param boolean $withsub Return also attributes of sub-managers if true
 	 * @return array List of attribute items implementing \Aimeos\MW\Criteria\Attribute\Iface
 	 */
-	public function getSearchAttributes( $withsub = true )
+	public function getSearchAttributes($withsub = true)
 	{
 		$path = 'mshop/customer/manager/lists/type/submanagers';
 
-		return $this->getSearchAttributesBase( $this->searchConfig, $path, [], $withsub );
+		return $this->getSearchAttributesBase($this->searchConfig, $path, [], $withsub);
 	}
 
 
@@ -128,9 +128,9 @@ 
 	 * @param string|null $name Name of the implementation, will be from configuration (or Default) if null
 	 * @return mixed Manager for different extensions, e.g stock, tags, locations, etc.
 	 */
-	public function getSubManager( $manager, $name = null )
+	public function getSubManager($manager, $name = null)
 	{
-		return $this->getSubManagerBase( 'customer', 'lists/type/' . $manager, ( $name === null ? 'FosUser' : $name ) );
+		return $this->getSubManagerBase('customer', 'lists/type/' . $manager, ($name === null ? 'FosUser' : $name));
 	}
 
 

lib/custom/src/MShop/Customer/Manager/Lists/FosUser.php

Spacing +9 added lines, -9 removed lines

@@ -25,7 +25,7 @@ 
 		'customer.lists.id'=> array(
 			'code'=>'customer.lists.id',
 			'internalcode'=>'fosli."id"',
-			'internaldeps' => array( 'LEFT JOIN "fos_user_list" AS fosli ON ( fos."id" = fosli."parentid" )' ),
+			'internaldeps' => array('LEFT JOIN "fos_user_list" AS fosli ON ( fos."id" = fosli."parentid" )'),
 			'label'=>'Customer list ID',
 			'type'=> 'integer',
 			'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_INT,
@@ -133,14 +133,14 @@ 
 	 *
 	 * @param array $siteids List of IDs for sites whose entries should be deleted
 	 */
-	public function cleanup( array $siteids )
+	public function cleanup(array $siteids)
 	{
 		$path = 'mshop/customer/manager/lists/submanagers';
-		foreach( $this->getContext()->getConfig()->get( $path, array( 'type' ) ) as $domain ) {
-			$this->getObject()->getSubManager( $domain )->cleanup( $siteids );
+		foreach ($this->getContext()->getConfig()->get($path, array('type')) as $domain) {
+			$this->getObject()->getSubManager($domain)->cleanup($siteids);
 		}
 
-		$this->cleanupBase( $siteids, 'mshop/customer/manager/lists/fosuser/delete' );
+		$this->cleanupBase($siteids, 'mshop/customer/manager/lists/fosuser/delete');
 	}
 
 
@@ -150,11 +150,11 @@ 
 	 * @param boolean $withsub Return also attributes of sub-managers if true
 	 * @return array List of attribute items implementing \Aimeos\MW\Criteria\Attribute\Iface
 	 */
-	public function getSearchAttributes( $withsub = true )
+	public function getSearchAttributes($withsub = true)
 	{
 		$path = 'mshop/customer/manager/lists/submanagers';
 
-		return $this->getSearchAttributesBase( $this->searchConfig, $path, array( 'type' ), $withsub );
+		return $this->getSearchAttributesBase($this->searchConfig, $path, array('type'), $withsub);
 	}
 
 
@@ -165,9 +165,9 @@ 
 	 * @param string|null $name Name of the implementation, will be from configuration (or Default) if null
 	 * @return mixed Manager for different extensions, e.g stock, tags, locations, etc.
 	 */
-	public function getSubManager( $manager, $name = null )
+	public function getSubManager($manager, $name = null)
 	{
-		return $this->getSubManagerBase( 'customer', 'lists/' . $manager, ( $name === null ? 'FosUser' : $name ) );
+		return $this->getSubManagerBase('customer', 'lists/' . $manager, ($name === null ? 'FosUser' : $name));
 	}
 
 

lib/custom/tests/MShop/Customer/Manager/Lists/FosUserTest.php

Spacing +151 added lines, -151 removed lines

@@ -18,43 +18,43 @@ 
 	{
 		$this->context = \TestHelper::getContext();
 		$this->editor = $this->context->getEditor();
-		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $this->context, 'FosUser' );
-		$this->object = $manager->getSubManager( 'lists', 'FosUser' );
+		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager($this->context, 'FosUser');
+		$this->object = $manager->getSubManager('lists', 'FosUser');
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->object, $this->context );
+		unset($this->object, $this->context);
 	}
 
 
 	public function testCleanup()
 	{
-		$this->object->cleanup( array( -1 ) );
+		$this->object->cleanup(array( -1 ));
 	}
 
 
 	public function testAggregate()
 	{
-		$search = $this->object->createSearch( true );
+		$search = $this->object->createSearch(true);
 		$expr = array(
 			$search->getConditions(),
-			$search->compare( '==', 'customer.lists.editor', 'ai-fosuser:unittest' ),
+			$search->compare('==', 'customer.lists.editor', 'ai-fosuser:unittest'),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		$result = $this->object->aggregate( $search, 'customer.lists.domain' );
+		$result = $this->object->aggregate($search, 'customer.lists.domain');
 
-		$this->assertEquals( 1, count( $result ) );
-		$this->assertArrayHasKey( 'text', $result );
-		$this->assertEquals( 4, $result['text'] );
+		$this->assertEquals(1, count($result));
+		$this->assertArrayHasKey('text', $result);
+		$this->assertEquals(4, $result['text']);
 	}
 
 
 	public function testCreateItem()
 	{
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $this->object->createItem() );
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $this->object->createItem());
 	}
 
 
@@ -62,13 +62,13 @@ 
 	{
 		$search = $this->object->createSearch();
 		$search->setSlice(0, 1);
-		$results = $this->object->searchItems( $search );
+		$results = $this->object->searchItems($search);
 
-		if( ( $item = reset( $results ) ) === false ) {
-			throw new \RuntimeException( 'No item found' );
+		if (($item = reset($results)) === false) {
+			throw new \RuntimeException('No item found');
 		}
 
-		$this->assertEquals( $item, $this->object->getItem( $item->getId() ) );
+		$this->assertEquals($item, $this->object->getItem($item->getId()));
 	}
 
 
@@ -76,147 +76,147 @@ 
 	{
 		$search = $this->object->createSearch();
 		$search->setSlice(0, 1);
-		$items = $this->object->searchItems( $search );
+		$items = $this->object->searchItems($search);
 
-		if( ( $item = reset( $items ) ) === false ) {
-			throw new \RuntimeException( 'No item found' );
+		if (($item = reset($items)) === false) {
+			throw new \RuntimeException('No item found');
 		}
 
-		$item->setId( null );
-		$item->setDomain( 'unittest' );
-		$resultSaved = $this->object->saveItem( $item );
-		$itemSaved = $this->object->getItem( $item->getId() );
+		$item->setId(null);
+		$item->setDomain('unittest');
+		$resultSaved = $this->object->saveItem($item);
+		$itemSaved = $this->object->getItem($item->getId());
 
 		$itemExp = clone $itemSaved;
-		$itemExp->setDomain( 'unittest2' );
-		$resultUpd = $this->object->saveItem( $itemExp );
-		$itemUpd = $this->object->getItem( $itemExp->getId() );
-
-		$this->object->deleteItem( $itemSaved->getId() );
-
-
-		$this->assertTrue( $item->getId() !== null );
-		$this->assertTrue( $itemSaved->getType() !== null );
-		$this->assertEquals( $item->getId(), $itemSaved->getId() );
-		$this->assertEquals( $item->getSiteId(), $itemSaved->getSiteId() );
-		$this->assertEquals( $item->getParentId(), $itemSaved->getParentId() );
-		$this->assertEquals( $item->getTypeId(), $itemSaved->getTypeId() );
-		$this->assertEquals( $item->getRefId(), $itemSaved->getRefId() );
-		$this->assertEquals( $item->getDomain(), $itemSaved->getDomain() );
-		$this->assertEquals( $item->getDateStart(), $itemSaved->getDateStart() );
-		$this->assertEquals( $item->getDateEnd(), $itemSaved->getDateEnd() );
-		$this->assertEquals( $item->getPosition(), $itemSaved->getPosition() );
-		$this->assertEquals( $this->editor, $itemSaved->getEditor() );
+		$itemExp->setDomain('unittest2');
+		$resultUpd = $this->object->saveItem($itemExp);
+		$itemUpd = $this->object->getItem($itemExp->getId());
+
+		$this->object->deleteItem($itemSaved->getId());
+
+
+		$this->assertTrue($item->getId() !== null);
+		$this->assertTrue($itemSaved->getType() !== null);
+		$this->assertEquals($item->getId(), $itemSaved->getId());
+		$this->assertEquals($item->getSiteId(), $itemSaved->getSiteId());
+		$this->assertEquals($item->getParentId(), $itemSaved->getParentId());
+		$this->assertEquals($item->getTypeId(), $itemSaved->getTypeId());
+		$this->assertEquals($item->getRefId(), $itemSaved->getRefId());
+		$this->assertEquals($item->getDomain(), $itemSaved->getDomain());
+		$this->assertEquals($item->getDateStart(), $itemSaved->getDateStart());
+		$this->assertEquals($item->getDateEnd(), $itemSaved->getDateEnd());
+		$this->assertEquals($item->getPosition(), $itemSaved->getPosition());
+		$this->assertEquals($this->editor, $itemSaved->getEditor());
 		$this->assertStringStartsWith(date('Y-m-d', time()), $itemSaved->getTimeCreated());
 		$this->assertStringStartsWith(date('Y-m-d', time()), $itemSaved->getTimeModified());
 
-		$this->assertEquals( $this->editor, $itemSaved->getEditor() );
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated() );
-		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified() );
+		$this->assertEquals($this->editor, $itemSaved->getEditor());
+		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated());
+		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified());
 
-		$this->assertTrue( $itemUpd->getType() !== null );
-		$this->assertEquals( $itemExp->getId(), $itemUpd->getId() );
-		$this->assertEquals( $itemExp->getSiteId(), $itemUpd->getSiteId() );
-		$this->assertEquals( $itemExp->getParentId(), $itemUpd->getParentId() );
-		$this->assertEquals( $itemExp->getTypeId(), $itemUpd->getTypeId() );
-		$this->assertEquals( $itemExp->getRefId(), $itemUpd->getRefId() );
-		$this->assertEquals( $itemExp->getDomain(), $itemUpd->getDomain() );
-		$this->assertEquals( $itemExp->getDateStart(), $itemUpd->getDateStart() );
-		$this->assertEquals( $itemExp->getDateEnd(), $itemUpd->getDateEnd() );
-		$this->assertEquals( $itemExp->getPosition(), $itemUpd->getPosition() );
+		$this->assertTrue($itemUpd->getType() !== null);
+		$this->assertEquals($itemExp->getId(), $itemUpd->getId());
+		$this->assertEquals($itemExp->getSiteId(), $itemUpd->getSiteId());
+		$this->assertEquals($itemExp->getParentId(), $itemUpd->getParentId());
+		$this->assertEquals($itemExp->getTypeId(), $itemUpd->getTypeId());
+		$this->assertEquals($itemExp->getRefId(), $itemUpd->getRefId());
+		$this->assertEquals($itemExp->getDomain(), $itemUpd->getDomain());
+		$this->assertEquals($itemExp->getDateStart(), $itemUpd->getDateStart());
+		$this->assertEquals($itemExp->getDateEnd(), $itemUpd->getDateEnd());
+		$this->assertEquals($itemExp->getPosition(), $itemUpd->getPosition());
 
-		$this->assertEquals( $this->editor, $itemUpd->getEditor() );
-		$this->assertEquals( $itemExp->getTimeCreated(), $itemUpd->getTimeCreated() );
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified() );
+		$this->assertEquals($this->editor, $itemUpd->getEditor());
+		$this->assertEquals($itemExp->getTimeCreated(), $itemUpd->getTimeCreated());
+		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified());
 
-		$this->assertInstanceOf( '\Aimeos\MShop\Common\Item\Iface', $resultSaved );
-		$this->assertInstanceOf( '\Aimeos\MShop\Common\Item\Iface', $resultUpd );
+		$this->assertInstanceOf('\Aimeos\MShop\Common\Item\Iface', $resultSaved);
+		$this->assertInstanceOf('\Aimeos\MShop\Common\Item\Iface', $resultUpd);
 
 		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
-		$this->object->getItem( $itemSaved->getId() );
+		$this->object->getItem($itemSaved->getId());
 	}
 
 
 	public function testMoveItemLastToFront()
 	{
 		$listItems = $this->getListItems();
-		$this->assertGreaterThan( 1, count( $listItems ) );
+		$this->assertGreaterThan(1, count($listItems));
 
-		if( ( $first = reset( $listItems ) ) === false ) {
-			throw new \RuntimeException( 'No first customer list item' );
+		if (($first = reset($listItems)) === false) {
+			throw new \RuntimeException('No first customer list item');
 		}
 
-		if( ( $last = end( $listItems ) ) === false ) {
-			throw new \RuntimeException( 'No last customer list item' );
+		if (($last = end($listItems)) === false) {
+			throw new \RuntimeException('No last customer list item');
 		}
 
-		$this->object->moveItem( $last->getId(), $first->getId() );
+		$this->object->moveItem($last->getId(), $first->getId());
 
-		$newFirst = $this->object->getItem( $last->getId() );
-		$newSecond = $this->object->getItem( $first->getId() );
+		$newFirst = $this->object->getItem($last->getId());
+		$newSecond = $this->object->getItem($first->getId());
 
-		$this->object->moveItem( $last->getId() );
+		$this->object->moveItem($last->getId());
 
-		$this->assertEquals( 1, $newFirst->getPosition() );
-		$this->assertEquals( 2, $newSecond->getPosition() );
+		$this->assertEquals(1, $newFirst->getPosition());
+		$this->assertEquals(2, $newSecond->getPosition());
 	}
 
 
 	public function testMoveItemFirstToLast()
 	{
 		$listItems = $this->getListItems();
-		$this->assertGreaterThan( 1, count( $listItems ) );
+		$this->assertGreaterThan(1, count($listItems));
 
-		if( ( $first = reset( $listItems ) ) === false ) {
-			throw new \RuntimeException( 'No first customer list item' );
+		if (($first = reset($listItems)) === false) {
+			throw new \RuntimeException('No first customer list item');
 		}
 
-		if( ( $second = next( $listItems ) ) === false ) {
-			throw new \RuntimeException( 'No second customer list item' );
+		if (($second = next($listItems)) === false) {
+			throw new \RuntimeException('No second customer list item');
 		}
 
-		if( ( $last = end( $listItems ) ) === false ) {
-			throw new \RuntimeException( 'No last customer list item' );
+		if (($last = end($listItems)) === false) {
+			throw new \RuntimeException('No last customer list item');
 		}
 
-		$this->object->moveItem( $first->getId() );
+		$this->object->moveItem($first->getId());
 
-		$newBefore = $this->object->getItem( $last->getId() );
-		$newLast = $this->object->getItem( $first->getId() );
+		$newBefore = $this->object->getItem($last->getId());
+		$newLast = $this->object->getItem($first->getId());
 
-		$this->object->moveItem( $first->getId(), $second->getId() );
+		$this->object->moveItem($first->getId(), $second->getId());
 
-		$this->assertEquals( $last->getPosition() - 1, $newBefore->getPosition() );
-		$this->assertEquals( $last->getPosition(), $newLast->getPosition() );
+		$this->assertEquals($last->getPosition() - 1, $newBefore->getPosition());
+		$this->assertEquals($last->getPosition(), $newLast->getPosition());
 	}
 
 
 	public function testMoveItemFirstUp()
 	{
 		$listItems = $this->getListItems();
-		$this->assertGreaterThan( 1, count( $listItems ) );
+		$this->assertGreaterThan(1, count($listItems));
 
-		if( ( $first = reset( $listItems ) ) === false ) {
-			throw new \RuntimeException( 'No first customer list item' );
+		if (($first = reset($listItems)) === false) {
+			throw new \RuntimeException('No first customer list item');
 		}
 
-		if( ( $second = next( $listItems ) ) === false ) {
-			throw new \RuntimeException( 'No second customer list item' );
+		if (($second = next($listItems)) === false) {
+			throw new \RuntimeException('No second customer list item');
 		}
 
-		if( ( $last = end( $listItems ) ) === false ) {
-			throw new \RuntimeException( 'No last customer list item' );
+		if (($last = end($listItems)) === false) {
+			throw new \RuntimeException('No last customer list item');
 		}
 
-		$this->object->moveItem( $first->getId(), $last->getId() );
+		$this->object->moveItem($first->getId(), $last->getId());
 
-		$newLast = $this->object->getItem( $last->getId() );
-		$newUp = $this->object->getItem( $first->getId() );
+		$newLast = $this->object->getItem($last->getId());
+		$newUp = $this->object->getItem($first->getId());
 
-		$this->object->moveItem( $first->getId(), $second->getId() );
+		$this->object->moveItem($first->getId(), $second->getId());
 
-		$this->assertEquals( $last->getPosition() - 1, $newUp->getPosition() );
-		$this->assertEquals( $last->getPosition(), $newLast->getPosition() );
+		$this->assertEquals($last->getPosition() - 1, $newUp->getPosition());
+		$this->assertEquals($last->getPosition(), $newLast->getPosition());
 	}
 
 
@@ -226,39 +226,39 @@ 
 		$search = $this->object->createSearch();
 
 		$expr = [];
-		$expr[] = $search->compare( '!=', 'customer.lists.id', null );
-		$expr[] = $search->compare( '!=', 'customer.lists.siteid', null );
-		$expr[] = $search->compare( '>', 'customer.lists.parentid', 0 );
-		$expr[] = $search->compare( '==', 'customer.lists.domain', 'text' );
-		$expr[] = $search->compare( '>', 'customer.lists.typeid', 0 );
-		$expr[] = $search->compare( '>', 'customer.lists.refid', 0 );
-		$expr[] = $search->compare( '==', 'customer.lists.datestart', '2010-01-01 00:00:00' );
-		$expr[] = $search->compare( '==', 'customer.lists.dateend', '2100-01-01 00:00:00' );
-		$expr[] = $search->compare( '!=', 'customer.lists.config', null );
-		$expr[] = $search->compare( '>', 'customer.lists.position', 1 );
-		$expr[] = $search->compare( '==', 'customer.lists.status', 1 );
-		$expr[] = $search->compare( '>=', 'customer.lists.mtime', '1970-01-01 00:00:00' );
-		$expr[] = $search->compare( '>=', 'customer.lists.ctime', '1970-01-01 00:00:00' );
-		$expr[] = $search->compare( '==', 'customer.lists.editor', $this->editor );
-
-		$expr[] = $search->compare( '!=', 'customer.lists.type.id', 0 );
-		$expr[] = $search->compare( '!=', 'customer.lists.type.siteid', null );
-		$expr[] = $search->compare( '==', 'customer.lists.type.code', 'default' );
-		$expr[] = $search->compare( '==', 'customer.lists.type.domain', 'text' );
-		$expr[] = $search->compare( '==', 'customer.lists.type.label', 'Standard' );
-		$expr[] = $search->compare( '==', 'customer.lists.type.status', 1 );
-		$expr[] = $search->compare( '>=', 'customer.lists.type.mtime', '1970-01-01 00:00:00' );
-		$expr[] = $search->compare( '>=', 'customer.lists.type.ctime', '1970-01-01 00:00:00' );
-		$expr[] = $search->compare( '==', 'customer.lists.type.editor', $this->editor );
-
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$expr[] = $search->compare('!=', 'customer.lists.id', null);
+		$expr[] = $search->compare('!=', 'customer.lists.siteid', null);
+		$expr[] = $search->compare('>', 'customer.lists.parentid', 0);
+		$expr[] = $search->compare('==', 'customer.lists.domain', 'text');
+		$expr[] = $search->compare('>', 'customer.lists.typeid', 0);
+		$expr[] = $search->compare('>', 'customer.lists.refid', 0);
+		$expr[] = $search->compare('==', 'customer.lists.datestart', '2010-01-01 00:00:00');
+		$expr[] = $search->compare('==', 'customer.lists.dateend', '2100-01-01 00:00:00');
+		$expr[] = $search->compare('!=', 'customer.lists.config', null);
+		$expr[] = $search->compare('>', 'customer.lists.position', 1);
+		$expr[] = $search->compare('==', 'customer.lists.status', 1);
+		$expr[] = $search->compare('>=', 'customer.lists.mtime', '1970-01-01 00:00:00');
+		$expr[] = $search->compare('>=', 'customer.lists.ctime', '1970-01-01 00:00:00');
+		$expr[] = $search->compare('==', 'customer.lists.editor', $this->editor);
+
+		$expr[] = $search->compare('!=', 'customer.lists.type.id', 0);
+		$expr[] = $search->compare('!=', 'customer.lists.type.siteid', null);
+		$expr[] = $search->compare('==', 'customer.lists.type.code', 'default');
+		$expr[] = $search->compare('==', 'customer.lists.type.domain', 'text');
+		$expr[] = $search->compare('==', 'customer.lists.type.label', 'Standard');
+		$expr[] = $search->compare('==', 'customer.lists.type.status', 1);
+		$expr[] = $search->compare('>=', 'customer.lists.type.mtime', '1970-01-01 00:00:00');
+		$expr[] = $search->compare('>=', 'customer.lists.type.ctime', '1970-01-01 00:00:00');
+		$expr[] = $search->compare('==', 'customer.lists.type.editor', $this->editor);
+
+		$search->setConditions($search->combine('&&', $expr));
 		$search->setSlice(0, 1);
-		$results = $this->object->searchItems( $search, [], $total );
-		$this->assertEquals( 1, count( $results ) );
-		$this->assertEquals( 2, $total );
+		$results = $this->object->searchItems($search, [], $total);
+		$this->assertEquals(1, count($results));
+		$this->assertEquals(2, $total);
 
-		foreach($results as $itemId => $item) {
-			$this->assertEquals( $itemId, $item->getId() );
+		foreach ($results as $itemId => $item) {
+			$this->assertEquals($itemId, $item->getId());
 		}
 	}
 
@@ -266,8 +266,8 @@ 
 	public function testSearchItemsNoCriteria()
 	{
 		$search = $this->object->createSearch();
-		$search->setConditions( $search->compare( '==', 'customer.lists.editor', $this->editor ) );
-		$this->assertEquals( 4, count( $this->object->searchItems($search) ) );
+		$search->setConditions($search->compare('==', 'customer.lists.editor', $this->editor));
+		$this->assertEquals(4, count($this->object->searchItems($search)));
 	}
 
 
@@ -275,48 +275,48 @@ 
 	{
 		$search = $this->object->createSearch(true);
 		$conditions = array(
-			$search->compare( '==', 'customer.lists.editor', $this->editor ),
+			$search->compare('==', 'customer.lists.editor', $this->editor),
 			$search->getConditions()
 		);
-		$search->setConditions( $search->combine( '&&', $conditions ) );
-		$this->assertEquals( 4, count( $this->object->searchItems($search) ) );
+		$search->setConditions($search->combine('&&', $conditions));
+		$this->assertEquals(4, count($this->object->searchItems($search)));
 	}
 
 
 	public function testGetSubManager()
 	{
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type') );
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type', 'Standard') );
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type'));
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('type', 'Standard'));
 
-		$this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
-		$this->object->getSubManager( 'unknown' );
+		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
+		$this->object->getSubManager('unknown');
 	}
 
 
 	protected function getListItems()
 	{
-		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $this->context, 'FosUser' );
+		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager($this->context, 'FosUser');
 
 		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'customer.code', 'UTC003' ) );
-		$search->setSlice( 0, 1 );
+		$search->setConditions($search->compare('==', 'customer.code', 'UTC003'));
+		$search->setSlice(0, 1);
 
-		$results = $manager->searchItems( $search );
+		$results = $manager->searchItems($search);
 
-		if( ( $item = reset( $results ) ) === false ) {
-			throw new \RuntimeException( 'No customer item found' );
+		if (($item = reset($results)) === false) {
+			throw new \RuntimeException('No customer item found');
 		}
 
 		$search = $this->object->createSearch();
 		$expr = array(
-			$search->compare( '==', 'customer.lists.parentid', $item->getId() ),
-			$search->compare( '==', 'customer.lists.domain', 'text' ),
-			$search->compare( '==', 'customer.lists.editor', $this->editor ),
-			$search->compare( '==', 'customer.lists.type.code', 'default' ),
+			$search->compare('==', 'customer.lists.parentid', $item->getId()),
+			$search->compare('==', 'customer.lists.domain', 'text'),
+			$search->compare('==', 'customer.lists.editor', $this->editor),
+			$search->compare('==', 'customer.lists.type.code', 'default'),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSortations( array( $search->sort( '+', 'customer.lists.position' ) ) );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSortations(array($search->sort('+', 'customer.lists.position')));
 
-		return $this->object->searchItems( $search );
+		return $this->object->searchItems($search);
 	}
 }

lib/custom/tests/MShop/Customer/Manager/Lists/Type/FosUserTest.php

Spacing +60 added lines, -60 removed lines

@@ -16,44 +16,44 @@ 
 	protected function setUp()
 	{
 		$this->editor = \TestHelper::getContext()->getEditor();
-		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( \TestHelper::getContext(), 'FosUser' );
+		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager(\TestHelper::getContext(), 'FosUser');
 
-		$listManager = $manager->getSubManager( 'lists', 'FosUser' );
-		$this->object = $listManager->getSubManager( 'type', 'FosUser' );
+		$listManager = $manager->getSubManager('lists', 'FosUser');
+		$this->object = $listManager->getSubManager('type', 'FosUser');
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->object );
+		unset($this->object);
 	}
 
 
 	public function testCleanup()
 	{
-		$this->object->cleanup( array( -1 ) );
+		$this->object->cleanup(array( -1 ));
 	}
 
 
 	public function testGetSearchAttributes()
 	{
-		foreach( $this->object->getSearchAttributes() as $attribute ) {
-			$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute );
+		foreach ($this->object->getSearchAttributes() as $attribute) {
+			$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute);
 		}
 	}
 
 
 	public function testGetSubManager()
 	{
-		$this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
-		$this->object->getSubManager( 'unknown' );
+		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
+		$this->object->getSubManager('unknown');
 	}
 
 
 	public function testCreateItem()
 	{
 		$item = $this->object->createItem();
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Type\\Iface', $item );
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Type\\Iface', $item);
 	}
 
 
@@ -63,11 +63,11 @@ 
 		$search->setSlice(0, 1);
 		$results = $this->object->searchItems($search);
 
-		if( ( $expected = reset($results) ) === false ) {
-			throw new \RuntimeException( 'No list type item found' );
+		if (($expected = reset($results)) === false) {
+			throw new \RuntimeException('No list type item found');
 		}
 
-		$this->assertEquals( $expected, $this->object->getItem( $expected->getId() ) );
+		$this->assertEquals($expected, $this->object->getItem($expected->getId()));
 	}
 
 
@@ -77,51 +77,51 @@ 
 		$search->setSlice(0, 1);
 		$results = $this->object->searchItems($search);
 
-		if( ( $item = reset($results) ) === false ) {
-			throw new \RuntimeException( 'No type item found' );
+		if (($item = reset($results)) === false) {
+			throw new \RuntimeException('No type item found');
 		}
 
 		$item->setId(null);
-		$item->setCode( 'unitTestInit' );
-		$resultSaved = $this->object->saveItem( $item );
-		$itemSaved = $this->object->getItem( $item->getId() );
+		$item->setCode('unitTestInit');
+		$resultSaved = $this->object->saveItem($item);
+		$itemSaved = $this->object->getItem($item->getId());
 
 		$itemExp = clone $itemSaved;
-		$itemExp->setCode( 'unitTestSave' );
-		$resultUpd = $this->object->saveItem( $itemExp );
-		$itemUpd = $this->object->getItem( $itemExp->getId() );
+		$itemExp->setCode('unitTestSave');
+		$resultUpd = $this->object->saveItem($itemExp);
+		$itemUpd = $this->object->getItem($itemExp->getId());
 
-		$this->object->deleteItem( $itemSaved->getId() );
+		$this->object->deleteItem($itemSaved->getId());
 
 
-		$this->assertTrue( $item->getId() !== null );
-		$this->assertEquals( $item->getId(), $itemSaved->getId() );
-		$this->assertEquals( $item->getSiteId(), $itemSaved->getSiteId() );
-		$this->assertEquals( $item->getCode(), $itemSaved->getCode() );
-		$this->assertEquals( $item->getDomain(), $itemSaved->getDomain() );
-		$this->assertEquals( $item->getLabel(), $itemSaved->getLabel() );
-		$this->assertEquals( $item->getStatus(), $itemSaved->getStatus() );
+		$this->assertTrue($item->getId() !== null);
+		$this->assertEquals($item->getId(), $itemSaved->getId());
+		$this->assertEquals($item->getSiteId(), $itemSaved->getSiteId());
+		$this->assertEquals($item->getCode(), $itemSaved->getCode());
+		$this->assertEquals($item->getDomain(), $itemSaved->getDomain());
+		$this->assertEquals($item->getLabel(), $itemSaved->getLabel());
+		$this->assertEquals($item->getStatus(), $itemSaved->getStatus());
 
-		$this->assertEquals( $this->editor, $itemSaved->getEditor() );
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated() );
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified() );
+		$this->assertEquals($this->editor, $itemSaved->getEditor());
+		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated());
+		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified());
 
-		$this->assertEquals( $itemExp->getId(), $itemUpd->getId() );
-		$this->assertEquals( $itemExp->getSiteId(), $itemUpd->getSiteId() );
-		$this->assertEquals( $itemExp->getCode(), $itemUpd->getCode() );
-		$this->assertEquals( $itemExp->getDomain(), $itemUpd->getDomain() );
-		$this->assertEquals( $itemExp->getLabel(), $itemUpd->getLabel() );
-		$this->assertEquals( $itemExp->getStatus(), $itemUpd->getStatus() );
+		$this->assertEquals($itemExp->getId(), $itemUpd->getId());
+		$this->assertEquals($itemExp->getSiteId(), $itemUpd->getSiteId());
+		$this->assertEquals($itemExp->getCode(), $itemUpd->getCode());
+		$this->assertEquals($itemExp->getDomain(), $itemUpd->getDomain());
+		$this->assertEquals($itemExp->getLabel(), $itemUpd->getLabel());
+		$this->assertEquals($itemExp->getStatus(), $itemUpd->getStatus());
 
-		$this->assertEquals( $this->editor, $itemUpd->getEditor() );
-		$this->assertEquals( $itemExp->getTimeCreated(), $itemUpd->getTimeCreated() );
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified() );
+		$this->assertEquals($this->editor, $itemUpd->getEditor());
+		$this->assertEquals($itemExp->getTimeCreated(), $itemUpd->getTimeCreated());
+		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified());
 
-		$this->assertInstanceOf( '\Aimeos\MShop\Common\Item\Iface', $resultSaved );
-		$this->assertInstanceOf( '\Aimeos\MShop\Common\Item\Iface', $resultUpd );
+		$this->assertInstanceOf('\Aimeos\MShop\Common\Item\Iface', $resultSaved);
+		$this->assertInstanceOf('\Aimeos\MShop\Common\Item\Iface', $resultUpd);
 
 		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
-		$this->object->getItem( $itemSaved->getId() );
+		$this->object->getItem($itemSaved->getId());
 	}
 
 
@@ -131,25 +131,25 @@ 
 		$search = $this->object->createSearch();
 
 		$expr = [];
-		$expr[] = $search->compare( '!=', 'customer.lists.type.id', 0 );
-		$expr[] = $search->compare( '!=', 'customer.lists.type.siteid', null );
-		$expr[] = $search->compare( '==', 'customer.lists.type.code', 'default' );
-		$expr[] = $search->compare( '==', 'customer.lists.type.domain', 'text' );
-		$expr[] = $search->compare( '==', 'customer.lists.type.label', 'Standard' );
-		$expr[] = $search->compare( '==', 'customer.lists.type.status', 1 );
-		$expr[] = $search->compare( '>=', 'customer.lists.type.mtime', '1970-01-01 00:00:00' );
-		$expr[] = $search->compare( '>=', 'customer.lists.type.ctime', '1970-01-01 00:00:00' );
-		$expr[] = $search->compare( '==', 'customer.lists.type.editor', $this->editor );
-
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$expr[] = $search->compare('!=', 'customer.lists.type.id', 0);
+		$expr[] = $search->compare('!=', 'customer.lists.type.siteid', null);
+		$expr[] = $search->compare('==', 'customer.lists.type.code', 'default');
+		$expr[] = $search->compare('==', 'customer.lists.type.domain', 'text');
+		$expr[] = $search->compare('==', 'customer.lists.type.label', 'Standard');
+		$expr[] = $search->compare('==', 'customer.lists.type.status', 1);
+		$expr[] = $search->compare('>=', 'customer.lists.type.mtime', '1970-01-01 00:00:00');
+		$expr[] = $search->compare('>=', 'customer.lists.type.ctime', '1970-01-01 00:00:00');
+		$expr[] = $search->compare('==', 'customer.lists.type.editor', $this->editor);
+
+		$search->setConditions($search->combine('&&', $expr));
 		$search->setSlice(0, 1);
 
-		$results = $this->object->searchItems( $search, [], $total );
-		$this->assertEquals( 1, count( $results ) );
-		$this->assertEquals( 1, $total );
+		$results = $this->object->searchItems($search, [], $total);
+		$this->assertEquals(1, count($results));
+		$this->assertEquals(1, $total);
 
-		foreach($results as $itemId => $item) {
-			$this->assertEquals( $itemId, $item->getId() );
+		foreach ($results as $itemId => $item) {
+			$this->assertEquals($itemId, $item->getId());
 		}
 	}
 

lib/custom/tests/MShop/Customer/Manager/Address/FosUserTest.php

Spacing +133 added lines, -133 removed lines

@@ -21,18 +21,18 @@ 
 	{
 		$context = \TestHelper::getContext();
 		$this->editor = $context->getEditor();
-		$customer = new \Aimeos\MShop\Customer\Manager\FosUser( $context );
+		$customer = new \Aimeos\MShop\Customer\Manager\FosUser($context);
 
 		$search = $customer->createSearch();
 		$conditions = array(
-			$search->compare( '==', 'customer.code', 'UTC001' ),
-			$search->compare( '==', 'customer.editor', $this->editor )
+			$search->compare('==', 'customer.code', 'UTC001'),
+			$search->compare('==', 'customer.editor', $this->editor)
 		);
-		$search->setConditions( $search->combine( '&&', $conditions ) );
-		$result = $customer->searchItems( $search );
+		$search->setConditions($search->combine('&&', $conditions));
+		$result = $customer->searchItems($search);
 
-		if( ( $customerItem = reset( $result ) ) === false ) {
-			throw new \RuntimeException( sprintf( 'No customer item found for code "%1$s"', 'UTC001' ) );
+		if (($customerItem = reset($result)) === false) {
+			throw new \RuntimeException(sprintf('No customer item found for code "%1$s"', 'UTC001'));
 		}
 
 		$this->fixture = array(
@@ -61,7 +61,7 @@ 
 			'customer.address.siteid' => $context->getLocale()->getSiteId(),
 		);
 
-		$this->object = $customer->getSubManager( 'address', 'FosUser' );
+		$this->object = $customer->getSubManager('address', 'FosUser');
 	}
 
 
@@ -70,133 +70,133 @@ 
 	 */
 	protected function tearDown()
 	{
-		unset( $this->object, $this->fixture );
+		unset($this->object, $this->fixture);
 	}
 
 
 	public function testCleanup()
 	{
-		$this->object->cleanup( array( -1 ) );
+		$this->object->cleanup(array( -1 ));
 	}
 
 	public function testGetSearchAttributes()
 	{
-		foreach( $this->object->getSearchAttributes() as $attribute ) {
-			$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute );
+		foreach ($this->object->getSearchAttributes() as $attribute) {
+			$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute);
 		}
 	}
 
 	public function testGetSubManager()
 	{
-		$this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
-		$this->object->getSubManager( 'unknown' );
+		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
+		$this->object->getSubManager('unknown');
 	}
 
 	public function testCreateItem()
 	{
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Address\\Iface', $this->object->createItem() );
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Address\\Iface', $this->object->createItem());
 	}
 
 	public function testGetItem()
 	{
 		$search = $this->object->createSearch();
-		$search->setConditions( $search->compare( '~=', 'customer.address.company', 'ABC GmbH' ) );
+		$search->setConditions($search->compare('~=', 'customer.address.company', 'ABC GmbH'));
 
-		$items = $this->object->searchItems( $search );
+		$items = $this->object->searchItems($search);
 
-		if( ( $item = reset( $items ) ) === false ) {
-			throw new \RuntimeException( 'No address item with company "ABC" found' );
+		if (($item = reset($items)) === false) {
+			throw new \RuntimeException('No address item with company "ABC" found');
 		}
 
-		$this->assertEquals( $item, $this->object->getItem( $item->getId() ) );
+		$this->assertEquals($item, $this->object->getItem($item->getId()));
 	}
 
 	public function testSaveUpdateDeleteItem()
 	{
-		$item = new \Aimeos\MShop\Common\Item\Address\Standard( 'customer.address.', $this->fixture );
-		$item->setId( null );
-		$resultSaved = $this->object->saveItem( $item );
-		$itemSaved = $this->object->getItem( $item->getId() );
+		$item = new \Aimeos\MShop\Common\Item\Address\Standard('customer.address.', $this->fixture);
+		$item->setId(null);
+		$resultSaved = $this->object->saveItem($item);
+		$itemSaved = $this->object->getItem($item->getId());
 
 		$itemExp = clone $itemSaved;
-		$itemExp->setPosition( 1 );
-		$itemExp->setCity( 'Berlin' );
-		$itemExp->setState( 'Berlin' );
-		$resultUpd = $this->object->saveItem( $itemExp );
-		$itemUpd = $this->object->getItem( $itemExp->getId() );
-
-		$this->object->deleteItem( $itemSaved->getId() );
-
-
-		$this->assertTrue( $item->getId() !== null );
-		$this->assertEquals( $item->getId(), $itemSaved->getId() );
-		$this->assertEquals( $item->getParentId(), $itemSaved->getParentId());
-		$this->assertEquals( $item->getPosition(), $itemSaved->getPosition());
-		$this->assertEquals( $item->getCompany(), $itemSaved->getCompany());
-		$this->assertEquals( $item->getVatID(), $itemSaved->getVatID());
-		$this->assertEquals( $item->getSalutation(), $itemSaved->getSalutation());
-		$this->assertEquals( $item->getTitle(), $itemSaved->getTitle());
-		$this->assertEquals( $item->getFirstname(), $itemSaved->getFirstname());
-		$this->assertEquals( $item->getLastname(), $itemSaved->getLastname());
-		$this->assertEquals( $item->getAddress1(), $itemSaved->getAddress1());
-		$this->assertEquals( $item->getAddress2(), $itemSaved->getAddress2());
-		$this->assertEquals( $item->getAddress3(), $itemSaved->getAddress3());
-		$this->assertEquals( $item->getPostal(), $itemSaved->getPostal());
-		$this->assertEquals( $item->getCity(), $itemSaved->getCity());
-		$this->assertEquals( $item->getState(), $itemSaved->getState());
-		$this->assertEquals( $item->getCountryId(), $itemSaved->getCountryId());
-		$this->assertEquals( $item->getLanguageId(), $itemSaved->getLanguageId());
-		$this->assertEquals( $item->getTelephone(), $itemSaved->getTelephone());
-		$this->assertEquals( $item->getEmail(), $itemSaved->getEmail());
-		$this->assertEquals( $item->getTelefax(), $itemSaved->getTelefax());
-		$this->assertEquals( $item->getWebsite(), $itemSaved->getWebsite());
-		$this->assertEquals( $item->getLongitude(), $itemSaved->getLongitude());
-		$this->assertEquals( $item->getLatitude(), $itemSaved->getLatitude());
-		$this->assertEquals( $item->getFlag(), $itemSaved->getFlag());
-
-		$this->assertEquals( $this->editor, $itemSaved->getEditor() );
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated() );
+		$itemExp->setPosition(1);
+		$itemExp->setCity('Berlin');
+		$itemExp->setState('Berlin');
+		$resultUpd = $this->object->saveItem($itemExp);
+		$itemUpd = $this->object->getItem($itemExp->getId());
+
+		$this->object->deleteItem($itemSaved->getId());
+
+
+		$this->assertTrue($item->getId() !== null);
+		$this->assertEquals($item->getId(), $itemSaved->getId());
+		$this->assertEquals($item->getParentId(), $itemSaved->getParentId());
+		$this->assertEquals($item->getPosition(), $itemSaved->getPosition());
+		$this->assertEquals($item->getCompany(), $itemSaved->getCompany());
+		$this->assertEquals($item->getVatID(), $itemSaved->getVatID());
+		$this->assertEquals($item->getSalutation(), $itemSaved->getSalutation());
+		$this->assertEquals($item->getTitle(), $itemSaved->getTitle());
+		$this->assertEquals($item->getFirstname(), $itemSaved->getFirstname());
+		$this->assertEquals($item->getLastname(), $itemSaved->getLastname());
+		$this->assertEquals($item->getAddress1(), $itemSaved->getAddress1());
+		$this->assertEquals($item->getAddress2(), $itemSaved->getAddress2());
+		$this->assertEquals($item->getAddress3(), $itemSaved->getAddress3());
+		$this->assertEquals($item->getPostal(), $itemSaved->getPostal());
+		$this->assertEquals($item->getCity(), $itemSaved->getCity());
+		$this->assertEquals($item->getState(), $itemSaved->getState());
+		$this->assertEquals($item->getCountryId(), $itemSaved->getCountryId());
+		$this->assertEquals($item->getLanguageId(), $itemSaved->getLanguageId());
+		$this->assertEquals($item->getTelephone(), $itemSaved->getTelephone());
+		$this->assertEquals($item->getEmail(), $itemSaved->getEmail());
+		$this->assertEquals($item->getTelefax(), $itemSaved->getTelefax());
+		$this->assertEquals($item->getWebsite(), $itemSaved->getWebsite());
+		$this->assertEquals($item->getLongitude(), $itemSaved->getLongitude());
+		$this->assertEquals($item->getLatitude(), $itemSaved->getLatitude());
+		$this->assertEquals($item->getFlag(), $itemSaved->getFlag());
+
+		$this->assertEquals($this->editor, $itemSaved->getEditor());
+		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated());
 		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified());
 
-		$this->assertEquals( $itemExp->getId(), $itemUpd->getId() );
-		$this->assertEquals( $itemExp->getParentId(), $itemUpd->getParentId());
-		$this->assertEquals( $itemExp->getPosition(), $itemUpd->getPosition());
-		$this->assertEquals( $itemExp->getCompany(), $itemUpd->getCompany());
-		$this->assertEquals( $itemExp->getVatID(), $itemUpd->getVatID());
-		$this->assertEquals( $itemExp->getSalutation(), $itemUpd->getSalutation());
-		$this->assertEquals( $itemExp->getTitle(), $itemUpd->getTitle());
-		$this->assertEquals( $itemExp->getFirstname(), $itemUpd->getFirstname());
-		$this->assertEquals( $itemExp->getLastname(), $itemUpd->getLastname());
-		$this->assertEquals( $itemExp->getAddress1(), $itemUpd->getAddress1());
-		$this->assertEquals( $itemExp->getAddress2(), $itemUpd->getAddress2());
-		$this->assertEquals( $itemExp->getAddress3(), $itemUpd->getAddress3());
-		$this->assertEquals( $itemExp->getPostal(), $itemUpd->getPostal());
-		$this->assertEquals( $itemExp->getCity(), $itemUpd->getCity());
-		$this->assertEquals( $itemExp->getState(), $itemUpd->getState());
-		$this->assertEquals( $itemExp->getCountryId(), $itemUpd->getCountryId());
-		$this->assertEquals( $itemExp->getLanguageId(), $itemUpd->getLanguageId());
-		$this->assertEquals( $itemExp->getTelephone(), $itemUpd->getTelephone());
-		$this->assertEquals( $itemExp->getEmail(), $itemUpd->getEmail());
-		$this->assertEquals( $itemExp->getTelefax(), $itemUpd->getTelefax());
-		$this->assertEquals( $itemExp->getWebsite(), $itemUpd->getWebsite());
-		$this->assertEquals( $itemExp->getLongitude(), $itemUpd->getLongitude());
-		$this->assertEquals( $itemExp->getLatitude(), $itemUpd->getLatitude());
-		$this->assertEquals( $itemExp->getFlag(), $itemUpd->getFlag());
-
-		$this->assertEquals( $this->editor, $itemUpd->getEditor() );
-		$this->assertEquals( $itemExp->getTimeCreated(), $itemUpd->getTimeCreated() );
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified() );
-
-		$this->assertInstanceOf( '\Aimeos\MShop\Common\Item\Iface', $resultSaved );
-		$this->assertInstanceOf( '\Aimeos\MShop\Common\Item\Iface', $resultUpd );
+		$this->assertEquals($itemExp->getId(), $itemUpd->getId());
+		$this->assertEquals($itemExp->getParentId(), $itemUpd->getParentId());
+		$this->assertEquals($itemExp->getPosition(), $itemUpd->getPosition());
+		$this->assertEquals($itemExp->getCompany(), $itemUpd->getCompany());
+		$this->assertEquals($itemExp->getVatID(), $itemUpd->getVatID());
+		$this->assertEquals($itemExp->getSalutation(), $itemUpd->getSalutation());
+		$this->assertEquals($itemExp->getTitle(), $itemUpd->getTitle());
+		$this->assertEquals($itemExp->getFirstname(), $itemUpd->getFirstname());
+		$this->assertEquals($itemExp->getLastname(), $itemUpd->getLastname());
+		$this->assertEquals($itemExp->getAddress1(), $itemUpd->getAddress1());
+		$this->assertEquals($itemExp->getAddress2(), $itemUpd->getAddress2());
+		$this->assertEquals($itemExp->getAddress3(), $itemUpd->getAddress3());
+		$this->assertEquals($itemExp->getPostal(), $itemUpd->getPostal());
+		$this->assertEquals($itemExp->getCity(), $itemUpd->getCity());
+		$this->assertEquals($itemExp->getState(), $itemUpd->getState());
+		$this->assertEquals($itemExp->getCountryId(), $itemUpd->getCountryId());
+		$this->assertEquals($itemExp->getLanguageId(), $itemUpd->getLanguageId());
+		$this->assertEquals($itemExp->getTelephone(), $itemUpd->getTelephone());
+		$this->assertEquals($itemExp->getEmail(), $itemUpd->getEmail());
+		$this->assertEquals($itemExp->getTelefax(), $itemUpd->getTelefax());
+		$this->assertEquals($itemExp->getWebsite(), $itemUpd->getWebsite());
+		$this->assertEquals($itemExp->getLongitude(), $itemUpd->getLongitude());
+		$this->assertEquals($itemExp->getLatitude(), $itemUpd->getLatitude());
+		$this->assertEquals($itemExp->getFlag(), $itemUpd->getFlag());
+
+		$this->assertEquals($this->editor, $itemUpd->getEditor());
+		$this->assertEquals($itemExp->getTimeCreated(), $itemUpd->getTimeCreated());
+		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified());
+
+		$this->assertInstanceOf('\Aimeos\MShop\Common\Item\Iface', $resultSaved);
+		$this->assertInstanceOf('\Aimeos\MShop\Common\Item\Iface', $resultUpd);
 
 		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
-		$this->object->getItem( $itemSaved->getId() );
+		$this->object->getItem($itemSaved->getId());
 	}
 
 	public function testCreateSearch()
 	{
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $this->object->createSearch() );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $this->object->createSearch());
 	}
 
 
@@ -205,36 +205,36 @@ 
 		$search = $this->object->createSearch();
 
 		$expr = [];
-		$expr[] = $search->compare( '!=', 'customer.address.id', null );
-		$expr[] = $search->compare( '!=', 'customer.address.parentid', null );
-		$expr[] = $search->compare( '==', 'customer.address.company', 'ABC GmbH' );
-		$expr[] = $search->compare( '==', 'customer.address.vatid', 'DE999999999' );
-		$expr[] = $search->compare( '==', 'customer.address.salutation', 'mr' );
-		$expr[] = $search->compare( '==', 'customer.address.title', 'Dr.' );
-		$expr[] = $search->compare( '==', 'customer.address.firstname', 'Good' );
-		$expr[] = $search->compare( '==', 'customer.address.lastname', 'Unittest' );
-		$expr[] = $search->compare( '==', 'customer.address.address1', 'Pickhuben' );
-		$expr[] = $search->compare( '==', 'customer.address.address2', '2-4' );
-		$expr[] = $search->compare( '==', 'customer.address.address3', '' );
-		$expr[] = $search->compare( '==', 'customer.address.postal', '11099' );
-		$expr[] = $search->compare( '==', 'customer.address.city', 'Berlin' );
-		$expr[] = $search->compare( '==', 'customer.address.state', 'Berlin' );
-		$expr[] = $search->compare( '==', 'customer.address.languageid', 'de' );
-		$expr[] = $search->compare( '==', 'customer.address.countryid', 'DE' );
-		$expr[] = $search->compare( '==', 'customer.address.telephone', '055544332221' );
-		$expr[] = $search->compare( '==', 'customer.address.email', 'unitCustomer2@aimeos.org' );
-		$expr[] = $search->compare( '==', 'customer.address.telefax', '055544333212' );
-		$expr[] = $search->compare( '==', 'customer.address.website', 'unittest.aimeos.org' );
-		$expr[] = $search->compare( '>=', 'customer.address.longitude', '10.0' );
-		$expr[] = $search->compare( '>=', 'customer.address.latitude', '50.0' );
-		$expr[] = $search->compare( '==', 'customer.address.flag', 0 );
-		$expr[] = $search->compare( '==', 'customer.address.position', 1 );
-		$expr[] = $search->compare( '!=', 'customer.address.mtime', '1970-01-01 00:00:00' );
-		$expr[] = $search->compare( '!=', 'customer.address.ctime', '1970-01-01 00:00:00' );
-		$expr[] = $search->compare( '==', 'customer.address.editor', $this->editor );
-
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$this->assertEquals( 1, count( $this->object->searchItems( $search ) ) );
+		$expr[] = $search->compare('!=', 'customer.address.id', null);
+		$expr[] = $search->compare('!=', 'customer.address.parentid', null);
+		$expr[] = $search->compare('==', 'customer.address.company', 'ABC GmbH');
+		$expr[] = $search->compare('==', 'customer.address.vatid', 'DE999999999');
+		$expr[] = $search->compare('==', 'customer.address.salutation', 'mr');
+		$expr[] = $search->compare('==', 'customer.address.title', 'Dr.');
+		$expr[] = $search->compare('==', 'customer.address.firstname', 'Good');
+		$expr[] = $search->compare('==', 'customer.address.lastname', 'Unittest');
+		$expr[] = $search->compare('==', 'customer.address.address1', 'Pickhuben');
+		$expr[] = $search->compare('==', 'customer.address.address2', '2-4');
+		$expr[] = $search->compare('==', 'customer.address.address3', '');
+		$expr[] = $search->compare('==', 'customer.address.postal', '11099');
+		$expr[] = $search->compare('==', 'customer.address.city', 'Berlin');
+		$expr[] = $search->compare('==', 'customer.address.state', 'Berlin');
+		$expr[] = $search->compare('==', 'customer.address.languageid', 'de');
+		$expr[] = $search->compare('==', 'customer.address.countryid', 'DE');
+		$expr[] = $search->compare('==', 'customer.address.telephone', '055544332221');
+		$expr[] = $search->compare('==', 'customer.address.email', 'unitCustomer2@aimeos.org');
+		$expr[] = $search->compare('==', 'customer.address.telefax', '055544333212');
+		$expr[] = $search->compare('==', 'customer.address.website', 'unittest.aimeos.org');
+		$expr[] = $search->compare('>=', 'customer.address.longitude', '10.0');
+		$expr[] = $search->compare('>=', 'customer.address.latitude', '50.0');
+		$expr[] = $search->compare('==', 'customer.address.flag', 0);
+		$expr[] = $search->compare('==', 'customer.address.position', 1);
+		$expr[] = $search->compare('!=', 'customer.address.mtime', '1970-01-01 00:00:00');
+		$expr[] = $search->compare('!=', 'customer.address.ctime', '1970-01-01 00:00:00');
+		$expr[] = $search->compare('==', 'customer.address.editor', $this->editor);
+
+		$search->setConditions($search->combine('&&', $expr));
+		$this->assertEquals(1, count($this->object->searchItems($search)));
 	}
 
 
@@ -244,20 +244,20 @@ 
 		$search = $this->object->createSearch();
 
 		$conditions = array(
-			$search->compare( '~=', 'customer.address.company', 'ABC GmbH' ),
-			$search->compare( '==', 'customer.address.editor', $this->editor )
+			$search->compare('~=', 'customer.address.company', 'ABC GmbH'),
+			$search->compare('==', 'customer.address.editor', $this->editor)
 		);
 
-		$search->setConditions( $search->combine( '&&', $conditions ) );
-		$search->setSlice( 0, 1 );
+		$search->setConditions($search->combine('&&', $conditions));
+		$search->setSlice(0, 1);
 
-		$results = $this->object->searchItems( $search, [], $total );
+		$results = $this->object->searchItems($search, [], $total);
 
-		$this->assertEquals( 1, count( $results ) );
-		$this->assertEquals( 2, $total );
+		$this->assertEquals(1, count($results));
+		$this->assertEquals(2, $total);
 
-		foreach( $results as $id => $item ) {
-			$this->assertEquals( $id, $item->getId() );
+		foreach ($results as $id => $item) {
+			$this->assertEquals($id, $item->getId());
 		}
 	}
 }

lib/custom/tests/MShop/Customer/Item/FosUserTest.php

Spacing +23 added lines, -23 removed lines

@@ -22,7 +22,7 @@ 
 			'customer.address.position' => 1,
 		);
 
-		$this->address = new \Aimeos\MShop\Common\Item\Address\Standard( 'common.address.', $addressValues );
+		$this->address = new \Aimeos\MShop\Common\Item\Address\Standard('common.address.', $addressValues);
 
 		$values = array(
 			'customer.id' => 541,
@@ -54,71 +54,71 @@ 
 			'customer.mtime'=> '2010-01-05 00:00:05',
 			'customer.ctime'=> '2010-01-01 00:00:00',
 			'customer.editor' => 'unitTestUser',
-			'roles' => array( 'ROLE_ADMIN' ),
+			'roles' => array('ROLE_ADMIN'),
 			'salt' => 'test',
 		);
 
-		$this->object = new \Aimeos\MShop\Customer\Item\FosUser( $this->address, $values );
+		$this->object = new \Aimeos\MShop\Customer\Item\FosUser($this->address, $values);
 	}
 
 	protected function tearDown()
 	{
-		unset( $this->object );
+		unset($this->object);
 	}
 
 	public function testGetPassword()
 	{
-		$this->assertEquals( 'testpwd', $this->object->getPassword() );
+		$this->assertEquals('testpwd', $this->object->getPassword());
 	}
 
 	public function testSetPassword()
 	{
-		$this->object->setPassword( 'new' );
-		$this->assertTrue( $this->object->isModified() );
-		$this->assertEquals( 'new', $this->object->getPassword() );
+		$this->object->setPassword('new');
+		$this->assertTrue($this->object->isModified());
+		$this->assertEquals('new', $this->object->getPassword());
 	}
 
 	public function testSetPasswordGenerated()
 	{
-		$helper = new \Aimeos\MShop\Common\Item\Helper\Password\Standard( array( 'format' => '%1$s{%2$s}' ) );
-		$object = new \Aimeos\MShop\Customer\Item\FosUser( $this->address, [], [], [], null, $helper );
+		$helper = new \Aimeos\MShop\Common\Item\Helper\Password\Standard(array('format' => '%1$s{%2$s}'));
+		$object = new \Aimeos\MShop\Customer\Item\FosUser($this->address, [], [], [], null, $helper);
 
-		$object->setPassword( 'newpwd' );
-		$this->assertEquals( sha1( 'newpwd{' . $object->getSalt() . '}' ), $object->getPassword() );
+		$object->setPassword('newpwd');
+		$this->assertEquals(sha1('newpwd{' . $object->getSalt() . '}'), $object->getPassword());
 	}
 
 	public function testGetRoles()
 	{
-		$this->assertEquals( array( 'ROLE_ADMIN' ), $this->object->getRoles() );
+		$this->assertEquals(array('ROLE_ADMIN'), $this->object->getRoles());
 	}
 
 	public function testSetRoles()
 	{
-		$this->object->setRoles( array( 'ROLE_USER' ) );
-		$this->assertTrue( $this->object->isModified() );
-		$this->assertEquals( array( 'ROLE_USER' ), $this->object->getRoles() );
+		$this->object->setRoles(array('ROLE_USER'));
+		$this->assertTrue($this->object->isModified());
+		$this->assertEquals(array('ROLE_USER'), $this->object->getRoles());
 	}
 
 	public function testGetSalt()
 	{
-		$this->assertEquals( 'test', $this->object->getSalt() );
+		$this->assertEquals('test', $this->object->getSalt());
 	}
 
 	public function testGetSaltGenerated()
 	{
-		$object = new \Aimeos\MShop\Customer\Item\FosUser( $this->address, [] );
-		$this->assertEquals( '', $object->getSalt() );
+		$object = new \Aimeos\MShop\Customer\Item\FosUser($this->address, []);
+		$this->assertEquals('', $object->getSalt());
 	}
 
 	public function testSetSalt()
 	{
-		$this->object->setSalt( 'new' );
-		$this->assertTrue( $this->object->isModified() );
-		$this->assertEquals( 'new', $this->object->getSalt() );
+		$this->object->setSalt('new');
+		$this->assertTrue($this->object->isModified());
+		$this->assertEquals('new', $this->object->getSalt());
 	}
 
 	public function testIsModified()
 	{
-		$this->assertFalse( $this->object->isModified() );
+		$this->assertFalse($this->object->isModified());
 	}
 }