aimeos / ai-fosuser

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

Spacing +80 added lines, -80 removed lines

@@ -243,11 +243,11 @@ 
 	 *
 	 * @param array $siteids List of IDs for sites whose entries should be deleted
 	 */
-	public function cleanup( array $siteids )
+	public function cleanup(array $siteids)
 	{
 		$path = 'mshop/customer/manager/submanagers';
-		foreach( $this->getContext()->getConfig()->get( $path, array( 'address', 'lists' ) ) as $domain ) {
-			$this->getObject()->getSubManager( $domain )->cleanup( $siteids );
+		foreach ($this->getContext()->getConfig()->get($path, array('address', 'lists')) as $domain) {
+			$this->getObject()->getSubManager($domain)->cleanup($siteids);
 		}
 	}
 
@@ -257,10 +257,10 @@ 
 	 *
 	 * @param array $ids List of IDs
 	 */
-	public function deleteItems( array $ids )
+	public function deleteItems(array $ids)
 	{
 		$path = 'mshop/customer/manager/fosuser/delete';
-		$this->deleteItemsBase( $ids, $path, false );
+		$this->deleteItemsBase($ids, $path, false);
 	}
 
 
@@ -270,11 +270,11 @@ 
 	 * @param boolean $withsub Return also attributes of sub-managers if true
 	 * @return array List of attribute items implementing \Aimeos\MW\Criteria\Attribute\Iface
 	 */
-	public function getSearchAttributes( $withsub = true )
+	public function getSearchAttributes($withsub = true)
 	{
 		$path = 'mshop/customer/manager/submanagers';
 
-		return $this->getSearchAttributesBase( $this->searchConfig, $path, array( 'address', 'lists' ), $withsub );
+		return $this->getSearchAttributesBase($this->searchConfig, $path, array('address', 'lists'), $withsub);
 	}
 
 
@@ -285,7 +285,7 @@ 
 	 */
 	public function createItem()
 	{
-		return $this->createItemBase( ['customer.siteid' => $this->getContext()->getLocale()->getSiteId()] );
+		return $this->createItemBase(['customer.siteid' => $this->getContext()->getLocale()->getSiteId()]);
 	}
 
 
@@ -296,29 +296,29 @@ 
 	 * @param boolean $fetch True if the new ID should be returned in the item
 	 * @return \Aimeos\MShop\Common\Item\Iface $item Updated item including the generated ID
 	 */
-	public function saveItem( \Aimeos\MShop\Common\Item\Iface $item, $fetch = true )
+	public function saveItem(\Aimeos\MShop\Common\Item\Iface $item, $fetch = true)
 	{
 		$iface = '\\Aimeos\\MShop\\Customer\\Item\\FosUser';
-		if( !( $item instanceof $iface ) ) {
-			throw new \Aimeos\MShop\Customer\Exception( sprintf( 'Object is not of required type "%1$s"', $iface ) );
+		if (!($item instanceof $iface)) {
+			throw new \Aimeos\MShop\Customer\Exception(sprintf('Object is not of required type "%1$s"', $iface));
 		}
 
-		if( !$item->isModified() ) {
+		if (!$item->isModified()) {
 			return $item;
 		}
 
 		$context = $this->getContext();
 		$dbm = $context->getDatabaseManager();
 		$dbname = $this->getResourceName();
-		$conn = $dbm->acquire( $dbname );
+		$conn = $dbm->acquire($dbname);
 
 		try
 		{
 			$id = $item->getId();
-			$date = date( 'Y-m-d H:i:s' );
+			$date = date('Y-m-d H:i:s');
 			$billingAddress = $item->getPaymentAddress();
 
-			if( $id === null )
+			if ($id === null)
 			{
 				/** mshop/customer/manager/fosuser/insert
 				 * Inserts a new customer record into the database table
@@ -382,51 +382,51 @@ 
 				$path = 'mshop/customer/manager/fosuser/update';
 			}
 
-			$stmt = $this->getCachedStatement( $conn, $path );
-
-			$stmt->bind( 1, $context->getLocale()->getSiteId(), \Aimeos\MW\DB\Statement\Base::PARAM_INT );
-			$stmt->bind( 2, $item->getCode() ); // canonical username
-			$stmt->bind( 3, $item->getCode() ); // username
-			$stmt->bind( 4, $billingAddress->getCompany() );
-			$stmt->bind( 5, $billingAddress->getVatID() );
-			$stmt->bind( 6, $billingAddress->getSalutation() );
-			$stmt->bind( 7, $billingAddress->getTitle() );
-			$stmt->bind( 8, $billingAddress->getFirstname() );
-			$stmt->bind( 9, $billingAddress->getLastname() );
-			$stmt->bind( 10, $billingAddress->getAddress1() );
-			$stmt->bind( 11, $billingAddress->getAddress2() );
-			$stmt->bind( 12, $billingAddress->getAddress3() );
-			$stmt->bind( 13, $billingAddress->getPostal() );
-			$stmt->bind( 14, $billingAddress->getCity() );
-			$stmt->bind( 15, $billingAddress->getState() );
-			$stmt->bind( 16, $billingAddress->getCountryId() );
-			$stmt->bind( 17, $billingAddress->getLanguageId() );
-			$stmt->bind( 18, $billingAddress->getTelephone() );
-			$stmt->bind( 19, $billingAddress->getEmail() );
-			$stmt->bind( 20, $billingAddress->getEmail() );
-			$stmt->bind( 21, $billingAddress->getTelefax() );
-			$stmt->bind( 22, $billingAddress->getWebsite() );
-			$stmt->bind( 23, $billingAddress->getLongitude() );
-			$stmt->bind( 24, $billingAddress->getLatitude() );
-			$stmt->bind( 25, $item->getBirthday() );
-			$stmt->bind( 26, $item->getStatus(), \Aimeos\MW\DB\Statement\Base::PARAM_INT );
-			$stmt->bind( 27, $item->getDateVerified() );
-			$stmt->bind( 28, $item->getPassword() );
-			$stmt->bind( 29, $date ); // Modification time
-			$stmt->bind( 30, $context->getEditor() );
-			$stmt->bind( 31, serialize( $item->getRoles() ) );
-			$stmt->bind( 32, $item->getSalt() );
-
-			if( $id !== null ) {
-				$stmt->bind( 33, $id, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
-				$item->setId( $id );
+			$stmt = $this->getCachedStatement($conn, $path);
+
+			$stmt->bind(1, $context->getLocale()->getSiteId(), \Aimeos\MW\DB\Statement\Base::PARAM_INT);
+			$stmt->bind(2, $item->getCode()); // canonical username
+			$stmt->bind(3, $item->getCode()); // username
+			$stmt->bind(4, $billingAddress->getCompany());
+			$stmt->bind(5, $billingAddress->getVatID());
+			$stmt->bind(6, $billingAddress->getSalutation());
+			$stmt->bind(7, $billingAddress->getTitle());
+			$stmt->bind(8, $billingAddress->getFirstname());
+			$stmt->bind(9, $billingAddress->getLastname());
+			$stmt->bind(10, $billingAddress->getAddress1());
+			$stmt->bind(11, $billingAddress->getAddress2());
+			$stmt->bind(12, $billingAddress->getAddress3());
+			$stmt->bind(13, $billingAddress->getPostal());
+			$stmt->bind(14, $billingAddress->getCity());
+			$stmt->bind(15, $billingAddress->getState());
+			$stmt->bind(16, $billingAddress->getCountryId());
+			$stmt->bind(17, $billingAddress->getLanguageId());
+			$stmt->bind(18, $billingAddress->getTelephone());
+			$stmt->bind(19, $billingAddress->getEmail());
+			$stmt->bind(20, $billingAddress->getEmail());
+			$stmt->bind(21, $billingAddress->getTelefax());
+			$stmt->bind(22, $billingAddress->getWebsite());
+			$stmt->bind(23, $billingAddress->getLongitude());
+			$stmt->bind(24, $billingAddress->getLatitude());
+			$stmt->bind(25, $item->getBirthday());
+			$stmt->bind(26, $item->getStatus(), \Aimeos\MW\DB\Statement\Base::PARAM_INT);
+			$stmt->bind(27, $item->getDateVerified());
+			$stmt->bind(28, $item->getPassword());
+			$stmt->bind(29, $date); // Modification time
+			$stmt->bind(30, $context->getEditor());
+			$stmt->bind(31, serialize($item->getRoles()));
+			$stmt->bind(32, $item->getSalt());
+
+			if ($id !== null) {
+				$stmt->bind(33, $id, \Aimeos\MW\DB\Statement\Base::PARAM_INT);
+				$item->setId($id);
 			} else {
-				$stmt->bind( 33, $date ); // Creation time
+				$stmt->bind(33, $date); // Creation time
 			}
 
 			$stmt->execute()->finish();
 
-			if( $id === null && $fetch === true )
+			if ($id === null && $fetch === true)
 			{
 				/** mshop/customer/manager/fosuser/newid
 				 * Retrieves the ID generated by the database when inserting a new record
@@ -459,18 +459,18 @@ 
 				 * @see mshop/customer/manager/fosuser/count
 				 */
 				$path = 'mshop/customer/manager/fosuser/newid';
-				$item->setId( $this->newId( $conn, $path ) );
+				$item->setId($this->newId($conn, $path));
 			}
 
-			$dbm->release( $conn, $dbname );
+			$dbm->release($conn, $dbname);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$dbm->release( $conn, $dbname );
+			$dbm->release($conn, $dbname);
 			throw $e;
 		}
 
-		$this->addGroups( $item );
+		$this->addGroups($item);
 
 		return $item;
 	}
@@ -484,11 +484,11 @@ 
 	 * @return array List of items implementing \Aimeos\MShop\Customer\Item\Iface
 	 * @throws \Aimeos\MShop\Customer\Exception If creating items failed
 	 */
-	public function searchItems( \Aimeos\MW\Criteria\Iface $search, array $ref = [], &$total = null )
+	public function searchItems(\Aimeos\MW\Criteria\Iface $search, array $ref = [], &$total = null)
 	{
 		$dbm = $this->getContext()->getDatabaseManager();
 		$dbname = $this->getResourceName();
-		$conn = $dbm->acquire( $dbname );
+		$conn = $dbm->acquire($dbname);
 		$map = [];
 
 		try
@@ -496,27 +496,27 @@ 
 			$level = \Aimeos\MShop\Locale\Manager\Base::SITE_ALL;
 			$cfgPathSearch = 'mshop/customer/manager/fosuser/search';
 			$cfgPathCount = 'mshop/customer/manager/fosuser/count';
-			$required = array( 'customer' );
+			$required = array('customer');
 
-			$results = $this->searchItemsBase( $conn, $search, $cfgPathSearch, $cfgPathCount, $required, $total, $level );
-			while( ( $row = $results->fetch() ) !== false ) {
-				$map[ $row['customer.id'] ] = $row;
+			$results = $this->searchItemsBase($conn, $search, $cfgPathSearch, $cfgPathCount, $required, $total, $level);
+			while (($row = $results->fetch()) !== false) {
+				$map[$row['customer.id']] = $row;
 			}
 
-			$dbm->release( $conn, $dbname );
+			$dbm->release($conn, $dbname);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$dbm->release( $conn, $dbname  );
+			$dbm->release($conn, $dbname);
 			throw $e;
 		}
 
 		$addrItems = [];
-		if( in_array( 'customer/address', $ref, true ) ) {
-			$addrItems = $this->getAddressItems( array_keys( $map ) );
+		if (in_array('customer/address', $ref, true)) {
+			$addrItems = $this->getAddressItems(array_keys($map));
 		}
 
-		return $this->buildItems( $map, $ref, 'customer', $addrItems );
+		return $this->buildItems($map, $ref, 'customer', $addrItems);
 	}
 
 
@@ -527,9 +527,9 @@ 
 	 * @param string|null $name Name of the implementation, will be from configuration (or Default) if null
 	 * @return mixed Manager for different extensions, e.g stock, tags, locations, etc.
 	 */
-	public function getSubManager( $manager, $name = null )
+	public function getSubManager($manager, $name = null)
 	{
-		return $this->getSubManagerBase( 'customer', $manager, ( $name === null ? 'FosUser' : $name ) );
+		return $this->getSubManagerBase('customer', $manager, ($name === null ? 'FosUser' : $name));
 	}
 
 
@@ -541,19 +541,19 @@ 
 	 * @param array $refItems Items referenced by the customer item via the list items
 	 * @return \Aimeos\MShop\Customer\Item\Iface New customer item
 	 */
-	protected function createItemBase( array $values = [], array $listItems = [], array $refItems = [], array $addresses = [] )
+	protected function createItemBase(array $values = [], array $listItems = [], array $refItems = [], array $addresses = [])
 	{
-		if( !isset( $this->addressManager ) ) {
-			$this->addressManager = $this->getObject()->getSubManager( 'address' );
+		if (!isset($this->addressManager)) {
+			$this->addressManager = $this->getObject()->getSubManager('address');
 		}
 
-		if( isset( $values['roles'] ) ) {
-			$values['roles'] = unserialize( $values['roles'] );
+		if (isset($values['roles'])) {
+			$values['roles'] = unserialize($values['roles']);
 		}
 
 		$helper = $this->getPasswordHelper();
 		$address = $this->addressManager->createItem();
 
-		return new \Aimeos\MShop\Customer\Item\FosUser( $address, $values, $listItems, $refItems, null, $helper, $addresses );
+		return new \Aimeos\MShop\Customer\Item\FosUser($address, $values, $listItems, $refItems, null, $helper, $addresses);
 	}
 }

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

Spacing +151 added lines, -151 removed lines

@@ -21,41 +21,41 @@ 
 	{
 		$context = \TestHelper::getContext();
 		$this->editor = $context->getEditor();
-		$this->object = new \Aimeos\MShop\Customer\Manager\FosUser( $context );
+		$this->object = new \Aimeos\MShop\Customer\Manager\FosUser($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 \RuntimeException( 'No customer item with code "UTC003" found' );
+		if (($expected = reset($items)) === false) {
+			throw new \RuntimeException('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,61 +85,61 @@ 
 	{
 		$item = $this->object->createItem();
 
-		$item->setCode( 'unitTest' );
-		$item->setLabel( 'unitTest' );
-		$resultSaved = $this->object->saveItem( $item );
-		$itemSaved = $this->object->getItem( $item->getId() );
+		$item->setCode('unitTest');
+		$item->setLabel('unitTest');
+		$resultSaved = $this->object->saveItem($item);
+		$itemSaved = $this->object->getItem($item->getId());
 
 		$itemExp = clone $itemSaved;
-		$itemExp->setCode( 'unitTest2' );
-		$itemExp->setLabel( 'unitTest2' );
-		$resultUpd = $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( $item->getRoles(), $itemSaved->getRoles() );
-		$this->assertEquals( $item->getSalt(), $itemSaved->getSalt() );
-
-		$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( $itemExp->getRoles(), $itemUpd->getRoles() );
-		$this->assertEquals( $itemExp->getSalt(), $itemUpd->getSalt() );
-
-		$this->assertEquals( $this->editor, $itemUpd->getEditor() );
-		$this->assertEquals( $itemExp->getTimeCreated(), $itemUpd->getTimeCreated() );
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified() );
-
-		$this->assertInstanceOf( '\Aimeos\MShop\Common\Item\Iface', $resultSaved );
-		$this->assertInstanceOf( '\Aimeos\MShop\Common\Item\Iface', $resultUpd );
-
-		$this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
-		$this->object->getItem( $item->getId() );
+		$itemExp->setCode('unitTest2');
+		$itemExp->setLabel('unitTest2');
+		$resultUpd = $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($item->getRoles(), $itemSaved->getRoles());
+		$this->assertEquals($item->getSalt(), $itemSaved->getSalt());
+
+		$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($itemExp->getRoles(), $itemUpd->getRoles());
+		$this->assertEquals($itemExp->getSalt(), $itemUpd->getSalt());
+
+		$this->assertEquals($this->editor, $itemUpd->getEditor());
+		$this->assertEquals($itemExp->getTimeCreated(), $itemUpd->getTimeCreated());
+		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified());
+
+		$this->assertInstanceOf('\Aimeos\MShop\Common\Item\Iface', $resultSaved);
+		$this->assertInstanceOf('\Aimeos\MShop\Common\Item\Iface', $resultUpd);
+
+		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
+		$this->object->getItem($item->getId());
 	}
 
 
 	public function testCreateSearch()
 	{
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $this->object->createSearch() );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $this->object->createSearch());
 	}
 
 
@@ -149,69 +149,69 @@ 
 		$search = $this->object->createSearch();
 
 		$expr = [];
-		$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.longitude', '10.0' );
-		$expr[] = $search->compare( '>=', 'customer.latitude', '50.0' );
-
-		$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.longitude', '10.0' );
-		$expr[] = $search->compare( '>=', 'customer.address.latitude', '50.0' );
-		$expr[] = $search->compare( '==', 'customer.address.flag', 0 );
-		$expr[] = $search->compare( '==', 'customer.address.position', 1 );
-		$expr[] = $search->compare( '!=', 'customer.address.mtime', '1970-01-01 00:00:00' );
-		$expr[] = $search->compare( '!=', 'customer.address.ctime', '1970-01-01 00:00:00' );
-		$expr[] = $search->compare( '==', 'customer.address.editor', $this->editor );
-
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$result = $this->object->searchItems( $search, [], $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.longitude', '10.0');
+		$expr[] = $search->compare('>=', 'customer.latitude', '50.0');
+
+		$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.longitude', '10.0');
+		$expr[] = $search->compare('>=', 'customer.address.latitude', '50.0');
+		$expr[] = $search->compare('==', 'customer.address.flag', 0);
+		$expr[] = $search->compare('==', 'customer.address.position', 1);
+		$expr[] = $search->compare('!=', 'customer.address.mtime', '1970-01-01 00:00:00');
+		$expr[] = $search->compare('!=', 'customer.address.ctime', '1970-01-01 00:00:00');
+		$expr[] = $search->compare('==', 'customer.address.editor', $this->editor);
+
+		$search->setConditions($search->combine('&&', $expr));
+		$result = $this->object->searchItems($search, [], $total);
+		$this->assertEquals(1, count($result));
 	}
 
 
@@ -220,60 +220,60 @@ 
 		$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, [], $total );
-		$this->assertEquals( 2, count( $results ) );
-		$this->assertEquals( 3, $total );
+		$results = $this->object->searchItems($search, [], $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 testSearchItemsCriteria()
 	{
-		$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, [], $total ) ) );
+		$search->setConditions($search->combine('&&', $conditions));
+		$this->assertEquals(2, count($this->object->searchItems($search, [], $total)));
 	}
 
 
 	public function testSearchItemsRef()
 	{
 		$search = $this->object->createSearch();
-		$search->setConditions( $search->compare( '==', 'customer.code', 'UTC001' ) );
+		$search->setConditions($search->compare('==', 'customer.code', 'UTC001'));
 
-		$results = $this->object->searchItems( $search, ['customer/address', 'text'] );
+		$results = $this->object->searchItems($search, ['customer/address', 'text']);
 
-		if( ( $item = reset( $results ) ) === false ) {
-			throw new \Exception( 'No customer item for "UTC001" available' );
+		if (($item = reset($results)) === false) {
+			throw new \Exception('No customer item for "UTC001" available');
 		}
 
-		$this->assertEquals( 1, count( $item->getRefItems( 'text' ) ) );
-		$this->assertEquals( 1, count( $item->getAddressItems() ) );
+		$this->assertEquals(1, count($item->getRefItems('text')));
+		$this->assertEquals(1, count($item->getAddressItems()));
 	}
 
 
 	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');
 	}
 }