aimeos / ai-fosuser

lib/custom/tests/bootstrap.php

Spacing +6 added lines, -6 removed lines

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

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

Braces +3 added lines, -6 removed lines

@@ -332,8 +332,7 @@ 
 				 * @see mshop/customer/manager/fosuser/count
 				 */
 				$path = 'mshop/customer/manager/fosuser/insert';
-			}
-			else
+			} else
 			{
 				/** mshop/customer/manager/fosuser/update
 				 * Updates an existing customer record in the database
@@ -441,8 +440,7 @@ 
 			}
 
 			$dbm->release( $conn, $dbname );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$dbm->release( $conn, $dbname );
 			throw $e;
@@ -478,8 +476,7 @@ 
 			}
 
 			$dbm->release( $conn, $dbname );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$dbm->release( $conn, $dbname  );
 			throw $e;

Spacing +77 added lines, -77 removed lines

@@ -242,11 +242,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);
 		}
 	}
 
@@ -256,10 +256,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);
 	}
 
 
@@ -269,11 +269,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);
 	}
 
 
@@ -294,27 +294,27 @@ 
 	 * @param \Aimeos\MShop\Customer\Item\Iface $item Customer item object
 	 * @param boolean $fetch True if the new ID should be returned in the item
 	 */
-	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() ) { return; }
+		if (!$item->isModified()) { return; }
 
 		$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
@@ -378,50 +378,50 @@ 
 				$path = 'mshop/customer/manager/fosuser/update';
 			}
 
-			$stmt = $this->getCachedStatement( $conn, $path );
-
-			$stmt->bind( 1, $item->getCode() ); // canonical username
-			$stmt->bind( 2, $item->getCode() ); // username
-			$stmt->bind( 3, $billingAddress->getCompany() );
-			$stmt->bind( 4, $billingAddress->getVatID() );
-			$stmt->bind( 5, $billingAddress->getSalutation() );
-			$stmt->bind( 6, $billingAddress->getTitle() );
-			$stmt->bind( 7, $billingAddress->getFirstname() );
-			$stmt->bind( 8, $billingAddress->getLastname() );
-			$stmt->bind( 9, $billingAddress->getAddress1() );
-			$stmt->bind( 10, $billingAddress->getAddress2() );
-			$stmt->bind( 11, $billingAddress->getAddress3() );
-			$stmt->bind( 12, $billingAddress->getPostal() );
-			$stmt->bind( 13, $billingAddress->getCity() );
-			$stmt->bind( 14, $billingAddress->getState() );
-			$stmt->bind( 15, $billingAddress->getCountryId() );
-			$stmt->bind( 16, $billingAddress->getLanguageId() );
-			$stmt->bind( 17, $billingAddress->getTelephone() );
-			$stmt->bind( 18, $billingAddress->getEmail() );
-			$stmt->bind( 19, $billingAddress->getEmail() );
-			$stmt->bind( 20, $billingAddress->getTelefax() );
-			$stmt->bind( 21, $billingAddress->getWebsite() );
-			$stmt->bind( 22, $billingAddress->getLongitude() );
-			$stmt->bind( 23, $billingAddress->getLatitude() );
-			$stmt->bind( 24, $item->getBirthday() );
-			$stmt->bind( 25, $item->getStatus(), \Aimeos\MW\DB\Statement\Base::PARAM_INT );
-			$stmt->bind( 26, $item->getDateVerified() );
-			$stmt->bind( 27, $item->getPassword() );
-			$stmt->bind( 28, $date ); // Modification time
-			$stmt->bind( 29, $context->getEditor() );
-			$stmt->bind( 30, serialize( $item->getRoles() ) );
-			$stmt->bind( 31, $item->getSalt() );
-
-			if( $id !== null ) {
-				$stmt->bind( 32, $id, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
-				$item->setId( $id );
+			$stmt = $this->getCachedStatement($conn, $path);
+
+			$stmt->bind(1, $item->getCode()); // canonical username
+			$stmt->bind(2, $item->getCode()); // username
+			$stmt->bind(3, $billingAddress->getCompany());
+			$stmt->bind(4, $billingAddress->getVatID());
+			$stmt->bind(5, $billingAddress->getSalutation());
+			$stmt->bind(6, $billingAddress->getTitle());
+			$stmt->bind(7, $billingAddress->getFirstname());
+			$stmt->bind(8, $billingAddress->getLastname());
+			$stmt->bind(9, $billingAddress->getAddress1());
+			$stmt->bind(10, $billingAddress->getAddress2());
+			$stmt->bind(11, $billingAddress->getAddress3());
+			$stmt->bind(12, $billingAddress->getPostal());
+			$stmt->bind(13, $billingAddress->getCity());
+			$stmt->bind(14, $billingAddress->getState());
+			$stmt->bind(15, $billingAddress->getCountryId());
+			$stmt->bind(16, $billingAddress->getLanguageId());
+			$stmt->bind(17, $billingAddress->getTelephone());
+			$stmt->bind(18, $billingAddress->getEmail());
+			$stmt->bind(19, $billingAddress->getEmail());
+			$stmt->bind(20, $billingAddress->getTelefax());
+			$stmt->bind(21, $billingAddress->getWebsite());
+			$stmt->bind(22, $billingAddress->getLongitude());
+			$stmt->bind(23, $billingAddress->getLatitude());
+			$stmt->bind(24, $item->getBirthday());
+			$stmt->bind(25, $item->getStatus(), \Aimeos\MW\DB\Statement\Base::PARAM_INT);
+			$stmt->bind(26, $item->getDateVerified());
+			$stmt->bind(27, $item->getPassword());
+			$stmt->bind(28, $date); // Modification time
+			$stmt->bind(29, $context->getEditor());
+			$stmt->bind(30, serialize($item->getRoles()));
+			$stmt->bind(31, $item->getSalt());
+
+			if ($id !== null) {
+				$stmt->bind(32, $id, \Aimeos\MW\DB\Statement\Base::PARAM_INT);
+				$item->setId($id);
 			} else {
-				$stmt->bind( 32, $date ); // Creation time
+				$stmt->bind(32, $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
@@ -454,14 +454,14 @@ 
 				 * @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;
 		}
 	}
@@ -475,11 +475,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
@@ -487,27 +487,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( 'address', $ref, true ) ) {
-			$addrItems = $this->getAddressItems( array_keys( $map ) );
+		if (in_array('address', $ref, true)) {
+			$addrItems = $this->getAddressItems(array_keys($map));
 		}
 
-		return $this->buildItems( $map, $ref, 'customer', $addrItems );
+		return $this->buildItems($map, $ref, 'customer', $addrItems);
 	}
 
 
@@ -518,9 +518,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));
 	}
 
 
@@ -532,19 +532,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/setup/FosuserAddIndexes.php

Spacing +10 added lines, -10 removed lines

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

Braces +1 added lines, -2 removed lines

@@ -66,8 +66,7 @@
 			{
 				$this->execute( $stmt );
 				$this->status( 'done' );
-			}
-			else
+			} else
 			{
 				$this->status( 'OK' );
 			}

lib/custom/setup/CustomerChangeAddressRefidParentidFosUser.php

Spacing +11 added lines, -11 removed lines

@@ -40,7 +40,7 @@ 
 	 */
 	public function getPostDependencies()
 	{
-		return array( 'TablesCreateFosUser' );
+		return array('TablesCreateFosUser');
 	}
 
 
@@ -49,7 +49,7 @@ 
 	 */
 	protected function mysql()
 	{
-		$this->process( $this->mysql );
+		$this->process($this->mysql);
 	}
 
 
@@ -58,22 +58,22 @@ 
 	 *
 	 * array string $stmts List of SQL statements for changing the columns
 	 */
-	protected function process( array $stmts )
+	protected function process(array $stmts)
 	{
 		$table = 'fos_user_address';
-		$this->msg( sprintf( 'Rename "refid" to "parentid" in table "%1$s"', $table ), 0 ); $this->status( '' );
+		$this->msg(sprintf('Rename "refid" to "parentid" in table "%1$s"', $table), 0); $this->status('');
 
-		foreach( $stmts as $column => $stmts )
+		foreach ($stmts as $column => $stmts)
 		{
-			$this->msg( sprintf( 'Checking column "%1$s"', $column ), 1 );
+			$this->msg(sprintf('Checking column "%1$s"', $column), 1);
 
-			if( $this->schema->tableExists( $table )
-				&& $this->schema->columnExists( $table, $column ) === true
+			if ($this->schema->tableExists($table)
+				&& $this->schema->columnExists($table, $column) === true
 			) {
-				$this->executeList( $stmts );
-				$this->status( 'done' );
+				$this->executeList($stmts);
+				$this->status('done');
 			} else {
-				$this->status( 'OK' );
+				$this->status('OK');
 			}
 		}
 	}

lib/custom/setup/unittest/data/customer.php

Spacing +8 added lines, -8 removed lines

@@ -5,16 +5,16 @@
  * @copyright Aimeos (aimeos.org), 2014-2016
  */
 
-return array (
+return array(
 	'customer' => array(
-		'customer/UTC001' => array( 'code' => 'UTC001', 'label' => 'unitCustomer1', 'salutation' => 'mr', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'title' => 'Dr.', 'firstname' => 'Max', 'lastname' => 'Mustermann', 'address1' => 'Musterstraße', 'address2' => '1a', 'address3' => '', 'postal' => '20001', 'city' => 'Musterstadt', 'state' => 'Hamburg', 'langid' => 'de', 'countryid' => 'DE', 'telephone' => '01234567890', 'email' => 'unitCustomer1@aimeos.org', 'telefax' => '01234567890', 'website' => 'unittest.aimeos.org', 'longitude' => '10.0', 'latitude' => '50.0', 'birthday' => '1970-01-01', 'status' => '1', 'password' => 'test' ),
-		'customer/UTC002' => array( 'code' => 'UTC002', 'label' => 'unitCustomer2', 'salutation' => 'mrs', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'title' => 'Prof. Dr.', 'firstname' => 'Erika', 'lastname' => 'Mustermann', 'address1' => 'Heidestraße', 'address2' => '17', 'address3' => '', 'postal' => '45632', 'city' => 'Köln', 'state' => '', 'langid' => 'de', 'countryid' => 'DE', 'telephone' => '09876543210', 'email' => 'unitCustomer2@aimeos.org', 'telefax' => '09876543210', 'website' => 'unittest.aimeos.org', 'longitude' => '10.5', 'latitude' => '51.0', 'birthday' => '1970-01-01', 'status' => '0','password' =>  'test' ),
-		'customer/UTC003' => array( 'code' => 'UTC003', 'label' => 'unitCustomer3', 'salutation' => 'mr', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'title' => '', 'firstname' => 'Franz-Xaver', 'lastname' => 'Gabler', 'address1' => 'Phantasiestraße', 'address2' => '2', 'address3' => '', 'postal' => '23643', 'city' => 'Berlin', 'state' => 'Berlin', 'langid' => 'de', 'countryid' => 'DE', 'telephone' => '01234509876', 'email' => 'unitCustomer3@aimeos.org', 'telefax' => '055544333212', 'website' => 'unittest.aimeos.org', 'longitude' => '11.0', 'latitude' => '52.0', 'birthday' => '1970-01-01', 'status' => '1', 'password' => 'test' ),
+		'customer/UTC001' => array('code' => 'UTC001', 'label' => 'unitCustomer1', 'salutation' => 'mr', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'title' => 'Dr.', 'firstname' => 'Max', 'lastname' => 'Mustermann', 'address1' => 'Musterstraße', 'address2' => '1a', 'address3' => '', 'postal' => '20001', 'city' => 'Musterstadt', 'state' => 'Hamburg', 'langid' => 'de', 'countryid' => 'DE', 'telephone' => '01234567890', 'email' => 'unitCustomer1@aimeos.org', 'telefax' => '01234567890', 'website' => 'unittest.aimeos.org', 'longitude' => '10.0', 'latitude' => '50.0', 'birthday' => '1970-01-01', 'status' => '1', 'password' => 'test'),
+		'customer/UTC002' => array('code' => 'UTC002', 'label' => 'unitCustomer2', 'salutation' => 'mrs', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'title' => 'Prof. Dr.', 'firstname' => 'Erika', 'lastname' => 'Mustermann', 'address1' => 'Heidestraße', 'address2' => '17', 'address3' => '', 'postal' => '45632', 'city' => 'Köln', 'state' => '', 'langid' => 'de', 'countryid' => 'DE', 'telephone' => '09876543210', 'email' => 'unitCustomer2@aimeos.org', 'telefax' => '09876543210', 'website' => 'unittest.aimeos.org', 'longitude' => '10.5', 'latitude' => '51.0', 'birthday' => '1970-01-01', 'status' => '0', 'password' =>  'test'),
+		'customer/UTC003' => array('code' => 'UTC003', 'label' => 'unitCustomer3', 'salutation' => 'mr', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'title' => '', 'firstname' => 'Franz-Xaver', 'lastname' => 'Gabler', 'address1' => 'Phantasiestraße', 'address2' => '2', 'address3' => '', 'postal' => '23643', 'city' => 'Berlin', 'state' => 'Berlin', 'langid' => 'de', 'countryid' => 'DE', 'telephone' => '01234509876', 'email' => 'unitCustomer3@aimeos.org', 'telefax' => '055544333212', 'website' => 'unittest.aimeos.org', 'longitude' => '11.0', 'latitude' => '52.0', 'birthday' => '1970-01-01', 'status' => '1', 'password' => 'test'),
 	),
 	'customer/address' => array(
-		array ( 'parentid' => 'customer/UTC001', 'company' => 'ABC', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => 'Dr', 'firstname' => 'Our', 'lastname' => 'Unittest', 'address1' => 'Pickhuben', 'address2' => '2-4', 'address3' => '', 'postal' => '20457', 'city' => 'Hamburg', 'state' => 'Hamburg', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '055544332211', 'email' => 'unitCustomer1@aimeos.org', 'telefax' => '055544332212', 'website' => 'unittest.aimeos.org', 'longitude' => '10.0', 'latitude' => '50.0', 'flag' => 0, 'pos' => '0' ),
-		array ( 'parentid' => 'customer/UTC002', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => 'Dr.', 'firstname' => 'Good', 'lastname' => 'Unittest', 'address1' => 'Pickhuben', 'address2' => '2-4', 'address3' => '', 'postal' => '20457', 'city' => 'Hamburg', 'state' => 'Hamburg', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '055544332211', 'email' => 'unitCustomer2@aimeos.org', 'telefax' => '055544332212', 'website' => 'unittest.aimeos.org', 'longitude' => '10.5', 'latitude' => '51.0', 'flag' => 0, 'pos' => '1' ),
-		array ( 'parentid' => 'customer/UTC002', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => 'Dr.', 'firstname' => 'Good', 'lastname' => 'Unittest', 'address1' => 'Pickhuben', 'address2' => '2-4', 'address3' => '', 'postal' => '11099', 'city' => 'Berlin', 'state' => 'Berlin', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '055544332221', 'email' => 'unitCustomer2@aimeos.org', 'telefax' => '055544333212', 'website' => 'unittest.aimeos.org', 'longitude' => '11.0', 'latitude' => '52.0', 'flag' => 0, 'pos' => '1' ),
-		array ( 'parentid' => 'customer/UTC003', 'company' => 'unitcompany', 'vatid' => 'DE999999999', 'salutation' => 'company', 'title' => 'unittitle', 'firstname' => 'unitfirstname', 'lastname' => 'unitlastname', 'address1' => 'unitaddress1', 'address2' => 'unitaddress2', 'address3' => 'unitaddress3', 'postal' => 'unitpostal', 'city' => 'unitcity', 'state' => 'unitstate', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '1234567890', 'email' => 'unitCustomer3@aimeos.org', 'telefax' => '1234567891', 'website' => 'unittest.aimeos.org', 'longitude' => '10.0', 'latitude' => '50.0', 'flag' => 0, 'pos' => '2' ),
+		array('parentid' => 'customer/UTC001', 'company' => 'ABC', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => 'Dr', 'firstname' => 'Our', 'lastname' => 'Unittest', 'address1' => 'Pickhuben', 'address2' => '2-4', 'address3' => '', 'postal' => '20457', 'city' => 'Hamburg', 'state' => 'Hamburg', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '055544332211', 'email' => 'unitCustomer1@aimeos.org', 'telefax' => '055544332212', 'website' => 'unittest.aimeos.org', 'longitude' => '10.0', 'latitude' => '50.0', 'flag' => 0, 'pos' => '0'),
+		array('parentid' => 'customer/UTC002', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => 'Dr.', 'firstname' => 'Good', 'lastname' => 'Unittest', 'address1' => 'Pickhuben', 'address2' => '2-4', 'address3' => '', 'postal' => '20457', 'city' => 'Hamburg', 'state' => 'Hamburg', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '055544332211', 'email' => 'unitCustomer2@aimeos.org', 'telefax' => '055544332212', 'website' => 'unittest.aimeos.org', 'longitude' => '10.5', 'latitude' => '51.0', 'flag' => 0, 'pos' => '1'),
+		array('parentid' => 'customer/UTC002', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => 'Dr.', 'firstname' => 'Good', 'lastname' => 'Unittest', 'address1' => 'Pickhuben', 'address2' => '2-4', 'address3' => '', 'postal' => '11099', 'city' => 'Berlin', 'state' => 'Berlin', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '055544332221', 'email' => 'unitCustomer2@aimeos.org', 'telefax' => '055544333212', 'website' => 'unittest.aimeos.org', 'longitude' => '11.0', 'latitude' => '52.0', 'flag' => 0, 'pos' => '1'),
+		array('parentid' => 'customer/UTC003', 'company' => 'unitcompany', 'vatid' => 'DE999999999', 'salutation' => 'company', 'title' => 'unittitle', 'firstname' => 'unitfirstname', 'lastname' => 'unitlastname', 'address1' => 'unitaddress1', 'address2' => 'unitaddress2', 'address3' => 'unitaddress3', 'postal' => 'unitpostal', 'city' => 'unitcity', 'state' => 'unitstate', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '1234567890', 'email' => 'unitCustomer3@aimeos.org', 'telefax' => '1234567891', 'website' => 'unittest.aimeos.org', 'longitude' => '10.0', 'latitude' => '50.0', 'flag' => 0, 'pos' => '2'),
 	),
 );

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

Spacing +12 added lines, -12 removed lines

@@ -33,10 +33,10 @@ 
 	 * @param \Aimeos\MShop\Common\Item\Iface[] $refItems List of referenced items
 	 * @param \Aimeos\MShop\Common\Item\Helper\Password\Iface|null $helper Password encryption helper object
 	 */
-	public function __construct( \Aimeos\MShop\Common\Item\Address\Iface $address, array $values = [], array $listItems = [],
-		array $refItems = [], $salt = '', \Aimeos\MShop\Common\Item\Helper\Password\Iface $helper = null, array $addresses = [] )
+	public function __construct(\Aimeos\MShop\Common\Item\Address\Iface $address, array $values = [], array $listItems = [],
+		array $refItems = [], $salt = '', \Aimeos\MShop\Common\Item\Helper\Password\Iface $helper = null, array $addresses = [])
 	{
-		parent::__construct( $address, $values, $listItems, $refItems, $salt, $helper, $addresses );
+		parent::__construct($address, $values, $listItems, $refItems, $salt, $helper, $addresses);
 
 		$this->values = $values;
 		$this->helper = $helper;
@@ -51,7 +51,7 @@ 
 	 */
 	public function getPassword()
 	{
-		if( isset( $this->values['customer.password'] ) ) {
+		if (isset($this->values['customer.password'])) {
 			return (string) $this->values['customer.password'];
 		}
 
@@ -65,12 +65,12 @@ 
 	 * @param string $value Password of the customer item
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item for chaining method calls
 	 */
-	public function setPassword( $value )
+	public function setPassword($value)
 	{
-		if( $value == $this->getPassword() ) { return $this; }
+		if ($value == $this->getPassword()) { return $this; }
 
-		if( $this->helper !== null ) {
-			$value = $this->helper->encode( $value, $this->getSalt() );
+		if ($this->helper !== null) {
+			$value = $this->helper->encode($value, $this->getSalt());
 		}
 
 		$this->values['customer.password'] = (string) $value;
@@ -87,7 +87,7 @@ 
 	 */
 	public function getRoles()
 	{
-		if( isset( $this->values['roles'] ) ) {
+		if (isset($this->values['roles'])) {
 			return (array) $this->values['roles'];
 		}
 
@@ -100,7 +100,7 @@ 
 	 *
 	 * @param array $roles List of Symfony roles
 	 */
-	public function setRoles( array $roles )
+	public function setRoles(array $roles)
 	{
 		$this->values['roles'] = $roles;
 		$this->setModified();
@@ -116,7 +116,7 @@ 
 	 */
 	public function getSalt()
 	{
-		if( isset( $this->values['salt'] ) ) {
+		if (isset($this->values['salt'])) {
 			return $this->values['salt'];
 		}
 
@@ -129,7 +129,7 @@ 
 	 *
 	 * @param string $value Password salt
 	 */
-	public function setSalt( $value )
+	public function setSalt($value)
 	{
 		$this->values['salt'] = (string) $value;
 		$this->setModified();

lib/custom/setup/unittest/data/customer-list.php

Spacing +8 added lines, -8 removed lines

@@ -5,15 +5,15 @@
  * @copyright Aimeos (aimeos.org), 2014-2016
  */
 
-return array (
-	'customer/lists/type' => array (
-		'text/default' => array( 'domain' => 'text', 'code' => 'default', 'label' => 'Standard', 'status' => 1 ),
+return array(
+	'customer/lists/type' => array(
+		'text/default' => array('domain' => 'text', 'code' => 'default', 'label' => 'Standard', 'status' => 1),
 	),
 
-	'customer/lists' => array (
-		array( 'parentid' => 'customer/UTC003', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/information', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => [], 'pos' => 1, 'status' => 1 ),
-		array( 'parentid' => 'customer/UTC003', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/notify', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => [], 'pos' => 2, 'status' => 1 ),
-		array( 'parentid' => 'customer/UTC003', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/newsletter', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => [], 'pos' => 3, 'status' => 1 ),
-		array( 'parentid' => 'customer/UTC001', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/information', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => [], 'pos' => 1, 'status' => 1 ),
+	'customer/lists' => array(
+		array('parentid' => 'customer/UTC003', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/information', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => [], 'pos' => 1, 'status' => 1),
+		array('parentid' => 'customer/UTC003', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/notify', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => [], 'pos' => 2, 'status' => 1),
+		array('parentid' => 'customer/UTC003', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/newsletter', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => [], 'pos' => 3, 'status' => 1),
+		array('parentid' => 'customer/UTC001', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/information', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => [], 'pos' => 1, 'status' => 1),
 	),
 );

lib/custom/setup/unittest/CustomerAddFosUserTestData.php

Spacing +15 added lines, -15 removed lines

@@ -21,7 +21,7 @@ 
 	 */
 	public function getPreDependencies()
 	{
-		return array( 'TablesCreateFosUser' );
+		return array('TablesCreateFosUser');
 	}
 
 
@@ -31,38 +31,38 @@ 
 	public function migrate()
 	{
 		$iface = '\\Aimeos\\MShop\\Context\\Item\\Iface';
-		if( !( $this->additional instanceof $iface ) ) {
-			throw new \Aimeos\MW\Setup\Exception( sprintf( 'Additionally provided object is not of type "%1$s"', $iface ) );
+		if (!($this->additional instanceof $iface)) {
+			throw new \Aimeos\MW\Setup\Exception(sprintf('Additionally provided object is not of type "%1$s"', $iface));
 		}
 
-		$this->msg( 'Adding Fos user bundle customer test data', 0 );
+		$this->msg('Adding Fos user bundle customer test data', 0);
 
 		$parentIds = [];
 		$ds = DIRECTORY_SEPARATOR;
-		$this->additional->setEditor( 'ai-fosuser:unittest' );
+		$this->additional->setEditor('ai-fosuser:unittest');
 		$path = __DIR__ . $ds . 'data' . $ds . 'customer.php';
 
-		if( ( $testdata = include( $path ) ) === false ){
-			throw new \Aimeos\MShop\Exception( sprintf( 'No file "%1$s" found for customer domain', $path ) );
+		if (($testdata = include($path)) === false) {
+			throw new \Aimeos\MShop\Exception(sprintf('No file "%1$s" found for customer domain', $path));
 		}
 
 
-		$customerManager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $this->additional, 'FosUser' );
-		$customerAddressManager = $customerManager->getSubManager( 'address', 'FosUser' );
+		$customerManager = \Aimeos\MShop\Customer\Manager\Factory::createManager($this->additional, 'FosUser');
+		$customerAddressManager = $customerManager->getSubManager('address', 'FosUser');
 
 		$search = $customerManager->createSearch();
-		$search->setConditions( $search->compare( '==', 'customer.code', array( 'UTC001', 'UTC002', 'UTC003' ) ) );
-		$items = $customerManager->searchItems( $search );
+		$search->setConditions($search->compare('==', 'customer.code', array('UTC001', 'UTC002', 'UTC003')));
+		$items = $customerManager->searchItems($search);
 
 		$this->conn->begin();
 
-		$customerManager->deleteItems( array_keys( $items ) );
-		$parentIds = $this->addCustomerData( $testdata, $customerManager, $customerAddressManager->createItem() );
-		$this->addCustomerAddressData( $testdata, $customerAddressManager, $parentIds );
+		$customerManager->deleteItems(array_keys($items));
+		$parentIds = $this->addCustomerData($testdata, $customerManager, $customerAddressManager->createItem());
+		$this->addCustomerAddressData($testdata, $customerAddressManager, $parentIds);
 
 		$this->conn->commit();
 
 
-		$this->status( 'done' );
+		$this->status('done');
 	}
 }

lib/custom/setup/unittest/CustomerListAddFosUserTestData.php

Spacing +13 added lines, -13 removed lines

@@ -22,7 +22,7 @@ 
 	 */
 	public function getPreDependencies()
 	{
-		return array( 'TablesCreateFosUser', 'CustomerAddFosUserTestData', 'LocaleAddTestData', 'TextAddTestData' );
+		return array('TablesCreateFosUser', 'CustomerAddFosUserTestData', 'LocaleAddTestData', 'TextAddTestData');
 	}
 
 
@@ -32,29 +32,29 @@ 
 	public function migrate()
 	{
 		$iface = '\\Aimeos\\MShop\\Context\\Item\\Iface';
-		if( !( $this->additional instanceof $iface ) ) {
-			throw new \Aimeos\MW\Setup\Exception( sprintf( 'Additionally provided object is not of type "%1$s"', $iface ) );
+		if (!($this->additional instanceof $iface)) {
+			throw new \Aimeos\MW\Setup\Exception(sprintf('Additionally provided object is not of type "%1$s"', $iface));
 		}
 
-		$this->msg( 'Adding customer-list Fos user bundle test data', 0 );
-		$this->additional->setEditor( 'ai-fosuser:unittest' );
+		$this->msg('Adding customer-list Fos user bundle test data', 0);
+		$this->additional->setEditor('ai-fosuser:unittest');
 
 		$ds = DIRECTORY_SEPARATOR;
-		$path = dirname( __FILE__ ) . $ds . 'data' . $ds . 'customer-list.php';
+		$path = dirname(__FILE__) . $ds . 'data' . $ds . 'customer-list.php';
 
-		if( ( $testdata = include( $path ) ) === false ){
-			throw new \Aimeos\MShop\Exception( sprintf( 'No file "%1$s" found for customer list domain', $path ) );
+		if (($testdata = include($path)) === false) {
+			throw new \Aimeos\MShop\Exception(sprintf('No file "%1$s" found for customer list domain', $path));
 		}
 
 		$refKeys = [];
-		foreach( $testdata['customer/lists'] as $dataset ) {
-			$refKeys[ $dataset['domain'] ][] = $dataset['refid'];
+		foreach ($testdata['customer/lists'] as $dataset) {
+			$refKeys[$dataset['domain']][] = $dataset['refid'];
 		}
 
 		$refIds = [];
-		$refIds['text'] = $this->getTextData( $refKeys['text'] );
-		$this->addCustomerListData( $testdata, $refIds, 'FosUser' );
+		$refIds['text'] = $this->getTextData($refKeys['text']);
+		$this->addCustomerListData($testdata, $refIds, 'FosUser');
 
-		$this->status( 'done' );
+		$this->status('done');
 	}
 }