aimeos / ai-symfony

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-list.php

Spacing +8 added lines, -8 removed lines

@@ -5,15 +5,15 @@
  * @copyright Aimeos (aimeos.org), 2014
  */
 
-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/unitCustomer3', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/information', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => array(), 'pos' => 0, 'status' => 1 ),
-		array( 'parentid' => 'customer/unitCustomer3', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/notify', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => array(), 'pos' => 1, 'status' => 1 ),
-		array( 'parentid' => 'customer/unitCustomer3', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/newsletter', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => array(), 'pos' => 2, 'status' => 1 ),
-		array( 'parentid' => 'customer/unitCustomer1', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/information', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => array(), 'pos' => 3, 'status' => 1 ),
+	'customer/lists' => array(
+		array('parentid' => 'customer/unitCustomer3', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/information', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => array(), 'pos' => 0, 'status' => 1),
+		array('parentid' => 'customer/unitCustomer3', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/notify', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => array(), 'pos' => 1, 'status' => 1),
+		array('parentid' => 'customer/unitCustomer3', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/newsletter', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => array(), 'pos' => 2, 'status' => 1),
+		array('parentid' => 'customer/unitCustomer1', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/information', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => array(), 'pos' => 3, 'status' => 1),
 	),
 );

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

Spacing +6 added lines, -6 removed lines

@@ -5,11 +5,11 @@
  * @copyright Aimeos (aimeos.org), 2014
  */
 
-return array (
-	'customer/address' => array (
-		array ( 'parentid' => 'customer/unitCustomer1', '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', 'flag' => 0, 'pos' => '0' ),
-		array ( 'parentid' => 'customer/unitCustomer2', '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', 'flag' => 0, 'pos' => '1' ),
-		array ( 'parentid' => 'customer/unitCustomer2', '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', 'flag' => 0, 'pos' => '1' ),
-		array ( 'parentid' => 'customer/unitCustomer3', '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', 'flag' => 0, 'pos' => '2' ),
+return array(
+	'customer/address' => array(
+		array('parentid' => 'customer/unitCustomer1', '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', 'flag' => 0, 'pos' => '0'),
+		array('parentid' => 'customer/unitCustomer2', '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', 'flag' => 0, 'pos' => '1'),
+		array('parentid' => 'customer/unitCustomer2', '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', 'flag' => 0, 'pos' => '1'),
+		array('parentid' => 'customer/unitCustomer3', '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', 'flag' => 0, 'pos' => '2'),
 	),
 );

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

Spacing +3 added lines, -3 removed lines

@@ -30,12 +30,12 @@ 
 	 */
 	public function getRoles()
 	{
-		if( isset( $this->roles ) ) {
+		if (isset($this->roles)) {
 			return $this->roles;
 		}
 
 		$values = $this->getRawValues();
-		return ( isset( $values['roles'] ) ? (array) $values['roles'] : array() );
+		return (isset($values['roles']) ? (array) $values['roles'] : array());
 	}
 
 
@@ -44,7 +44,7 @@ 
 	 *
 	 * @param array $roles List of Symfony roles
 	 */
-	public function setRoles( array $roles )
+	public function setRoles(array $roles)
 	{
 		$this->roles = $roles;
 		$this->setModified();

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

Spacing +72 added lines, -72 removed lines

@@ -228,11 +228,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->getSubManager( $domain )->cleanup( $siteids );
+		foreach ($this->getContext()->getConfig()->get($path, array('address', 'lists')) as $domain) {
+			$this->getSubManager($domain)->cleanup($siteids);
 		}
 	}
 
@@ -242,10 +242,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);
 	}
 
 
@@ -255,11 +255,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);
 	}
 
 
@@ -280,27 +280,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\\Iface';
-		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
@@ -364,47 +364,47 @@ 
 				$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, $item->getBirthday() );
-			$stmt->bind( 23, $item->getStatus(), \Aimeos\MW\DB\Statement\Base::PARAM_INT );
-			$stmt->bind( 24, $item->getDateVerified() );
-			$stmt->bind( 25, $item->getPassword() );
-			$stmt->bind( 26, $date ); // Modification time
-			$stmt->bind( 27, $context->getEditor() );
-			$stmt->bind( 28, serialize( $item->getRoles() ) );
-
-			if( $id !== null ) {
-				$stmt->bind( 29, $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, $item->getBirthday());
+			$stmt->bind(23, $item->getStatus(), \Aimeos\MW\DB\Statement\Base::PARAM_INT);
+			$stmt->bind(24, $item->getDateVerified());
+			$stmt->bind(25, $item->getPassword());
+			$stmt->bind(26, $date); // Modification time
+			$stmt->bind(27, $context->getEditor());
+			$stmt->bind(28, serialize($item->getRoles()));
+
+			if ($id !== null) {
+				$stmt->bind(29, $id, \Aimeos\MW\DB\Statement\Base::PARAM_INT);
+				$item->setId($id);
 			} else {
-				$stmt->bind( 29, $date ); // Creation time
+				$stmt->bind(29, $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
@@ -437,14 +437,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;
 		}
 	}
@@ -458,11 +458,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 = array(), &$total = null )
+	public function searchItems(\Aimeos\MW\Criteria\Iface $search, array $ref = array(), &$total = null)
 	{
 		$dbm = $this->getContext()->getDatabaseManager();
 		$dbname = $this->getResourceName();
-		$conn = $dbm->acquire( $dbname );
+		$conn = $dbm->acquire($dbname);
 		$map = array();
 
 		try
@@ -470,22 +470,22 @@ 
 			$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;
 		}
 
-		return $this->buildItems( $map, $ref, 'customer' );
+		return $this->buildItems($map, $ref, 'customer');
 	}
 
 
@@ -496,9 +496,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));
 	}
 
 
@@ -510,19 +510,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(), array $listItems = array(), array $refItems = array() )
+	protected function createItemBase(array $values = array(), array $listItems = array(), array $refItems = array())
 	{
-		if( !isset( $this->addressManager ) ) {
-			$this->addressManager = $this->getSubManager( 'address' );
+		if (!isset($this->addressManager)) {
+			$this->addressManager = $this->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 );
+		return new \Aimeos\MShop\Customer\Item\FosUser($address, $values, $listItems, $refItems, null, $helper);
 	}
 }

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;

lib/custom/src/MW/Session/Symfony2.php

Spacing +5 added lines, -5 removed lines

@@ -27,7 +27,7 @@ 
 	 *
 	 * @param Symfony\Component\HttpFoundation\Session\SessionInterface $object Symfony2 session object
 	 */
-	public function __construct( \Symfony\Component\HttpFoundation\Session\SessionInterface $object )
+	public function __construct(\Symfony\Component\HttpFoundation\Session\SessionInterface $object)
 	{
 		$this->object = $object;
 	}
@@ -42,9 +42,9 @@ 
 	 * @param mixed $default Value returned if requested key isn't found
 	 * @return mixed Value associated to the requested key
 	 */
-	public function get( $name, $default = null )
+	public function get($name, $default = null)
 	{
-		return $this->object->get( $name, $default );
+		return $this->object->get($name, $default);
 	}
 
 
@@ -57,8 +57,8 @@ 
 	 * @param mixed $value Value that should be associated with the given key
 	 * @return void
 	 */
-	public function set( $name, $value )
+	public function set($name, $value)
 	{
-		$this->object->set( $name, $value );
+		$this->object->set($name, $value);
 	}
 }

lib/custom/src/MW/View/Helper/Url/Symfony2.php

Spacing +7 added lines, -7 removed lines

@@ -32,9 +32,9 @@ 
 	 * @param Symfony\Component\Routing\RouterInterface $router Symfony2 Router implementation
 	 * @param array $fixed Fixed parameters that should be added to each URL
 	 */
-	public function __construct( $view, \Symfony\Component\Routing\RouterInterface $router, array $fixed )
+	public function __construct($view, \Symfony\Component\Routing\RouterInterface $router, array $fixed)
 	{
-		parent::__construct( $view );
+		parent::__construct($view);
 
 		$this->router = $router;
 		$this->fixed = $fixed;
@@ -52,18 +52,18 @@ 
 	 * @param array $config Additional configuration parameter per URL
 	 * @return string Complete URL that can be used in the template
 	 */
-	public function transform( $target = null, $controller = null, $action = null, array $params = array(), array $trailing = array(), array $config = array() )
+	public function transform($target = null, $controller = null, $action = null, array $params = array(), array $trailing = array(), array $config = array())
 	{
-		if( !empty( $trailing ) ) {
-			$params['trailing'] = str_replace( '/', '_', join( '_', $trailing ) );
+		if (!empty($trailing)) {
+			$params['trailing'] = str_replace('/', '_', join('_', $trailing));
 		}
 
 		$refType = \Symfony\Component\Routing\Generator\UrlGeneratorInterface::ABSOLUTE_PATH;
 
-		if( isset( $config['absoluteUri'] ) ) {
+		if (isset($config['absoluteUri'])) {
 			$refType = \Symfony\Component\Routing\Generator\UrlGeneratorInterface::ABSOLUTE_URL;
 		}
 
-		return $this->router->generate( $target, $params + $this->fixed, $refType );
+		return $this->router->generate($target, $params + $this->fixed, $refType);
 	}
 }

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

Spacing +9 added lines, -9 removed lines

@@ -30,7 +30,7 @@ 
 			'customer.address.position' => 1,
 		);
 
-		$address = new \Aimeos\MShop\Common\Item\Address\Standard( 'common.address.', $addressValues );
+		$address = new \Aimeos\MShop\Common\Item\Address\Standard('common.address.', $addressValues);
 
 		$values = array(
 			'customer.id' => 541,
@@ -62,10 +62,10 @@ 
 			'customer.mtime'=> '2010-01-05 00:00:05',
 			'customer.ctime'=> '2010-01-01 00:00:00',
 			'customer.editor' => 'unitTestUser',
-			'roles' => array( 'ROLE_ADMIN' ),
+			'roles' => array('ROLE_ADMIN'),
 		);
 
-		$this->object = new \Aimeos\MShop\Customer\Item\FosUser( $address, $values, array(), array(), 'mshop', null );
+		$this->object = new \Aimeos\MShop\Customer\Item\FosUser($address, $values, array(), array(), 'mshop', null);
 	}
 
 	/**
@@ -76,23 +76,23 @@ 
 	 */
 	protected function tearDown()
 	{
-		unset( $this->object );
+		unset($this->object);
 	}
 
 	public function testGetRoles()
 	{
-		$this->assertEquals( array( 'ROLE_ADMIN' ), $this->object->getRoles() );
+		$this->assertEquals(array('ROLE_ADMIN'), $this->object->getRoles());
 	}
 
 	public function testSetRoles()
 	{
-		$this->object->setRoles( array( 'ROLE_USER' ) );
-		$this->assertTrue( $this->object->isModified() );
-		$this->assertEquals( array( 'ROLE_USER' ), $this->object->getRoles() );
+		$this->object->setRoles(array('ROLE_USER'));
+		$this->assertTrue($this->object->isModified());
+		$this->assertEquals(array('ROLE_USER'), $this->object->getRoles());
 	}
 
 	public function testIsModified()
 	{
-		$this->assertFalse( $this->object->isModified() );
+		$this->assertFalse($this->object->isModified());
 	}
 }

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

Spacing +98 added lines, -98 removed lines

@@ -21,18 +21,18 @@ 
 	{
 		$context = \TestHelper::getContext();
 		$this->editor = $context->getEditor();
-		$customer = new \Aimeos\MShop\Customer\Manager\FosUser( $context );
+		$customer = new \Aimeos\MShop\Customer\Manager\FosUser($context);
 
 		$search = $customer->createSearch();
 		$conditions = array(
-			$search->compare( '==', 'customer.label', 'unitCustomer1' ),
-			$search->compare( '==', 'customer.editor', $this->editor )
+			$search->compare('==', 'customer.label', 'unitCustomer1'),
+			$search->compare('==', 'customer.editor', $this->editor)
 		);
-		$search->setConditions( $search->combine( '&&', $conditions ) );
-		$result = $customer->searchItems( $search );
+		$search->setConditions($search->combine('&&', $conditions));
+		$result = $customer->searchItems($search);
 
-		if( ( $customerItem = reset( $result ) ) === false ) {
-			throw new \Exception( sprintf( 'No customer item found for label "%1$s"', 'unitCustomer1' ) );
+		if (($customerItem = reset($result)) === false) {
+			throw new \Exception(sprintf('No customer item found for label "%1$s"', 'unitCustomer1'));
 		}
 
 		$this->fixture = array(
@@ -59,7 +59,7 @@ 
 			'customer.address.siteid' => $context->getLocale()->getSiteId(),
 		);
 
-		$this->object = $customer->getSubManager( 'address', 'FosUser' );
+		$this->object = $customer->getSubManager('address', 'FosUser');
 	}
 
 
@@ -68,120 +68,120 @@ 
 	 */
 	protected function tearDown()
 	{
-		unset( $this->object, $this->fixture );
+		unset($this->object, $this->fixture);
 	}
 
 
 	public function testCleanup()
 	{
-		$this->object->cleanup( array( -1 ) );
+		$this->object->cleanup(array( -1 ));
 	}
 
 	public function testGetSearchAttributes()
 	{
-		foreach( $this->object->getSearchAttributes() as $attribute ) {
-			$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute );
+		foreach ($this->object->getSearchAttributes() as $attribute) {
+			$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute);
 		}
 	}
 
 	public function testCreateItem()
 	{
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Address\\Iface', $this->object->createItem() );
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Address\\Iface', $this->object->createItem());
 	}
 
 	public function testGetItem()
 	{
 		$search = $this->object->createSearch();
-		$search->setConditions( $search->compare( '~=', 'customer.address.company', 'ABC GmbH' ) );
+		$search->setConditions($search->compare('~=', 'customer.address.company', 'ABC GmbH'));
 
-		$items = $this->object->searchItems( $search );
+		$items = $this->object->searchItems($search);
 
-		if( ( $item = reset( $items ) ) === false ) {
-			throw new \Exception( 'No address item with company "ABC" found' );
+		if (($item = reset($items)) === false) {
+			throw new \Exception('No address item with company "ABC" found');
 		}
 
-		$this->assertEquals( $item, $this->object->getItem( $item->getId() ) );
+		$this->assertEquals($item, $this->object->getItem($item->getId()));
 	}
 
 	public function testSaveUpdateDeleteItem()
 	{
-		$item = new \Aimeos\MShop\Common\Item\Address\Standard( 'customer.address.', $this->fixture );
-		$item->setId( null );
-		$this->object->saveItem( $item );
-		$itemSaved = $this->object->getItem( $item->getId() );
+		$item = new \Aimeos\MShop\Common\Item\Address\Standard('customer.address.', $this->fixture);
+		$item->setId(null);
+		$this->object->saveItem($item);
+		$itemSaved = $this->object->getItem($item->getId());
 
 		$itemExp = clone $itemSaved;
-		$itemExp->setPosition( 1 );
-		$itemExp->setCity( 'Berlin' );
-		$itemExp->setState( 'Berlin' );
-		$this->object->saveItem( $itemExp );
-		$itemUpd = $this->object->getItem( $itemExp->getId() );
-
-		$this->object->deleteItem( $itemSaved->getId() );
-
-
-		$this->assertTrue( $item->getId() !== null );
-		$this->assertEquals( $item->getId(), $itemSaved->getId() );
-		$this->assertEquals( $item->getParentId(), $itemSaved->getParentId());
-		$this->assertEquals( $item->getPosition(), $itemSaved->getPosition());
-		$this->assertEquals( $item->getCompany(), $itemSaved->getCompany());
-		$this->assertEquals( $item->getVatID(), $itemSaved->getVatID());
-		$this->assertEquals( $item->getSalutation(), $itemSaved->getSalutation());
-		$this->assertEquals( $item->getTitle(), $itemSaved->getTitle());
-		$this->assertEquals( $item->getFirstname(), $itemSaved->getFirstname());
-		$this->assertEquals( $item->getLastname(), $itemSaved->getLastname());
-		$this->assertEquals( $item->getAddress1(), $itemSaved->getAddress1());
-		$this->assertEquals( $item->getAddress2(), $itemSaved->getAddress2());
-		$this->assertEquals( $item->getAddress3(), $itemSaved->getAddress3());
-		$this->assertEquals( $item->getPostal(), $itemSaved->getPostal());
-		$this->assertEquals( $item->getCity(), $itemSaved->getCity());
-		$this->assertEquals( $item->getState(), $itemSaved->getState());
-		$this->assertEquals( $item->getCountryId(), $itemSaved->getCountryId());
-		$this->assertEquals( $item->getLanguageId(), $itemSaved->getLanguageId());
-		$this->assertEquals( $item->getTelephone(), $itemSaved->getTelephone());
-		$this->assertEquals( $item->getEmail(), $itemSaved->getEmail());
-		$this->assertEquals( $item->getTelefax(), $itemSaved->getTelefax());
-		$this->assertEquals( $item->getWebsite(), $itemSaved->getWebsite());
-		$this->assertEquals( $item->getFlag(), $itemSaved->getFlag());
-
-		$this->assertEquals( $this->editor, $itemSaved->getEditor() );
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated() );
+		$itemExp->setPosition(1);
+		$itemExp->setCity('Berlin');
+		$itemExp->setState('Berlin');
+		$this->object->saveItem($itemExp);
+		$itemUpd = $this->object->getItem($itemExp->getId());
+
+		$this->object->deleteItem($itemSaved->getId());
+
+
+		$this->assertTrue($item->getId() !== null);
+		$this->assertEquals($item->getId(), $itemSaved->getId());
+		$this->assertEquals($item->getParentId(), $itemSaved->getParentId());
+		$this->assertEquals($item->getPosition(), $itemSaved->getPosition());
+		$this->assertEquals($item->getCompany(), $itemSaved->getCompany());
+		$this->assertEquals($item->getVatID(), $itemSaved->getVatID());
+		$this->assertEquals($item->getSalutation(), $itemSaved->getSalutation());
+		$this->assertEquals($item->getTitle(), $itemSaved->getTitle());
+		$this->assertEquals($item->getFirstname(), $itemSaved->getFirstname());
+		$this->assertEquals($item->getLastname(), $itemSaved->getLastname());
+		$this->assertEquals($item->getAddress1(), $itemSaved->getAddress1());
+		$this->assertEquals($item->getAddress2(), $itemSaved->getAddress2());
+		$this->assertEquals($item->getAddress3(), $itemSaved->getAddress3());
+		$this->assertEquals($item->getPostal(), $itemSaved->getPostal());
+		$this->assertEquals($item->getCity(), $itemSaved->getCity());
+		$this->assertEquals($item->getState(), $itemSaved->getState());
+		$this->assertEquals($item->getCountryId(), $itemSaved->getCountryId());
+		$this->assertEquals($item->getLanguageId(), $itemSaved->getLanguageId());
+		$this->assertEquals($item->getTelephone(), $itemSaved->getTelephone());
+		$this->assertEquals($item->getEmail(), $itemSaved->getEmail());
+		$this->assertEquals($item->getTelefax(), $itemSaved->getTelefax());
+		$this->assertEquals($item->getWebsite(), $itemSaved->getWebsite());
+		$this->assertEquals($item->getFlag(), $itemSaved->getFlag());
+
+		$this->assertEquals($this->editor, $itemSaved->getEditor());
+		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated());
 		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified());
 
-		$this->assertEquals( $itemExp->getId(), $itemUpd->getId() );
-		$this->assertEquals( $itemExp->getParentId(), $itemUpd->getParentId());
-		$this->assertEquals( $itemExp->getPosition(), $itemUpd->getPosition());
-		$this->assertEquals( $itemExp->getCompany(), $itemUpd->getCompany());
-		$this->assertEquals( $itemExp->getVatID(), $itemUpd->getVatID());
-		$this->assertEquals( $itemExp->getSalutation(), $itemUpd->getSalutation());
-		$this->assertEquals( $itemExp->getTitle(), $itemUpd->getTitle());
-		$this->assertEquals( $itemExp->getFirstname(), $itemUpd->getFirstname());
-		$this->assertEquals( $itemExp->getLastname(), $itemUpd->getLastname());
-		$this->assertEquals( $itemExp->getAddress1(), $itemUpd->getAddress1());
-		$this->assertEquals( $itemExp->getAddress2(), $itemUpd->getAddress2());
-		$this->assertEquals( $itemExp->getAddress3(), $itemUpd->getAddress3());
-		$this->assertEquals( $itemExp->getPostal(), $itemUpd->getPostal());
-		$this->assertEquals( $itemExp->getCity(), $itemUpd->getCity());
-		$this->assertEquals( $itemExp->getState(), $itemUpd->getState());
-		$this->assertEquals( $itemExp->getCountryId(), $itemUpd->getCountryId());
-		$this->assertEquals( $itemExp->getLanguageId(), $itemUpd->getLanguageId());
-		$this->assertEquals( $itemExp->getTelephone(), $itemUpd->getTelephone());
-		$this->assertEquals( $itemExp->getEmail(), $itemUpd->getEmail());
-		$this->assertEquals( $itemExp->getTelefax(), $itemUpd->getTelefax());
-		$this->assertEquals( $itemExp->getWebsite(), $itemUpd->getWebsite());
-		$this->assertEquals( $itemExp->getFlag(), $itemUpd->getFlag());
-
-		$this->assertEquals( $this->editor, $itemUpd->getEditor() );
-		$this->assertEquals( $itemExp->getTimeCreated(), $itemUpd->getTimeCreated() );
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified() );
+		$this->assertEquals($itemExp->getId(), $itemUpd->getId());
+		$this->assertEquals($itemExp->getParentId(), $itemUpd->getParentId());
+		$this->assertEquals($itemExp->getPosition(), $itemUpd->getPosition());
+		$this->assertEquals($itemExp->getCompany(), $itemUpd->getCompany());
+		$this->assertEquals($itemExp->getVatID(), $itemUpd->getVatID());
+		$this->assertEquals($itemExp->getSalutation(), $itemUpd->getSalutation());
+		$this->assertEquals($itemExp->getTitle(), $itemUpd->getTitle());
+		$this->assertEquals($itemExp->getFirstname(), $itemUpd->getFirstname());
+		$this->assertEquals($itemExp->getLastname(), $itemUpd->getLastname());
+		$this->assertEquals($itemExp->getAddress1(), $itemUpd->getAddress1());
+		$this->assertEquals($itemExp->getAddress2(), $itemUpd->getAddress2());
+		$this->assertEquals($itemExp->getAddress3(), $itemUpd->getAddress3());
+		$this->assertEquals($itemExp->getPostal(), $itemUpd->getPostal());
+		$this->assertEquals($itemExp->getCity(), $itemUpd->getCity());
+		$this->assertEquals($itemExp->getState(), $itemUpd->getState());
+		$this->assertEquals($itemExp->getCountryId(), $itemUpd->getCountryId());
+		$this->assertEquals($itemExp->getLanguageId(), $itemUpd->getLanguageId());
+		$this->assertEquals($itemExp->getTelephone(), $itemUpd->getTelephone());
+		$this->assertEquals($itemExp->getEmail(), $itemUpd->getEmail());
+		$this->assertEquals($itemExp->getTelefax(), $itemUpd->getTelefax());
+		$this->assertEquals($itemExp->getWebsite(), $itemUpd->getWebsite());
+		$this->assertEquals($itemExp->getFlag(), $itemUpd->getFlag());
+
+		$this->assertEquals($this->editor, $itemUpd->getEditor());
+		$this->assertEquals($itemExp->getTimeCreated(), $itemUpd->getTimeCreated());
+		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified());
 
 		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
-		$this->object->getItem( $itemSaved->getId() );
+		$this->object->getItem($itemSaved->getId());
 	}
 
 	public function testCreateSearch()
 	{
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $this->object->createSearch() );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $this->object->createSearch());
 	}
 
 
@@ -190,11 +190,11 @@ 
 		$search = $this->object->createSearch();
 
 		$conditions = array(
-			$search->compare( '==', 'customer.address.company', 'ABC' ),
-			$search->compare( '==', 'customer.address.editor', $this->editor )
+			$search->compare('==', 'customer.address.company', 'ABC'),
+			$search->compare('==', 'customer.address.editor', $this->editor)
 		);
-		$search->setConditions( $search->combine( '&&', $conditions ) );
-		$this->assertEquals( 1, count( $this->object->searchItems( $search ) ) );
+		$search->setConditions($search->combine('&&', $conditions));
+		$this->assertEquals(1, count($this->object->searchItems($search)));
 	}
 
 
@@ -204,20 +204,20 @@ 
 		$search = $this->object->createSearch();
 
 		$conditions = array(
-			$search->compare( '~=', 'customer.address.company', 'ABC GmbH' ),
-			$search->compare( '==', 'customer.address.editor', $this->editor )
+			$search->compare('~=', 'customer.address.company', 'ABC GmbH'),
+			$search->compare('==', 'customer.address.editor', $this->editor)
 		);
 
-		$search->setConditions( $search->combine( '&&', $conditions ) );
-		$search->setSlice( 0, 1 );
+		$search->setConditions($search->combine('&&', $conditions));
+		$search->setSlice(0, 1);
 
-		$results = $this->object->searchItems( $search, array(), $total );
+		$results = $this->object->searchItems($search, array(), $total);
 
-		$this->assertEquals( 1, count( $results ) );
-		$this->assertEquals( 2, $total );
+		$this->assertEquals(1, count($results));
+		$this->assertEquals(2, $total);
 
-		foreach( $results as $id => $item ) {
-			$this->assertEquals( $id, $item->getId() );
+		foreach ($results as $id => $item) {
+			$this->assertEquals($id, $item->getId());
 		}
 	}
 }