aimeos / ai-ezpublish

lib/custom/config/mshop/customer/manager/ezpublish.php

Indentation +12 added lines, -12 removed lines

@@ -6,14 +6,14 @@ 
  */
 
 return array(
-	'delete' => array(
-		'ansi' => '
+    'delete' => array(
+        'ansi' => '
 			DELETE FROM "ezuser"
 			WHERE :cond
 		',
-	),
-	'update' => array(
-		'ansi' => '
+    ),
+    'update' => array(
+        'ansi' => '
 			UPDATE "ezuser"
 			SET "login_normalized" = ?, "login" = ?, "company" = ?, "vatid" = ?,
 				"salutation" = ?, "title" = ?, "firstname" = ?, "lastname" = ?,
@@ -24,9 +24,9 @@ 
 				"mtime" = ?, "editor" = ?, "ctime" = ?
 			WHERE "contentobject_id" = ?
 		',
-	),
-	'search' => array(
-		'ansi' => '
+    ),
+    'search' => array(
+        'ansi' => '
 			SELECT DISTINCT ezu."contentobject_id" AS "customer.id",
 				ezu."login_normalized" as "customer.code", ezu."login" as "customer.label",
 				ezu."company" AS "customer.company", ezu."vatid" AS "customer.vatid",
@@ -48,9 +48,9 @@ 
 			/*-orderby*/ ORDER BY :order /*orderby-*/
 			LIMIT :size OFFSET :start
 		',
-	),
-	'count' => array(
-		'ansi' => '
+    ),
+    'count' => array(
+        'ansi' => '
 			SELECT COUNT(*) AS "count"
 			FROM (
 				SELECT DISTINCT ezu."contentobject_id"
@@ -60,5 +60,5 @@ 
 				LIMIT 10000 OFFSET 0
 			) AS list
 		',
-	),
+    ),
 );

lib/custom/src/MShop/Common/Item/Helper/Password/Ezpublish.php

Indentation +11 added lines, -11 removed lines

@@ -19,15 +19,15 @@
  */
 class Ezpublish implements \Aimeos\MShop\Common\Item\Helper\Password\Iface
 {
-	/**
-	 * Returns the hashed password
-	 *
-	 * @param string $password Clear text password string
-	 * @param string|null $salt Password salt
-	 * @return string Hashed password
-	 */
-	public function encode( $password, $salt = null )
-	{
-		return md5( $salt . "\n" . $password );
-	}
+    /**
+     * Returns the hashed password
+     *
+     * @param string $password Clear text password string
+     * @param string|null $salt Password salt
+     * @return string Hashed password
+     */
+    public function encode( $password, $salt = null )
+    {
+        return md5( $salt . "\n" . $password );
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -26,8 +26,8 @@
 	 * @param string|null $salt Password salt
 	 * @return string Hashed password
 	 */
-	public function encode( $password, $salt = null )
+	public function encode($password, $salt = null)
 	{
-		return md5( $salt . "\n" . $password );
+		return md5($salt."\n".$password);
 	}
 }

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

Indentation +58 added lines, -58 removed lines

@@ -19,62 +19,62 @@
  */
 class Ezpublish extends Standard implements Iface
 {
-	private $password = '';
-	private $helper;
-
-
-	/**
-	 * Initializes the customer item object
-	 *
-	 * @param \Aimeos\MShop\Common\Item\Address\Iface $address Payment address item object
-	 * @param array $values List of attributes that belong to the customer item
-	 * @param \Aimeos\MShop\Common\Lists\Item\Iface[] $listItems List of list items
-	 * @param \Aimeos\MShop\Common\Item\Iface[] $refItems List of referenced items
-	 * @param string $salt Password salt (optional)
-	 * @param \Aimeos\MShop\Common\Item\Helper\Password\Iface|null $helper Password encryption helper object
-	 */
-	public function __construct( \Aimeos\MShop\Common\Item\Address\Iface $address, array $values = array(),
-		array $listItems = array(), array $refItems = array(), $salt = '',
-		\Aimeos\MShop\Common\Item\Helper\Password\Iface $helper = null )
-	{
-		parent::__construct( $address, $values, $listItems, $refItems );
-
-		if( isset( $values['customer.password'] ) ) {
-			$this->password = $values['customer.password'];
-		}
-
-		$this->helper = $helper;
-	}
-
-
-	/**
-	 * Returns the password of the customer item
-	 *
-	 * @return string
-	 */
-	public function getPassword()
-	{
-		return $this->password;
-	}
-
-
-	/**
-	 * Sets the password of the customer item
-	 *
-	 * @param string $value password of the customer item
-	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item for chaining method calls
-	 */
-	public function setPassword( $value )
-	{
-		if( $value == $this->getPassword() ) { return $this; }
-
-		if( $this->helper !== null ) {
-			$value = $this->helper->encode( $value, $this->getCode() );
-		}
-
-		$this->password = (string) $value;
-		$this->setModified();
-
-		return $this;
-	}
+    private $password = '';
+    private $helper;
+
+
+    /**
+     * Initializes the customer item object
+     *
+     * @param \Aimeos\MShop\Common\Item\Address\Iface $address Payment address item object
+     * @param array $values List of attributes that belong to the customer item
+     * @param \Aimeos\MShop\Common\Lists\Item\Iface[] $listItems List of list items
+     * @param \Aimeos\MShop\Common\Item\Iface[] $refItems List of referenced items
+     * @param string $salt Password salt (optional)
+     * @param \Aimeos\MShop\Common\Item\Helper\Password\Iface|null $helper Password encryption helper object
+     */
+    public function __construct( \Aimeos\MShop\Common\Item\Address\Iface $address, array $values = array(),
+        array $listItems = array(), array $refItems = array(), $salt = '',
+        \Aimeos\MShop\Common\Item\Helper\Password\Iface $helper = null )
+    {
+        parent::__construct( $address, $values, $listItems, $refItems );
+
+        if( isset( $values['customer.password'] ) ) {
+            $this->password = $values['customer.password'];
+        }
+
+        $this->helper = $helper;
+    }
+
+
+    /**
+     * Returns the password of the customer item
+     *
+     * @return string
+     */
+    public function getPassword()
+    {
+        return $this->password;
+    }
+
+
+    /**
+     * Sets the password of the customer item
+     *
+     * @param string $value password of the customer item
+     * @return \Aimeos\MShop\Customer\Item\Iface Customer item for chaining method calls
+     */
+    public function setPassword( $value )
+    {
+        if( $value == $this->getPassword() ) { return $this; }
+
+        if( $this->helper !== null ) {
+            $value = $this->helper->encode( $value, $this->getCode() );
+        }
+
+        $this->password = (string) $value;
+        $this->setModified();
+
+        return $this;
+    }
 }

Spacing +8 added lines, -8 removed lines

@@ -33,13 +33,13 @@ 
 	 * @param string $salt Password salt (optional)
 	 * @param \Aimeos\MShop\Common\Item\Helper\Password\Iface|null $helper Password encryption helper object
 	 */
-	public function __construct( \Aimeos\MShop\Common\Item\Address\Iface $address, array $values = array(),
+	public function __construct(\Aimeos\MShop\Common\Item\Address\Iface $address, array $values = array(),
 		array $listItems = array(), array $refItems = array(), $salt = '',
-		\Aimeos\MShop\Common\Item\Helper\Password\Iface $helper = null )
+		\Aimeos\MShop\Common\Item\Helper\Password\Iface $helper = null)
 	{
-		parent::__construct( $address, $values, $listItems, $refItems );
+		parent::__construct($address, $values, $listItems, $refItems);
 
-		if( isset( $values['customer.password'] ) ) {
+		if (isset($values['customer.password'])) {
 			$this->password = $values['customer.password'];
 		}
 
@@ -64,12 +64,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( $value == $this->getPassword() ) { return $this; }
+		if ($value == $this->getPassword()) { return $this; }
 
-		if( $this->helper !== null ) {
-			$value = $this->helper->encode( $value, $this->getCode() );
+		if ($this->helper !== null) {
+			$value = $this->helper->encode($value, $this->getCode());
 		}
 
 		$this->password = (string) $value;

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

Indentation +402 added lines, -402 removed lines

@@ -18,407 +18,407 @@
  * @subpackage Customer
  */
 class Ezpublish
-	extends \Aimeos\MShop\Customer\Manager\Standard
+    extends \Aimeos\MShop\Customer\Manager\Standard
 {
-	private $searchConfig = array(
-		'customer.id' => array(
-			'label' => 'Customer ID',
-			'code' => 'customer.id',
-			'internalcode' => 'ezu."contentobject_id"',
-			'type' => 'integer',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT
-		),
-		// customer.siteid is not available
-		'customer.label' => array(
-			'label' => 'Customer label',
-			'code' => 'customer.label',
-			'internalcode' => 'ezu."login"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR
-		),
-		'customer.code' => array(
-			'label' => 'Customer username',
-			'code' => 'customer.code',
-			'internalcode' => 'ezu."login_normalized"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR
-		),
-		'customer.salutation' => array(
-			'label' => 'Customer salutation',
-			'code' => 'customer.salutation',
-			'internalcode' => 'ezu."salutation"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.company'=> array(
-			'label' => 'Customer company',
-			'code' => 'customer.company',
-			'internalcode' => 'ezu."company"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.vatid'=> array(
-			'label' => 'Customer VAT ID',
-			'code' => 'customer.vatid',
-			'internalcode' => 'ezu."vatid"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.title' => array(
-			'label' => 'Customer title',
-			'code' => 'customer.title',
-			'internalcode' => 'ezu."title"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.firstname' => array(
-			'label' => 'Customer firstname',
-			'code' => 'customer.firstname',
-			'internalcode' => 'ezu."firstname"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.lastname' => array(
-			'label' => 'Customer lastname',
-			'code' => 'customer.lastname',
-			'internalcode' => 'ezu."lastname"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.address1' => array(
-			'label' => 'Customer address part one',
-			'code' => 'customer.address1',
-			'internalcode' => 'ezu."address1"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.address2' => array(
-			'label' => 'Customer address part two',
-			'code' => 'customer.address2',
-			'internalcode' => 'ezu."address2"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.address3' => array(
-			'label' => 'Customer address part three',
-			'code' => 'customer.address3',
-			'internalcode' => 'ezu."address3"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.postal' => array(
-			'label' => 'Customer postal',
-			'code' => 'customer.postal',
-			'internalcode' => 'ezu."postal"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.city' => array(
-			'label' => 'Customer city',
-			'code' => 'customer.city',
-			'internalcode' => 'ezu."city"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.state' => array(
-			'label' => 'Customer state',
-			'code' => 'customer.state',
-			'internalcode' => 'ezu."state"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.languageid' => array(
-			'label' => 'Customer language',
-			'code' => 'customer.languageid',
-			'internalcode' => 'ezu."langid"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.countryid' => array(
-			'label' => 'Customer country',
-			'code' => 'customer.countryid',
-			'internalcode' => 'ezu."countryid"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.telephone' => array(
-			'label' => 'Customer telephone',
-			'code' => 'customer.telephone',
-			'internalcode' => 'ezu."telephone"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.email' => array(
-			'label' => 'Customer email',
-			'code' => 'customer.email',
-			'internalcode' => 'ezu."email"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.telefax' => array(
-			'label' => 'Customer telefax',
-			'code' => 'customer.telefax',
-			'internalcode' => 'ezu."telefax"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.website' => array(
-			'label' => 'Customer website',
-			'code' => 'customer.website',
-			'internalcode' => 'ezu."website"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.birthday' => array(
-			'label' => 'Customer birthday',
-			'code' => 'customer.birthday',
-			'internalcode' => 'ezu."birthday"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.password'=> array(
-			'label' => 'Customer password',
-			'code' => 'customer.password',
-			'internalcode' => 'ezu."password_hash"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.status'=> array(
-			'label' => 'Customer status',
-			'code' => 'customer.status',
-			'internalcode' => 'ezs."is_enabled"',
-			'type' => 'integer',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT
-		),
-		'customer.dateverified'=> array(
-			'label' => 'Customer verification date',
-			'code' => 'customer.dateverified',
-			'internalcode' => 'ezu."vdate"',
-			'type' => 'date',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.ctime'=> array(
-			'label' => 'Customer creation time',
-			'code' => 'customer.ctime',
-			'internalcode' => 'ezu."ctime"',
-			'type' => 'datetime',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.mtime'=> array(
-			'label' => 'Customer modification time',
-			'code' => 'customer.mtime',
-			'internalcode' => 'ezu."mtime"',
-			'type' => 'datetime',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.editor'=> array(
-			'label'=>'Customer editor',
-			'code'=>'customer.editor',
-			'internalcode' => 'ezu."editor"',
-			'type'=> 'string',
-			'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-	);
-
-	private $addressManager;
-
-
-	/**
-	 * Removes old entries from the storage.
-	 *
-	 * @param array $siteids List of IDs for sites whose entries should be deleted
-	 */
-	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 );
-		}
-	}
-
-
-	/**
-	 * Removes multiple items specified by ids in the array.
-	 *
-	 * @param array $ids List of IDs
-	 */
-	public function deleteItems( array $ids )
-	{
-		$path = 'mshop/customer/manager/ezpublish/delete';
-		$this->deleteItemsBase( $ids, $path, false, 'contentobject_id' );
-	}
-
-
-	/**
-	 * Returns the list attributes that can be used for searching.
-	 *
-	 * @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 )
-	{
-		$path = 'mshop/customer/manager/submanagers';
-
-		return $this->getSearchAttributesBase( $this->searchConfig, $path, array( 'address', 'lists' ), $withsub );
-	}
-
-
-	/**
-	 * Instantiates a new customer item object.
-	 *
-	 * @return \Aimeos\MShop\Customer\Item\Iface New customer item object
-	 */
-	public function createItem()
-	{
-		return $this->createItemBase();
-	}
-
-
-	/**
-	 * Saves a customer item object.
-	 *
-	 * @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 )
-	{
-		$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->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 ) );
-		}
-
-		$fcn = $context->getEzUser();
-		$email = $item->getPaymentAddress()->getEmail();
-		$contentId = $fcn( $item->getId(), $item->getCode(), $email, $item->getPassword(), $item->getStatus() );
-		$item->setId( $contentId );
-
-		$dbm = $context->getDatabaseManager();
-		$dbname = $this->getResourceName();
-		$conn = $dbm->acquire( $dbname );
-
-		try
-		{
-			$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->execute()->finish();
-
-			$dbm->release( $conn, $dbname );
-		}
-		catch( \Exception $e )
-		{
-			$dbm->release( $conn, $dbname );
-			throw $e;
-		}
-	}
-
-
-	/**
-	 * Returns the item objects matched by the given search criteria.
-	 *
-	 * @param \Aimeos\MW\Criteria\Iface $search Search criteria object
-	 * @param integer &$total Number of items that are available in total
-	 * @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 )
-	{
-		$dbm = $this->getContext()->getDatabaseManager();
-		$dbname = $this->getResourceName();
-		$conn = $dbm->acquire( $dbname );
-		$map = array();
-
-		try
-		{
-			$level = \Aimeos\MShop\Locale\Manager\Base::SITE_ALL;
-			$cfgPathSearch = 'mshop/customer/manager/ezpublish/search';
-			$cfgPathCount = 'mshop/customer/manager/ezpublish/count';
-			$required = array( 'customer' );
-
-			$results = $this->searchItemsBase( $conn, $search, $cfgPathSearch, $cfgPathCount, $required, $total, $level );
-			while( ( $row = $results->fetch() ) !== false ) {
-				$map[ $row['customer.id'] ] = $row;
-			}
-
-			$dbm->release( $conn, $dbname );
-		}
-		catch( \Exception $e )
-		{
-			$dbm->release( $conn, $dbname  );
-			throw $e;
-		}
-
-		return $this->buildItems( $map, $ref, 'customer' );
-	}
-
-
-	/**
-	 * Returns a new manager for customer extensions
-	 *
-	 * @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.
-	 */
-	public function getSubManager( $manager, $name = null )
-	{
-		return $this->getSubManagerBase( 'customer', $manager, ( $name === null ? 'Ezpublish' : $name ) );
-	}
-
-
-	/**
-	 * Creates a new customer item.
-	 *
-	 * @param array $values List of attributes for customer item
-	 * @param array $listItems List items associated to the customer item
-	 * @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() )
-	{
-		if( !isset( $this->addressManager ) ) {
-			$this->addressManager = $this->getSubManager( 'address' );
-		}
-
-		$helper = $this->getPasswordHelper();
-		$address = $this->addressManager->createItem();
-
-		return new \Aimeos\MShop\Customer\Item\Ezpublish( $address, $values, $listItems, $refItems, null, $helper );
-	}
+    private $searchConfig = array(
+        'customer.id' => array(
+            'label' => 'Customer ID',
+            'code' => 'customer.id',
+            'internalcode' => 'ezu."contentobject_id"',
+            'type' => 'integer',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT
+        ),
+        // customer.siteid is not available
+        'customer.label' => array(
+            'label' => 'Customer label',
+            'code' => 'customer.label',
+            'internalcode' => 'ezu."login"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR
+        ),
+        'customer.code' => array(
+            'label' => 'Customer username',
+            'code' => 'customer.code',
+            'internalcode' => 'ezu."login_normalized"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR
+        ),
+        'customer.salutation' => array(
+            'label' => 'Customer salutation',
+            'code' => 'customer.salutation',
+            'internalcode' => 'ezu."salutation"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.company'=> array(
+            'label' => 'Customer company',
+            'code' => 'customer.company',
+            'internalcode' => 'ezu."company"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.vatid'=> array(
+            'label' => 'Customer VAT ID',
+            'code' => 'customer.vatid',
+            'internalcode' => 'ezu."vatid"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.title' => array(
+            'label' => 'Customer title',
+            'code' => 'customer.title',
+            'internalcode' => 'ezu."title"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.firstname' => array(
+            'label' => 'Customer firstname',
+            'code' => 'customer.firstname',
+            'internalcode' => 'ezu."firstname"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.lastname' => array(
+            'label' => 'Customer lastname',
+            'code' => 'customer.lastname',
+            'internalcode' => 'ezu."lastname"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.address1' => array(
+            'label' => 'Customer address part one',
+            'code' => 'customer.address1',
+            'internalcode' => 'ezu."address1"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.address2' => array(
+            'label' => 'Customer address part two',
+            'code' => 'customer.address2',
+            'internalcode' => 'ezu."address2"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.address3' => array(
+            'label' => 'Customer address part three',
+            'code' => 'customer.address3',
+            'internalcode' => 'ezu."address3"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.postal' => array(
+            'label' => 'Customer postal',
+            'code' => 'customer.postal',
+            'internalcode' => 'ezu."postal"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.city' => array(
+            'label' => 'Customer city',
+            'code' => 'customer.city',
+            'internalcode' => 'ezu."city"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.state' => array(
+            'label' => 'Customer state',
+            'code' => 'customer.state',
+            'internalcode' => 'ezu."state"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.languageid' => array(
+            'label' => 'Customer language',
+            'code' => 'customer.languageid',
+            'internalcode' => 'ezu."langid"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.countryid' => array(
+            'label' => 'Customer country',
+            'code' => 'customer.countryid',
+            'internalcode' => 'ezu."countryid"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.telephone' => array(
+            'label' => 'Customer telephone',
+            'code' => 'customer.telephone',
+            'internalcode' => 'ezu."telephone"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.email' => array(
+            'label' => 'Customer email',
+            'code' => 'customer.email',
+            'internalcode' => 'ezu."email"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.telefax' => array(
+            'label' => 'Customer telefax',
+            'code' => 'customer.telefax',
+            'internalcode' => 'ezu."telefax"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.website' => array(
+            'label' => 'Customer website',
+            'code' => 'customer.website',
+            'internalcode' => 'ezu."website"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.birthday' => array(
+            'label' => 'Customer birthday',
+            'code' => 'customer.birthday',
+            'internalcode' => 'ezu."birthday"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.password'=> array(
+            'label' => 'Customer password',
+            'code' => 'customer.password',
+            'internalcode' => 'ezu."password_hash"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.status'=> array(
+            'label' => 'Customer status',
+            'code' => 'customer.status',
+            'internalcode' => 'ezs."is_enabled"',
+            'type' => 'integer',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT
+        ),
+        'customer.dateverified'=> array(
+            'label' => 'Customer verification date',
+            'code' => 'customer.dateverified',
+            'internalcode' => 'ezu."vdate"',
+            'type' => 'date',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.ctime'=> array(
+            'label' => 'Customer creation time',
+            'code' => 'customer.ctime',
+            'internalcode' => 'ezu."ctime"',
+            'type' => 'datetime',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.mtime'=> array(
+            'label' => 'Customer modification time',
+            'code' => 'customer.mtime',
+            'internalcode' => 'ezu."mtime"',
+            'type' => 'datetime',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.editor'=> array(
+            'label'=>'Customer editor',
+            'code'=>'customer.editor',
+            'internalcode' => 'ezu."editor"',
+            'type'=> 'string',
+            'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+    );
+
+    private $addressManager;
+
+
+    /**
+     * Removes old entries from the storage.
+     *
+     * @param array $siteids List of IDs for sites whose entries should be deleted
+     */
+    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 );
+        }
+    }
+
+
+    /**
+     * Removes multiple items specified by ids in the array.
+     *
+     * @param array $ids List of IDs
+     */
+    public function deleteItems( array $ids )
+    {
+        $path = 'mshop/customer/manager/ezpublish/delete';
+        $this->deleteItemsBase( $ids, $path, false, 'contentobject_id' );
+    }
+
+
+    /**
+     * Returns the list attributes that can be used for searching.
+     *
+     * @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 )
+    {
+        $path = 'mshop/customer/manager/submanagers';
+
+        return $this->getSearchAttributesBase( $this->searchConfig, $path, array( 'address', 'lists' ), $withsub );
+    }
+
+
+    /**
+     * Instantiates a new customer item object.
+     *
+     * @return \Aimeos\MShop\Customer\Item\Iface New customer item object
+     */
+    public function createItem()
+    {
+        return $this->createItemBase();
+    }
+
+
+    /**
+     * Saves a customer item object.
+     *
+     * @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 )
+    {
+        $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->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 ) );
+        }
+
+        $fcn = $context->getEzUser();
+        $email = $item->getPaymentAddress()->getEmail();
+        $contentId = $fcn( $item->getId(), $item->getCode(), $email, $item->getPassword(), $item->getStatus() );
+        $item->setId( $contentId );
+
+        $dbm = $context->getDatabaseManager();
+        $dbname = $this->getResourceName();
+        $conn = $dbm->acquire( $dbname );
+
+        try
+        {
+            $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->execute()->finish();
+
+            $dbm->release( $conn, $dbname );
+        }
+        catch( \Exception $e )
+        {
+            $dbm->release( $conn, $dbname );
+            throw $e;
+        }
+    }
+
+
+    /**
+     * Returns the item objects matched by the given search criteria.
+     *
+     * @param \Aimeos\MW\Criteria\Iface $search Search criteria object
+     * @param integer &$total Number of items that are available in total
+     * @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 )
+    {
+        $dbm = $this->getContext()->getDatabaseManager();
+        $dbname = $this->getResourceName();
+        $conn = $dbm->acquire( $dbname );
+        $map = array();
+
+        try
+        {
+            $level = \Aimeos\MShop\Locale\Manager\Base::SITE_ALL;
+            $cfgPathSearch = 'mshop/customer/manager/ezpublish/search';
+            $cfgPathCount = 'mshop/customer/manager/ezpublish/count';
+            $required = array( 'customer' );
+
+            $results = $this->searchItemsBase( $conn, $search, $cfgPathSearch, $cfgPathCount, $required, $total, $level );
+            while( ( $row = $results->fetch() ) !== false ) {
+                $map[ $row['customer.id'] ] = $row;
+            }
+
+            $dbm->release( $conn, $dbname );
+        }
+        catch( \Exception $e )
+        {
+            $dbm->release( $conn, $dbname  );
+            throw $e;
+        }
+
+        return $this->buildItems( $map, $ref, 'customer' );
+    }
+
+
+    /**
+     * Returns a new manager for customer extensions
+     *
+     * @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.
+     */
+    public function getSubManager( $manager, $name = null )
+    {
+        return $this->getSubManagerBase( 'customer', $manager, ( $name === null ? 'Ezpublish' : $name ) );
+    }
+
+
+    /**
+     * Creates a new customer item.
+     *
+     * @param array $values List of attributes for customer item
+     * @param array $listItems List items associated to the customer item
+     * @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() )
+    {
+        if( !isset( $this->addressManager ) ) {
+            $this->addressManager = $this->getSubManager( 'address' );
+        }
+
+        $helper = $this->getPasswordHelper();
+        $address = $this->addressManager->createItem();
+
+        return new \Aimeos\MShop\Customer\Item\Ezpublish( $address, $values, $listItems, $refItems, null, $helper );
+    }
 }

Spacing +62 added lines, -62 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,71 +280,71 @@ 
 	 * @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));
 		}
 
 		$fcn = $context->getEzUser();
 		$email = $item->getPaymentAddress()->getEmail();
-		$contentId = $fcn( $item->getId(), $item->getCode(), $email, $item->getPassword(), $item->getStatus() );
-		$item->setId( $contentId );
+		$contentId = $fcn($item->getId(), $item->getCode(), $email, $item->getPassword(), $item->getStatus());
+		$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, $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;
 		}
 	}
@@ -358,11 +358,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
@@ -370,22 +370,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');
 	}
 
 
@@ -396,9 +396,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));
 	}
 
 
@@ -410,15 +410,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\Ezpublish( $address, $values, $listItems, $refItems, null, $helper );
+		return new \Aimeos\MShop\Customer\Item\Ezpublish($address, $values, $listItems, $refItems, null, $helper);
 	}
 }

lib/custom/setup/unittest/CustomerAddEzpublishTestData.php

Indentation +97 added lines, -97 removed lines

@@ -14,134 +14,134 @@
  */
 class CustomerAddEzpublishTestData extends \Aimeos\MW\Setup\Task\CustomerAddTestData
 {
-	/**
-	 * Returns the list of task names which this task depends on.
-	 *
-	 * @return string[] List of task names
-	 */
-	public function getPreDependencies()
-	{
-		return array( 'TablesCreateEzpublish', 'EzuserAddAddress', 'MShopSetLocale', 'MediaAddTestData' );
-	}
+    /**
+     * Returns the list of task names which this task depends on.
+     *
+     * @return string[] List of task names
+     */
+    public function getPreDependencies()
+    {
+        return array( 'TablesCreateEzpublish', 'EzuserAddAddress', 'MShopSetLocale', 'MediaAddTestData' );
+    }
 
 
-	/**
-	 * Adds attribute test data.
-	 */
-	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 ) );
-		}
+    /**
+     * Adds attribute test data.
+     */
+    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 ) );
+        }
 
-		$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';
+        $parentIds = array();
+        $ds = DIRECTORY_SEPARATOR;
+        $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 = $customerManager->createSearch();
+        $search->setConditions( $search->compare( '==', 'customer.code', array( 'UTC001', 'UTC002', 'UTC003' ) ) );
+        $items = $customerManager->searchItems( $search );
 
-		$this->conn->begin();
+        $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->conn->commit();
 
 
-		$this->status( 'done' );
-	}
+        $this->status( 'done' );
+    }
 
 
-	/**
-	 * Returns the Ezpublish context
-	 *
-	 * @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 )
-	{
-		$class = '\Aimeos\MShop\Context\Item\Ezpublish';
-		if( is_a( $context, $class ) ) {
-			return $context;
-		}
+    /**
+     * Returns the Ezpublish context
+     *
+     * @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 )
+    {
+        $class = '\Aimeos\MShop\Context\Item\Ezpublish';
+        if( is_a( $context, $class ) ) {
+            return $context;
+        }
 
-		$ctx = new \Aimeos\MShop\Context\Item\Ezpublish();
-		$ctx->setDatabaseManager( clone $context->getDatabaseManager() );
-		$ctx->setSession( clone $context->getSession() );
-		$ctx->setLogger( clone $context->getLogger() );
-		$ctx->setLocale( clone $context->getLocale() );
-		$ctx->setConfig( clone $context->getConfig() );
-		$ctx->setCache( clone $context->getCache() );
+        $ctx = new \Aimeos\MShop\Context\Item\Ezpublish();
+        $ctx->setDatabaseManager( clone $context->getDatabaseManager() );
+        $ctx->setSession( clone $context->getSession() );
+        $ctx->setLogger( clone $context->getLogger() );
+        $ctx->setLocale( clone $context->getLocale() );
+        $ctx->setConfig( clone $context->getConfig() );
+        $ctx->setCache( clone $context->getCache() );
 
 
-		$ctx->setEzUser( function( $id, $code, $email, $password, $status ) use ( $ctx ) {
+        $ctx->setEzUser( function( $id, $code, $email, $password, $status ) use ( $ctx ) {
 
-			$dbm = $ctx->getDatabaseManager();
-			$dbname = ( $ctx->getConfig()->get( 'resource/db-customer' ) ? 'db-customer' : 'db' );
-			$conn = $dbm->acquire( $dbname );
+            $dbm = $ctx->getDatabaseManager();
+            $dbname = ( $ctx->getConfig()->get( 'resource/db-customer' ) ? 'db-customer' : 'db' );
+            $conn = $dbm->acquire( $dbname );
 
-			try
-			{
-				$contentid = ( $id === null ? mt_rand( -0x7fffffff,-1 ) : $id );
+            try
+            {
+                $contentid = ( $id === null ? mt_rand( -0x7fffffff,-1 ) : $id );
 
-				if( $id === null ) {
-					$sql = 'INSERT INTO "ezuser" ( "email", "login", "login_normalized", "password_hash", "password_hash_type", "contentobject_id" ) VALUES ( ?, ?, ?, ?, 5, ? )';
-				} else {
-					$sql = 'UPDATE "ezuser" SET "email" = ?, "login" = ?, "login_normalized" = ?, "password_hash" = ?, "password_hash_type" = 5 WHERE "contentobject_id" = ?';
-				}
+                if( $id === null ) {
+                    $sql = 'INSERT INTO "ezuser" ( "email", "login", "login_normalized", "password_hash", "password_hash_type", "contentobject_id" ) VALUES ( ?, ?, ?, ?, 5, ? )';
+                } else {
+                    $sql = 'UPDATE "ezuser" SET "email" = ?, "login" = ?, "login_normalized" = ?, "password_hash" = ?, "password_hash_type" = 5 WHERE "contentobject_id" = ?';
+                }
 
-				$stmt = $conn->create( $sql );
-				$stmt->bind( 1, $email );
-				$stmt->bind( 2, $code );
-				$stmt->bind( 3, $code );
-				$stmt->bind( 4, $password );
-				$stmt->bind( 5, $contentid, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
+                $stmt = $conn->create( $sql );
+                $stmt->bind( 1, $email );
+                $stmt->bind( 2, $code );
+                $stmt->bind( 3, $code );
+                $stmt->bind( 4, $password );
+                $stmt->bind( 5, $contentid, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
 
-				$stmt->execute()->finish();
+                $stmt->execute()->finish();
 
 
-				if( $id === null ) {
-					$sql = 'INSERT INTO "ezuser_setting" ( "is_enabled", "user_id" ) VALUES ( ?, ? )';
-				} else {
-					$sql = 'UPDATE "ezuser_setting" SET "is_enabled" = ? WHERE "user_id" = ?';
-				}
+                if( $id === null ) {
+                    $sql = 'INSERT INTO "ezuser_setting" ( "is_enabled", "user_id" ) VALUES ( ?, ? )';
+                } else {
+                    $sql = 'UPDATE "ezuser_setting" SET "is_enabled" = ? WHERE "user_id" = ?';
+                }
 
-				$stmt = $conn->create( $sql );
-				$stmt->bind( 1, $status, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
-				$stmt->bind( 2, $contentid, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
+                $stmt = $conn->create( $sql );
+                $stmt->bind( 1, $status, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
+                $stmt->bind( 2, $contentid, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
 
-				$stmt->execute()->finish();
+                $stmt->execute()->finish();
 
 
-				$dbm->release( $conn, $dbname );
-			}
-			catch( \Exception $e )
-			{
-				$dbm->release( $conn, $dbname );
-				throw $e;
-			}
+                $dbm->release( $conn, $dbname );
+            }
+            catch( \Exception $e )
+            {
+                $dbm->release( $conn, $dbname );
+                throw $e;
+            }
 
-			return $contentid;
-		} );
+            return $contentid;
+        } );
 
 
-		return $ctx;
-	}
+        return $ctx;
+    }
 }

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,66 +75,66 @@ 
 	 * @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;
 		}
 
 		$ctx = new \Aimeos\MShop\Context\Item\Ezpublish();
-		$ctx->setDatabaseManager( clone $context->getDatabaseManager() );
-		$ctx->setSession( clone $context->getSession() );
-		$ctx->setLogger( clone $context->getLogger() );
-		$ctx->setLocale( clone $context->getLocale() );
-		$ctx->setConfig( clone $context->getConfig() );
-		$ctx->setCache( clone $context->getCache() );
+		$ctx->setDatabaseManager(clone $context->getDatabaseManager());
+		$ctx->setSession(clone $context->getSession());
+		$ctx->setLogger(clone $context->getLogger());
+		$ctx->setLocale(clone $context->getLocale());
+		$ctx->setConfig(clone $context->getConfig());
+		$ctx->setCache(clone $context->getCache());
 
 
-		$ctx->setEzUser( function( $id, $code, $email, $password, $status ) use ( $ctx ) {
+		$ctx->setEzUser(function($id, $code, $email, $password, $status) use ($ctx) {
 
 			$dbm = $ctx->getDatabaseManager();
-			$dbname = ( $ctx->getConfig()->get( 'resource/db-customer' ) ? 'db-customer' : 'db' );
-			$conn = $dbm->acquire( $dbname );
+			$dbname = ($ctx->getConfig()->get('resource/db-customer') ? 'db-customer' : 'db');
+			$conn = $dbm->acquire($dbname);
 
 			try
 			{
-				$contentid = ( $id === null ? mt_rand( -0x7fffffff,-1 ) : $id );
+				$contentid = ($id === null ? mt_rand( -0x7fffffff, -1 ) : $id);
 
-				if( $id === null ) {
+				if ($id === null) {
 					$sql = 'INSERT INTO "ezuser" ( "email", "login", "login_normalized", "password_hash", "password_hash_type", "contentobject_id" ) VALUES ( ?, ?, ?, ?, 5, ? )';
 				} else {
 					$sql = 'UPDATE "ezuser" SET "email" = ?, "login" = ?, "login_normalized" = ?, "password_hash" = ?, "password_hash_type" = 5 WHERE "contentobject_id" = ?';
 				}
 
-				$stmt = $conn->create( $sql );
-				$stmt->bind( 1, $email );
-				$stmt->bind( 2, $code );
-				$stmt->bind( 3, $code );
-				$stmt->bind( 4, $password );
-				$stmt->bind( 5, $contentid, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
+				$stmt = $conn->create($sql);
+				$stmt->bind(1, $email);
+				$stmt->bind(2, $code);
+				$stmt->bind(3, $code);
+				$stmt->bind(4, $password);
+				$stmt->bind(5, $contentid, \Aimeos\MW\DB\Statement\Base::PARAM_INT);
 
 				$stmt->execute()->finish();
 
 
-				if( $id === null ) {
+				if ($id === null) {
 					$sql = 'INSERT INTO "ezuser_setting" ( "is_enabled", "user_id" ) VALUES ( ?, ? )';
 				} else {
 					$sql = 'UPDATE "ezuser_setting" SET "is_enabled" = ? WHERE "user_id" = ?';
 				}
 
-				$stmt = $conn->create( $sql );
-				$stmt->bind( 1, $status, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
-				$stmt->bind( 2, $contentid, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
+				$stmt = $conn->create($sql);
+				$stmt->bind(1, $status, \Aimeos\MW\DB\Statement\Base::PARAM_INT);
+				$stmt->bind(2, $contentid, \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;
 			}
 

lib/custom/tests/TestHelper.php

Indentation +91 added lines, -91 removed lines

@@ -8,140 +8,140 @@
  */
 class TestHelper
 {
-	private static $aimeos;
-	private static $context = array();
+    private static $aimeos;
+    private static $context = array();
 
 
-	public static function bootstrap()
-	{
-		$aimeos = self::getAimeos();
+    public static function bootstrap()
+    {
+        $aimeos = self::getAimeos();
 
-		$includepaths = $aimeos->getIncludePaths();
-		$includepaths[] = get_include_path();
-		set_include_path( implode( PATH_SEPARATOR, $includepaths ) );
-	}
+        $includepaths = $aimeos->getIncludePaths();
+        $includepaths[] = get_include_path();
+        set_include_path( implode( PATH_SEPARATOR, $includepaths ) );
+    }
 
 
-	public static function getContext( $site = 'unittest' )
-	{
-		if( !isset( self::$context[$site] ) ) {
-			self::$context[$site] = self::createContext( $site );
-		}
+    public static function getContext( $site = 'unittest' )
+    {
+        if( !isset( self::$context[$site] ) ) {
+            self::$context[$site] = self::createContext( $site );
+        }
 
-		return clone self::$context[$site];
-	}
+        return clone self::$context[$site];
+    }
 
 
-	private static function getAimeos()
-	{
-		if( !isset( self::$aimeos ) )
-		{
-			require_once 'Bootstrap.php';
-			spl_autoload_register( 'Aimeos\\Bootstrap::autoload' );
+    private static function getAimeos()
+    {
+        if( !isset( self::$aimeos ) )
+        {
+            require_once 'Bootstrap.php';
+            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;
-	}
+        return self::$aimeos;
+    }
 
 
-	/**
-	 * @param string $site
-	 */
-	private static function createContext( $site )
-	{
-		$ctx = new \Aimeos\MShop\Context\Item\Ezpublish();
-		$aimeos = self::getAimeos();
+    /**
+     * @param string $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 = $aimeos->getConfigPaths();
+        $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 );
+        $cache = new \Aimeos\MW\Cache\None();
+        $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 );
+        $session = new \Aimeos\MW\Session\None();
+        $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( $id, $code, $email, $password, $status ) use ( $ctx ) {
+        $ctx->setEzUser( function( $id, $code, $email, $password, $status ) use ( $ctx ) {
 
-			$dbm = $ctx->getDatabaseManager();
-			$dbname = ( $ctx->getConfig()->get( 'resource/db-customer' ) ? 'db-customer' : 'db' );
-			$conn = $dbm->acquire( $dbname );
+            $dbm = $ctx->getDatabaseManager();
+            $dbname = ( $ctx->getConfig()->get( 'resource/db-customer' ) ? 'db-customer' : 'db' );
+            $conn = $dbm->acquire( $dbname );
 
-			try
-			{
-				$contentid = ( $id === null ? mt_rand( -0x7fffffff,-1 ) : $id );
+            try
+            {
+                $contentid = ( $id === null ? mt_rand( -0x7fffffff,-1 ) : $id );
 
-				if( $id === null ) {
-					$sql = 'INSERT INTO "ezuser" ( "email", "login", "login_normalized", "password_hash", "password_hash_type", "contentobject_id" ) VALUES ( ?, ?, ?, ?, 5, ? )';
-				} else {
-					$sql = 'UPDATE "ezuser" SET "email" = ?, "login" = ?, "login_normalized" = ?, "password_hash" = ?, "password_hash_type" = 5 WHERE "contentobject_id" = ?';
-				}
+                if( $id === null ) {
+                    $sql = 'INSERT INTO "ezuser" ( "email", "login", "login_normalized", "password_hash", "password_hash_type", "contentobject_id" ) VALUES ( ?, ?, ?, ?, 5, ? )';
+                } else {
+                    $sql = 'UPDATE "ezuser" SET "email" = ?, "login" = ?, "login_normalized" = ?, "password_hash" = ?, "password_hash_type" = 5 WHERE "contentobject_id" = ?';
+                }
 
-				$stmt = $conn->create( $sql );
-				$stmt->bind( 1, $email );
-				$stmt->bind( 2, $code );
-				$stmt->bind( 3, $code );
-				$stmt->bind( 4, $password );
-				$stmt->bind( 5, $contentid, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
+                $stmt = $conn->create( $sql );
+                $stmt->bind( 1, $email );
+                $stmt->bind( 2, $code );
+                $stmt->bind( 3, $code );
+                $stmt->bind( 4, $password );
+                $stmt->bind( 5, $contentid, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
 
-				$stmt->execute()->finish();
+                $stmt->execute()->finish();
 
 
-				if( $id === null ) {
-					$sql = 'INSERT INTO "ezuser_setting" ( "is_enabled", "user_id" ) VALUES ( ?, ? )';
-				} else {
-					$sql = 'UPDATE "ezuser_setting" SET "is_enabled" = ? WHERE "user_id" = ?';
-				}
+                if( $id === null ) {
+                    $sql = 'INSERT INTO "ezuser_setting" ( "is_enabled", "user_id" ) VALUES ( ?, ? )';
+                } else {
+                    $sql = 'UPDATE "ezuser_setting" SET "is_enabled" = ? WHERE "user_id" = ?';
+                }
 
-				$stmt = $conn->create( $sql );
-				$stmt->bind( 1, $status, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
-				$stmt->bind( 2, $contentid, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
+                $stmt = $conn->create( $sql );
+                $stmt->bind( 1, $status, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
+                $stmt->bind( 2, $contentid, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
 
-				$stmt->execute()->finish();
+                $stmt->execute()->finish();
 
 
-				$dbm->release( $conn, $dbname );
-			}
-			catch( \Exception $e )
-			{
-				$dbm->release( $conn, $dbname );
-				throw $e;
-			}
+                $dbm->release( $conn, $dbname );
+            }
+            catch( \Exception $e )
+            {
+                $dbm->release( $conn, $dbname );
+                throw $e;
+            }
 
-			return $contentid;
-		} );
+            return $contentid;
+        } );
 
 
-		return $ctx;
-	}
+        return $ctx;
+    }
 }

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,91 +50,91 @@ 
 	/**
 	 * @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( $id, $code, $email, $password, $status ) use ( $ctx ) {
+		$ctx->setEzUser(function($id, $code, $email, $password, $status) use ($ctx) {
 
 			$dbm = $ctx->getDatabaseManager();
-			$dbname = ( $ctx->getConfig()->get( 'resource/db-customer' ) ? 'db-customer' : 'db' );
-			$conn = $dbm->acquire( $dbname );
+			$dbname = ($ctx->getConfig()->get('resource/db-customer') ? 'db-customer' : 'db');
+			$conn = $dbm->acquire($dbname);
 
 			try
 			{
-				$contentid = ( $id === null ? mt_rand( -0x7fffffff,-1 ) : $id );
+				$contentid = ($id === null ? mt_rand( -0x7fffffff, -1 ) : $id);
 
-				if( $id === null ) {
+				if ($id === null) {
 					$sql = 'INSERT INTO "ezuser" ( "email", "login", "login_normalized", "password_hash", "password_hash_type", "contentobject_id" ) VALUES ( ?, ?, ?, ?, 5, ? )';
 				} else {
 					$sql = 'UPDATE "ezuser" SET "email" = ?, "login" = ?, "login_normalized" = ?, "password_hash" = ?, "password_hash_type" = 5 WHERE "contentobject_id" = ?';
 				}
 
-				$stmt = $conn->create( $sql );
-				$stmt->bind( 1, $email );
-				$stmt->bind( 2, $code );
-				$stmt->bind( 3, $code );
-				$stmt->bind( 4, $password );
-				$stmt->bind( 5, $contentid, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
+				$stmt = $conn->create($sql);
+				$stmt->bind(1, $email);
+				$stmt->bind(2, $code);
+				$stmt->bind(3, $code);
+				$stmt->bind(4, $password);
+				$stmt->bind(5, $contentid, \Aimeos\MW\DB\Statement\Base::PARAM_INT);
 
 				$stmt->execute()->finish();
 
 
-				if( $id === null ) {
+				if ($id === null) {
 					$sql = 'INSERT INTO "ezuser_setting" ( "is_enabled", "user_id" ) VALUES ( ?, ? )';
 				} else {
 					$sql = 'UPDATE "ezuser_setting" SET "is_enabled" = ? WHERE "user_id" = ?';
 				}
 
-				$stmt = $conn->create( $sql );
-				$stmt->bind( 1, $status, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
-				$stmt->bind( 2, $contentid, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
+				$stmt = $conn->create($sql);
+				$stmt->bind(1, $status, \Aimeos\MW\DB\Statement\Base::PARAM_INT);
+				$stmt->bind(2, $contentid, \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;
 			}