aimeos / ai-ezpublish

manifest.php

Indentation +13 added lines, -13 removed lines

@@ -1,17 +1,17 @@
 <?php
 
 return array(
-	'name' => 'ai-ezpublish',
-	'depends' => array(
-		'aimeos-core',
-	),
-	'include' => array(
-		'lib/custom/src',
-	),
-	'config' => array(
-		'lib/custom/config',
-	),
-	'setup' => array(
-		'lib/custom/setup',
-	),
+    'name' => 'ai-ezpublish',
+    'depends' => array(
+        'aimeos-core',
+    ),
+    'include' => array(
+        'lib/custom/src',
+    ),
+    'config' => array(
+        'lib/custom/config',
+    ),
+    'setup' => array(
+        'lib/custom/setup',
+    ),
 );

lib/custom/config/mshop/customer/manager/ezpublish.php

Indentation +12 added lines, -12 removed lines

@@ -6,14 +6,14 @@ 
  */
 
 return array(
-	'delete' => array(
-		'ansi' => '
+    'delete' => array(
+        'ansi' => '
 			DELETE FROM "ezuser"
 			WHERE :cond
 		',
-	),
-	'update' => array(
-		'ansi' => '
+    ),
+    'update' => array(
+        'ansi' => '
 			UPDATE "ezuser"
 			SET "login_normalized" = ?, "login" = ?, "company" = ?, "vatid" = ?,
 				"salutation" = ?, "title" = ?, "firstname" = ?, "lastname" = ?,
@@ -24,9 +24,9 @@ 
 				"mtime" = ?, "editor" = ?, "ctime" = ?
 			WHERE "contentobject_id" = ?
 		',
-	),
-	'search' => array(
-		'ansi' => '
+    ),
+    'search' => array(
+        'ansi' => '
 			SELECT DISTINCT ezu."contentobject_id" AS "customer.id",
 				ezu."login_normalized" as "customer.code", ezu."login" as "customer.label",
 				ezu."company" AS "customer.company", ezu."vatid" AS "customer.vatid",
@@ -48,9 +48,9 @@ 
 			/*-orderby*/ ORDER BY :order /*orderby-*/
 			LIMIT :size OFFSET :start
 		',
-	),
-	'count' => array(
-		'ansi' => '
+    ),
+    'count' => array(
+        'ansi' => '
 			SELECT COUNT(*) AS "count"
 			FROM (
 				SELECT DISTINCT ezu."contentobject_id"
@@ -60,5 +60,5 @@ 
 				LIMIT 10000 OFFSET 0
 			) AS list
 		',
-	),
+    ),
 );

lib/custom/config/mshop/customer/manager/address/ezpublish.php

Indentation +24 added lines, -24 removed lines

@@ -6,14 +6,14 @@ 
  */
 
 return array(
-	'delete' => array(
-		'ansi' => '
+    'delete' => array(
+        'ansi' => '
 			DELETE FROM "ezuser_address"
 			WHERE :cond
 		',
-	),
-	'insert' => array(
-		'ansi' => '
+    ),
+    'insert' => array(
+        'ansi' => '
 			INSERT INTO "ezuser_address" (
 				"siteid", "parentid", "company", "vatid", "salutation", "title",
 				"firstname", "lastname", "address1", "address2", "address3",
@@ -24,9 +24,9 @@ 
 				?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?
 			)
 		',
-	),
-	'update' => array(
-		'ansi' => '
+    ),
+    'update' => array(
+        'ansi' => '
 			UPDATE "ezuser_address"
 			SET "siteid" = ?, "parentid" = ?, "company" = ?, "vatid" = ?, "salutation" = ?,
 				"title" = ?, "firstname" = ?, "lastname" = ?, "address1" = ?,
@@ -36,9 +36,9 @@ 
 				"pos" = ?, "mtime" = ?, "editor" = ?
 			WHERE "id" = ?
 		',
-	),
-	'search' => array(
-		'ansi' => '
+    ),
+    'search' => array(
+        'ansi' => '
 			SELECT DISTINCT ezuad."id" AS "customer.address.id", ezuad."parentid" AS "customer.address.parentid",
 				ezuad."company" AS "customer.address.company", ezuad."vatid" AS "customer.address.vatid",
 				ezuad."salutation" AS "customer.address.salutation", ezuad."title" AS "customer.address.title",
@@ -58,9 +58,9 @@ 
 			/*-orderby*/ ORDER BY :order /*orderby-*/
 			LIMIT :size OFFSET :start
 		',
-	),
-	'count' => array(
-		'ansi' => '
+    ),
+    'count' => array(
+        'ansi' => '
 			SELECT COUNT(*) AS "count"
 			FROM (
 				SELECT DISTINCT ezuad."id"
@@ -70,14 +70,14 @@ 
 				LIMIT 10000 OFFSET 0
 			) AS list
 		',
-	),
-	'newid' => array(
-		'db2' => 'SELECT IDENTITY_VAL_LOCAL()',
-		'mysql' => 'SELECT LAST_INSERT_ID()',
-		'oracle' => 'SELECT ezuser_address.CURRVAL FROM DUAL',
-		'pgsql' => 'SELECT lastval()',
-		'sqlite' => 'SELECT last_insert_rowid()',
-		'sqlsrv' => 'SELECT SCOPE_IDENTITY()',
-		'sqlanywhere' => 'SELECT @@IDENTITY',
-	),
+    ),
+    'newid' => array(
+        'db2' => 'SELECT IDENTITY_VAL_LOCAL()',
+        'mysql' => 'SELECT LAST_INSERT_ID()',
+        'oracle' => 'SELECT ezuser_address.CURRVAL FROM DUAL',
+        'pgsql' => 'SELECT lastval()',
+        'sqlite' => 'SELECT last_insert_rowid()',
+        'sqlsrv' => 'SELECT SCOPE_IDENTITY()',
+        'sqlanywhere' => 'SELECT @@IDENTITY',
+    ),
 );

lib/custom/config/mshop/customer/manager/lists/ezpublish.php

Indentation +36 added lines, -36 removed lines

@@ -6,8 +6,8 @@ 
  */
 
 return array(
-	'aggregate' => array(
-		'ansi' => '
+    'aggregate' => array(
+        'ansi' => '
 			SELECT "key", COUNT(DISTINCT "id") AS "count"
 			FROM (
 				SELECT :key AS "key", ezuli."id" AS "id"
@@ -19,9 +19,9 @@ 
 			) AS list
 			GROUP BY "key"
 		',
-	),
-	'getposmax' => array(
-		'ansi' => '
+    ),
+    'getposmax' => array(
+        'ansi' => '
 			SELECT MAX( "pos" ) AS pos
 			FROM "ezuser_list"
 			WHERE "siteid" = ?
@@ -29,37 +29,37 @@ 
 				AND "typeid" = ?
 				AND "domain" = ?
 		',
-	),
-	'insert' => array(
-		'ansi' => '
+    ),
+    'insert' => array(
+        'ansi' => '
 			INSERT INTO "ezuser_list"( "parentid", "siteid", "typeid", "domain", "refid", "start", "end",
 			"config", "pos", "status", "mtime", "editor", "ctime" )
 			VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? )
 		',
-	),
-	'update' => array(
-		'ansi' => '
+    ),
+    'update' => array(
+        'ansi' => '
 			UPDATE "ezuser_list"
 			SET "parentid"=?, "siteid" = ?, "typeid" = ?, "domain" = ?, "refid" = ?, "start" = ?, "end" = ?,
 				"config" = ?, "pos" = ?, "status" = ?, "mtime" = ?, "editor" = ?
 			WHERE "id" = ?
 		',
-	),
-	'updatepos' => array(
-		'ansi' => '
+    ),
+    'updatepos' => array(
+        'ansi' => '
 			UPDATE "ezuser_list"
 				SET "pos" = ?, "mtime" = ?, "editor" = ?
 			WHERE "id" = ?
 		',
-	),
-	'delete' => array(
-		'ansi' => '
+    ),
+    'delete' => array(
+        'ansi' => '
 			DELETE FROM "ezuser_list"
 			WHERE :cond AND siteid = ?
 		',
-	),
-	'move' => array(
-		'ansi' => '
+    ),
+    'move' => array(
+        'ansi' => '
 			UPDATE "ezuser_list"
 				SET "pos" = "pos" + ?, "mtime" = ?, "editor" = ?
 			WHERE "siteid" = ?
@@ -68,9 +68,9 @@ 
 				AND "domain" = ?
 				AND "pos" >= ?
 		',
-	),
-	'search' => array(
-		'ansi' => '
+    ),
+    'search' => array(
+        'ansi' => '
 			SELECT ezuli."id" AS "customer.lists.id", ezuli."siteid" AS "customer.lists.siteid",
 				ezuli."parentid" AS "customer.lists.parentid", ezuli."typeid" AS "customer.lists.typeid",
 				ezuli."domain" AS "customer.lists.domain", ezuli."refid" AS "customer.lists.refid",
@@ -84,9 +84,9 @@ 
 			/*-orderby*/ ORDER BY :order /*orderby-*/
 			LIMIT :size OFFSET :start
 		',
-	),
-	'count' => array(
-		'ansi' => '
+    ),
+    'count' => array(
+        'ansi' => '
 			SELECT COUNT(*) AS "count"
 			FROM (
 				SELECT DISTINCT ezuli."id"
@@ -96,14 +96,14 @@ 
 				LIMIT 10000 OFFSET 0
 			) AS list
 		',
-	),
-	'newid' => array(
-		'db2' => 'SELECT IDENTITY_VAL_LOCAL()',
-		'mysql' => 'SELECT LAST_INSERT_ID()',
-		'oracle' => 'SELECT ezuser_list.CURRVAL FROM DUAL',
-		'pgsql' => 'SELECT lastval()',
-		'sqlite' => 'SELECT last_insert_rowid()',
-		'sqlsrv' => 'SELECT SCOPE_IDENTITY()',
-		'sqlanywhere' => 'SELECT @@IDENTITY',
-	),
+    ),
+    'newid' => array(
+        'db2' => 'SELECT IDENTITY_VAL_LOCAL()',
+        'mysql' => 'SELECT LAST_INSERT_ID()',
+        'oracle' => 'SELECT ezuser_list.CURRVAL FROM DUAL',
+        'pgsql' => 'SELECT lastval()',
+        'sqlite' => 'SELECT last_insert_rowid()',
+        'sqlsrv' => 'SELECT SCOPE_IDENTITY()',
+        'sqlanywhere' => 'SELECT @@IDENTITY',
+    ),
 );

lib/custom/config/mshop/customer/manager/lists/type/ezpublish.php

Indentation +24 added lines, -24 removed lines

@@ -6,28 +6,28 @@ 
  */
 
 return array(
-	'insert' => array(
-		'ansi' => '
+    'insert' => array(
+        'ansi' => '
 			INSERT INTO "ezuser_list_type"( "siteid", "code", "domain", "label", "status",
 				"mtime", "editor", "ctime" )
 			VALUES ( ?, ?, ?, ?, ?, ?, ?, ? )
 		',
-	),
-	'update' => array(
-		'ansi' => '
+    ),
+    'update' => array(
+        'ansi' => '
 			UPDATE "ezuser_list_type"
 			SET "siteid"=?, "code" = ?, "domain" = ?, "label" = ?, "status" = ?, "mtime" = ?, "editor" = ?
 			WHERE "id" = ?
 		',
-	),
-	'delete' => array(
-		'ansi' => '
+    ),
+    'delete' => array(
+        'ansi' => '
 			DELETE FROM "ezuser_list_type"
 			WHERE :cond AND siteid = ?
 		',
-	),
-	'search' => array(
-		'ansi' => '
+    ),
+    'search' => array(
+        'ansi' => '
 			SELECT ezulity."id" AS "customer.lists.type.id", ezulity."siteid" AS "customer.lists.type.siteid",
 				ezulity."code" AS "customer.lists.type.code", ezulity."domain" AS "customer.lists.type.domain",
 				ezulity."label" AS "customer.lists.type.label", ezulity."status" AS "customer.lists.type.status",
@@ -40,9 +40,9 @@ 
 			/*-orderby*/ ORDER BY :order /*orderby-*/
 			LIMIT :size OFFSET :start
 		',
-	),
-	'count' => array(
-		'ansi' => '
+    ),
+    'count' => array(
+        'ansi' => '
 			SELECT COUNT(*) AS "count"
 			FROM (
 				SELECT DISTINCT ezulity."id"
@@ -52,14 +52,14 @@ 
 				LIMIT 10000 OFFSET 0
 			) AS LIST
 		',
-	),
-	'newid' => array(
-		'db2' => 'SELECT IDENTITY_VAL_LOCAL()',
-		'mysql' => 'SELECT LAST_INSERT_ID()',
-		'oracle' => 'SELECT ezuser_list_type.CURRVAL FROM DUAL',
-		'pgsql' => 'SELECT lastval()',
-		'sqlite' => 'SELECT last_insert_rowid()',
-		'sqlsrv' => 'SELECT SCOPE_IDENTITY()',
-		'sqlanywhere' => 'SELECT @@IDENTITY',
-	),
+    ),
+    'newid' => array(
+        'db2' => 'SELECT IDENTITY_VAL_LOCAL()',
+        'mysql' => 'SELECT LAST_INSERT_ID()',
+        'oracle' => 'SELECT ezuser_list_type.CURRVAL FROM DUAL',
+        'pgsql' => 'SELECT lastval()',
+        'sqlite' => 'SELECT last_insert_rowid()',
+        'sqlsrv' => 'SELECT SCOPE_IDENTITY()',
+        'sqlanywhere' => 'SELECT @@IDENTITY',
+    ),
 );

lib/custom/tests/MShop/Context/Item/EzpublishTest.php

Indentation +21 added lines, -21 removed lines

@@ -11,34 +11,34 @@
 
 class EzpublishTest extends \PHPUnit_Framework_TestCase
 {
-	private $object;
+    private $object;
 
 
-	protected function setUp()
-	{
-		$this->object = new \Aimeos\MShop\Context\Item\Ezpublish();
-	}
+    protected function setUp()
+    {
+        $this->object = new \Aimeos\MShop\Context\Item\Ezpublish();
+    }
 
 
-	protected function tearDown()
-	{
-		unset( $this->object );
-	}
+    protected function tearDown()
+    {
+        unset( $this->object );
+    }
 
 
-	public function testGetEzUser()
-	{
-		$this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
-		$this->object->getEzUser();
-	}
+    public function testGetEzUser()
+    {
+        $this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
+        $this->object->getEzUser();
+    }
 
 
-	public function testSetEzUser()
-	{
-		$closure = function() {};
-		$return = $this->object->setEzUser( $closure );
+    public function testSetEzUser()
+    {
+        $closure = function() {};
+        $return = $this->object->setEzUser( $closure );
 
-		$this->assertSame( $closure, $this->object->getEzUser() );
-		$this->assertInstanceOf( '\Aimeos\MShop\Context\Item\Iface', $return );
-	}
+        $this->assertSame( $closure, $this->object->getEzUser() );
+        $this->assertInstanceOf( '\Aimeos\MShop\Context\Item\Iface', $return );
+    }
 }
\ No newline at end of file

Spacing +5 added lines, -5 removed lines

@@ -22,13 +22,13 @@ 
 
 	protected function tearDown()
 	{
-		unset( $this->object );
+		unset($this->object);
 	}
 
 
 	public function testGetEzUser()
 	{
-		$this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
+		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
 		$this->object->getEzUser();
 	}
 
@@ -36,9 +36,9 @@ 
 	public function testSetEzUser()
 	{
 		$closure = function() {};
-		$return = $this->object->setEzUser( $closure );
+		$return = $this->object->setEzUser($closure);
 
-		$this->assertSame( $closure, $this->object->getEzUser() );
-		$this->assertInstanceOf( '\Aimeos\MShop\Context\Item\Iface', $return );
+		$this->assertSame($closure, $this->object->getEzUser());
+		$this->assertInstanceOf('\Aimeos\MShop\Context\Item\Iface', $return);
 	}
 }
\ No newline at end of file

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

Indentation +284 added lines, -284 removed lines

@@ -11,311 +11,311 @@
 
 class EzpublishTest extends \PHPUnit_Framework_TestCase
 {
-	private $object;
-	private $context;
-	private $editor = '';
-
-
-	protected function setUp()
-	{
-		$this->context = \TestHelper::getContext();
-		$this->editor = $this->context->getEditor();
-		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $this->context, 'Ezpublish' );
-		$this->object = $manager->getSubManager( 'lists', 'Ezpublish' );
-	}
-
-
-	protected function tearDown()
-	{
-		unset( $this->object, $this->context );
-	}
-
-
-	public function testCleanup()
-	{
-		$this->object->cleanup( array( -1 ) );
-	}
-
-
-	public function testAggregate()
-	{
-		$search = $this->object->createSearch( true );
-		$expr = array(
-			$search->getConditions(),
-			$search->compare( '==', 'customer.lists.editor', 'ai-ezpublish:unittest' ),
-		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-
-		$result = $this->object->aggregate( $search, 'customer.lists.domain' );
-
-		$this->assertEquals( 1, count( $result ) );
-		$this->assertArrayHasKey( 'text', $result );
-		$this->assertEquals( 4, $result['text'] );
-	}
+    private $object;
+    private $context;
+    private $editor = '';
+
+
+    protected function setUp()
+    {
+        $this->context = \TestHelper::getContext();
+        $this->editor = $this->context->getEditor();
+        $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $this->context, 'Ezpublish' );
+        $this->object = $manager->getSubManager( 'lists', 'Ezpublish' );
+    }
+
+
+    protected function tearDown()
+    {
+        unset( $this->object, $this->context );
+    }
+
+
+    public function testCleanup()
+    {
+        $this->object->cleanup( array( -1 ) );
+    }
+
+
+    public function testAggregate()
+    {
+        $search = $this->object->createSearch( true );
+        $expr = array(
+            $search->getConditions(),
+            $search->compare( '==', 'customer.lists.editor', 'ai-ezpublish:unittest' ),
+        );
+        $search->setConditions( $search->combine( '&&', $expr ) );
+
+        $result = $this->object->aggregate( $search, 'customer.lists.domain' );
+
+        $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() );
-	}
-
+    public function testCreateItem()
+    {
+        $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface', $this->object->createItem() );
+    }
+
 
-	public function testGetItem()
-	{
-		$search = $this->object->createSearch();
-		$search->setSlice(0, 1);
-		$results = $this->object->searchItems( $search );
+    public function testGetItem()
+    {
+        $search = $this->object->createSearch();
+        $search->setSlice(0, 1);
+        $results = $this->object->searchItems( $search );
 
-		if( ( $item = reset( $results ) ) === false ) {
-			throw new \Exception( 'No item found' );
-		}
+        if( ( $item = reset( $results ) ) === false ) {
+            throw new \Exception( 'No item found' );
+        }
 
-		$this->assertEquals( $item, $this->object->getItem( $item->getId() ) );
-	}
+        $this->assertEquals( $item, $this->object->getItem( $item->getId() ) );
+    }
 
 
-	public function testSaveUpdateDeleteItem()
-	{
-		$search = $this->object->createSearch();
-		$search->setSlice(0, 1);
-		$items = $this->object->searchItems( $search );
+    public function testSaveUpdateDeleteItem()
+    {
+        $search = $this->object->createSearch();
+        $search->setSlice(0, 1);
+        $items = $this->object->searchItems( $search );
 
-		if( ( $item = reset( $items ) ) === false ) {
-			throw new \Exception( 'No item found' );
-		}
+        if( ( $item = reset( $items ) ) === false ) {
+            throw new \Exception( 'No item found' );
+        }
 
-		$item->setId( null );
-		$item->setDomain( 'unittest' );
-		$this->object->saveItem( $item );
-		$itemSaved = $this->object->getItem( $item->getId() );
+        $item->setId( null );
+        $item->setDomain( 'unittest' );
+        $this->object->saveItem( $item );
+        $itemSaved = $this->object->getItem( $item->getId() );
 
-		$itemExp = clone $itemSaved;
-		$itemExp->setDomain( 'unittest2' );
-		$this->object->saveItem( $itemExp );
-		$itemUpd = $this->object->getItem( $itemExp->getId() );
+        $itemExp = clone $itemSaved;
+        $itemExp->setDomain( 'unittest2' );
+        $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->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->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->setExpectedException('\\Aimeos\\MShop\\Exception');
-		$this->object->getItem( $itemSaved->getId() );
-	}
+        $this->setExpectedException('\\Aimeos\\MShop\\Exception');
+        $this->object->getItem( $itemSaved->getId() );
+    }
 
 
-	public function testMoveItemLastToFront()
-	{
-		$listItems = $this->getListItems();
-		$this->assertGreaterThan( 1, count( $listItems ) );
+    public function testMoveItemLastToFront()
+    {
+        $listItems = $this->getListItems();
+        $this->assertGreaterThan( 1, count( $listItems ) );
 
-		if( ( $first = reset( $listItems ) ) === false ) {
-			throw new \Exception( 'No first customer list item' );
-		}
+        if( ( $first = reset( $listItems ) ) === false ) {
+            throw new \Exception( 'No first customer list item' );
+        }
 
-		if( ( $last = end( $listItems ) ) === false ) {
-			throw new \Exception( 'No last customer list item' );
-		}
-
-		$this->object->moveItem( $last->getId(), $first->getId() );
-
-		$newFirst = $this->object->getItem( $last->getId() );
-		$newSecond = $this->object->getItem( $first->getId() );
-
-		$this->object->moveItem( $last->getId() );
-
-		$this->assertEquals( 0, $newFirst->getPosition() );
-		$this->assertEquals( 1, $newSecond->getPosition() );
-	}
-
-
-	public function testMoveItemFirstToLast()
-	{
-		$listItems = $this->getListItems();
-		$this->assertGreaterThan( 1, count( $listItems ) );
-
-		if( ( $first = reset( $listItems ) ) === false ) {
-			throw new \Exception( 'No first customer list item' );
-		}
-
-		if( ( $second = next( $listItems ) ) === false ) {
-			throw new \Exception( 'No second customer list item' );
-		}
-
-		if( ( $last = end( $listItems ) ) === false ) {
-			throw new \Exception( 'No last customer list item' );
-		}
-
-		$this->object->moveItem( $first->getId() );
-
-		$newBefore = $this->object->getItem( $last->getId() );
-		$newLast = $this->object->getItem( $first->getId() );
-
-		$this->object->moveItem( $first->getId(), $second->getId() );
-
-		$this->assertEquals( $last->getPosition() - 1, $newBefore->getPosition() );
-		$this->assertEquals( $last->getPosition(), $newLast->getPosition() );
-	}
-
-
-	public function testMoveItemFirstUp()
-	{
-		$listItems = $this->getListItems();
-		$this->assertGreaterThan( 1, count( $listItems ) );
-
-		if( ( $first = reset( $listItems ) ) === false ) {
-			throw new \Exception( 'No first customer list item' );
-		}
-
-		if( ( $second = next( $listItems ) ) === false ) {
-			throw new \Exception( 'No second customer list item' );
-		}
-
-		if( ( $last = end( $listItems ) ) === false ) {
-			throw new \Exception( 'No last customer list item' );
-		}
-
-		$this->object->moveItem( $first->getId(), $last->getId() );
-
-		$newLast = $this->object->getItem( $last->getId() );
-		$newUp = $this->object->getItem( $first->getId() );
-
-		$this->object->moveItem( $first->getId(), $second->getId() );
-
-		$this->assertEquals( $last->getPosition() - 1, $newUp->getPosition() );
-		$this->assertEquals( $last->getPosition(), $newLast->getPosition() );
-	}
-
-
-	public function testSearchItems()
-	{
-		$total = 0;
-		$search = $this->object->createSearch();
+        if( ( $last = end( $listItems ) ) === false ) {
+            throw new \Exception( 'No last customer list item' );
+        }
+
+        $this->object->moveItem( $last->getId(), $first->getId() );
+
+        $newFirst = $this->object->getItem( $last->getId() );
+        $newSecond = $this->object->getItem( $first->getId() );
+
+        $this->object->moveItem( $last->getId() );
+
+        $this->assertEquals( 0, $newFirst->getPosition() );
+        $this->assertEquals( 1, $newSecond->getPosition() );
+    }
+
+
+    public function testMoveItemFirstToLast()
+    {
+        $listItems = $this->getListItems();
+        $this->assertGreaterThan( 1, count( $listItems ) );
+
+        if( ( $first = reset( $listItems ) ) === false ) {
+            throw new \Exception( 'No first customer list item' );
+        }
+
+        if( ( $second = next( $listItems ) ) === false ) {
+            throw new \Exception( 'No second customer list item' );
+        }
+
+        if( ( $last = end( $listItems ) ) === false ) {
+            throw new \Exception( 'No last customer list item' );
+        }
+
+        $this->object->moveItem( $first->getId() );
+
+        $newBefore = $this->object->getItem( $last->getId() );
+        $newLast = $this->object->getItem( $first->getId() );
+
+        $this->object->moveItem( $first->getId(), $second->getId() );
+
+        $this->assertEquals( $last->getPosition() - 1, $newBefore->getPosition() );
+        $this->assertEquals( $last->getPosition(), $newLast->getPosition() );
+    }
+
+
+    public function testMoveItemFirstUp()
+    {
+        $listItems = $this->getListItems();
+        $this->assertGreaterThan( 1, count( $listItems ) );
+
+        if( ( $first = reset( $listItems ) ) === false ) {
+            throw new \Exception( 'No first customer list item' );
+        }
+
+        if( ( $second = next( $listItems ) ) === false ) {
+            throw new \Exception( 'No second customer list item' );
+        }
+
+        if( ( $last = end( $listItems ) ) === false ) {
+            throw new \Exception( 'No last customer list item' );
+        }
+
+        $this->object->moveItem( $first->getId(), $last->getId() );
+
+        $newLast = $this->object->getItem( $last->getId() );
+        $newUp = $this->object->getItem( $first->getId() );
+
+        $this->object->moveItem( $first->getId(), $second->getId() );
+
+        $this->assertEquals( $last->getPosition() - 1, $newUp->getPosition() );
+        $this->assertEquals( $last->getPosition(), $newLast->getPosition() );
+    }
+
+
+    public function testSearchItems()
+    {
+        $total = 0;
+        $search = $this->object->createSearch();
 
-		$expr = array();
-		$expr[] = $search->compare( '!=', 'customer.lists.id', null );
-		$expr[] = $search->compare( '!=', 'customer.lists.siteid', null );
-		$expr[] = $search->compare( '!=', 'customer.lists.parentid', null );
-		$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', 0 );
-		$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 = array();
+        $expr[] = $search->compare( '!=', 'customer.lists.id', null );
+        $expr[] = $search->compare( '!=', 'customer.lists.siteid', null );
+        $expr[] = $search->compare( '!=', 'customer.lists.parentid', null );
+        $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', 0 );
+        $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, 2);
-		$results = $this->object->searchItems( $search, array(), $total );
-		$this->assertEquals( 2, count( $results ) );
-		$this->assertEquals( 3, $total );
-
-		foreach($results as $itemId => $item) {
-			$this->assertEquals( $itemId, $item->getId() );
-		}
-	}
-
-
-	public function testSearchItemsNoCriteria()
-	{
-		$search = $this->object->createSearch();
-		$search->setConditions( $search->compare( '==', 'customer.lists.editor', $this->editor ) );
-		$this->assertEquals( 4, count( $this->object->searchItems($search) ) );
-	}
-
-
-	public function testSearchItemsBaseCriteria()
-	{
-		$search = $this->object->createSearch(true);
-		$conditions = array(
-			$search->compare( '==', 'customer.lists.editor', $this->editor ),
-			$search->getConditions()
-		);
-		$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->setExpectedException( '\\Aimeos\\MShop\\Exception' );
-		$this->object->getSubManager( 'unknown' );
-	}
-
-
-	protected function getListItems()
-	{
-		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $this->context, 'Ezpublish' );
-
-		$search = $manager->createSearch();
-		$search->setConditions( $search->compare( '==', 'customer.code', 'UTC003' ) );
-		$search->setSlice( 0, 1 );
-
-		$results = $manager->searchItems( $search );
-
-		if( ( $item = reset( $results ) ) === false ) {
-			throw new \Exception( '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->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSortations( array( $search->sort( '+', 'customer.lists.position' ) ) );
-
-		return $this->object->searchItems( $search );
-	}
+        $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, 2);
+        $results = $this->object->searchItems( $search, array(), $total );
+        $this->assertEquals( 2, count( $results ) );
+        $this->assertEquals( 3, $total );
+
+        foreach($results as $itemId => $item) {
+            $this->assertEquals( $itemId, $item->getId() );
+        }
+    }
+
+
+    public function testSearchItemsNoCriteria()
+    {
+        $search = $this->object->createSearch();
+        $search->setConditions( $search->compare( '==', 'customer.lists.editor', $this->editor ) );
+        $this->assertEquals( 4, count( $this->object->searchItems($search) ) );
+    }
+
+
+    public function testSearchItemsBaseCriteria()
+    {
+        $search = $this->object->createSearch(true);
+        $conditions = array(
+            $search->compare( '==', 'customer.lists.editor', $this->editor ),
+            $search->getConditions()
+        );
+        $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->setExpectedException( '\\Aimeos\\MShop\\Exception' );
+        $this->object->getSubManager( 'unknown' );
+    }
+
+
+    protected function getListItems()
+    {
+        $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $this->context, 'Ezpublish' );
+
+        $search = $manager->createSearch();
+        $search->setConditions( $search->compare( '==', 'customer.code', 'UTC003' ) );
+        $search->setSlice( 0, 1 );
+
+        $results = $manager->searchItems( $search );
+
+        if( ( $item = reset( $results ) ) === false ) {
+            throw new \Exception( '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->setConditions( $search->combine( '&&', $expr ) );
+        $search->setSortations( array( $search->sort( '+', 'customer.lists.position' ) ) );
+
+        return $this->object->searchItems( $search );
+    }
 }

Spacing +151 added lines, -151 removed lines

@@ -20,43 +20,43 @@ 
 	{
 		$this->context = \TestHelper::getContext();
 		$this->editor = $this->context->getEditor();
-		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $this->context, 'Ezpublish' );
-		$this->object = $manager->getSubManager( 'lists', 'Ezpublish' );
+		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager($this->context, 'Ezpublish');
+		$this->object = $manager->getSubManager('lists', 'Ezpublish');
 	}
 
 
 	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-ezpublish:unittest' ),
+			$search->compare('==', 'customer.lists.editor', 'ai-ezpublish: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());
 	}
 
 
@@ -64,13 +64,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 \Exception( 'No item found' );
+		if (($item = reset($results)) === false) {
+			throw new \Exception('No item found');
 		}
 
-		$this->assertEquals( $item, $this->object->getItem( $item->getId() ) );
+		$this->assertEquals($item, $this->object->getItem($item->getId()));
 	}
 
 
@@ -78,144 +78,144 @@ 
 	{
 		$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 \Exception( 'No item found' );
+		if (($item = reset($items)) === false) {
+			throw new \Exception('No item found');
 		}
 
-		$item->setId( null );
-		$item->setDomain( 'unittest' );
-		$this->object->saveItem( $item );
-		$itemSaved = $this->object->getItem( $item->getId() );
+		$item->setId(null);
+		$item->setDomain('unittest');
+		$this->object->saveItem($item);
+		$itemSaved = $this->object->getItem($item->getId());
 
 		$itemExp = clone $itemSaved;
-		$itemExp->setDomain( 'unittest2' );
-		$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');
+		$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->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, $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->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->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 \Exception( 'No first customer list item' );
+		if (($first = reset($listItems)) === false) {
+			throw new \Exception('No first customer list item');
 		}
 
-		if( ( $last = end( $listItems ) ) === false ) {
-			throw new \Exception( 'No last customer list item' );
+		if (($last = end($listItems)) === false) {
+			throw new \Exception('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( 0, $newFirst->getPosition() );
-		$this->assertEquals( 1, $newSecond->getPosition() );
+		$this->assertEquals(0, $newFirst->getPosition());
+		$this->assertEquals(1, $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 \Exception( 'No first customer list item' );
+		if (($first = reset($listItems)) === false) {
+			throw new \Exception('No first customer list item');
 		}
 
-		if( ( $second = next( $listItems ) ) === false ) {
-			throw new \Exception( 'No second customer list item' );
+		if (($second = next($listItems)) === false) {
+			throw new \Exception('No second customer list item');
 		}
 
-		if( ( $last = end( $listItems ) ) === false ) {
-			throw new \Exception( 'No last customer list item' );
+		if (($last = end($listItems)) === false) {
+			throw new \Exception('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 \Exception( 'No first customer list item' );
+		if (($first = reset($listItems)) === false) {
+			throw new \Exception('No first customer list item');
 		}
 
-		if( ( $second = next( $listItems ) ) === false ) {
-			throw new \Exception( 'No second customer list item' );
+		if (($second = next($listItems)) === false) {
+			throw new \Exception('No second customer list item');
 		}
 
-		if( ( $last = end( $listItems ) ) === false ) {
-			throw new \Exception( 'No last customer list item' );
+		if (($last = end($listItems)) === false) {
+			throw new \Exception('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());
 	}
 
 
@@ -225,39 +225,39 @@ 
 		$search = $this->object->createSearch();
 
 		$expr = array();
-		$expr[] = $search->compare( '!=', 'customer.lists.id', null );
-		$expr[] = $search->compare( '!=', 'customer.lists.siteid', null );
-		$expr[] = $search->compare( '!=', 'customer.lists.parentid', null );
-		$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', 0 );
-		$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', null);
+		$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', 0);
+		$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, 2);
-		$results = $this->object->searchItems( $search, array(), $total );
-		$this->assertEquals( 2, count( $results ) );
-		$this->assertEquals( 3, $total );
+		$results = $this->object->searchItems($search, array(), $total);
+		$this->assertEquals(2, count($results));
+		$this->assertEquals(3, $total);
 
-		foreach($results as $itemId => $item) {
-			$this->assertEquals( $itemId, $item->getId() );
+		foreach ($results as $itemId => $item) {
+			$this->assertEquals($itemId, $item->getId());
 		}
 	}
 
@@ -265,8 +265,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)));
 	}
 
 
@@ -274,48 +274,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, 'Ezpublish' );
+		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager($this->context, 'Ezpublish');
 
 		$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 \Exception( 'No customer item found' );
+		if (($item = reset($results)) === false) {
+			throw new \Exception('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/EzpublishTest.php

Indentation +97 added lines, -97 removed lines

@@ -11,130 +11,130 @@
 
 class EzpublishTest extends \PHPUnit_Framework_TestCase
 {
-	private $object;
-	private $editor = '';
+    private $object;
+    private $editor = '';
 
 
-	protected function setUp()
-	{
-		$this->editor = \TestHelper::getContext()->getEditor();
-		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( \TestHelper::getContext(), 'Ezpublish' );
+    protected function setUp()
+    {
+        $this->editor = \TestHelper::getContext()->getEditor();
+        $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( \TestHelper::getContext(), 'Ezpublish' );
 
-		$listManager = $manager->getSubManager( 'lists', 'Ezpublish' );
-		$this->object = $listManager->getSubManager( 'type', 'Ezpublish' );
-	}
+        $listManager = $manager->getSubManager( 'lists', 'Ezpublish' );
+        $this->object = $listManager->getSubManager( 'type', 'Ezpublish' );
+    }
 
 
-	protected function tearDown()
-	{
-		unset( $this->object );
-	}
+    protected function tearDown()
+    {
+        unset( $this->object );
+    }
 
 
-	public function testCleanup()
-	{
-		$this->object->cleanup( array( -1 ) );
-	}
+    public function testCleanup()
+    {
+        $this->object->cleanup( array( -1 ) );
+    }
 
 
-	public function testCreateItem()
-	{
-		$item = $this->object->createItem();
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Type\\Iface', $item );
-	}
+    public function testCreateItem()
+    {
+        $item = $this->object->createItem();
+        $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Type\\Iface', $item );
+    }
 
 
-	public function testGetItem()
-	{
-		$search = $this->object->createSearch();
-		$search->setSlice(0, 1);
-		$results = $this->object->searchItems($search);
+    public function testGetItem()
+    {
+        $search = $this->object->createSearch();
+        $search->setSlice(0, 1);
+        $results = $this->object->searchItems($search);
 
-		if( ( $expected = reset($results) ) === false ) {
-			throw new \Exception( 'No list type item found' );
-		}
+        if( ( $expected = reset($results) ) === false ) {
+            throw new \Exception( 'No list type item found' );
+        }
 
-		$this->assertEquals( $expected, $this->object->getItem( $expected->getId() ) );
-	}
+        $this->assertEquals( $expected, $this->object->getItem( $expected->getId() ) );
+    }
 
 
-	public function testSaveUpdateDeleteItem()
-	{
-		$search = $this->object->createSearch();
-		$search->setSlice(0, 1);
-		$results = $this->object->searchItems($search);
+    public function testSaveUpdateDeleteItem()
+    {
+        $search = $this->object->createSearch();
+        $search->setSlice(0, 1);
+        $results = $this->object->searchItems($search);
 
-		if( ( $item = reset($results) ) === false ) {
-			throw new \Exception( 'No type item found' );
-		}
+        if( ( $item = reset($results) ) === false ) {
+            throw new \Exception( 'No type item found' );
+        }
 
-		$item->setId(null);
-		$item->setCode( 'unitTestInit' );
-		$this->object->saveItem( $item );
-		$itemSaved = $this->object->getItem( $item->getId() );
+        $item->setId(null);
+        $item->setCode( 'unitTestInit' );
+        $this->object->saveItem( $item );
+        $itemSaved = $this->object->getItem( $item->getId() );
 
-		$itemExp = clone $itemSaved;
-		$itemExp->setCode( 'unitTestSave' );
-		$this->object->saveItem( $itemExp );
-		$itemUpd = $this->object->getItem( $itemExp->getId() );
+        $itemExp = clone $itemSaved;
+        $itemExp->setCode( 'unitTestSave' );
+        $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->setExpectedException('\\Aimeos\\MShop\\Exception');
-		$this->object->getItem( $itemSaved->getId() );
-	}
+        $this->setExpectedException('\\Aimeos\\MShop\\Exception');
+        $this->object->getItem( $itemSaved->getId() );
+    }
 
 
-	public function testSearchItems()
-	{
-		$total = 0;
-		$search = $this->object->createSearch();
+    public function testSearchItems()
+    {
+        $total = 0;
+        $search = $this->object->createSearch();
 
-		$expr = array();
-		$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, array(), $total );
-		$this->assertEquals( 1, count( $results ) );
-		$this->assertEquals( 1, $total );
-
-		foreach($results as $itemId => $item) {
-			$this->assertEquals( $itemId, $item->getId() );
-		}
-	}
+        $expr = array();
+        $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, array(), $total );
+        $this->assertEquals( 1, count( $results ) );
+        $this->assertEquals( 1, $total );
+
+        foreach($results as $itemId => $item) {
+            $this->assertEquals( $itemId, $item->getId() );
+        }
+    }
 
 }

Spacing +54 added lines, -54 removed lines

@@ -18,29 +18,29 @@ 
 	protected function setUp()
 	{
 		$this->editor = \TestHelper::getContext()->getEditor();
-		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( \TestHelper::getContext(), 'Ezpublish' );
+		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager(\TestHelper::getContext(), 'Ezpublish');
 
-		$listManager = $manager->getSubManager( 'lists', 'Ezpublish' );
-		$this->object = $listManager->getSubManager( 'type', 'Ezpublish' );
+		$listManager = $manager->getSubManager('lists', 'Ezpublish');
+		$this->object = $listManager->getSubManager('type', 'Ezpublish');
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->object );
+		unset($this->object);
 	}
 
 
 	public function testCleanup()
 	{
-		$this->object->cleanup( array( -1 ) );
+		$this->object->cleanup(array( -1 ));
 	}
 
 
 	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);
 	}
 
 
@@ -50,11 +50,11 @@ 
 		$search->setSlice(0, 1);
 		$results = $this->object->searchItems($search);
 
-		if( ( $expected = reset($results) ) === false ) {
-			throw new \Exception( 'No list type item found' );
+		if (($expected = reset($results)) === false) {
+			throw new \Exception('No list type item found');
 		}
 
-		$this->assertEquals( $expected, $this->object->getItem( $expected->getId() ) );
+		$this->assertEquals($expected, $this->object->getItem($expected->getId()));
 	}
 
 
@@ -64,48 +64,48 @@ 
 		$search->setSlice(0, 1);
 		$results = $this->object->searchItems($search);
 
-		if( ( $item = reset($results) ) === false ) {
-			throw new \Exception( 'No type item found' );
+		if (($item = reset($results)) === false) {
+			throw new \Exception('No type item found');
 		}
 
 		$item->setId(null);
-		$item->setCode( 'unitTestInit' );
-		$this->object->saveItem( $item );
-		$itemSaved = $this->object->getItem( $item->getId() );
+		$item->setCode('unitTestInit');
+		$this->object->saveItem($item);
+		$itemSaved = $this->object->getItem($item->getId());
 
 		$itemExp = clone $itemSaved;
-		$itemExp->setCode( 'unitTestSave' );
-		$this->object->saveItem( $itemExp );
-		$itemUpd = $this->object->getItem( $itemExp->getId() );
+		$itemExp->setCode('unitTestSave');
+		$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->setExpectedException('\\Aimeos\\MShop\\Exception');
-		$this->object->getItem( $itemSaved->getId() );
+		$this->object->getItem($itemSaved->getId());
 	}
 
 
@@ -115,25 +115,25 @@ 
 		$search = $this->object->createSearch();
 
 		$expr = array();
-		$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, array(), $total );
-		$this->assertEquals( 1, count( $results ) );
-		$this->assertEquals( 1, $total );
+		$results = $this->object->searchItems($search, array(), $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/EzpublishTest.php

Indentation +236 added lines, -236 removed lines

@@ -11,242 +11,242 @@
 
 class EzpublishTest extends \PHPUnit_Framework_TestCase
 {
-	private $object;
-	private $fixture;
-	private $address;
-	private $editor = '';
-
-
-	protected function setUp()
-	{
-		$context = \TestHelper::getContext();
-		$this->editor = $context->getEditor();
-		$this->object = new \Aimeos\MShop\Customer\Manager\Ezpublish( $context );
-
-		$this->fixture = array(
-			'label' => 'unitTest',
-			'status' => 2,
-		);
-
-		$this->address = new \Aimeos\MShop\Common\Item\Address\Standard( 'common.address.' );
-	}
-
-
-	protected function tearDown()
-	{
-		unset( $this->object, $this->fixture, $this->address );
-	}
+    private $object;
+    private $fixture;
+    private $address;
+    private $editor = '';
+
+
+    protected function setUp()
+    {
+        $context = \TestHelper::getContext();
+        $this->editor = $context->getEditor();
+        $this->object = new \Aimeos\MShop\Customer\Manager\Ezpublish( $context );
+
+        $this->fixture = array(
+            'label' => 'unitTest',
+            'status' => 2,
+        );
+
+        $this->address = new \Aimeos\MShop\Common\Item\Address\Standard( 'common.address.' );
+    }
+
+
+    protected function tearDown()
+    {
+        unset( $this->object, $this->fixture, $this->address );
+    }
 
 
-	public function testCleanup()
-	{
-		$this->object->cleanup( array( -1 ) );
-	}
-
-
-	public function testGetSearchAttributes()
-	{
-		foreach( $this->object->getSearchAttributes() as $attribute )
-		{
-			$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute );
-		}
-	}
-
-
-	public function testCreateItem()
-	{
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Customer\\Item\\Iface', $this->object->createItem() );
-	}
-
-
-	public function testGetItem()
-	{
-		$search = $this->object->createSearch();
-		$conditions = array(
-			$search->compare( '==', 'customer.code', 'UTC003' ),
-			$search->compare( '==', 'customer.editor', $this->editor )
-		);
-		$search->setConditions( $search->combine( '&&', $conditions ) );
-		$items = $this->object->searchItems( $search, array( 'text' ) );
-
-		if( ( $expected = reset( $items ) ) === false ) {
-			throw new \Exception( 'No customer item with code "UTC003" found' );
-		}
-
-		$actual = $this->object->getItem( $expected->getId(), array( 'text' ) );
-
-		$this->assertEquals( $expected, $actual );
-		$this->assertEquals( 3, count( $actual->getListItems( 'text' ) ) );
-		$this->assertEquals( 3, count( $actual->getRefItems( 'text' ) ) );
-	}
-
-
-	public function testSaveUpdateDeleteItem()
-	{
-		$item = $this->object->createItem();
-
-		$item->setCode( 'unitTest' );
-		$item->setLabel( 'unitTest' );
-		$this->object->saveItem( $item );
-		$itemSaved = $this->object->getItem( $item->getId() );
-
-		$itemExp = clone $itemSaved;
-		$itemExp->setCode( 'unitTest2' );
-		$itemExp->setLabel( 'unitTest2' );
-		$this->object->saveItem( $itemExp );
-		$itemUpd = $this->object->getItem( $itemExp->getId() );
-
-		$this->object->deleteItem( $item->getId() );
-
-		$this->assertTrue( $item->getId() !== null );
-		$this->assertEquals( $item->getId(), $itemSaved->getId() );
-		$this->assertEquals( $item->getSiteId(), $itemSaved->getSiteId() );
-		$this->assertEquals( $item->getStatus(), $itemSaved->getStatus() );
-		$this->assertEquals( $item->getCode(), $itemSaved->getCode() );
-		$this->assertEquals( $item->getLabel(), $itemSaved->getLabel() );
-		$this->assertEquals( $item->getPaymentAddress(), $itemSaved->getPaymentAddress() );
-		$this->assertEquals( $item->getBirthday(), $itemSaved->getBirthday() );
-		$this->assertEquals( $item->getPassword(), $itemSaved->getPassword() );
-
-		$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->getStatus(), $itemUpd->getStatus() );
-		$this->assertEquals( $itemExp->getCode(), $itemUpd->getCode() );
-		$this->assertEquals( $itemExp->getLabel(), $itemUpd->getLabel() );
-		$this->assertEquals( $itemExp->getPaymentAddress(), $itemUpd->getPaymentAddress() );
-		$this->assertEquals( $itemExp->getBirthday(), $itemUpd->getBirthday() );
-		$this->assertEquals( $itemExp->getPassword(), $itemUpd->getPassword() );
-
-		$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->setExpectedException( '\\Aimeos\\MShop\\Exception' );
-		$this->object->getItem( $item->getId() );
-	}
-
-
-	public function testCreateSearch()
-	{
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $this->object->createSearch() );
-	}
-
-
-	public function testSearchItems()
-	{
-		$total = 0;
-		$search = $this->object->createSearch();
-
-		$expr = array();
-		$expr[] = $search->compare( '!=', 'customer.id', null );
-		$expr[] = $search->compare( '==', 'customer.label', 'UTC002' );
-		$expr[] = $search->compare( '==', 'customer.code', 'UTC002' );
-
-		$expr[] = $search->compare( '>=', 'customer.salutation', '' );
-		$expr[] = $search->compare( '>=', 'customer.company', '' );
-		$expr[] = $search->compare( '>=', 'customer.vatid', '' );
-		$expr[] = $search->compare( '>=', 'customer.title', '' );
-		$expr[] = $search->compare( '>=', 'customer.firstname', '' );
-		$expr[] = $search->compare( '>=', 'customer.lastname', '' );
-		$expr[] = $search->compare( '>=', 'customer.address1', '' );
-		$expr[] = $search->compare( '>=', 'customer.address2', '' );
-		$expr[] = $search->compare( '>=', 'customer.address3', '' );
-		$expr[] = $search->compare( '>=', 'customer.postal', '' );
-		$expr[] = $search->compare( '>=', 'customer.city', '' );
-		$expr[] = $search->compare( '>=', 'customer.state', '' );
-		$expr[] = $search->compare( '!=', 'customer.languageid', null );
-		$expr[] = $search->compare( '>=', 'customer.countryid', '' );
-		$expr[] = $search->compare( '>=', 'customer.telephone', '' );
-		$expr[] = $search->compare( '>=', 'customer.email', '' );
-		$expr[] = $search->compare( '>=', 'customer.telefax', '' );
-		$expr[] = $search->compare( '>=', 'customer.website', '' );
-
-		$expr[] = $search->compare( '==', 'customer.birthday', '1970-01-01' );
-		$expr[] = $search->compare( '>=', 'customer.password', '' );
-		$expr[] = $search->compare( '==', 'customer.status', 0 );
-		$expr[] = $search->compare( '!=', 'customer.mtime', '1970-01-01 00:00:00' );
-		$expr[] = $search->compare( '!=', 'customer.ctime', '1970-01-01 00:00:00' );
-		$expr[] = $search->compare( '==', 'customer.editor', $this->editor );
-
-		$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.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 ) );
-		$result = $this->object->searchItems( $search, array(), $total );
-		$this->assertEquals( 1, count( $result ) );
-	}
-
-
-	public function testSearchItemsNoCriteria()
-	{
-		$total = 0;
-
-		$search = $this->object->createSearch();
-		$search->setConditions( $search->compare( '==', 'customer.address.editor', $this->editor ) );
-		$search->setSlice( 0, 2 );
-
-		$results = $this->object->searchItems( $search, array(), $total );
-		$this->assertEquals( 2, count( $results ) );
-		$this->assertEquals( 3, $total );
-
-		foreach($results as $itemId => $item) {
-			$this->assertEquals( $itemId, $item->getId() );
-		}
-	}
-
-
-	public function testSearchItemsBaseCriteria()
-	{
-		$search = $this->object->createSearch( true );
-		$conditions = array(
-			$search->compare( '==', 'customer.address.editor', $this->editor ),
-			$search->getConditions()
-		);
-		$search->setConditions( $search->combine( '&&', $conditions ) );
-		$this->assertEquals( 2, count( $this->object->searchItems( $search, array(), $total ) ) );
-	}
-
-
-	public function testGetSubManager()
-	{
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager( 'address' ) );
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager( 'address', 'Standard' ) );
-
-		$this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
-		$this->object->getSubManager( 'unknown' );
-	}
-
-
-	public function testGetSubManagerInvalidName()
-	{
-		$this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
-		$this->object->getSubManager( 'address', 'unknown' );
-	}
+    public function testCleanup()
+    {
+        $this->object->cleanup( array( -1 ) );
+    }
+
+
+    public function testGetSearchAttributes()
+    {
+        foreach( $this->object->getSearchAttributes() as $attribute )
+        {
+            $this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute );
+        }
+    }
+
+
+    public function testCreateItem()
+    {
+        $this->assertInstanceOf( '\\Aimeos\\MShop\\Customer\\Item\\Iface', $this->object->createItem() );
+    }
+
+
+    public function testGetItem()
+    {
+        $search = $this->object->createSearch();
+        $conditions = array(
+            $search->compare( '==', 'customer.code', 'UTC003' ),
+            $search->compare( '==', 'customer.editor', $this->editor )
+        );
+        $search->setConditions( $search->combine( '&&', $conditions ) );
+        $items = $this->object->searchItems( $search, array( 'text' ) );
+
+        if( ( $expected = reset( $items ) ) === false ) {
+            throw new \Exception( 'No customer item with code "UTC003" found' );
+        }
+
+        $actual = $this->object->getItem( $expected->getId(), array( 'text' ) );
+
+        $this->assertEquals( $expected, $actual );
+        $this->assertEquals( 3, count( $actual->getListItems( 'text' ) ) );
+        $this->assertEquals( 3, count( $actual->getRefItems( 'text' ) ) );
+    }
+
+
+    public function testSaveUpdateDeleteItem()
+    {
+        $item = $this->object->createItem();
+
+        $item->setCode( 'unitTest' );
+        $item->setLabel( 'unitTest' );
+        $this->object->saveItem( $item );
+        $itemSaved = $this->object->getItem( $item->getId() );
+
+        $itemExp = clone $itemSaved;
+        $itemExp->setCode( 'unitTest2' );
+        $itemExp->setLabel( 'unitTest2' );
+        $this->object->saveItem( $itemExp );
+        $itemUpd = $this->object->getItem( $itemExp->getId() );
+
+        $this->object->deleteItem( $item->getId() );
+
+        $this->assertTrue( $item->getId() !== null );
+        $this->assertEquals( $item->getId(), $itemSaved->getId() );
+        $this->assertEquals( $item->getSiteId(), $itemSaved->getSiteId() );
+        $this->assertEquals( $item->getStatus(), $itemSaved->getStatus() );
+        $this->assertEquals( $item->getCode(), $itemSaved->getCode() );
+        $this->assertEquals( $item->getLabel(), $itemSaved->getLabel() );
+        $this->assertEquals( $item->getPaymentAddress(), $itemSaved->getPaymentAddress() );
+        $this->assertEquals( $item->getBirthday(), $itemSaved->getBirthday() );
+        $this->assertEquals( $item->getPassword(), $itemSaved->getPassword() );
+
+        $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->getStatus(), $itemUpd->getStatus() );
+        $this->assertEquals( $itemExp->getCode(), $itemUpd->getCode() );
+        $this->assertEquals( $itemExp->getLabel(), $itemUpd->getLabel() );
+        $this->assertEquals( $itemExp->getPaymentAddress(), $itemUpd->getPaymentAddress() );
+        $this->assertEquals( $itemExp->getBirthday(), $itemUpd->getBirthday() );
+        $this->assertEquals( $itemExp->getPassword(), $itemUpd->getPassword() );
+
+        $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->setExpectedException( '\\Aimeos\\MShop\\Exception' );
+        $this->object->getItem( $item->getId() );
+    }
+
+
+    public function testCreateSearch()
+    {
+        $this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $this->object->createSearch() );
+    }
+
+
+    public function testSearchItems()
+    {
+        $total = 0;
+        $search = $this->object->createSearch();
+
+        $expr = array();
+        $expr[] = $search->compare( '!=', 'customer.id', null );
+        $expr[] = $search->compare( '==', 'customer.label', 'UTC002' );
+        $expr[] = $search->compare( '==', 'customer.code', 'UTC002' );
+
+        $expr[] = $search->compare( '>=', 'customer.salutation', '' );
+        $expr[] = $search->compare( '>=', 'customer.company', '' );
+        $expr[] = $search->compare( '>=', 'customer.vatid', '' );
+        $expr[] = $search->compare( '>=', 'customer.title', '' );
+        $expr[] = $search->compare( '>=', 'customer.firstname', '' );
+        $expr[] = $search->compare( '>=', 'customer.lastname', '' );
+        $expr[] = $search->compare( '>=', 'customer.address1', '' );
+        $expr[] = $search->compare( '>=', 'customer.address2', '' );
+        $expr[] = $search->compare( '>=', 'customer.address3', '' );
+        $expr[] = $search->compare( '>=', 'customer.postal', '' );
+        $expr[] = $search->compare( '>=', 'customer.city', '' );
+        $expr[] = $search->compare( '>=', 'customer.state', '' );
+        $expr[] = $search->compare( '!=', 'customer.languageid', null );
+        $expr[] = $search->compare( '>=', 'customer.countryid', '' );
+        $expr[] = $search->compare( '>=', 'customer.telephone', '' );
+        $expr[] = $search->compare( '>=', 'customer.email', '' );
+        $expr[] = $search->compare( '>=', 'customer.telefax', '' );
+        $expr[] = $search->compare( '>=', 'customer.website', '' );
+
+        $expr[] = $search->compare( '==', 'customer.birthday', '1970-01-01' );
+        $expr[] = $search->compare( '>=', 'customer.password', '' );
+        $expr[] = $search->compare( '==', 'customer.status', 0 );
+        $expr[] = $search->compare( '!=', 'customer.mtime', '1970-01-01 00:00:00' );
+        $expr[] = $search->compare( '!=', 'customer.ctime', '1970-01-01 00:00:00' );
+        $expr[] = $search->compare( '==', 'customer.editor', $this->editor );
+
+        $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.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 ) );
+        $result = $this->object->searchItems( $search, array(), $total );
+        $this->assertEquals( 1, count( $result ) );
+    }
+
+
+    public function testSearchItemsNoCriteria()
+    {
+        $total = 0;
+
+        $search = $this->object->createSearch();
+        $search->setConditions( $search->compare( '==', 'customer.address.editor', $this->editor ) );
+        $search->setSlice( 0, 2 );
+
+        $results = $this->object->searchItems( $search, array(), $total );
+        $this->assertEquals( 2, count( $results ) );
+        $this->assertEquals( 3, $total );
+
+        foreach($results as $itemId => $item) {
+            $this->assertEquals( $itemId, $item->getId() );
+        }
+    }
+
+
+    public function testSearchItemsBaseCriteria()
+    {
+        $search = $this->object->createSearch( true );
+        $conditions = array(
+            $search->compare( '==', 'customer.address.editor', $this->editor ),
+            $search->getConditions()
+        );
+        $search->setConditions( $search->combine( '&&', $conditions ) );
+        $this->assertEquals( 2, count( $this->object->searchItems( $search, array(), $total ) ) );
+    }
+
+
+    public function testGetSubManager()
+    {
+        $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager( 'address' ) );
+        $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager( 'address', 'Standard' ) );
+
+        $this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
+        $this->object->getSubManager( 'unknown' );
+    }
+
+
+    public function testGetSubManagerInvalidName()
+    {
+        $this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
+        $this->object->getSubManager( 'address', 'unknown' );
+    }
 }

Spacing +134 added lines, -134 removed lines

@@ -21,41 +21,41 @@ 
 	{
 		$context = \TestHelper::getContext();
 		$this->editor = $context->getEditor();
-		$this->object = new \Aimeos\MShop\Customer\Manager\Ezpublish( $context );
+		$this->object = new \Aimeos\MShop\Customer\Manager\Ezpublish($context);
 
 		$this->fixture = array(
 			'label' => 'unitTest',
 			'status' => 2,
 		);
 
-		$this->address = new \Aimeos\MShop\Common\Item\Address\Standard( 'common.address.' );
+		$this->address = new \Aimeos\MShop\Common\Item\Address\Standard('common.address.');
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->object, $this->fixture, $this->address );
+		unset($this->object, $this->fixture, $this->address);
 	}
 
 
 	public function testCleanup()
 	{
-		$this->object->cleanup( array( -1 ) );
+		$this->object->cleanup(array( -1 ));
 	}
 
 
 	public function testGetSearchAttributes()
 	{
-		foreach( $this->object->getSearchAttributes() as $attribute )
+		foreach ($this->object->getSearchAttributes() as $attribute)
 		{
-			$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute );
+			$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute);
 		}
 	}
 
 
 	public function testCreateItem()
 	{
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Customer\\Item\\Iface', $this->object->createItem() );
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Customer\\Item\\Iface', $this->object->createItem());
 	}
 
 
@@ -63,21 +63,21 @@ 
 	{
 		$search = $this->object->createSearch();
 		$conditions = array(
-			$search->compare( '==', 'customer.code', 'UTC003' ),
-			$search->compare( '==', 'customer.editor', $this->editor )
+			$search->compare('==', 'customer.code', 'UTC003'),
+			$search->compare('==', 'customer.editor', $this->editor)
 		);
-		$search->setConditions( $search->combine( '&&', $conditions ) );
-		$items = $this->object->searchItems( $search, array( 'text' ) );
+		$search->setConditions($search->combine('&&', $conditions));
+		$items = $this->object->searchItems($search, array('text'));
 
-		if( ( $expected = reset( $items ) ) === false ) {
-			throw new \Exception( 'No customer item with code "UTC003" found' );
+		if (($expected = reset($items)) === false) {
+			throw new \Exception('No customer item with code "UTC003" found');
 		}
 
-		$actual = $this->object->getItem( $expected->getId(), array( 'text' ) );
+		$actual = $this->object->getItem($expected->getId(), array('text'));
 
-		$this->assertEquals( $expected, $actual );
-		$this->assertEquals( 3, count( $actual->getListItems( 'text' ) ) );
-		$this->assertEquals( 3, count( $actual->getRefItems( 'text' ) ) );
+		$this->assertEquals($expected, $actual);
+		$this->assertEquals(3, count($actual->getListItems('text')));
+		$this->assertEquals(3, count($actual->getRefItems('text')));
 	}
 
 
@@ -85,54 +85,54 @@ 
 	{
 		$item = $this->object->createItem();
 
-		$item->setCode( 'unitTest' );
-		$item->setLabel( 'unitTest' );
-		$this->object->saveItem( $item );
-		$itemSaved = $this->object->getItem( $item->getId() );
+		$item->setCode('unitTest');
+		$item->setLabel('unitTest');
+		$this->object->saveItem($item);
+		$itemSaved = $this->object->getItem($item->getId());
 
 		$itemExp = clone $itemSaved;
-		$itemExp->setCode( 'unitTest2' );
-		$itemExp->setLabel( 'unitTest2' );
-		$this->object->saveItem( $itemExp );
-		$itemUpd = $this->object->getItem( $itemExp->getId() );
-
-		$this->object->deleteItem( $item->getId() );
-
-		$this->assertTrue( $item->getId() !== null );
-		$this->assertEquals( $item->getId(), $itemSaved->getId() );
-		$this->assertEquals( $item->getSiteId(), $itemSaved->getSiteId() );
-		$this->assertEquals( $item->getStatus(), $itemSaved->getStatus() );
-		$this->assertEquals( $item->getCode(), $itemSaved->getCode() );
-		$this->assertEquals( $item->getLabel(), $itemSaved->getLabel() );
-		$this->assertEquals( $item->getPaymentAddress(), $itemSaved->getPaymentAddress() );
-		$this->assertEquals( $item->getBirthday(), $itemSaved->getBirthday() );
-		$this->assertEquals( $item->getPassword(), $itemSaved->getPassword() );
-
-		$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->getStatus(), $itemUpd->getStatus() );
-		$this->assertEquals( $itemExp->getCode(), $itemUpd->getCode() );
-		$this->assertEquals( $itemExp->getLabel(), $itemUpd->getLabel() );
-		$this->assertEquals( $itemExp->getPaymentAddress(), $itemUpd->getPaymentAddress() );
-		$this->assertEquals( $itemExp->getBirthday(), $itemUpd->getBirthday() );
-		$this->assertEquals( $itemExp->getPassword(), $itemUpd->getPassword() );
-
-		$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->setExpectedException( '\\Aimeos\\MShop\\Exception' );
-		$this->object->getItem( $item->getId() );
+		$itemExp->setCode('unitTest2');
+		$itemExp->setLabel('unitTest2');
+		$this->object->saveItem($itemExp);
+		$itemUpd = $this->object->getItem($itemExp->getId());
+
+		$this->object->deleteItem($item->getId());
+
+		$this->assertTrue($item->getId() !== null);
+		$this->assertEquals($item->getId(), $itemSaved->getId());
+		$this->assertEquals($item->getSiteId(), $itemSaved->getSiteId());
+		$this->assertEquals($item->getStatus(), $itemSaved->getStatus());
+		$this->assertEquals($item->getCode(), $itemSaved->getCode());
+		$this->assertEquals($item->getLabel(), $itemSaved->getLabel());
+		$this->assertEquals($item->getPaymentAddress(), $itemSaved->getPaymentAddress());
+		$this->assertEquals($item->getBirthday(), $itemSaved->getBirthday());
+		$this->assertEquals($item->getPassword(), $itemSaved->getPassword());
+
+		$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->getStatus(), $itemUpd->getStatus());
+		$this->assertEquals($itemExp->getCode(), $itemUpd->getCode());
+		$this->assertEquals($itemExp->getLabel(), $itemUpd->getLabel());
+		$this->assertEquals($itemExp->getPaymentAddress(), $itemUpd->getPaymentAddress());
+		$this->assertEquals($itemExp->getBirthday(), $itemUpd->getBirthday());
+		$this->assertEquals($itemExp->getPassword(), $itemUpd->getPassword());
+
+		$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->setExpectedException('\\Aimeos\\MShop\\Exception');
+		$this->object->getItem($item->getId());
 	}
 
 
 	public function testCreateSearch()
 	{
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $this->object->createSearch() );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $this->object->createSearch());
 	}
 
 
@@ -142,65 +142,65 @@ 
 		$search = $this->object->createSearch();
 
 		$expr = array();
-		$expr[] = $search->compare( '!=', 'customer.id', null );
-		$expr[] = $search->compare( '==', 'customer.label', 'UTC002' );
-		$expr[] = $search->compare( '==', 'customer.code', 'UTC002' );
-
-		$expr[] = $search->compare( '>=', 'customer.salutation', '' );
-		$expr[] = $search->compare( '>=', 'customer.company', '' );
-		$expr[] = $search->compare( '>=', 'customer.vatid', '' );
-		$expr[] = $search->compare( '>=', 'customer.title', '' );
-		$expr[] = $search->compare( '>=', 'customer.firstname', '' );
-		$expr[] = $search->compare( '>=', 'customer.lastname', '' );
-		$expr[] = $search->compare( '>=', 'customer.address1', '' );
-		$expr[] = $search->compare( '>=', 'customer.address2', '' );
-		$expr[] = $search->compare( '>=', 'customer.address3', '' );
-		$expr[] = $search->compare( '>=', 'customer.postal', '' );
-		$expr[] = $search->compare( '>=', 'customer.city', '' );
-		$expr[] = $search->compare( '>=', 'customer.state', '' );
-		$expr[] = $search->compare( '!=', 'customer.languageid', null );
-		$expr[] = $search->compare( '>=', 'customer.countryid', '' );
-		$expr[] = $search->compare( '>=', 'customer.telephone', '' );
-		$expr[] = $search->compare( '>=', 'customer.email', '' );
-		$expr[] = $search->compare( '>=', 'customer.telefax', '' );
-		$expr[] = $search->compare( '>=', 'customer.website', '' );
-
-		$expr[] = $search->compare( '==', 'customer.birthday', '1970-01-01' );
-		$expr[] = $search->compare( '>=', 'customer.password', '' );
-		$expr[] = $search->compare( '==', 'customer.status', 0 );
-		$expr[] = $search->compare( '!=', 'customer.mtime', '1970-01-01 00:00:00' );
-		$expr[] = $search->compare( '!=', 'customer.ctime', '1970-01-01 00:00:00' );
-		$expr[] = $search->compare( '==', 'customer.editor', $this->editor );
-
-		$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.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 ) );
-		$result = $this->object->searchItems( $search, array(), $total );
-		$this->assertEquals( 1, count( $result ) );
+		$expr[] = $search->compare('!=', 'customer.id', null);
+		$expr[] = $search->compare('==', 'customer.label', 'UTC002');
+		$expr[] = $search->compare('==', 'customer.code', 'UTC002');
+
+		$expr[] = $search->compare('>=', 'customer.salutation', '');
+		$expr[] = $search->compare('>=', 'customer.company', '');
+		$expr[] = $search->compare('>=', 'customer.vatid', '');
+		$expr[] = $search->compare('>=', 'customer.title', '');
+		$expr[] = $search->compare('>=', 'customer.firstname', '');
+		$expr[] = $search->compare('>=', 'customer.lastname', '');
+		$expr[] = $search->compare('>=', 'customer.address1', '');
+		$expr[] = $search->compare('>=', 'customer.address2', '');
+		$expr[] = $search->compare('>=', 'customer.address3', '');
+		$expr[] = $search->compare('>=', 'customer.postal', '');
+		$expr[] = $search->compare('>=', 'customer.city', '');
+		$expr[] = $search->compare('>=', 'customer.state', '');
+		$expr[] = $search->compare('!=', 'customer.languageid', null);
+		$expr[] = $search->compare('>=', 'customer.countryid', '');
+		$expr[] = $search->compare('>=', 'customer.telephone', '');
+		$expr[] = $search->compare('>=', 'customer.email', '');
+		$expr[] = $search->compare('>=', 'customer.telefax', '');
+		$expr[] = $search->compare('>=', 'customer.website', '');
+
+		$expr[] = $search->compare('==', 'customer.birthday', '1970-01-01');
+		$expr[] = $search->compare('>=', 'customer.password', '');
+		$expr[] = $search->compare('==', 'customer.status', 0);
+		$expr[] = $search->compare('!=', 'customer.mtime', '1970-01-01 00:00:00');
+		$expr[] = $search->compare('!=', 'customer.ctime', '1970-01-01 00:00:00');
+		$expr[] = $search->compare('==', 'customer.editor', $this->editor);
+
+		$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.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));
+		$result = $this->object->searchItems($search, array(), $total);
+		$this->assertEquals(1, count($result));
 	}
 
 
@@ -209,44 +209,44 @@ 
 		$total = 0;
 
 		$search = $this->object->createSearch();
-		$search->setConditions( $search->compare( '==', 'customer.address.editor', $this->editor ) );
-		$search->setSlice( 0, 2 );
+		$search->setConditions($search->compare('==', 'customer.address.editor', $this->editor));
+		$search->setSlice(0, 2);
 
-		$results = $this->object->searchItems( $search, array(), $total );
-		$this->assertEquals( 2, count( $results ) );
-		$this->assertEquals( 3, $total );
+		$results = $this->object->searchItems($search, array(), $total);
+		$this->assertEquals(2, count($results));
+		$this->assertEquals(3, $total);
 
-		foreach($results as $itemId => $item) {
-			$this->assertEquals( $itemId, $item->getId() );
+		foreach ($results as $itemId => $item) {
+			$this->assertEquals($itemId, $item->getId());
 		}
 	}
 
 
 	public function testSearchItemsBaseCriteria()
 	{
-		$search = $this->object->createSearch( true );
+		$search = $this->object->createSearch(true);
 		$conditions = array(
-			$search->compare( '==', 'customer.address.editor', $this->editor ),
+			$search->compare('==', 'customer.address.editor', $this->editor),
 			$search->getConditions()
 		);
-		$search->setConditions( $search->combine( '&&', $conditions ) );
-		$this->assertEquals( 2, count( $this->object->searchItems( $search, array(), $total ) ) );
+		$search->setConditions($search->combine('&&', $conditions));
+		$this->assertEquals(2, count($this->object->searchItems($search, array(), $total)));
 	}
 
 
 	public function testGetSubManager()
 	{
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager( 'address' ) );
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager( 'address', 'Standard' ) );
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('address'));
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('address', 'Standard'));
 
-		$this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
-		$this->object->getSubManager( 'unknown' );
+		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
+		$this->object->getSubManager('unknown');
 	}
 
 
 	public function testGetSubManagerInvalidName()
 	{
-		$this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
-		$this->object->getSubManager( 'address', 'unknown' );
+		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
+		$this->object->getSubManager('address', 'unknown');
 	}
 }