aimeos / ai-fosuser

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

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 \Aimeos\MShop\Common\Item\Property\Iface[] $propItems List of property items
 	 * @return \Aimeos\MShop\Customer\Item\Iface New customer item
 	 */
-	protected function createItemBase( array $values = [], array $listItems = [], array $refItems = [],
-		array $addrItems = [], array $propItems = [] )
+	protected function createItemBase(array $values = [], array $listItems = [], array $refItems = [],
+		array $addrItems = [], 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, $addrItems, $propItems, $helper

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

Spacing +13 added lines, -13 removed lines

@@ -35,11 +35,11 @@ 
 	 * @param \Aimeos\MShop\Common\Item\Helper\Password\Iface|null $helper Password encryption helper object
 	 * @param string|null $salt Password salt
 	 */
-	public function __construct( \Aimeos\MShop\Common\Item\Address\Iface $address, array $values = [],
+	public function __construct(\Aimeos\MShop\Common\Item\Address\Iface $address, array $values = [],
 		array $listItems = [], array $refItems = [], array $addrItems = [], array $propItems = [],
-		\Aimeos\MShop\Common\Item\Helper\Password\Iface $helper = null, $salt = null )
+		\Aimeos\MShop\Common\Item\Helper\Password\Iface $helper = null, $salt = null)
 	{
-		parent::__construct( $address, $values, $listItems, $refItems, $addrItems, $propItems, $helper, $salt );
+		parent::__construct($address, $values, $listItems, $refItems, $addrItems, $propItems, $helper, $salt);
 
 		$this->values = $values;
 		$this->helper = $helper;
@@ -54,7 +54,7 @@ 
 	 */
 	public function getPassword()
 	{
-		if( isset( $this->values['customer.password'] ) ) {
+		if (isset($this->values['customer.password'])) {
 			return (string) $this->values['customer.password'];
 		}
 
@@ -68,12 +68,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;
@@ -91,7 +91,7 @@ 
 	 */
 	public function getRoles()
 	{
-		if( isset( $this->values['roles'] ) ) {
+		if (isset($this->values['roles'])) {
 			return (array) $this->values['roles'];
 		}
 
@@ -104,7 +104,7 @@ 
 	 *
 	 * @param array $roles List of Symfony roles
 	 */
-	public function setRoles( array $roles )
+	public function setRoles(array $roles)
 	{
 		$this->values['roles'] = $roles;
 		$this->setModified();
@@ -120,7 +120,7 @@ 
 	 */
 	public function getSalt()
 	{
-		if( isset( $this->values['salt'] ) ) {
+		if (isset($this->values['salt'])) {
 			return $this->values['salt'];
 		}
 
@@ -133,9 +133,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/tests/MShop/Customer/Item/FosUserTest.php

Spacing +23 added lines, -23 removed lines

@@ -47,72 +47,72 @@
 			'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'),
 			'salt' => 'test',
 		);
 
-		$this->address = new \Aimeos\MShop\Common\Item\Address\Standard( 'customer.', $values );
-		$this->object = new \Aimeos\MShop\Customer\Item\FosUser( $this->address, $values );
+		$this->address = new \Aimeos\MShop\Common\Item\Address\Standard('customer.', $values);
+		$this->object = new \Aimeos\MShop\Customer\Item\FosUser($this->address, $values);
 	}
 
 	protected function tearDown()
 	{
-		unset( $this->object );
+		unset($this->object);
 	}
 
 	public function testGetPassword()
 	{
-		$this->assertEquals( 'testpwd', $this->object->getPassword() );
+		$this->assertEquals('testpwd', $this->object->getPassword());
 	}
 
 	public function testSetPassword()
 	{
-		$this->object->setPassword( 'new' );
-		$this->assertTrue( $this->object->isModified() );
-		$this->assertEquals( 'new', $this->object->getPassword() );
+		$this->object->setPassword('new');
+		$this->assertTrue($this->object->isModified());
+		$this->assertEquals('new', $this->object->getPassword());
 	}
 
 	public function testSetPasswordGenerated()
 	{
-		$helper = new \Aimeos\MShop\Common\Item\Helper\Password\Standard( array( 'format' => '%1$s{%2$s}' ) );
-		$object = new \Aimeos\MShop\Customer\Item\FosUser( $this->address, [], [], [], [], [], $helper );
+		$helper = new \Aimeos\MShop\Common\Item\Helper\Password\Standard(array('format' => '%1$s{%2$s}'));
+		$object = new \Aimeos\MShop\Customer\Item\FosUser($this->address, [], [], [], [], [], $helper);
 
-		$object->setPassword( 'newpwd' );
-		$this->assertEquals( sha1( 'newpwd{' . $object->getSalt() . '}' ), $object->getPassword() );
+		$object->setPassword('newpwd');
+		$this->assertEquals(sha1('newpwd{' . $object->getSalt() . '}'), $object->getPassword());
 	}
 
 	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 testGetSalt()
 	{
-		$this->assertEquals( 'test', $this->object->getSalt() );
+		$this->assertEquals('test', $this->object->getSalt());
 	}
 
 	public function testGetSaltGenerated()
 	{
-		$object = new \Aimeos\MShop\Customer\Item\FosUser( $this->address, [] );
-		$this->assertEquals( '', $object->getSalt() );
+		$object = new \Aimeos\MShop\Customer\Item\FosUser($this->address, []);
+		$this->assertEquals('', $object->getSalt());
 	}
 
 	public function testSetSalt()
 	{
-		$this->object->setSalt( 'new' );
-		$this->assertTrue( $this->object->isModified() );
-		$this->assertEquals( 'new', $this->object->getSalt() );
+		$this->object->setSalt('new');
+		$this->assertTrue($this->object->isModified());
+		$this->assertEquals('new', $this->object->getSalt());
 	}
 
 	public function testIsModified()
 	{
-		$this->assertFalse( $this->object->isModified() );
+		$this->assertFalse($this->object->isModified());
 	}
 }