aimeos / ai-ezpublish

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

Spacing +71 added lines, -71 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/ezpublish/delete';
-		$this->deleteItemsBase( $ids, $path, false, 'contentobject_id' );
+		$this->deleteItemsBase($ids, $path, false, 'contentobject_id');
 	}
 
 
@@ -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,88 +280,88 @@ 
 	 * @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();
 
 		$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));
 		}
 
-		if( $item->getId() === null )
+		if ($item->getId() === null)
 		{
 			$fcn = $context->getEzUser();
-			$contentId = $fcn( $item->getCode(), $item->getPaymentAddress()->getEmail(), $item->getPassword() );
-			$item->setId( $contentId );
+			$contentId = $fcn($item->getCode(), $item->getPaymentAddress()->getEmail(), $item->getPassword());
+			$item->setId($contentId);
 		}
 
 		$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, $item->getCode() ); // login normalized
-			$stmt->bind( 2, $item->getCode() ); // login
-			$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->getTelefax() );
-			$stmt->bind( 20, $billingAddress->getWebsite() );
-			$stmt->bind( 21, $item->getBirthday() );
-			$stmt->bind( 22, $item->getStatus(), \Aimeos\MW\DB\Statement\Base::PARAM_INT );
-			$stmt->bind( 23, $item->getDateVerified() );
-			$stmt->bind( 24, $item->getPassword() );
-			$stmt->bind( 25, $date ); // Modification time
-			$stmt->bind( 26, $context->getEditor() );
-			$stmt->bind( 27, $ctime ); // Creation time
-			$stmt->bind( 28, $item->getId(), \Aimeos\MW\DB\Statement\Base::PARAM_INT );
+			$stmt = $this->getCachedStatement($conn, $path);
+
+			$stmt->bind(1, $item->getCode()); // login normalized
+			$stmt->bind(2, $item->getCode()); // login
+			$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->getTelefax());
+			$stmt->bind(20, $billingAddress->getWebsite());
+			$stmt->bind(21, $item->getBirthday());
+			$stmt->bind(22, $item->getStatus(), \Aimeos\MW\DB\Statement\Base::PARAM_INT);
+			$stmt->bind(23, $item->getDateVerified());
+			$stmt->bind(24, $item->getPassword());
+			$stmt->bind(25, $date); // Modification time
+			$stmt->bind(26, $context->getEditor());
+			$stmt->bind(27, $ctime); // Creation time
+			$stmt->bind(28, $item->getId(), \Aimeos\MW\DB\Statement\Base::PARAM_INT);
 
 			$stmt->execute()->finish();
 
 
 			$path = 'mshop/customer/manager/ezpublish/update-status';
-			$stmt = $this->getCachedStatement( $conn, $path );
+			$stmt = $this->getCachedStatement($conn, $path);
 
-			$stmt->bind( 1, $item->getStatus(), \Aimeos\MW\DB\Statement\Base::PARAM_INT );
-			$stmt->bind( 2, $item->getId(), \Aimeos\MW\DB\Statement\Base::PARAM_INT );
+			$stmt->bind(1, $item->getStatus(), \Aimeos\MW\DB\Statement\Base::PARAM_INT);
+			$stmt->bind(2, $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;
 		}
 	}
@@ -375,11 +375,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
@@ -387,22 +387,22 @@ 
 			$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 );
-			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');
 	}
 
 
@@ -413,9 +413,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));
 	}
 
 
@@ -427,15 +427,15 @@ 
 	 * @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');
 		}
 
 		$helper = $this->getPasswordHelper();
 		$address = $this->addressManager->createItem();
 
-		return new \Aimeos\MShop\Customer\Item\Standard( $address, $values, $listItems, $refItems, null, $helper );
+		return new \Aimeos\MShop\Customer\Item\Standard($address, $values, $listItems, $refItems, null, $helper);
 	}
 }

lib/custom/setup/unittest/CustomerAddEzpublishTestData.php

Spacing +43 added lines, -43 removed lines

@@ -21,7 +21,7 @@ 
 	 */
 	public function getPreDependencies()
 	{
-		return array( 'TablesCreateEzpublish', 'EzuserAddAddress', 'MShopSetLocale', 'MediaAddTestData' );
+		return array('TablesCreateEzpublish', 'EzuserAddAddress', 'MShopSetLocale', 'MediaAddTestData');
 	}
 
 
@@ -31,41 +31,41 @@ 
 	public function migrate()
 	{
 		$iface = '\\Aimeos\\MShop\\Context\\Item\\Iface';
-		if( !( $this->additional instanceof $iface ) ) {
-			throw new \Aimeos\MW\Setup\Exception( sprintf( 'Additionally provided object is not of type "%1$s"', $iface ) );
+		if (!($this->additional instanceof $iface)) {
+			throw new \Aimeos\MW\Setup\Exception(sprintf('Additionally provided object is not of type "%1$s"', $iface));
 		}
 
-		$context = $this->getEzContext( $this->additional );
+		$context = $this->getEzContext($this->additional);
 
-		$this->msg( 'Adding ezPublish customer test data', 0 );
+		$this->msg('Adding ezPublish customer test data', 0);
 
 		$parentIds = array();
 		$ds = DIRECTORY_SEPARATOR;
-		$context->setEditor( 'ai-ezpublish:unittest' );
-		$path = __DIR__ . $ds . 'data' . $ds . 'customer.php';
+		$context->setEditor('ai-ezpublish:unittest');
+		$path = __DIR__.$ds.'data'.$ds.'customer.php';
 
-		if( ( $testdata = include( $path ) ) === false ){
-			throw new \Aimeos\MShop\Exception( sprintf( 'No file "%1$s" found for customer domain', $path ) );
+		if (($testdata = include($path)) === false) {
+			throw new \Aimeos\MShop\Exception(sprintf('No file "%1$s" found for customer domain', $path));
 		}
 
 
-		$customerManager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $context, 'Ezpublish' );
-		$customerAddressManager = $customerManager->getSubManager( 'address', 'Ezpublish' );
+		$customerManager = \Aimeos\MShop\Customer\Manager\Factory::createManager($context, 'Ezpublish');
+		$customerAddressManager = $customerManager->getSubManager('address', 'Ezpublish');
 
 		$search = $customerManager->createSearch();
-		$search->setConditions( $search->compare( '==', 'customer.code', array( 'UTC001', 'UTC002', 'UTC003' ) ) );
-		$items = $customerManager->searchItems( $search );
+		$search->setConditions($search->compare('==', 'customer.code', array('UTC001', 'UTC002', 'UTC003')));
+		$items = $customerManager->searchItems($search);
 
 		$this->conn->begin();
 
-		$customerManager->deleteItems( array_keys( $items ) );
-		$parentIds = $this->addCustomerData( $testdata, $customerManager, $customerAddressManager->createItem() );
-		$this->addCustomerAddressData( $testdata, $customerAddressManager, $parentIds );
+		$customerManager->deleteItems(array_keys($items));
+		$parentIds = $this->addCustomerData($testdata, $customerManager, $customerAddressManager->createItem());
+		$this->addCustomerAddressData($testdata, $customerAddressManager, $parentIds);
 
 		$this->conn->commit();
 
 
-		$this->status( 'done' );
+		$this->status('done');
 	}
 
 
@@ -75,60 +75,60 @@ 
 	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
 	 * @return \Aimeos\MShop\Context\Item\Ezpublish Ezpublish context object
 	 */
-	protected function getEzContext( \Aimeos\MShop\Context\Item\Iface $context )
+	protected function getEzContext(\Aimeos\MShop\Context\Item\Iface $context)
 	{
 		$class = '\Aimeos\MShop\Context\Item\Ezpublish';
-		if( is_a( $context, $class ) ) {
+		if (is_a($context, $class)) {
 			return $context;
 		}
 
 		$ezContext = new \Aimeos\MShop\Context\Item\Ezpublish();
-		$ezContext->setDatabaseManager( clone $context->getDatabaseManager() );
-		$ezContext->setSession( clone $context->getSession() );
-		$ezContext->setLogger( clone $context->getLogger() );
-		$ezContext->setLocale( clone $context->getLocale() );
-		$ezContext->setConfig( clone $context->getConfig() );
-		$ezContext->setCache( clone $context->getCache() );
+		$ezContext->setDatabaseManager(clone $context->getDatabaseManager());
+		$ezContext->setSession(clone $context->getSession());
+		$ezContext->setLogger(clone $context->getLogger());
+		$ezContext->setLocale(clone $context->getLocale());
+		$ezContext->setConfig(clone $context->getConfig());
+		$ezContext->setCache(clone $context->getCache());
 
 
-		$ezContext->setEzUser( function( $code, $email, $password ) use ( $context ) {
+		$ezContext->setEzUser(function($code, $email, $password) use ($context) {
 
-			$id = mt_rand( -0x7fffffff,-1 );
+			$id = mt_rand( -0x7fffffff, -1 );
 			$dbm = $context->getDatabaseManager();
-			$dbconf = $context->getConfig()->get( 'resource/db-customer' );
-			$dbname = ( $dbconf ? 'db-customer' : 'db' );
-			$conn = $dbm->acquire( $dbname );
+			$dbconf = $context->getConfig()->get('resource/db-customer');
+			$dbname = ($dbconf ? 'db-customer' : 'db');
+			$conn = $dbm->acquire($dbname);
 
 			try
 			{
-				$stmt = $conn->create( 'INSERT INTO "ezuser" (
+				$stmt = $conn->create('INSERT INTO "ezuser" (
 					"contentobject_id", "email", "login", "login_normalized", "password_hash", "password_hash_type"
 				) VALUES (
 					?, ?, ?, ?, ?, 5
 				)' );
 
-				$stmt->bind( 1, $id, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
-				$stmt->bind( 2, $email );
-				$stmt->bind( 3, $code );
-				$stmt->bind( 4, $code );
-				$stmt->bind( 5, $password );
+				$stmt->bind(1, $id, \Aimeos\MW\DB\Statement\Base::PARAM_INT);
+				$stmt->bind(2, $email);
+				$stmt->bind(3, $code);
+				$stmt->bind(4, $code);
+				$stmt->bind(5, $password);
 
 				$stmt->execute()->finish();
 
 				$sql = 'INSERT INTO "ezuser_setting" ( "user_id", "is_enabled", "max_login" ) VALUES ( ?, ?, ? )';
-				$stmt = $conn->create( $sql );
+				$stmt = $conn->create($sql);
 
-				$stmt->bind( 1, $id, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
-				$stmt->bind( 2, 0 );
-				$stmt->bind( 3, 10 );
+				$stmt->bind(1, $id, \Aimeos\MW\DB\Statement\Base::PARAM_INT);
+				$stmt->bind(2, 0);
+				$stmt->bind(3, 10);
 
 				$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;
 			}
 

lib/custom/setup/default/schema/customer.php

Spacing +104 added lines, -104 removed lines

@@ -8,135 +8,135 @@
 
 return array(
 	'table' => array(
-		'ezuser' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'ezuser' => function(\Doctrine\DBAL\Schema\Schema $schema) {
 
-			$table = $schema->createTable( 'ezuser' );
+			$table = $schema->createTable('ezuser');
 
-			$table->addColumn( 'contentobject_id', 'integer', array() );
-			$table->addColumn( 'email', 'string', array( 'length' => 150 ) );
-			$table->addColumn( 'login', 'string', array( 'length' => 150 ) );
-			$table->addColumn( 'login_normalized', 'string', array( 'length' => 150 ) );
-			$table->addColumn( 'password_hash', 'string', array( 'length' => 50 ) );
-			$table->addColumn( 'password_hash_type', 'integer', array( 'default' => 1 ) );
+			$table->addColumn('contentobject_id', 'integer', array());
+			$table->addColumn('email', 'string', array('length' => 150));
+			$table->addColumn('login', 'string', array('length' => 150));
+			$table->addColumn('login_normalized', 'string', array('length' => 150));
+			$table->addColumn('password_hash', 'string', array('length' => 50));
+			$table->addColumn('password_hash_type', 'integer', array('default' => 1));
 
-			$table->setPrimaryKey( array( 'contentobject_id' ) );
-			$table->addUniqueIndex( array( 'login_normalized' ), 'ezuser_login' );
+			$table->setPrimaryKey(array('contentobject_id'));
+			$table->addUniqueIndex(array('login_normalized'), 'ezuser_login');
 
 			return $schema;
 		},
 
-		'ezuser_setting' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'ezuser_setting' => function(\Doctrine\DBAL\Schema\Schema $schema) {
 
-			$table = $schema->createTable( 'ezuser_setting' );
+			$table = $schema->createTable('ezuser_setting');
 
-			$table->addColumn( 'is_enabled', 'integer', array() );
-			$table->addColumn( 'max_login', 'integer', array( 'notnull' => false ) );
-			$table->addColumn( 'user_id', 'integer', array() );
+			$table->addColumn('is_enabled', 'integer', array());
+			$table->addColumn('max_login', 'integer', array('notnull' => false));
+			$table->addColumn('user_id', 'integer', array());
 
-			$table->setPrimaryKey( array( 'user_id' ) );
+			$table->setPrimaryKey(array('user_id'));
 
 			return $schema;
 		},
 
-		'ezuser_address' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
-
-			$table = $schema->createTable( 'ezuser_address' );
-
-			$table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) );
-			$table->addColumn( 'siteid', 'integer', array() );
-			$table->addColumn( 'parentid', 'integer', array() );
-			$table->addColumn( 'company', 'string', array( 'length' => 100 ) );
-			$table->addColumn( 'vatid', 'string', array( 'length' => 32 ) );
-			$table->addColumn( 'salutation', 'string', array( 'length' => 8 ) );
-			$table->addColumn( 'title', 'string', array( 'length' => 64 ) );
-			$table->addColumn( 'firstname', 'string', array( 'length' => 64 ) );
-			$table->addColumn( 'lastname', 'string', array( 'length' => 64 ) );
-			$table->addColumn( 'address1', 'string', array( 'length' => 255 ) );
-			$table->addColumn( 'address2', 'string', array( 'length' => 255 ) );
-			$table->addColumn( 'address3', 'string', array( 'length' => 255 ) );
-			$table->addColumn( 'postal', 'string', array( 'length' => 16 ) );
-			$table->addColumn( 'city', 'string', array( 'length' => 255 ) );
-			$table->addColumn( 'state', 'string', array( 'length' => 255 ) );
-			$table->addColumn( 'langid', 'string', array( 'length' => 5, 'notnull' => false ) );
-			$table->addColumn( 'countryid', 'string', array( 'length' => 2, 'notnull' => false, 'fixed' => true ) );
-			$table->addColumn( 'telephone', 'string', array( 'length' => 32 ) );
-			$table->addColumn( 'email', 'string', array( 'length' => 255 ) );
-			$table->addColumn( 'telefax', 'string', array( 'length' => 255 ) );
-			$table->addColumn( 'website', 'string', array( 'length' => 255 ) );
-			$table->addColumn( 'flag', 'integer', array() );
-			$table->addColumn( 'pos', 'smallint', array() );
-			$table->addColumn( 'mtime', 'datetime', array() );
-			$table->addColumn( 'ctime', 'datetime', array() );
-			$table->addColumn( 'editor', 'string', array('length' => 255 ) );
-
-			$table->setPrimaryKey( array( 'id' ), 'pk_ezpad_id' );
-			$table->addIndex( array( 'lastname', 'firstname' ), 'idx_ezpad_ln_fn' );
-			$table->addIndex( array( 'address1', 'address2' ), 'idx_ezpad_ad1_ad2' );
-			$table->addIndex( array( 'postal', 'city' ), 'idx_ezpad_post_ci' );
-			$table->addIndex( array( 'parentid' ), 'idx_ezpad_pid' );
-			$table->addIndex( array( 'city' ), 'idx_ezpad_city' );
-
-			$table->addForeignKeyConstraint( 'ezuser', array( 'parentid' ), array( 'contentobject_id' ),
-				array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_ezpad_pid' );
+		'ezuser_address' => function(\Doctrine\DBAL\Schema\Schema $schema) {
+
+			$table = $schema->createTable('ezuser_address');
+
+			$table->addColumn('id', 'integer', array('autoincrement' => true));
+			$table->addColumn('siteid', 'integer', array());
+			$table->addColumn('parentid', 'integer', array());
+			$table->addColumn('company', 'string', array('length' => 100));
+			$table->addColumn('vatid', 'string', array('length' => 32));
+			$table->addColumn('salutation', 'string', array('length' => 8));
+			$table->addColumn('title', 'string', array('length' => 64));
+			$table->addColumn('firstname', 'string', array('length' => 64));
+			$table->addColumn('lastname', 'string', array('length' => 64));
+			$table->addColumn('address1', 'string', array('length' => 255));
+			$table->addColumn('address2', 'string', array('length' => 255));
+			$table->addColumn('address3', 'string', array('length' => 255));
+			$table->addColumn('postal', 'string', array('length' => 16));
+			$table->addColumn('city', 'string', array('length' => 255));
+			$table->addColumn('state', 'string', array('length' => 255));
+			$table->addColumn('langid', 'string', array('length' => 5, 'notnull' => false));
+			$table->addColumn('countryid', 'string', array('length' => 2, 'notnull' => false, 'fixed' => true));
+			$table->addColumn('telephone', 'string', array('length' => 32));
+			$table->addColumn('email', 'string', array('length' => 255));
+			$table->addColumn('telefax', 'string', array('length' => 255));
+			$table->addColumn('website', 'string', array('length' => 255));
+			$table->addColumn('flag', 'integer', array());
+			$table->addColumn('pos', 'smallint', array());
+			$table->addColumn('mtime', 'datetime', array());
+			$table->addColumn('ctime', 'datetime', array());
+			$table->addColumn('editor', 'string', array('length' => 255));
+
+			$table->setPrimaryKey(array('id'), 'pk_ezpad_id');
+			$table->addIndex(array('lastname', 'firstname'), 'idx_ezpad_ln_fn');
+			$table->addIndex(array('address1', 'address2'), 'idx_ezpad_ad1_ad2');
+			$table->addIndex(array('postal', 'city'), 'idx_ezpad_post_ci');
+			$table->addIndex(array('parentid'), 'idx_ezpad_pid');
+			$table->addIndex(array('city'), 'idx_ezpad_city');
+
+			$table->addForeignKeyConstraint('ezuser', array('parentid'), array('contentobject_id'),
+				array('onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE'), 'fk_ezpad_pid');
 
 			return $schema;
 		},
 
-		'ezuser_list_type' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'ezuser_list_type' => function(\Doctrine\DBAL\Schema\Schema $schema) {
 
-			$table = $schema->createTable( 'ezuser_list_type' );
+			$table = $schema->createTable('ezuser_list_type');
 
-			$table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) );
-			$table->addColumn( 'siteid', 'integer', array() );
-			$table->addColumn( 'domain', 'string', array( 'length' => 32 ) );
-			$table->addColumn( 'code', 'string', array( 'length' => 32 ) );
-			$table->addColumn( 'label', 'string', array( 'length' => 255 ) );
-			$table->addColumn( 'status', 'smallint', array() );
-			$table->addColumn( 'mtime', 'datetime', array() );
-			$table->addColumn( 'ctime', 'datetime', array() );
-			$table->addColumn( 'editor', 'string', array( 'length' => 255 ) );
+			$table->addColumn('id', 'integer', array('autoincrement' => true));
+			$table->addColumn('siteid', 'integer', array());
+			$table->addColumn('domain', 'string', array('length' => 32));
+			$table->addColumn('code', 'string', array('length' => 32));
+			$table->addColumn('label', 'string', array('length' => 255));
+			$table->addColumn('status', 'smallint', array());
+			$table->addColumn('mtime', 'datetime', array());
+			$table->addColumn('ctime', 'datetime', array());
+			$table->addColumn('editor', 'string', array('length' => 255));
 
-			$table->setPrimaryKey( array( 'id' ), 'pk_ezplity_id' );
-			$table->addUniqueIndex( array( 'siteid', 'domain', 'code' ), 'unq_ezplity_sid_dom_code' );
-			$table->addIndex( array( 'siteid', 'status' ), 'idx_ezplity_sid_status' );
-			$table->addIndex( array( 'siteid', 'label' ), 'idx_ezplity_sid_label' );
-			$table->addIndex( array( 'siteid', 'code' ), 'idx_ezplity_sid_code' );
+			$table->setPrimaryKey(array('id'), 'pk_ezplity_id');
+			$table->addUniqueIndex(array('siteid', 'domain', 'code'), 'unq_ezplity_sid_dom_code');
+			$table->addIndex(array('siteid', 'status'), 'idx_ezplity_sid_status');
+			$table->addIndex(array('siteid', 'label'), 'idx_ezplity_sid_label');
+			$table->addIndex(array('siteid', 'code'), 'idx_ezplity_sid_code');
 
 			return $schema;
 		},
 
-		'ezuser_list' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
-
-			$table = $schema->createTable( 'ezuser_list' );
-
-			$table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) );
-			$table->addColumn( 'parentid', 'integer', array() );
-			$table->addColumn( 'siteid', 'integer', array() );
-			$table->addColumn( 'typeid', 'integer', array() );
-			$table->addColumn( 'domain', 'string', array( 'length' => 32 ) );
-			$table->addColumn( 'refid', 'string', array( 'length' => 32 ) );
-			$table->addColumn( 'start', 'datetime', array( 'notnull' => false ) );
-			$table->addColumn( 'end', 'datetime', array( 'notnull' => false ) );
-			$table->addColumn( 'config', 'text', array( 'length' => 0xffff ) );
-			$table->addColumn( 'pos', 'integer', array() );
-			$table->addColumn( 'status', 'smallint', array() );
-			$table->addColumn( 'mtime', 'datetime', array() );
-			$table->addColumn( 'ctime', 'datetime', array() );
-			$table->addColumn( 'editor', 'string', array( 'length' => 255 ) );
-
-			$table->setPrimaryKey( array( 'id' ), 'pk_ezpli_id' );
-			$table->addUniqueIndex( array( 'siteid', 'domain', 'refid', 'typeid', 'parentid' ), 'unq_ezpli_sid_dm_rid_tid_pid' );
-			$table->addIndex( array( 'siteid', 'status', 'start', 'end' ), 'idx_ezpli_sid_stat_start_end' );
-			$table->addIndex( array( 'parentid', 'siteid', 'refid', 'domain', 'typeid' ), 'idx_ezpli_pid_sid_rid_dom_tid' );
-			$table->addIndex( array( 'parentid', 'siteid', 'start' ), 'idx_ezpli_pid_sid_start' );
-			$table->addIndex( array( 'parentid', 'siteid', 'end' ), 'idx_ezpli_pid_sid_end' );
-			$table->addIndex( array( 'parentid', 'siteid', 'pos' ), 'idx_ezpli_pid_sid_pos' );
-
-			$table->addForeignKeyConstraint( 'ezuser', array( 'parentid' ), array( 'contentobject_id' ),
-				array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_ezpli_pid' );
-
-			$table->addForeignKeyConstraint( 'ezuser_list_type', array( 'typeid' ), array( 'id' ),
-				array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_ezpli_typeid' );
+		'ezuser_list' => function(\Doctrine\DBAL\Schema\Schema $schema) {
+
+			$table = $schema->createTable('ezuser_list');
+
+			$table->addColumn('id', 'integer', array('autoincrement' => true));
+			$table->addColumn('parentid', 'integer', array());
+			$table->addColumn('siteid', 'integer', array());
+			$table->addColumn('typeid', 'integer', array());
+			$table->addColumn('domain', 'string', array('length' => 32));
+			$table->addColumn('refid', 'string', array('length' => 32));
+			$table->addColumn('start', 'datetime', array('notnull' => false));
+			$table->addColumn('end', 'datetime', array('notnull' => false));
+			$table->addColumn('config', 'text', array('length' => 0xffff));
+			$table->addColumn('pos', 'integer', array());
+			$table->addColumn('status', 'smallint', array());
+			$table->addColumn('mtime', 'datetime', array());
+			$table->addColumn('ctime', 'datetime', array());
+			$table->addColumn('editor', 'string', array('length' => 255));
+
+			$table->setPrimaryKey(array('id'), 'pk_ezpli_id');
+			$table->addUniqueIndex(array('siteid', 'domain', 'refid', 'typeid', 'parentid'), 'unq_ezpli_sid_dm_rid_tid_pid');
+			$table->addIndex(array('siteid', 'status', 'start', 'end'), 'idx_ezpli_sid_stat_start_end');
+			$table->addIndex(array('parentid', 'siteid', 'refid', 'domain', 'typeid'), 'idx_ezpli_pid_sid_rid_dom_tid');
+			$table->addIndex(array('parentid', 'siteid', 'start'), 'idx_ezpli_pid_sid_start');
+			$table->addIndex(array('parentid', 'siteid', 'end'), 'idx_ezpli_pid_sid_end');
+			$table->addIndex(array('parentid', 'siteid', 'pos'), 'idx_ezpli_pid_sid_pos');
+
+			$table->addForeignKeyConstraint('ezuser', array('parentid'), array('contentobject_id'),
+				array('onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE'), 'fk_ezpli_pid');
+
+			$table->addForeignKeyConstraint('ezuser_list_type', array('typeid'), array('id'),
+				array('onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE'), 'fk_ezpli_typeid');
 
 			return $schema;
 		},

lib/custom/tests/TestHelper.php

Spacing +42 added lines, -42 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,85 +50,85 @@ 
 	/**
 	 * @param string $site
 	 */
-	private static function createContext( $site )
+	private static function createContext($site)
 	{
 		$ctx = new \Aimeos\MShop\Context\Item\Ezpublish();
 		$aimeos = self::getAimeos();
 
 
 		$paths = $aimeos->getConfigPaths();
-		$paths[] = __DIR__ . DIRECTORY_SEPARATOR . 'config';
+		$paths[] = __DIR__.DIRECTORY_SEPARATOR.'config';
 
-		$conf = new \Aimeos\MW\Config\PHPArray( array(), $paths );
-		$ctx->setConfig( $conf );
+		$conf = new \Aimeos\MW\Config\PHPArray(array(), $paths);
+		$ctx->setConfig($conf);
 
 
-		$dbm = new \Aimeos\MW\DB\Manager\DBAL( $conf );
-		$ctx->setDatabaseManager( $dbm );
+		$dbm = new \Aimeos\MW\DB\Manager\DBAL($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-ezpublish:unittest' );
+		$ctx->setEditor('ai-ezpublish:unittest');
 
 
-		$ctx->setEzUser( function( $code, $email, $password ) use ( $ctx ) {
+		$ctx->setEzUser(function($code, $email, $password) use ($ctx) {
 
-			$id = mt_rand( -0x7fffffff,-1 );
+			$id = mt_rand( -0x7fffffff, -1 );
 			$dbm = $ctx->getDatabaseManager();
-			$dbconf = $ctx->getConfig()->get( 'resource/db-customer' );
-			$dbname = ( $dbconf ? 'db-customer' : 'db' );
-			$conn = $dbm->acquire( $dbname );
+			$dbconf = $ctx->getConfig()->get('resource/db-customer');
+			$dbname = ($dbconf ? 'db-customer' : 'db');
+			$conn = $dbm->acquire($dbname);
 
 			try
 			{
-				$stmt = $conn->create( 'INSERT INTO "ezuser" (
+				$stmt = $conn->create('INSERT INTO "ezuser" (
 					"contentobject_id", "email", "login", "login_normalized", "password_hash", "password_hash_type"
 				) VALUES (
 					?, ?, ?, ?, ?, 5
 				)' );
 
-				$stmt->bind( 1, $id, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
-				$stmt->bind( 2, $email );
-				$stmt->bind( 3, $code );
-				$stmt->bind( 4, $code );
-				$stmt->bind( 5, $password );
+				$stmt->bind(1, $id, \Aimeos\MW\DB\Statement\Base::PARAM_INT);
+				$stmt->bind(2, $email);
+				$stmt->bind(3, $code);
+				$stmt->bind(4, $code);
+				$stmt->bind(5, $password);
 
 				$stmt->execute()->finish();
 
 				$sql = 'INSERT INTO "ezuser_setting" ( "user_id", "is_enabled", "max_login" ) VALUES ( ?, ?, ? )';
-				$stmt = $conn->create( $sql );
+				$stmt = $conn->create($sql);
 
-				$stmt->bind( 1, $id, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
-				$stmt->bind( 2, 0 );
-				$stmt->bind( 3, 10 );
+				$stmt->bind(1, $id, \Aimeos\MW\DB\Statement\Base::PARAM_INT);
+				$stmt->bind(2, 0);
+				$stmt->bind(3, 10);
 
 				$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;
 			}