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;

Doc Comments +3 added lines, -3 removed lines

@@ -241,7 +241,7 @@ 
 	/**
 	 * Removes old entries from the storage.
 	 *
-	 * @param array $siteids List of IDs for sites whose entries should be deleted
+	 * @param integer[] $siteids List of IDs for sites whose entries should be deleted
 	 */
 	public function cleanup( array $siteids )
 	{
@@ -294,7 +294,7 @@ 
 	 *
 	 * @param \Aimeos\MShop\Customer\Item\Iface $item Customer item object
 	 * @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
+	 * @return \Aimeos\MShop\Common\Item\ListRef\Iface $item Updated item including the generated ID
 	 */
 	public function saveItem( \Aimeos\MShop\Common\Item\Iface $item, $fetch = true )
 	{
@@ -525,7 +525,7 @@ 
 	 *
 	 * @param string $manager Name of the sub manager type in lower case
 	 * @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.
+	 * @return \Aimeos\MShop\Common\Manager\Iface Manager for different extensions, e.g stock, tags, locations, etc.
 	 */
 	public function getSubManager( $manager, $name = null )
 	{

Spacing +85 added lines, -85 removed lines

@@ -241,13 +241,13 @@ 
 	 *
 	 * @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';
 		$default = ['address', 'group', 'lists', 'property'];
 
-		foreach( $this->getContext()->getConfig()->get( $path, $default ) as $domain ) {
-			$this->getObject()->getSubManager( $domain )->cleanup( $siteids );
+		foreach ($this->getContext()->getConfig()->get($path, $default) 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,12 +270,12 @@ 
 	 * @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';
 		$default = ['address', 'group', 'lists', 'property'];
 
-		return $this->getSearchAttributesBase( $this->searchConfig, $path, $default, $withsub );
+		return $this->getSearchAttributesBase($this->searchConfig, $path, $default, $withsub);
 	}
 
 
@@ -286,29 +286,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)
 	{
-		self::checkClass( '\\Aimeos\\MShop\\Customer\\Item\\FosUser', $item );
+		self::checkClass('\\Aimeos\\MShop\\Customer\\Item\\FosUser', $item);
 
-		if( !$item->isModified() )
+		if (!$item->isModified())
 		{
-			$item = $this->savePropertyItems( $item, 'customer' );
-			$item = $this->saveAddressItems( $item, 'customer' );
-			return $this->saveListItems( $item, 'customer' );
+			$item = $this->savePropertyItems($item, 'customer');
+			$item = $this->saveAddressItems($item, 'customer');
+			return $this->saveListItems($item, 'customer');
 		}
 
 		$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
@@ -372,51 +372,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(), \Aimeos\MW\DB\Statement\Base::PARAM_FLOAT );
-			$stmt->bind( 24, $billingAddress->getLatitude(), \Aimeos\MW\DB\Statement\Base::PARAM_FLOAT );
-			$stmt->bind( 25, $item->getBirthday() );
-			$stmt->bind( 26, ( $item->getStatus() > 0 ? true : false ), \Aimeos\MW\DB\Statement\Base::PARAM_BOOL );
-			$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(), \Aimeos\MW\DB\Statement\Base::PARAM_FLOAT);
+			$stmt->bind(24, $billingAddress->getLatitude(), \Aimeos\MW\DB\Statement\Base::PARAM_FLOAT);
+			$stmt->bind(25, $item->getBirthday());
+			$stmt->bind(26, ($item->getStatus() > 0 ? true : false), \Aimeos\MW\DB\Statement\Base::PARAM_BOOL);
+			$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
@@ -449,22 +449,22 @@ 
 				 * @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);
 
-		$item = $this->savePropertyItems( $item, 'customer' );
-		$item = $this->saveAddressItems( $item, 'customer' );
-		return $this->saveListItems( $item, 'customer' );
+		$item = $this->savePropertyItems($item, 'customer');
+		$item = $this->saveAddressItems($item, 'customer');
+		return $this->saveListItems($item, 'customer');
 	}
 
 
@@ -476,11 +476,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
@@ -488,32 +488,32 @@ 
 			$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 ), 'customer' );
+		if (in_array('customer/address', $ref, true)) {
+			$addrItems = $this->getAddressItems(array_keys($map), 'customer');
 		}
 
 		$propItems = [];
-		if( in_array( 'customer/property', $ref, true ) ) {
-			$propItems = $this->getPropertyItems( array_keys( $map ), 'customer' );
+		if (in_array('customer/property', $ref, true)) {
+			$propItems = $this->getPropertyItems(array_keys($map), 'customer');
 		}
 
-		return $this->buildItems( $map, $ref, 'customer', $addrItems, $propItems );
+		return $this->buildItems($map, $ref, 'customer', $addrItems, $propItems);
 	}
 
 
@@ -524,9 +524,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));
 	}
 
 
@@ -540,15 +540,15 @@ 
 	 * @param array $propItems List of property items of the customer item
 	 * @return \Aimeos\MShop\Customer\Item\Iface New customer item
 	 */
-	protected function createItemBase( array $values = [], array $listItems = [], array $refItems = [],
-		array $addresses = [], array $propItems = [] )
+	protected function createItemBase(array $values = [], array $listItems = [], array $refItems = [],
+		array $addresses = [], array $propItems = [])
 	{
-		if( isset( $values['roles'] ) ) {
-			$values['roles'] = unserialize( $values['roles'] );
+		if (isset($values['roles'])) {
+			$values['roles'] = unserialize($values['roles']);
 		}
 
 		$helper = $this->getPasswordHelper();
-		$address = new \Aimeos\MShop\Common\Item\Address\Simple( 'customer.', $values );
+		$address = new \Aimeos\MShop\Common\Item\Address\Simple('customer.', $values);
 
 		return new \Aimeos\MShop\Customer\Item\FosUser(
 			$address, $values, $listItems, $refItems,

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/src/MShop/Customer/Manager/Address/FosUser.php

Doc Comments +1 added lines, -1 removed lines

@@ -249,7 +249,7 @@
 	 *
 	 * @param string $manager Name of the sub manager type in lower case
 	 * @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.
+	 * @return \Aimeos\MShop\Common\Manager\Iface Manager for different extensions, e.g stock, tags, locations, etc.
 	 */
 	public function getSubManager( $manager, $name = null )
 	{

Spacing +9 added lines, -9 removed lines

@@ -25,7 +25,7 @@ 
 			'label' => 'Customer address ID',
 			'code' => 'customer.address.id',
 			'internalcode' => 'fosad."id"',
-			'internaldeps' => array( 'LEFT JOIN "fos_user_address" AS fosad ON ( fos."id" = fosad."parentid" )' ),
+			'internaldeps' => array('LEFT JOIN "fos_user_address" AS fosad ON ( fos."id" = fosad."parentid" )'),
 			'type' => 'integer',
 			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT,
 			'public' => false,
@@ -222,14 +222,14 @@ 
 	 *
 	 * @param array $siteids List of IDs for sites whose entries should be deleted
 	 */
-	public function cleanup( array $siteids )
+	public function cleanup(array $siteids)
 	{
 		$path = 'mshop/customer/manager/address/submanagers';
-		foreach( $this->getContext()->getConfig()->get( $path, [] ) as $domain ) {
-			$this->getObject()->getSubManager( $domain )->cleanup( $siteids );
+		foreach ($this->getContext()->getConfig()->get($path, []) as $domain) {
+			$this->getObject()->getSubManager($domain)->cleanup($siteids);
 		}
 
-		$this->cleanupBase( $siteids, 'mshop/customer/manager/lists/fosuser/delete' );
+		$this->cleanupBase($siteids, 'mshop/customer/manager/lists/fosuser/delete');
 	}
 
 
@@ -239,11 +239,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/address/submanagers';
 
-		return $this->getSearchAttributesBase( $this->searchConfig, $path, [], $withsub );
+		return $this->getSearchAttributesBase($this->searchConfig, $path, [], $withsub);
 	}
 
 
@@ -254,9 +254,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', 'address/' . $manager, ( $name === null ? 'FosUser' : $name ) );
+		return $this->getSubManagerBase('customer', 'address/' . $manager, ($name === null ? 'FosUser' : $name));
 	}
 
 

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

Doc Comments +1 added lines, -1 removed lines

@@ -98,7 +98,7 @@
 	/**
 	 * Sets the associated user roles
 	 *
-	 * @param array $roles List of Symfony roles
+	 * @param string[] $roles List of Symfony roles
 	 */
 	public function setRoles( array $roles )
 	{

Spacing +13 added lines, -13 removed lines

@@ -32,11 +32,11 @@ 
 	 * @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,
+	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 = [], array $propItems = [] )
+		\Aimeos\MShop\Common\Item\Helper\Password\Iface $helper = null, array $addresses = [], array $propItems = [])
 	{
-		parent::__construct( $address, $values, $listItems, $refItems, $salt, $helper, $addresses, $propItems, $propItems );
+		parent::__construct($address, $values, $listItems, $refItems, $salt, $helper, $addresses, $propItems, $propItems);
 
 		$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( (string) $value !== $this->getPassword() )
+		if ((string) $value !== $this->getPassword())
 		{
-			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;
@@ -88,7 +88,7 @@ 
 	 */
 	public function getRoles()
 	{
-		if( isset( $this->values['roles'] ) ) {
+		if (isset($this->values['roles'])) {
 			return (array) $this->values['roles'];
 		}
 
@@ -101,7 +101,7 @@ 
 	 *
 	 * @param array $roles List of Symfony roles
 	 */
-	public function setRoles( array $roles )
+	public function setRoles(array $roles)
 	{
 		$this->values['roles'] = $roles;
 		$this->setModified();
@@ -117,7 +117,7 @@ 
 	 */
 	public function getSalt()
 	{
-		if( isset( $this->values['salt'] ) ) {
+		if (isset($this->values['salt'])) {
 			return $this->values['salt'];
 		}
 
@@ -130,9 +130,9 @@ 
 	 *
 	 * @param string $value Password salt
 	 */
-	public function setSalt( $value )
+	public function setSalt($value)
 	{
-		if( (string) $value !== $this->getSalt() )
+		if ((string) $value !== $this->getSalt())
 		{
 			$this->values['salt'] = (string) $value;
 			$this->setModified();

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

Doc Comments +1 added lines, -1 removed lines

@@ -249,7 +249,7 @@
 	 *
 	 * @param string $manager Name of the sub manager type in lower case
 	 * @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.
+	 * @return \Aimeos\MShop\Common\Manager\Iface Manager for different extensions, e.g stock, tags, locations, etc.
 	 */
 	public function getSubManager( $manager, $name = null )
 	{

Spacing +9 added lines, -9 removed lines

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

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

Doc Comments +1 added lines, -1 removed lines

@@ -249,7 +249,7 @@
 	 *
 	 * @param string $manager Name of the sub manager type in lower case
 	 * @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.
+	 * @return \Aimeos\MShop\Common\Manager\Iface Manager for different extensions, e.g stock, tags, locations, etc.
 	 */
 	public function getSubManager( $manager, $name = null )
 	{

Spacing +9 added lines, -9 removed lines

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

lib/custom/tests/TestHelper.php

Spacing +24 added lines, -24 removed lines

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

lib/custom/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 @@ 
 	 */
 	public function migrate()
 	{
-		$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');
 			}
 		}
 	}