aimeos / ai-ezpublish

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/setup/EzuserAddAddress.php

Braces +1 added lines, -2 removed lines

@@ -50,8 +50,7 @@
 		{
 			$this->executeList( $sql, 'db-customer' );
 			$this->status( 'done' );
-		}
-		else
+		} else
 		{
 			$this->status( 'OK' );
 		}

Doc Comments +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 	/**
 	 * Returns the list of task names which depends on this task.
 	 *
-	 * @return array List of task names
+	 * @return string[] List of task names
 	 */
 	public function getPreDependencies()
 	{

Spacing +50 added lines, -50 removed lines

@@ -21,7 +21,7 @@ 
 	 */
 	public function getPreDependencies()
 	{
-		return array( 'TablesCreateEzpublish' );
+		return array('TablesCreateEzpublish');
 	}
 
 
@@ -41,29 +41,29 @@ 
 	 */
 	public function migrate()
 	{
-		$this->msg( 'Adding address fields to ezuser table', 0 );
+		$this->msg('Adding address fields to ezuser table', 0);
 
-		$dbal = $this->getConnection( 'db-customer' )->getRawObject();
+		$dbal = $this->getConnection('db-customer')->getRawObject();
 
-		if( !( $dbal instanceof \Doctrine\DBAL\Connection ) ) {
-			throw new \Aimeos\MW\Setup\Exception( 'Not a DBAL connection' );
+		if (!($dbal instanceof \Doctrine\DBAL\Connection)) {
+			throw new \Aimeos\MW\Setup\Exception('Not a DBAL connection');
 		}
 
 
 		$fromSchema = $dbal->getSchemaManager()->createSchema();
 		$toSchema = clone $fromSchema;
 
-		$this->addIndexes( $this->addColumns( $toSchema->getTable( 'ezuser' ) ) );
-		$sql = $fromSchema->getMigrateToSql( $toSchema, $dbal->getDatabasePlatform() );
+		$this->addIndexes($this->addColumns($toSchema->getTable('ezuser')));
+		$sql = $fromSchema->getMigrateToSql($toSchema, $dbal->getDatabasePlatform());
 
-		if( $sql !== [] )
+		if ($sql !== [])
 		{
-			$this->executeList( $sql, 'db-customer' );
-			$this->status( 'done' );
+			$this->executeList($sql, 'db-customer');
+			$this->status('done');
 		}
 		else
 		{
-			$this->status( 'OK' );
+			$this->status('OK');
 		}
 	}
 
@@ -74,38 +74,38 @@ 
 	 * @param \Doctrine\DBAL\Schema\Table $table Table object
 	 * @return \Doctrine\DBAL\Schema\Table Updated table object
 	 */
-	protected function addColumns( \Doctrine\DBAL\Schema\Table $table )
+	protected function addColumns(\Doctrine\DBAL\Schema\Table $table)
 	{
 		$columns = array(
-			'company' => array( 'string', array( 'length' => 100 ) ),
-			'vatid' => array( 'string', array( 'length' => 32 ) ),
-			'salutation' => array( 'string', array( 'length' => 8 ) ),
-			'title' => array( 'string', array( 'length' => 64 ) ),
-			'firstname' => array( 'string', array( 'length' => 64 ) ),
-			'lastname' => array( 'string', array( 'length' => 64 ) ),
-			'address1' => array( 'string', array( 'length' => 255 ) ),
-			'address2' => array( 'string', array( 'length' => 255 ) ),
-			'address3' => array( 'string', array( 'length' => 255 ) ),
-			'postal' => array( 'string', array( 'length' => 16 ) ),
-			'city' => array( 'string', array( 'length' => 255 ) ),
-			'state' => array( 'string', array( 'length' => 255 ) ),
-			'langid' => array( 'string', array( 'length' => 5, 'notnull' => false ) ),
-			'countryid' => array( 'string', array( 'length' => 2, 'notnull' => false, 'fixed' => true ) ),
-			'telephone' => array( 'string', array( 'length' => 32 ) ),
-			'telefax' => array( 'string', array( 'length' => 32 ) ),
-			'website' => array( 'string', array( 'length' => 255 ) ),
-			'birthday' => array( 'date', array( 'notnull' => false ) ),
-			'vdate' => array( 'date', array( 'notnull' => false ) ),
-			'status' => array( 'smallint', [] ),
-			'mtime' => array( 'datetime', [] ),
-			'ctime' => array( 'datetime', [] ),
-			'editor' => array( 'string', array( 'length' => 255 ) ),
+			'company' => array('string', array('length' => 100)),
+			'vatid' => array('string', array('length' => 32)),
+			'salutation' => array('string', array('length' => 8)),
+			'title' => array('string', array('length' => 64)),
+			'firstname' => array('string', array('length' => 64)),
+			'lastname' => array('string', array('length' => 64)),
+			'address1' => array('string', array('length' => 255)),
+			'address2' => array('string', array('length' => 255)),
+			'address3' => array('string', array('length' => 255)),
+			'postal' => array('string', array('length' => 16)),
+			'city' => array('string', array('length' => 255)),
+			'state' => array('string', array('length' => 255)),
+			'langid' => array('string', array('length' => 5, 'notnull' => false)),
+			'countryid' => array('string', array('length' => 2, 'notnull' => false, 'fixed' => true)),
+			'telephone' => array('string', array('length' => 32)),
+			'telefax' => array('string', array('length' => 32)),
+			'website' => array('string', array('length' => 255)),
+			'birthday' => array('date', array('notnull' => false)),
+			'vdate' => array('date', array('notnull' => false)),
+			'status' => array('smallint', []),
+			'mtime' => array('datetime', []),
+			'ctime' => array('datetime', []),
+			'editor' => array('string', array('length' => 255)),
 		);
 
-		foreach( $columns as $name => $def )
+		foreach ($columns as $name => $def)
 		{
-			if( $table->hasColumn( $name ) === false ) {
-				$table->addColumn( $name, $def[0], $def[1] );
+			if ($table->hasColumn($name) === false) {
+				$table->addColumn($name, $def[0], $def[1]);
 			}
 		}
 
@@ -119,23 +119,23 @@ 
 	 * @param \Doctrine\DBAL\Schema\Table $table Table object
 	 * @return \Doctrine\DBAL\Schema\Table Updated table object
 	 */
-	protected function addIndexes( \Doctrine\DBAL\Schema\Table $table )
+	protected function addIndexes(\Doctrine\DBAL\Schema\Table $table)
 	{
 		$indexes = array(
-			'idx_ezpus_langid' => array( 'langid' ),
-			'idx_ezpus_status_ln_fn' => array( 'status', 'lastname', 'firstname' ),
-			'idx_ezpus_status_ad1_ad2' => array( 'status', 'address1', 'address2' ),
-			'idx_ezpus_status_postal_city' => array( 'status', 'postal', 'city' ),
-			'idx_ezpus_lastname' => array( 'lastname' ),
-			'idx_ezpus_address1' => array( 'address1' ),
-			'idx_ezpus_postal' => array( 'postal' ),
-			'idx_ezpus_city' => array( 'city' ),
+			'idx_ezpus_langid' => array('langid'),
+			'idx_ezpus_status_ln_fn' => array('status', 'lastname', 'firstname'),
+			'idx_ezpus_status_ad1_ad2' => array('status', 'address1', 'address2'),
+			'idx_ezpus_status_postal_city' => array('status', 'postal', 'city'),
+			'idx_ezpus_lastname' => array('lastname'),
+			'idx_ezpus_address1' => array('address1'),
+			'idx_ezpus_postal' => array('postal'),
+			'idx_ezpus_city' => array('city'),
 		);
 
-		foreach( $indexes as $name => $def )
+		foreach ($indexes as $name => $def)
 		{
-			if( $table->hasIndex( $name ) === false ) {
-				$table->addIndex( $def, $name );
+			if ($table->hasIndex($name) === false) {
+				$table->addIndex($def, $name);
 			}
 		}
 

lib/custom/tests/MShop/Customer/Manager/Lists/Type/EzpublishTest.php

Spacing +10 added lines, -10 removed lines

@@ -16,39 +16,39 @@
 
 	protected function setUp()
 	{
-		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( \TestHelper::getContext(), 'Ezpublish' );
+		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager(\TestHelper::getContext(), 'Ezpublish');
 
-		$listManager = $manager->getSubManager( 'lists', 'Ezpublish' );
-		$this->object = $listManager->getSubManager( 'type', 'Ezpublish' );
+		$listManager = $manager->getSubManager('lists', 'Ezpublish');
+		$this->object = $listManager->getSubManager('type', 'Ezpublish');
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->object );
+		unset($this->object);
 	}
 
 
 	public function testCleanup()
 	{
-		$this->object->cleanup( array( -1 ) );
+		$this->object->cleanup(array( -1 ));
 	}
 
 
 	public function testGetSearchAttributes()
 	{
 		$attributes = $this->object->getSearchAttributes();
-		$this->assertGreaterThan( 0, count( $attributes ) );
+		$this->assertGreaterThan(0, count($attributes));
 
-		foreach( $attributes as $attribute ) {
-			$this->assertInstanceOf( '\Aimeos\MW\Criteria\Attribute\Iface', $attribute );
+		foreach ($attributes as $attribute) {
+			$this->assertInstanceOf('\Aimeos\MW\Criteria\Attribute\Iface', $attribute);
 		}
 	}
 
 
 	public function testGetSubManager()
 	{
-		$this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
-		$this->object->getSubManager( 'unknown' );
+		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
+		$this->object->getSubManager('unknown');
 	}
 }

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

Spacing +10 added lines, -10 removed lines

@@ -16,44 +16,44 @@
 
 	protected function setUp()
 	{
-		$customer = new \Aimeos\MShop\Customer\Manager\Ezpublish( \TestHelper::getContext() );
+		$customer = new \Aimeos\MShop\Customer\Manager\Ezpublish(\TestHelper::getContext());
 
-		$this->object = $customer->getSubManager( 'address', 'Ezpublish' );
+		$this->object = $customer->getSubManager('address', 'Ezpublish');
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->object );
+		unset($this->object);
 	}
 
 
 	public function testCleanup()
 	{
-		$this->object->cleanup( array( -1 ) );
+		$this->object->cleanup(array( -1 ));
 	}
 
 
 	public function testDeleteItems()
 	{
-		$this->object->deleteItems( array( -1 ) );
+		$this->object->deleteItems(array( -1 ));
 	}
 
 
 	public function testGetSearchAttributes()
 	{
 		$attributes = $this->object->getSearchAttributes();
-		$this->assertGreaterThan( 0, count( $attributes ) );
+		$this->assertGreaterThan(0, count($attributes));
 
-		foreach( $attributes as $attribute ) {
-			$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute );
+		foreach ($attributes as $attribute) {
+			$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute);
 		}
 	}
 
 
 	public function testGetSubManager()
 	{
-		$this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
-		$this->object->getSubManager( 'unknown' );
+		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
+		$this->object->getSubManager('unknown');
 	}
 }

lib/custom/tests/MShop/Customer/Manager/Group/EzpublishTest.php

Spacing +32 added lines, -32 removed lines

@@ -18,91 +18,91 @@
 	protected function setUp()
 	{
 		$this->context = \TestHelper::getContext();
-		$customer = new \Aimeos\MShop\Customer\Manager\Ezpublish( $this->context );
+		$customer = new \Aimeos\MShop\Customer\Manager\Ezpublish($this->context);
 
-		$this->object = $customer->getSubManager( 'group', 'Ezpublish' );
+		$this->object = $customer->getSubManager('group', 'Ezpublish');
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->object );
+		unset($this->object);
 	}
 
 
 	public function testCleanup()
 	{
-		$this->object->cleanup( array( -1 ) );
+		$this->object->cleanup(array( -1 ));
 	}
 
 
 	public function testDeleteItems()
 	{
-		$this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
-		$this->object->deleteItems( array( -1 ) );
+		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
+		$this->object->deleteItems(array( -1 ));
 	}
 
 
 	public function testGetSearchAttributes()
 	{
 		$attributes = $this->object->getSearchAttributes();
-		$this->assertGreaterThan( 0, count( $attributes ) );
+		$this->assertGreaterThan(0, count($attributes));
 
-		foreach( $attributes as $attribute ) {
-			$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute );
+		foreach ($attributes as $attribute) {
+			$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute);
 		}
 	}
 
 
 	public function testGetSubManager()
 	{
-		$this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
-		$this->object->getSubManager( 'unknown' );
+		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
+		$this->object->getSubManager('unknown');
 	}
 
 
 	public function testSaveItem()
 	{
-		$this->setExpectedException( '\\Aimeos\\MShop\\Customer\\Exception' );
-		$this->object->saveItem( new \Aimeos\MShop\Common\Item\Lists\Standard( 'common.lists.' ) );
+		$this->setExpectedException('\\Aimeos\\MShop\\Customer\\Exception');
+		$this->object->saveItem(new \Aimeos\MShop\Common\Item\Lists\Standard('common.lists.'));
 	}
 
 
 	public function testSearchItems()
 	{
-		$mock = $this->getMockBuilder( '\Aimeos\MShop\Customer\Manager\Group\Ezpublish' )
-			->setConstructorArgs( array( \TestHelper::getContext() ) )
-			->setMethods( array( 'searchItemsBase' ) )
+		$mock = $this->getMockBuilder('\Aimeos\MShop\Customer\Manager\Group\Ezpublish')
+			->setConstructorArgs(array(\TestHelper::getContext()))
+			->setMethods(array('searchItemsBase'))
 			->getMock();
 
-		$result = $this->getMockBuilder( '\Aimeos\MW\DB\Result\Iface' )
-			->setMethods( array( 'affectedRows', 'fetch', 'finish', 'nextResult' ) )
+		$result = $this->getMockBuilder('\Aimeos\MW\DB\Result\Iface')
+			->setMethods(array('affectedRows', 'fetch', 'finish', 'nextResult'))
 			->getMock();
 
-		$mock->expects( $this->once() )->method( 'searchItemsBase' )
-			->will( $this->returnValue( $result ) );
+		$mock->expects($this->once())->method('searchItemsBase')
+			->will($this->returnValue($result));
 
-		$result->expects( $this->exactly( 2 ) )->method( 'fetch' )
-			->will( $this->onConsecutiveCalls( array( 'customer.group.id' => 1 ), false ) );
+		$result->expects($this->exactly(2))->method('fetch')
+			->will($this->onConsecutiveCalls(array('customer.group.id' => 1), false));
 
-		$result = $mock->searchItems( $mock->createSearch() );
+		$result = $mock->searchItems($mock->createSearch());
 
-		$this->assertEquals( 1, count( $result ) );
-		$this->assertInstanceOf( '\Aimeos\MShop\Customer\Item\Group\Iface', $result[1] );
+		$this->assertEquals(1, count($result));
+		$this->assertInstanceOf('\Aimeos\MShop\Customer\Item\Group\Iface', $result[1]);
 	}
 
 
 	public function testSearchItemsException()
 	{
-		$mock = $this->getMockBuilder( '\Aimeos\MShop\Customer\Manager\Group\Ezpublish' )
-			->setConstructorArgs( array( \TestHelper::getContext() ) )
-			->setMethods( array( 'searchItemsBase' ) )
+		$mock = $this->getMockBuilder('\Aimeos\MShop\Customer\Manager\Group\Ezpublish')
+			->setConstructorArgs(array(\TestHelper::getContext()))
+			->setMethods(array('searchItemsBase'))
 			->getMock();
 
-		$mock->expects( $this->once() )->method( 'searchItemsBase' )
-			->will( $this->throwException( new \Aimeos\MShop\Exception() ) );
+		$mock->expects($this->once())->method('searchItemsBase')
+			->will($this->throwException(new \Aimeos\MShop\Exception()));
 
-		$this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
-		$mock->searchItems( $mock->createSearch() );
+		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
+		$mock->searchItems($mock->createSearch());
 	}
 }

lib/custom/tests/MShop/Context/Item/EzpublishTest.php

Spacing +8 added lines, -8 removed lines

@@ -16,33 +16,33 @@
 
 	protected function setUp()
 	{
-		if( !interface_exists( 'eZ\Publish\API\Repository\UserService' ) ) {
-			$this->markTestSkipped( 'Install ezsystems/ezpublish-api first' );
+		if (!interface_exists('eZ\Publish\API\Repository\UserService')) {
+			$this->markTestSkipped('Install ezsystems/ezpublish-api first');
 		}
 
-		$this->mock = $this->getMockBuilder( 'eZ\Publish\API\Repository\UserService' )->getMock();
+		$this->mock = $this->getMockBuilder('eZ\Publish\API\Repository\UserService')->getMock();
 		$this->object = new \Aimeos\MShop\Context\Item\Ezpublish();
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->object, $this->mock );
+		unset($this->object, $this->mock);
 	}
 
 
 	public function testGetEzUserService()
 	{
-		$this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
+		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
 		$this->object->getEzUserService();
 	}
 
 
 	public function testSetEzUserService()
 	{
-		$return = $this->object->setEzUserService( $this->mock );
+		$return = $this->object->setEzUserService($this->mock);
 
-		$this->assertSame( $this->mock, $this->object->getEzUserService() );
-		$this->assertInstanceOf( '\Aimeos\MShop\Context\Item\Iface', $return );
+		$this->assertSame($this->mock, $this->object->getEzUserService());
+		$this->assertInstanceOf('\Aimeos\MShop\Context\Item\Iface', $return);
 	}
 }

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

Spacing +2 added lines, -2 removed lines

@@ -39,9 +39,9 @@
 	 * @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 !== '' && $value != $this->getPassword() )
+		if ($value !== '' && $value != $this->getPassword())
 		{
 			$this->password = (string) $value;
 			$this->setModified();

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

Braces +3 added lines, -6 removed lines

@@ -324,8 +324,7 @@ 
 
 			$user = $service->loadUser( $item->getId() );
 			$service->updateUser( $user, $struct );
-		}
-		else
+		} else
 		{
 			$struct = $service->newUserCreateStruct( $item->getCode(), $email, $item->getPassword(), 'eng-GB' );
 			$struct->enabled = $item->getStatus();
@@ -374,8 +373,7 @@ 
 			$stmt->execute()->finish();
 
 			$dbm->release( $conn, $dbname );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$dbm->release( $conn, $dbname );
 			throw $e;
@@ -423,8 +421,7 @@ 
 			}
 
 			$dbm->release( $conn, $dbname );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$dbm->release( $conn, $dbname  );
 			throw $e;

Doc Comments +4 added lines, -4 removed lines

@@ -226,7 +226,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 )
 	{
@@ -251,7 +251,7 @@ 
 	/**
 	 * Removes multiple items specified by ids in the array.
 	 *
-	 * @param array $ids List of IDs
+	 * @param integer[] $ids List of IDs
 	 */
 	public function deleteItems( array $ids )
 	{
@@ -282,7 +282,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 )
 	{
@@ -295,7 +295,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 )
 	{

Spacing +83 added lines, -83 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, ['address', 'group', 'lists', 'property'] ) as $domain ) {
-			$this->getObject()->getSubManager( $domain )->cleanup( $siteids );
+		foreach ($this->getContext()->getConfig()->get($path, ['address', 'group', 'lists', 'property']) as $domain) {
+			$this->getObject()->getSubManager($domain)->cleanup($siteids);
 		}
 	}
 
@@ -242,12 +242,12 @@ 
 	 *
 	 * @param array $ids List of IDs
 	 */
-	public function deleteItems( array $ids )
+	public function deleteItems(array $ids)
 	{
 		$service = $this->getContext()->getEzUserService();
 
-		foreach( $ids as $id ) {
-			$service->deleteUser( $service->loadUser( $id ) );
+		foreach ($ids as $id) {
+			$service->deleteUser($service->loadUser($id));
 		}
 	}
 
@@ -258,11 +258,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, ['address', 'group', 'lists', 'property'], $withsub );
+		return $this->getSearchAttributesBase($this->searchConfig, $path, ['address', 'group', 'lists', 'property'], $withsub);
 	}
 
 
@@ -273,9 +273,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 ? 'Ezpublish' : $name ) );
+		return $this->getSubManagerBase('customer', $manager, ($name === null ? 'Ezpublish' : $name));
 	}
 
 
@@ -286,96 +286,96 @@ 
 	 * @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\\Iface', $item );
+		self::checkClass('\\Aimeos\\MShop\\Customer\\Item\\Iface', $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();
 
 		$class = '\Aimeos\MShop\Context\Item\Ezpublish';
-		if( !is_a( $context, $class ) ) {
-			throw new \Aimeos\MShop\Customer\Exception( sprintf( 'Object is not of required type "%1$s"', $class ) );
+		if (!is_a($context, $class)) {
+			throw new \Aimeos\MShop\Customer\Exception(sprintf('Object is not of required type "%1$s"', $class));
 		}
 
 		$service = $context->getEzUserService();
 		$email = $item->getPaymentAddress()->getEmail();
 
-		if( $item->getId() !== null )
+		if ($item->getId() !== null)
 		{
 			$struct = $service->newUserUpdateStruct();
 			$struct->password = $item->getPassword();
 			$struct->enabled = $item->getStatus();
 			$struct->email = $email;
 
-			$user = $service->loadUser( $item->getId() );
-			$service->updateUser( $user, $struct );
+			$user = $service->loadUser($item->getId());
+			$service->updateUser($user, $struct);
 		}
 		else
 		{
-			$struct = $service->newUserCreateStruct( $item->getCode(), $email, $item->getPassword(), 'eng-GB' );
+			$struct = $service->newUserCreateStruct($item->getCode(), $email, $item->getPassword(), 'eng-GB');
 			$struct->enabled = $item->getStatus();
 
-			$user = $service->createUser( $struct, [] );
-			$item->setId( $user->getUserId() );
+			$user = $service->createUser($struct, []);
+			$item->setId($user->getUserId());
 		}
 
 		$dbm = $context->getDatabaseManager();
 		$dbname = $this->getResourceName();
-		$conn = $dbm->acquire( $dbname );
+		$conn = $dbm->acquire($dbname);
 
 		try
 		{
-			$date = date( 'Y-m-d H:i:s' );
-			$ctime = ( $item->getTimeCreated() ? $item->getTimeCreated() : $date );
+			$date = date('Y-m-d H:i:s');
+			$ctime = ($item->getTimeCreated() ? $item->getTimeCreated() : $date);
 			$billingAddress = $item->getPaymentAddress();
 
 			$path = 'mshop/customer/manager/ezpublish/update';
-			$stmt = $this->getCachedStatement( $conn, $path );
-
-			$stmt->bind( 1, $billingAddress->getCompany() );
-			$stmt->bind( 2, $billingAddress->getVatID() );
-			$stmt->bind( 3, $billingAddress->getSalutation() );
-			$stmt->bind( 4, $billingAddress->getTitle() );
-			$stmt->bind( 5, $billingAddress->getFirstname() );
-			$stmt->bind( 6, $billingAddress->getLastname() );
-			$stmt->bind( 7, $billingAddress->getAddress1() );
-			$stmt->bind( 8, $billingAddress->getAddress2() );
-			$stmt->bind( 9, $billingAddress->getAddress3() );
-			$stmt->bind( 10, $billingAddress->getPostal() );
-			$stmt->bind( 11, $billingAddress->getCity() );
-			$stmt->bind( 12, $billingAddress->getState() );
-			$stmt->bind( 13, $billingAddress->getCountryId() );
-			$stmt->bind( 14, $billingAddress->getLanguageId() );
-			$stmt->bind( 15, $billingAddress->getTelephone() );
-			$stmt->bind( 16, $billingAddress->getTelefax() );
-			$stmt->bind( 17, $billingAddress->getWebsite() );
-			$stmt->bind( 18, $item->getBirthday() );
-			$stmt->bind( 19, $item->getDateVerified() );
-			$stmt->bind( 20, $date ); // Modification time
-			$stmt->bind( 21, $context->getEditor() );
-			$stmt->bind( 22, $ctime ); // Creation time
-			$stmt->bind( 23, $item->getId(), \Aimeos\MW\DB\Statement\Base::PARAM_INT );
+			$stmt = $this->getCachedStatement($conn, $path);
+
+			$stmt->bind(1, $billingAddress->getCompany());
+			$stmt->bind(2, $billingAddress->getVatID());
+			$stmt->bind(3, $billingAddress->getSalutation());
+			$stmt->bind(4, $billingAddress->getTitle());
+			$stmt->bind(5, $billingAddress->getFirstname());
+			$stmt->bind(6, $billingAddress->getLastname());
+			$stmt->bind(7, $billingAddress->getAddress1());
+			$stmt->bind(8, $billingAddress->getAddress2());
+			$stmt->bind(9, $billingAddress->getAddress3());
+			$stmt->bind(10, $billingAddress->getPostal());
+			$stmt->bind(11, $billingAddress->getCity());
+			$stmt->bind(12, $billingAddress->getState());
+			$stmt->bind(13, $billingAddress->getCountryId());
+			$stmt->bind(14, $billingAddress->getLanguageId());
+			$stmt->bind(15, $billingAddress->getTelephone());
+			$stmt->bind(16, $billingAddress->getTelefax());
+			$stmt->bind(17, $billingAddress->getWebsite());
+			$stmt->bind(18, $item->getBirthday());
+			$stmt->bind(19, $item->getDateVerified());
+			$stmt->bind(20, $date); // Modification time
+			$stmt->bind(21, $context->getEditor());
+			$stmt->bind(22, $ctime); // Creation time
+			$stmt->bind(23, $item->getId(), \Aimeos\MW\DB\Statement\Base::PARAM_INT);
 
 			$stmt->execute()->finish();
 
-			$dbm->release( $conn, $dbname );
+			$dbm->release($conn, $dbname);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$dbm->release( $conn, $dbname );
+			$dbm->release($conn, $dbname);
 			throw $e;
 		}
 
-		$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');
 	}
 
 
@@ -387,11 +387,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
@@ -399,34 +399,34 @@ 
 			$level = \Aimeos\MShop\Locale\Manager\Base::SITE_ALL;
 			$cfgPathSearch = 'mshop/customer/manager/ezpublish/search';
 			$cfgPathCount = 'mshop/customer/manager/ezpublish/count';
-			$required = array( 'customer' );
+			$required = array('customer');
 
-			$results = $this->searchItemsBase( $conn, $search, $cfgPathSearch, $cfgPathCount, $required, $total, $level );
+			$results = $this->searchItemsBase($conn, $search, $cfgPathSearch, $cfgPathCount, $required, $total, $level);
 
-			while( ( $row = $results->fetch() ) !== false )
+			while (($row = $results->fetch()) !== false)
 			{
-				$map[ $row['customer.id'] ] = $row;
-				$map[ $row['customer.id'] ]['groups'] = [];
+				$map[$row['customer.id']] = $row;
+				$map[$row['customer.id']]['groups'] = [];
 			}
 
 
 			$path = 'mshop/customer/manager/ezpublish/groups';
-			$stmt = $conn->create( $this->getGroupSql( array_keys( $map ), $path ) );
+			$stmt = $conn->create($this->getGroupSql(array_keys($map), $path));
 			$results = $stmt->execute();
 
-			while( ( $row = $results->fetch() ) !== false ) {
-				$map[ $row['contentobject_id'] ]['groups'][] = $row['role_id'];
+			while (($row = $results->fetch()) !== false) {
+				$map[$row['contentobject_id']]['groups'][] = $row['role_id'];
 			}
 
-			$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');
 	}
 
 
@@ -439,11 +439,11 @@ 
 	 * @param array $addresses List of address 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( $this->addressManager ) ) {
-			$this->addressManager = $this->getObject()->getSubManager( 'address' );
+		if (!isset($this->addressManager)) {
+			$this->addressManager = $this->getObject()->getSubManager('address');
 		}
 
 		$address = $this->addressManager->createItem();
@@ -462,18 +462,18 @@ 
 	 * @param string $cfgpath Configuration path to the SQL statement
 	 * @return string SQL statement ready for execution
 	 */
-	protected function getGroupSql( array $ids, $cfgpath )
+	protected function getGroupSql(array $ids, $cfgpath)
 	{
-		if( empty( $ids ) ) { return '1=1'; }
+		if (empty($ids)) { return '1=1'; }
 
 		$search = $this->getObject()->createSearch();
-		$search->setConditions( $search->compare( '==', 'id', $ids ) );
+		$search->setConditions($search->compare('==', 'id', $ids));
 
-		$types = array( 'id' => \Aimeos\MW\DB\Statement\Base::PARAM_INT );
-		$translations = array( 'id' => '"contentobject_id"' );
+		$types = array('id' => \Aimeos\MW\DB\Statement\Base::PARAM_INT);
+		$translations = array('id' => '"contentobject_id"');
 
-		$cond = $search->getConditionString( $types, $translations );
+		$cond = $search->getConditionString($types, $translations);
 
-		return str_replace( ':cond', $cond, $this->getSqlConfig( $cfgpath ) );
+		return str_replace(':cond', $cond, $this->getSqlConfig($cfgpath));
 	}
 }

lib/custom/src/MShop/Customer/Manager/Group/Ezpublish.php

Braces +1 added lines, -2 removed lines

@@ -159,8 +159,7 @@
 			}
 
 			$dbm->release( $conn, $dbname );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$dbm->release( $conn, $dbname );
 			throw $e;

Spacing +18 added lines, -18 removed lines

@@ -72,7 +72,7 @@ 
 	 *
 	 * @param integer[] $siteids List of IDs for sites whose entries should be deleted
 	 */
-	public function cleanup( array $siteids )
+	public function cleanup(array $siteids)
 	{
 	}
 
@@ -82,9 +82,9 @@ 
 	 *
 	 * @param array $ids List of IDs
 	 */
-	public function deleteItems( array $ids )
+	public function deleteItems(array $ids)
 	{
-		throw new \Aimeos\MShop\Customer\Exception( sprintf( 'Deleting groups is not supported, please use the eZ Publish backend' ) );
+		throw new \Aimeos\MShop\Customer\Exception(sprintf('Deleting groups is not supported, please use the eZ Publish backend'));
 	}
 
 
@@ -94,11 +94,11 @@ 
 	 * @param boolean $withsub Return also attributes of sub-managers if true
 	 * @return array Returns a list of attribtes implementing \Aimeos\MW\Criteria\Attribute\Iface
 	 */
-	public function getSearchAttributes( $withsub = true )
+	public function getSearchAttributes($withsub = true)
 	{
 		$path = 'mshop/customer/manager/group/submanagers';
 
-		return $this->getSearchAttributesBase( $this->searchConfig, $path, [], $withsub );
+		return $this->getSearchAttributesBase($this->searchConfig, $path, [], $withsub);
 	}
 
 
@@ -109,9 +109,9 @@ 
 	 * @param string|null $name Name of the implementation, will be from configuration (or Default) if null
 	 * @return \Aimeos\MShop\Common\Manager\Iface Manager for different extensions
 	 */
-	public function getSubManager( $manager, $name = null )
+	public function getSubManager($manager, $name = null)
 	{
-		return $this->getSubManagerBase( 'customer/group', $manager, ( $name === null ? 'Ezpublish' : $name ) );
+		return $this->getSubManagerBase('customer/group', $manager, ($name === null ? 'Ezpublish' : $name));
 	}
 
 
@@ -121,9 +121,9 @@ 
 	 * @param \Aimeos\MShop\Customer\Item\Group\Iface $item Customer group item
 	 * @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)
 	{
-		throw new \Aimeos\MShop\Customer\Exception( sprintf( 'Saving groups is not supported, please use the eZ Publish backend' ) );
+		throw new \Aimeos\MShop\Customer\Exception(sprintf('Saving groups is not supported, please use the eZ Publish backend'));
 	}
 
 
@@ -136,33 +136,33 @@ 
 	 * @return array List of items implementing \Aimeos\MShop\Customer\Item\Group\Iface
 	 * @throws \Aimeos\MShop\Exception If retrieving 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)
 	{
 		$map = [];
 		$context = $this->getContext();
 
 		$dbm = $context->getDatabaseManager();
 		$dbname = $this->getResourceName();
-		$conn = $dbm->acquire( $dbname );
+		$conn = $dbm->acquire($dbname);
 
 		try
 		{
-			$required = array( 'customer.group' );
+			$required = array('customer.group');
 			$level = \Aimeos\MShop\Locale\Manager\Base::SITE_ALL;
 			$cfgPathSearch = 'mshop/customer/manager/group/ezpublish/search';
 			$cfgPathCount = 'mshop/customer/manager/group/ezpublish/count';
 
-			$results = $this->searchItemsBase( $conn, $search, $cfgPathSearch, $cfgPathCount, $required, $total, $level );
+			$results = $this->searchItemsBase($conn, $search, $cfgPathSearch, $cfgPathCount, $required, $total, $level);
 
-			while( ( $row = $results->fetch() ) !== false ) {
-				$map[$row['customer.group.id']] = $this->createItemBase( $row );
+			while (($row = $results->fetch()) !== false) {
+				$map[$row['customer.group.id']] = $this->createItemBase($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;
 		}