aimeos / ai-ezpublish

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

Indentation +172 added lines, -172 removed lines

@@ -18,177 +18,177 @@
  * @subpackage Customer
  */
 class Ezpublish
-	extends \Aimeos\MShop\Customer\Manager\Lists\Standard
-	implements \Aimeos\MShop\Customer\Manager\Lists\Iface, \Aimeos\MShop\Common\Manager\Lists\Iface
+    extends \Aimeos\MShop\Customer\Manager\Lists\Standard
+    implements \Aimeos\MShop\Customer\Manager\Lists\Iface, \Aimeos\MShop\Common\Manager\Lists\Iface
 {
-	private $searchConfig = array(
-		'customer.lists.id'=> array(
-			'code'=>'customer.lists.id',
-			'internalcode'=>'ezuli."id"',
-			'internaldeps' => array( 'LEFT JOIN "ezuser_list" AS ezuli ON ( ezu."id" = ezuli."parentid" )' ),
-			'label'=>'Customer list ID',
-			'type'=> 'integer',
-			'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_INT,
-			'public' => false,
-		),
-		'customer.lists.siteid'=> array(
-			'code'=>'customer.lists.siteid',
-			'internalcode'=>'ezuli."siteid"',
-			'label'=>'Customer list site ID',
-			'type'=> 'integer',
-			'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_INT,
-			'public' => false,
-		),
-		'customer.lists.parentid'=> array(
-			'code'=>'customer.lists.parentid',
-			'internalcode'=>'ezuli."parentid"',
-			'label'=>'Customer list parent ID',
-			'type'=> 'integer',
-			'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_INT,
-			'public' => false,
-		),
-		'customer.lists.domain'=> array(
-			'code'=>'customer.lists.domain',
-			'internalcode'=>'ezuli."domain"',
-			'label'=>'Customer list domain',
-			'type'=> 'string',
-			'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.lists.typeid' => array(
-			'code'=>'customer.lists.typeid',
-			'internalcode'=>'ezuli."typeid"',
-			'label'=>'Customer list type ID',
-			'type'=> 'integer',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT,
-			'public' => false,
-		),
-		'customer.lists.refid'=> array(
-			'code'=>'customer.lists.refid',
-			'internalcode'=>'ezuli."refid"',
-			'label'=>'Customer list reference ID',
-			'type'=> 'string',
-			'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.lists.datestart' => array(
-			'code'=>'customer.lists.datestart',
-			'internalcode'=>'ezuli."start"',
-			'label'=>'Customer list start date/time',
-			'type'=> 'datetime',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.lists.dateend' => array(
-			'code'=>'customer.lists.dateend',
-			'internalcode'=>'ezuli."end"',
-			'label'=>'Customer list end date/time',
-			'type'=> 'datetime',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.lists.config' => array(
-			'code'=>'customer.lists.config',
-			'internalcode'=>'ezuli."config"',
-			'label'=>'Customer list position',
-			'type'=> 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.lists.position' => array(
-			'code'=>'customer.lists.position',
-			'internalcode'=>'ezuli."pos"',
-			'label'=>'Customer list position',
-			'type'=> 'integer',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT,
-		),
-		'customer.lists.status' => array(
-			'code'=>'customer.lists.status',
-			'internalcode'=>'ezuli."status"',
-			'label'=>'Customer list status',
-			'type'=> 'integer',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT,
-		),
-		'customer.lists.ctime'=> array(
-			'code'=>'customer.lists.ctime',
-			'internalcode'=>'ezuli."ctime"',
-			'label'=>'Customer list create date/time',
-			'type'=> 'datetime',
-			'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.lists.mtime'=> array(
-			'code'=>'customer.lists.mtime',
-			'internalcode'=>'ezuli."mtime"',
-			'label'=>'Customer list modification date/time',
-			'type'=> 'datetime',
-			'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.lists.editor'=> array(
-			'code'=>'customer.lists.editor',
-			'internalcode'=>'ezuli."editor"',
-			'label'=>'Customer list editor',
-			'type'=> 'string',
-			'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-	);
-
-
-	/**
-	 * 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/lists/submanagers';
-		foreach( $this->getContext()->getConfig()->get( $path, array( 'type' ) ) as $domain ) {
-			$this->getSubManager( $domain )->cleanup( $siteids );
-		}
-
-		$this->cleanupBase( $siteids, 'mshop/customer/manager/lists/ezpublish/delete' );
-	}
-
-
-	/**
-	 * 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/lists/submanagers';
-
-		return $this->getSearchAttributesBase( $this->searchConfig, $path, array( 'type' ), $withsub );
-	}
-
-
-	/**
-	 * 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', 'lists/' . $manager, ( $name === null ? 'Ezpublish' : $name ) );
-	}
-
-
-	/**
-	 * Returns the config path for retrieving the configuration values.
-	 *
-	 * @return string Configuration path (mshop/customer/manager/lists/ezpublish/)
-	 */
-	protected function getConfigPath()
-	{
-		return 'mshop/customer/manager/lists/ezpublish/';
-	}
-
-
-	/**
-	 * Returns the search configuration for searching items.
-	 *
-	 * @return array Associative list of search keys and search definitions
-	 */
-	protected function getSearchConfig()
-	{
-		return $this->searchConfig;
-	}
+    private $searchConfig = array(
+        'customer.lists.id'=> array(
+            'code'=>'customer.lists.id',
+            'internalcode'=>'ezuli."id"',
+            'internaldeps' => array( 'LEFT JOIN "ezuser_list" AS ezuli ON ( ezu."id" = ezuli."parentid" )' ),
+            'label'=>'Customer list ID',
+            'type'=> 'integer',
+            'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_INT,
+            'public' => false,
+        ),
+        'customer.lists.siteid'=> array(
+            'code'=>'customer.lists.siteid',
+            'internalcode'=>'ezuli."siteid"',
+            'label'=>'Customer list site ID',
+            'type'=> 'integer',
+            'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_INT,
+            'public' => false,
+        ),
+        'customer.lists.parentid'=> array(
+            'code'=>'customer.lists.parentid',
+            'internalcode'=>'ezuli."parentid"',
+            'label'=>'Customer list parent ID',
+            'type'=> 'integer',
+            'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_INT,
+            'public' => false,
+        ),
+        'customer.lists.domain'=> array(
+            'code'=>'customer.lists.domain',
+            'internalcode'=>'ezuli."domain"',
+            'label'=>'Customer list domain',
+            'type'=> 'string',
+            'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.lists.typeid' => array(
+            'code'=>'customer.lists.typeid',
+            'internalcode'=>'ezuli."typeid"',
+            'label'=>'Customer list type ID',
+            'type'=> 'integer',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT,
+            'public' => false,
+        ),
+        'customer.lists.refid'=> array(
+            'code'=>'customer.lists.refid',
+            'internalcode'=>'ezuli."refid"',
+            'label'=>'Customer list reference ID',
+            'type'=> 'string',
+            'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.lists.datestart' => array(
+            'code'=>'customer.lists.datestart',
+            'internalcode'=>'ezuli."start"',
+            'label'=>'Customer list start date/time',
+            'type'=> 'datetime',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.lists.dateend' => array(
+            'code'=>'customer.lists.dateend',
+            'internalcode'=>'ezuli."end"',
+            'label'=>'Customer list end date/time',
+            'type'=> 'datetime',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.lists.config' => array(
+            'code'=>'customer.lists.config',
+            'internalcode'=>'ezuli."config"',
+            'label'=>'Customer list position',
+            'type'=> 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.lists.position' => array(
+            'code'=>'customer.lists.position',
+            'internalcode'=>'ezuli."pos"',
+            'label'=>'Customer list position',
+            'type'=> 'integer',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT,
+        ),
+        'customer.lists.status' => array(
+            'code'=>'customer.lists.status',
+            'internalcode'=>'ezuli."status"',
+            'label'=>'Customer list status',
+            'type'=> 'integer',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT,
+        ),
+        'customer.lists.ctime'=> array(
+            'code'=>'customer.lists.ctime',
+            'internalcode'=>'ezuli."ctime"',
+            'label'=>'Customer list create date/time',
+            'type'=> 'datetime',
+            'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.lists.mtime'=> array(
+            'code'=>'customer.lists.mtime',
+            'internalcode'=>'ezuli."mtime"',
+            'label'=>'Customer list modification date/time',
+            'type'=> 'datetime',
+            'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.lists.editor'=> array(
+            'code'=>'customer.lists.editor',
+            'internalcode'=>'ezuli."editor"',
+            'label'=>'Customer list editor',
+            'type'=> 'string',
+            'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+    );
+
+
+    /**
+     * 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/lists/submanagers';
+        foreach( $this->getContext()->getConfig()->get( $path, array( 'type' ) ) as $domain ) {
+            $this->getSubManager( $domain )->cleanup( $siteids );
+        }
+
+        $this->cleanupBase( $siteids, 'mshop/customer/manager/lists/ezpublish/delete' );
+    }
+
+
+    /**
+     * 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/lists/submanagers';
+
+        return $this->getSearchAttributesBase( $this->searchConfig, $path, array( 'type' ), $withsub );
+    }
+
+
+    /**
+     * 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', 'lists/' . $manager, ( $name === null ? 'Ezpublish' : $name ) );
+    }
+
+
+    /**
+     * Returns the config path for retrieving the configuration values.
+     *
+     * @return string Configuration path (mshop/customer/manager/lists/ezpublish/)
+     */
+    protected function getConfigPath()
+    {
+        return 'mshop/customer/manager/lists/ezpublish/';
+    }
+
+
+    /**
+     * Returns the search configuration for searching items.
+     *
+     * @return array Associative list of search keys and search definitions
+     */
+    protected function getSearchConfig()
+    {
+        return $this->searchConfig;
+    }
 }

Spacing +9 added lines, -9 removed lines

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

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

Indentation +135 added lines, -135 removed lines

@@ -18,140 +18,140 @@
  * @subpackage Customer
  */
 class Ezpublish
-	extends \Aimeos\MShop\Customer\Manager\Lists\Type\Standard
-	implements \Aimeos\MShop\Customer\Manager\Lists\Type\Iface
+    extends \Aimeos\MShop\Customer\Manager\Lists\Type\Standard
+    implements \Aimeos\MShop\Customer\Manager\Lists\Type\Iface
 {
-	private $searchConfig = array(
-		'customer.lists.type.id' => array(
-			'code'=>'customer.lists.type.id',
-			'internalcode'=>'ezulity."id"',
-			'internaldeps'=>array( 'LEFT JOIN "ezuser_list_type" AS ezulity ON ( ezuli."typeid" = ezulity."id" )' ),
-			'label'=>'Customer list type ID',
-			'type'=> 'integer',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT,
-			'public' => false,
-		),
-		'customer.lists.type.siteid' => array(
-			'code'=>'customer.lists.type.siteid',
-			'internalcode'=>'ezulity."siteid"',
-			'label'=>'Customer list type site ID',
-			'type'=> 'integer',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT,
-			'public' => false,
-		),
-		'customer.lists.type.code' => array(
-			'code'=>'customer.lists.type.code',
-			'internalcode'=>'ezulity."code"',
-			'label'=>'Customer list type code',
-			'type'=> 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.lists.type.domain' => array(
-			'code'=>'customer.lists.type.domain',
-			'internalcode'=>'ezulity."domain"',
-			'label'=>'Customer list type domain',
-			'type'=> 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.lists.type.label' => array(
-			'code'=>'customer.lists.type.label',
-			'internalcode'=>'ezulity."label"',
-			'label'=>'Customer list type label',
-			'type'=> 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.lists.type.status' => array(
-			'code'=>'customer.lists.type.status',
-			'internalcode'=>'ezulity."status"',
-			'label'=>'Customer list type status',
-			'type'=> 'integer',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT,
-		),
-		'customer.lists.type.ctime'=> array(
-			'code'=>'customer.lists.type.ctime',
-			'internalcode'=>'ezulity."ctime"',
-			'label'=>'Customer list type create date/time',
-			'type'=> 'datetime',
-			'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.lists.type.mtime'=> array(
-			'code'=>'customer.lists.type.mtime',
-			'internalcode'=>'ezulity."mtime"',
-			'label'=>'Customer list type modification date/time',
-			'type'=> 'datetime',
-			'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.lists.type.editor'=> array(
-			'code'=>'customer.lists.type.editor',
-			'internalcode'=>'ezulity."editor"',
-			'label'=>'Customer list type editor',
-			'type'=> 'string',
-			'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-	);
-
-
-	/**
-	 * 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/lists/type/submanagers';
-		foreach( $this->getContext()->getConfig()->get( $path, array() ) as $domain ) {
-			$this->getSubManager( $domain )->cleanup( $siteids );
-		}
-
-		$this->cleanupBase( $siteids, 'mshop/customer/manager/lists/type/ezpublish/delete' );
-	}
-
-
-	/**
-	 * 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/lists/type/submanagers';
-
-		return $this->getSearchAttributesBase( $this->searchConfig, $path, array(), $withsub );
-	}
-
-
-	/**
-	 * 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', 'lists/type/' . $manager, ( $name === null ? 'Ezpublish' : $name ) );
-	}
-
-
-	/**
-	 * Returns the config path for retrieving the configuration values.
-	 *
-	 * @return string Configuration path (mshop/customer/manager/lists/type/ezpublish/)
-	 */
-	protected function getConfigPath()
-	{
-		return 'mshop/customer/manager/lists/type/ezpublish/';
-	}
-
-
-	/**
-	 * Returns the search configuration for searching items.
-	 *
-	 * @return array Associative list of search keys and search definitions
-	 */
-	protected function getSearchConfig()
-	{
-		return $this->searchConfig;
-	}
+    private $searchConfig = array(
+        'customer.lists.type.id' => array(
+            'code'=>'customer.lists.type.id',
+            'internalcode'=>'ezulity."id"',
+            'internaldeps'=>array( 'LEFT JOIN "ezuser_list_type" AS ezulity ON ( ezuli."typeid" = ezulity."id" )' ),
+            'label'=>'Customer list type ID',
+            'type'=> 'integer',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT,
+            'public' => false,
+        ),
+        'customer.lists.type.siteid' => array(
+            'code'=>'customer.lists.type.siteid',
+            'internalcode'=>'ezulity."siteid"',
+            'label'=>'Customer list type site ID',
+            'type'=> 'integer',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT,
+            'public' => false,
+        ),
+        'customer.lists.type.code' => array(
+            'code'=>'customer.lists.type.code',
+            'internalcode'=>'ezulity."code"',
+            'label'=>'Customer list type code',
+            'type'=> 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.lists.type.domain' => array(
+            'code'=>'customer.lists.type.domain',
+            'internalcode'=>'ezulity."domain"',
+            'label'=>'Customer list type domain',
+            'type'=> 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.lists.type.label' => array(
+            'code'=>'customer.lists.type.label',
+            'internalcode'=>'ezulity."label"',
+            'label'=>'Customer list type label',
+            'type'=> 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.lists.type.status' => array(
+            'code'=>'customer.lists.type.status',
+            'internalcode'=>'ezulity."status"',
+            'label'=>'Customer list type status',
+            'type'=> 'integer',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT,
+        ),
+        'customer.lists.type.ctime'=> array(
+            'code'=>'customer.lists.type.ctime',
+            'internalcode'=>'ezulity."ctime"',
+            'label'=>'Customer list type create date/time',
+            'type'=> 'datetime',
+            'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.lists.type.mtime'=> array(
+            'code'=>'customer.lists.type.mtime',
+            'internalcode'=>'ezulity."mtime"',
+            'label'=>'Customer list type modification date/time',
+            'type'=> 'datetime',
+            'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.lists.type.editor'=> array(
+            'code'=>'customer.lists.type.editor',
+            'internalcode'=>'ezulity."editor"',
+            'label'=>'Customer list type editor',
+            'type'=> 'string',
+            'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+    );
+
+
+    /**
+     * 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/lists/type/submanagers';
+        foreach( $this->getContext()->getConfig()->get( $path, array() ) as $domain ) {
+            $this->getSubManager( $domain )->cleanup( $siteids );
+        }
+
+        $this->cleanupBase( $siteids, 'mshop/customer/manager/lists/type/ezpublish/delete' );
+    }
+
+
+    /**
+     * 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/lists/type/submanagers';
+
+        return $this->getSearchAttributesBase( $this->searchConfig, $path, array(), $withsub );
+    }
+
+
+    /**
+     * 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', 'lists/type/' . $manager, ( $name === null ? 'Ezpublish' : $name ) );
+    }
+
+
+    /**
+     * Returns the config path for retrieving the configuration values.
+     *
+     * @return string Configuration path (mshop/customer/manager/lists/type/ezpublish/)
+     */
+    protected function getConfigPath()
+    {
+        return 'mshop/customer/manager/lists/type/ezpublish/';
+    }
+
+
+    /**
+     * Returns the search configuration for searching items.
+     *
+     * @return array Associative list of search keys and search definitions
+     */
+    protected function getSearchConfig()
+    {
+        return $this->searchConfig;
+    }
 }

Spacing +9 added lines, -9 removed lines

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

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

Indentation +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@
  * @subpackage Customer
  */
 class Ezpublish
-	extends \Aimeos\MShop\Customer\Manager\Group\Standard
-	implements \Aimeos\MShop\Customer\Manager\Group\Iface
+    extends \Aimeos\MShop\Customer\Manager\Group\Standard
+    implements \Aimeos\MShop\Customer\Manager\Group\Iface
 {
 }

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

Braces +2 added lines, -4 removed lines

@@ -375,8 +375,7 @@ 
 			$stmt->execute()->finish();
 
 			$dbm->release( $conn, $dbname );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$dbm->release( $conn, $dbname );
 			throw $e;
@@ -412,8 +411,7 @@ 
 			}
 
 			$dbm->release( $conn, $dbname );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$dbm->release( $conn, $dbname  );
 			throw $e;

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

Indentation +245 added lines, -245 removed lines

@@ -18,263 +18,263 @@
  * @subpackage Customer
  */
 class Ezpublish
-	extends \Aimeos\MShop\Customer\Manager\Address\Standard
-	implements \Aimeos\MShop\Customer\Manager\Address\Iface
+    extends \Aimeos\MShop\Customer\Manager\Address\Standard
+    implements \Aimeos\MShop\Customer\Manager\Address\Iface
 {
-	private $searchConfig = array(
-		'customer.address.id' => array(
-			'label' => 'Customer address ID',
-			'code' => 'customer.address.id',
-			'internalcode' => 'ezuad."id"',
-			'internaldeps' => array( 'LEFT JOIN "ezuser_address" AS ezuad ON ( ezu."contentobject_id" = ezuad."parentid" )' ),
-			'type' => 'integer',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT,
-			'public' => false,
-		),
-		// site ID is not available
-		'customer.address.refid' => array(
-			'label' => 'Customer address parent ID',
-			'code' => 'customer.address.parentid',
-			'internalcode' => 'ezuad."parentid"',
-			'type' => 'integer',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-			'public' => false,
-		),
-		'customer.address.company'=> array(
-			'label' => 'Customer address company',
-			'code' => 'customer.address.company',
-			'internalcode' => 'ezuad."company"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.address.vatid'=> array(
-			'label' => 'Customer address VAT ID',
-			'code' => 'customer.address.vatid',
-			'internalcode' => 'ezuad."vatid"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.address.salutation' => array(
-			'label' => 'Customer address salutation',
-			'code' => 'customer.address.salutation',
-			'internalcode' => 'ezuad."salutation"',
-			'type' => 'integer',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.address.title' => array(
-			'label' => 'Customer address title',
-			'code' => 'customer.address.title',
-			'internalcode' => 'ezuad."title"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.address.firstname' => array(
-			'label' => 'Customer address firstname',
-			'code' => 'customer.address.firstname',
-			'internalcode' => 'ezuad."firstname"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.address.lastname' => array(
-			'label' => 'Customer address lastname',
-			'code' => 'customer.address.lastname',
-			'internalcode' => 'ezuad."lastname"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.address.address1' => array(
-			'label' => 'Customer address address part one',
-			'code' => 'customer.address.address1',
-			'internalcode' => 'ezuad."address1"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.address.address2' => array(
-			'label' => 'Customer address address part two',
-			'code' => 'customer.address.address2',
-			'internalcode' => 'ezuad."address2"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.address.address3' => array(
-			'label' => 'Customer address address part three',
-			'code' => 'customer.address.address3',
-			'internalcode' => 'ezuad."address3"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.address.postal' => array(
-			'label' => 'Customer address postal',
-			'code' => 'customer.address.postal',
-			'internalcode' => 'ezuad."postal"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.address.city' => array(
-			'label' => 'Customer address city',
-			'code' => 'customer.address.city',
-			'internalcode' => 'ezuad."city"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.address.state' => array(
-			'label' => 'Customer address state',
-			'code' => 'customer.address.state',
-			'internalcode' => 'ezuad."state"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.address.languageid' => array(
-			'label' => 'Customer address language',
-			'code' => 'customer.address.languageid',
-			'internalcode' => 'ezuad."langid"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.address.countryid' => array(
-			'label' => 'Customer address country',
-			'code' => 'customer.address.countryid',
-			'internalcode' => 'ezuad."countryid"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.address.telephone' => array(
-			'label' => 'Customer address telephone',
-			'code' => 'customer.address.telephone',
-			'internalcode' => 'ezuad."telephone"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.address.email' => array(
-			'label' => 'Customer address email',
-			'code' => 'customer.address.email',
-			'internalcode' => 'ezuad."email"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.address.telefax' => array(
-			'label' => 'Customer address telefax',
-			'code' => 'customer.address.telefax',
-			'internalcode' => 'ezuad."telefax"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.address.website' => array(
-			'label' => 'Customer address website',
-			'code' => 'customer.address.website',
-			'internalcode' => 'ezuad."website"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.address.flag' => array(
-			'label' => 'Customer address flag',
-			'code' => 'customer.address.flag',
-			'internalcode' => 'ezuad."flag"',
-			'type' => 'integer',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT,
-		),
-		'customer.address.position' => array(
-			'label' => 'Customer address position',
-			'code' => 'customer.address.position',
-			'internalcode' => 'ezuad."pos"',
-			'type' => 'integer',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT,
-		),
-		'customer.address.ctime'=> array(
-			'label'=>'Customer address create date/time',
-			'code'=>'customer.address.ctime',
-			'internalcode'=>'ezuad."ctime"',
-			'type'=> 'datetime',
-			'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.address.mtime'=> array(
-			'label'=>'Customer address modification date/time',
-			'code'=>'customer.address.mtime',
-			'internalcode'=>'ezuad."mtime"',
-			'type'=> 'datetime',
-			'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.address.editor'=> array(
-			'label'=>'Customer address editor',
-			'code'=>'customer.address.editor',
-			'internalcode'=>'ezuad."editor"',
-			'type'=> 'string',
-			'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-	);
+    private $searchConfig = array(
+        'customer.address.id' => array(
+            'label' => 'Customer address ID',
+            'code' => 'customer.address.id',
+            'internalcode' => 'ezuad."id"',
+            'internaldeps' => array( 'LEFT JOIN "ezuser_address" AS ezuad ON ( ezu."contentobject_id" = ezuad."parentid" )' ),
+            'type' => 'integer',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT,
+            'public' => false,
+        ),
+        // site ID is not available
+        'customer.address.refid' => array(
+            'label' => 'Customer address parent ID',
+            'code' => 'customer.address.parentid',
+            'internalcode' => 'ezuad."parentid"',
+            'type' => 'integer',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+            'public' => false,
+        ),
+        'customer.address.company'=> array(
+            'label' => 'Customer address company',
+            'code' => 'customer.address.company',
+            'internalcode' => 'ezuad."company"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.address.vatid'=> array(
+            'label' => 'Customer address VAT ID',
+            'code' => 'customer.address.vatid',
+            'internalcode' => 'ezuad."vatid"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.address.salutation' => array(
+            'label' => 'Customer address salutation',
+            'code' => 'customer.address.salutation',
+            'internalcode' => 'ezuad."salutation"',
+            'type' => 'integer',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.address.title' => array(
+            'label' => 'Customer address title',
+            'code' => 'customer.address.title',
+            'internalcode' => 'ezuad."title"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.address.firstname' => array(
+            'label' => 'Customer address firstname',
+            'code' => 'customer.address.firstname',
+            'internalcode' => 'ezuad."firstname"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.address.lastname' => array(
+            'label' => 'Customer address lastname',
+            'code' => 'customer.address.lastname',
+            'internalcode' => 'ezuad."lastname"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.address.address1' => array(
+            'label' => 'Customer address address part one',
+            'code' => 'customer.address.address1',
+            'internalcode' => 'ezuad."address1"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.address.address2' => array(
+            'label' => 'Customer address address part two',
+            'code' => 'customer.address.address2',
+            'internalcode' => 'ezuad."address2"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.address.address3' => array(
+            'label' => 'Customer address address part three',
+            'code' => 'customer.address.address3',
+            'internalcode' => 'ezuad."address3"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.address.postal' => array(
+            'label' => 'Customer address postal',
+            'code' => 'customer.address.postal',
+            'internalcode' => 'ezuad."postal"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.address.city' => array(
+            'label' => 'Customer address city',
+            'code' => 'customer.address.city',
+            'internalcode' => 'ezuad."city"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.address.state' => array(
+            'label' => 'Customer address state',
+            'code' => 'customer.address.state',
+            'internalcode' => 'ezuad."state"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.address.languageid' => array(
+            'label' => 'Customer address language',
+            'code' => 'customer.address.languageid',
+            'internalcode' => 'ezuad."langid"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.address.countryid' => array(
+            'label' => 'Customer address country',
+            'code' => 'customer.address.countryid',
+            'internalcode' => 'ezuad."countryid"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.address.telephone' => array(
+            'label' => 'Customer address telephone',
+            'code' => 'customer.address.telephone',
+            'internalcode' => 'ezuad."telephone"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.address.email' => array(
+            'label' => 'Customer address email',
+            'code' => 'customer.address.email',
+            'internalcode' => 'ezuad."email"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.address.telefax' => array(
+            'label' => 'Customer address telefax',
+            'code' => 'customer.address.telefax',
+            'internalcode' => 'ezuad."telefax"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.address.website' => array(
+            'label' => 'Customer address website',
+            'code' => 'customer.address.website',
+            'internalcode' => 'ezuad."website"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.address.flag' => array(
+            'label' => 'Customer address flag',
+            'code' => 'customer.address.flag',
+            'internalcode' => 'ezuad."flag"',
+            'type' => 'integer',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT,
+        ),
+        'customer.address.position' => array(
+            'label' => 'Customer address position',
+            'code' => 'customer.address.position',
+            'internalcode' => 'ezuad."pos"',
+            'type' => 'integer',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT,
+        ),
+        'customer.address.ctime'=> array(
+            'label'=>'Customer address create date/time',
+            'code'=>'customer.address.ctime',
+            'internalcode'=>'ezuad."ctime"',
+            'type'=> 'datetime',
+            'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.address.mtime'=> array(
+            'label'=>'Customer address modification date/time',
+            'code'=>'customer.address.mtime',
+            'internalcode'=>'ezuad."mtime"',
+            'type'=> 'datetime',
+            'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.address.editor'=> array(
+            'label'=>'Customer address editor',
+            'code'=>'customer.address.editor',
+            'internalcode'=>'ezuad."editor"',
+            'type'=> 'string',
+            'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+    );
 
 
-	/**
-	 * 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/address/submanagers';
-		foreach( $this->getContext()->getConfig()->get( $path, array() ) as $domain ) {
-			$this->getSubManager( $domain )->cleanup( $siteids );
-		}
-	}
+    /**
+     * 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/address/submanagers';
+        foreach( $this->getContext()->getConfig()->get( $path, array() ) 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/address/ezpublish/delete';
-		$this->deleteItemsBase( $ids, $path, false );
-	}
+    /**
+     * Removes multiple items specified by ids in the array.
+     *
+     * @param array $ids List of IDs
+     */
+    public function deleteItems( array $ids )
+    {
+        $path = 'mshop/customer/manager/address/ezpublish/delete';
+        $this->deleteItemsBase( $ids, $path, false );
+    }
 
 
-	/**
-	 * 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/address/submanagers';
+    /**
+     * 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/address/submanagers';
 
-		return $this->getSearchAttributesBase( $this->searchConfig, $path, array(), $withsub );
-	}
+        return $this->getSearchAttributesBase( $this->searchConfig, $path, array(), $withsub );
+    }
 
 
-	/**
-	 * 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', 'address/' . $manager, ( $name === null ? 'Ezpublish' : $name ) );
-	}
+    /**
+     * 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', 'address/' . $manager, ( $name === null ? 'Ezpublish' : $name ) );
+    }
 
 
-	/**
-	 * Returns the config path for retrieving the configuration values.
-	 *
-	 * @return string Configuration path (mshop/customer/manager/address/ezpublish/)
-	 */
-	protected function getConfigPath()
-	{
-		return 'mshop/customer/manager/address/ezpublish/';
-	}
+    /**
+     * Returns the config path for retrieving the configuration values.
+     *
+     * @return string Configuration path (mshop/customer/manager/address/ezpublish/)
+     */
+    protected function getConfigPath()
+    {
+        return 'mshop/customer/manager/address/ezpublish/';
+    }
 
 
-	/**
-	 * Returns the search configuration for searching items.
-	 *
-	 * @return array Associative list of search keys and search definitions
-	 */
-	protected function getSearchConfig()
-	{
-		return $this->searchConfig;
-	}
+    /**
+     * Returns the search configuration for searching items.
+     *
+     * @return array Associative list of search keys and search definitions
+     */
+    protected function getSearchConfig()
+    {
+        return $this->searchConfig;
+    }
 }

Spacing +10 added lines, -10 removed lines

@@ -26,7 +26,7 @@ 
 			'label' => 'Customer address ID',
 			'code' => 'customer.address.id',
 			'internalcode' => 'ezuad."id"',
-			'internaldeps' => array( 'LEFT JOIN "ezuser_address" AS ezuad ON ( ezu."contentobject_id" = ezuad."parentid" )' ),
+			'internaldeps' => array('LEFT JOIN "ezuser_address" AS ezuad ON ( ezu."contentobject_id" = ezuad."parentid" )'),
 			'type' => 'integer',
 			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT,
 			'public' => false,
@@ -209,11 +209,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/address/submanagers';
-		foreach( $this->getContext()->getConfig()->get( $path, array() ) as $domain ) {
-			$this->getSubManager( $domain )->cleanup( $siteids );
+		foreach ($this->getContext()->getConfig()->get($path, array()) as $domain) {
+			$this->getSubManager($domain)->cleanup($siteids);
 		}
 	}
 
@@ -223,10 +223,10 @@ 
 	 *
 	 * @param array $ids List of IDs
 	 */
-	public function deleteItems( array $ids )
+	public function deleteItems(array $ids)
 	{
 		$path = 'mshop/customer/manager/address/ezpublish/delete';
-		$this->deleteItemsBase( $ids, $path, false );
+		$this->deleteItemsBase($ids, $path, false);
 	}
 
 
@@ -236,11 +236,11 @@ 
 	 * @param boolean $withsub Return also attributes of sub-managers if true
 	 * @return array List of attribute items implementing \Aimeos\MW\Criteria\Attribute\Iface
 	 */
-	public function getSearchAttributes( $withsub = true )
+	public function getSearchAttributes($withsub = true)
 	{
 		$path = 'mshop/customer/manager/address/submanagers';
 
-		return $this->getSearchAttributesBase( $this->searchConfig, $path, array(), $withsub );
+		return $this->getSearchAttributesBase($this->searchConfig, $path, array(), $withsub);
 	}
 
 
@@ -251,9 +251,9 @@ 
 	 * @param string|null $name Name of the implementation, will be from configuration (or Default) if null
 	 * @return mixed Manager for different extensions, e.g stock, tags, locations, etc.
 	 */
-	public function getSubManager( $manager, $name = null )
+	public function getSubManager($manager, $name = null)
 	{
-		return $this->getSubManagerBase( 'customer', 'address/' . $manager, ( $name === null ? 'Ezpublish' : $name ) );
+		return $this->getSubManagerBase('customer', 'address/'.$manager, ($name === null ? 'Ezpublish' : $name));
 	}
 
 

lib/custom/setup/EzuserAddAddress.php

Braces +1 added lines, -2 removed lines

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

Spacing +50 added lines, -50 removed lines

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

Indentation +116 added lines, -116 removed lines

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

lib/custom/setup/TablesCreateEzpublish.php

Indentation +27 added lines, -27 removed lines

@@ -14,31 +14,31 @@
  */
 class TablesCreateEzpublish extends \Aimeos\MW\Setup\Task\TablesCreateMShop
 {
-	/**
-	 * Returns the list of task names which depends on this task.
-	 *
-	 * @return array List of task names
-	 */
-	public function getPostDependencies()
-	{
-		return array( 'MShopAddTypeData' );
-	}
-
-
-	/**
-	 * Migrate database schema
-	 */
-	public function migrate()
-	{
-		$this->msg( 'Creating Aimeos ezPublish tables', 0 );
-		$this->status( '' );
-
-		$ds = DIRECTORY_SEPARATOR;
-
-		$files = array(
-			'db-customer' => __DIR__ . $ds . 'default' . $ds . 'schema' . $ds . 'customer.php',
-		);
-
-		$this->setupSchema( $files );
-	}
+    /**
+     * Returns the list of task names which depends on this task.
+     *
+     * @return array List of task names
+     */
+    public function getPostDependencies()
+    {
+        return array( 'MShopAddTypeData' );
+    }
+
+
+    /**
+     * Migrate database schema
+     */
+    public function migrate()
+    {
+        $this->msg( 'Creating Aimeos ezPublish tables', 0 );
+        $this->status( '' );
+
+        $ds = DIRECTORY_SEPARATOR;
+
+        $files = array(
+            'db-customer' => __DIR__ . $ds . 'default' . $ds . 'schema' . $ds . 'customer.php',
+        );
+
+        $this->setupSchema( $files );
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -21,7 +21,7 @@ 
 	 */
 	public function getPostDependencies()
 	{
-		return array( 'MShopAddTypeData' );
+		return array('MShopAddTypeData');
 	}
 
 
@@ -30,15 +30,15 @@ 
 	 */
 	public function migrate()
 	{
-		$this->msg( 'Creating Aimeos ezPublish tables', 0 );
-		$this->status( '' );
+		$this->msg('Creating Aimeos ezPublish tables', 0);
+		$this->status('');
 
 		$ds = DIRECTORY_SEPARATOR;
 
 		$files = array(
-			'db-customer' => __DIR__ . $ds . 'default' . $ds . 'schema' . $ds . 'customer.php',
+			'db-customer' => __DIR__.$ds.'default'.$ds.'schema'.$ds.'customer.php',
 		);
 
-		$this->setupSchema( $files );
+		$this->setupSchema($files);
 	}
 }

lib/custom/setup/unittest/CustomerListAddEzpublishTestData.php

Indentation +43 added lines, -43 removed lines

@@ -13,48 +13,48 @@
  * Adds customer list test data.
  */
 class CustomerListAddEzpublishTestData
-	extends \Aimeos\MW\Setup\Task\CustomerListAddTestData
+    extends \Aimeos\MW\Setup\Task\CustomerListAddTestData
 {
-	/**
-	 * Returns the list of task names which this task depends on.
-	 *
-	 * @return string[] List of task names
-	 */
-	public function getPreDependencies()
-	{
-		return array( 'TablesCreateEzpublish', 'CustomerAddEzpublishTestData', 'LocaleAddTestData', 'TextAddTestData' );
-	}
-
-
-	/**
-	 * 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 ) );
-		}
-
-		$this->msg( 'Adding customer-list ezPublish test data', 0 );
-		$this->additional->setEditor( 'ai-ezpublish:unittest' );
-
-		$ds = DIRECTORY_SEPARATOR;
-		$path = dirname( __FILE__ ) . $ds . 'data' . $ds . 'customer-list.php';
-
-		if( ( $testdata = include( $path ) ) === false ){
-			throw new \Aimeos\MShop\Exception( sprintf( 'No file "%1$s" found for customer list domain', $path ) );
-		}
-
-		$refKeys = array();
-		foreach( $testdata['customer/lists'] as $dataset ) {
-			$refKeys[ $dataset['domain'] ][] = $dataset['refid'];
-		}
-
-		$refIds = array();
-		$refIds['text'] = $this->getTextData( $refKeys['text'] );
-		$this->addCustomerListData( $testdata, $refIds, 'Ezpublish' );
-
-		$this->status( 'done' );
-	}
+    /**
+     * Returns the list of task names which this task depends on.
+     *
+     * @return string[] List of task names
+     */
+    public function getPreDependencies()
+    {
+        return array( 'TablesCreateEzpublish', 'CustomerAddEzpublishTestData', 'LocaleAddTestData', 'TextAddTestData' );
+    }
+
+
+    /**
+     * 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 ) );
+        }
+
+        $this->msg( 'Adding customer-list ezPublish test data', 0 );
+        $this->additional->setEditor( 'ai-ezpublish:unittest' );
+
+        $ds = DIRECTORY_SEPARATOR;
+        $path = dirname( __FILE__ ) . $ds . 'data' . $ds . 'customer-list.php';
+
+        if( ( $testdata = include( $path ) ) === false ){
+            throw new \Aimeos\MShop\Exception( sprintf( 'No file "%1$s" found for customer list domain', $path ) );
+        }
+
+        $refKeys = array();
+        foreach( $testdata['customer/lists'] as $dataset ) {
+            $refKeys[ $dataset['domain'] ][] = $dataset['refid'];
+        }
+
+        $refIds = array();
+        $refIds['text'] = $this->getTextData( $refKeys['text'] );
+        $this->addCustomerListData( $testdata, $refIds, 'Ezpublish' );
+
+        $this->status( 'done' );
+    }
 }

Spacing +13 added lines, -13 removed lines

@@ -22,7 +22,7 @@ 
 	 */
 	public function getPreDependencies()
 	{
-		return array( 'TablesCreateEzpublish', 'CustomerAddEzpublishTestData', 'LocaleAddTestData', 'TextAddTestData' );
+		return array('TablesCreateEzpublish', 'CustomerAddEzpublishTestData', 'LocaleAddTestData', 'TextAddTestData');
 	}
 
 
@@ -32,29 +32,29 @@ 
 	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));
 		}
 
-		$this->msg( 'Adding customer-list ezPublish test data', 0 );
-		$this->additional->setEditor( 'ai-ezpublish:unittest' );
+		$this->msg('Adding customer-list ezPublish test data', 0);
+		$this->additional->setEditor('ai-ezpublish:unittest');
 
 		$ds = DIRECTORY_SEPARATOR;
-		$path = dirname( __FILE__ ) . $ds . 'data' . $ds . 'customer-list.php';
+		$path = dirname(__FILE__).$ds.'data'.$ds.'customer-list.php';
 
-		if( ( $testdata = include( $path ) ) === false ){
-			throw new \Aimeos\MShop\Exception( sprintf( 'No file "%1$s" found for customer list domain', $path ) );
+		if (($testdata = include($path)) === false) {
+			throw new \Aimeos\MShop\Exception(sprintf('No file "%1$s" found for customer list domain', $path));
 		}
 
 		$refKeys = array();
-		foreach( $testdata['customer/lists'] as $dataset ) {
-			$refKeys[ $dataset['domain'] ][] = $dataset['refid'];
+		foreach ($testdata['customer/lists'] as $dataset) {
+			$refKeys[$dataset['domain']][] = $dataset['refid'];
 		}
 
 		$refIds = array();
-		$refIds['text'] = $this->getTextData( $refKeys['text'] );
-		$this->addCustomerListData( $testdata, $refIds, 'Ezpublish' );
+		$refIds['text'] = $this->getTextData($refKeys['text']);
+		$this->addCustomerListData($testdata, $refIds, 'Ezpublish');
 
-		$this->status( 'done' );
+		$this->status('done');
 	}
 }

lib/custom/setup/unittest/data/customer.php

Indentation +11 added lines, -11 removed lines

@@ -6,15 +6,15 @@
  */
 
 return array (
-	'customer' => array(
-		'customer/UTC001' => array( 'code' => 'UTC001', 'label' => 'unitCustomer1', 'salutation' => 'mr', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'title' => 'Dr.', 'firstname' => 'Max', 'lastname' => 'Mustermann', 'address1' => 'Musterstraße', 'address2' => '1a', 'address3' => '', 'postal' => '20001', 'city' => 'Musterstadt', 'state' => 'Hamburg', 'langid' => 'de', 'countryid' => 'DE', 'telephone' => '01234567890', 'email' => 'unitCustomer1@aimeos.org', 'telefax' => '01234567890', 'website' => 'unittest.aimeos.org', 'birthday' => '1970-01-01', 'status' => '1', 'password' => 'test' ),
-		'customer/UTC002' => array( 'code' => 'UTC002', 'label' => 'unitCustomer2', 'salutation' => 'mrs', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'title' => 'Prof. Dr.', 'firstname' => 'Erika', 'lastname' => 'Mustermann', 'address1' => 'Heidestraße', 'address2' => '17', 'address3' => '', 'postal' => '45632', 'city' => 'Köln', 'state' => '', 'langid' => 'de', 'countryid' => 'DE', 'telephone' => '09876543210', 'email' => 'unitCustomer2@aimeos.org', 'telefax' => '09876543210', 'website' => 'unittest.aimeos.org', 'birthday' => '1970-01-01', 'status' => '0','password' =>  'test' ),
-		'customer/UTC003' => array( 'code' => 'UTC003', 'label' => 'unitCustomer3', 'salutation' => 'mr', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'title' => '', 'firstname' => 'Franz-Xaver', 'lastname' => 'Gabler', 'address1' => 'Phantasiestraße', 'address2' => '2', 'address3' => '', 'postal' => '23643', 'city' => 'Berlin', 'state' => 'Berlin', 'langid' => 'de', 'countryid' => 'DE', 'telephone' => '01234509876', 'email' => 'unitCustomer3@aimeos.org', 'telefax' => '055544333212', 'website' => 'unittest.aimeos.org', 'birthday' => '1970-01-01', 'status' => '1', 'password' => 'test' ),
-	),
-	'customer/address' => array(
-		array ( 'parentid' => 'customer/UTC001', 'company' => 'ABC', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => 'Dr', 'firstname' => 'Our', 'lastname' => 'Unittest', 'address1' => 'Pickhuben', 'address2' => '2-4', 'address3' => '', 'postal' => '20457', 'city' => 'Hamburg', 'state' => 'Hamburg', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '055544332211', 'email' => 'unitCustomer1@aimeos.org', 'telefax' => '055544332212', 'website' => 'unittest.aimeos.org', 'flag' => 0, 'pos' => '0' ),
-		array ( 'parentid' => 'customer/UTC002', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => 'Dr.', 'firstname' => 'Good', 'lastname' => 'Unittest', 'address1' => 'Pickhuben', 'address2' => '2-4', 'address3' => '', 'postal' => '20457', 'city' => 'Hamburg', 'state' => 'Hamburg', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '055544332211', 'email' => 'unitCustomer2@aimeos.org', 'telefax' => '055544332212', 'website' => 'unittest.aimeos.org', 'flag' => 0, 'pos' => '1' ),
-		array ( 'parentid' => 'customer/UTC002', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => 'Dr.', 'firstname' => 'Good', 'lastname' => 'Unittest', 'address1' => 'Pickhuben', 'address2' => '2-4', 'address3' => '', 'postal' => '11099', 'city' => 'Berlin', 'state' => 'Berlin', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '055544332221', 'email' => 'unitCustomer2@aimeos.org', 'telefax' => '055544333212', 'website' => 'unittest.aimeos.org', 'flag' => 0, 'pos' => '1' ),
-		array ( 'parentid' => 'customer/UTC003', 'company' => 'unitcompany', 'vatid' => 'DE999999999', 'salutation' => 'company', 'title' => 'unittitle', 'firstname' => 'unitfirstname', 'lastname' => 'unitlastname', 'address1' => 'unitaddress1', 'address2' => 'unitaddress2', 'address3' => 'unitaddress3', 'postal' => 'unitpostal', 'city' => 'unitcity', 'state' => 'unitstate', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '1234567890', 'email' => 'unitCustomer3@aimeos.org', 'telefax' => '1234567891', 'website' => 'unittest.aimeos.org', 'flag' => 0, 'pos' => '2' ),
-	),
+    'customer' => array(
+        'customer/UTC001' => array( 'code' => 'UTC001', 'label' => 'unitCustomer1', 'salutation' => 'mr', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'title' => 'Dr.', 'firstname' => 'Max', 'lastname' => 'Mustermann', 'address1' => 'Musterstraße', 'address2' => '1a', 'address3' => '', 'postal' => '20001', 'city' => 'Musterstadt', 'state' => 'Hamburg', 'langid' => 'de', 'countryid' => 'DE', 'telephone' => '01234567890', 'email' => 'unitCustomer1@aimeos.org', 'telefax' => '01234567890', 'website' => 'unittest.aimeos.org', 'birthday' => '1970-01-01', 'status' => '1', 'password' => 'test' ),
+        'customer/UTC002' => array( 'code' => 'UTC002', 'label' => 'unitCustomer2', 'salutation' => 'mrs', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'title' => 'Prof. Dr.', 'firstname' => 'Erika', 'lastname' => 'Mustermann', 'address1' => 'Heidestraße', 'address2' => '17', 'address3' => '', 'postal' => '45632', 'city' => 'Köln', 'state' => '', 'langid' => 'de', 'countryid' => 'DE', 'telephone' => '09876543210', 'email' => 'unitCustomer2@aimeos.org', 'telefax' => '09876543210', 'website' => 'unittest.aimeos.org', 'birthday' => '1970-01-01', 'status' => '0','password' =>  'test' ),
+        'customer/UTC003' => array( 'code' => 'UTC003', 'label' => 'unitCustomer3', 'salutation' => 'mr', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'title' => '', 'firstname' => 'Franz-Xaver', 'lastname' => 'Gabler', 'address1' => 'Phantasiestraße', 'address2' => '2', 'address3' => '', 'postal' => '23643', 'city' => 'Berlin', 'state' => 'Berlin', 'langid' => 'de', 'countryid' => 'DE', 'telephone' => '01234509876', 'email' => 'unitCustomer3@aimeos.org', 'telefax' => '055544333212', 'website' => 'unittest.aimeos.org', 'birthday' => '1970-01-01', 'status' => '1', 'password' => 'test' ),
+    ),
+    'customer/address' => array(
+        array ( 'parentid' => 'customer/UTC001', 'company' => 'ABC', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => 'Dr', 'firstname' => 'Our', 'lastname' => 'Unittest', 'address1' => 'Pickhuben', 'address2' => '2-4', 'address3' => '', 'postal' => '20457', 'city' => 'Hamburg', 'state' => 'Hamburg', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '055544332211', 'email' => 'unitCustomer1@aimeos.org', 'telefax' => '055544332212', 'website' => 'unittest.aimeos.org', 'flag' => 0, 'pos' => '0' ),
+        array ( 'parentid' => 'customer/UTC002', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => 'Dr.', 'firstname' => 'Good', 'lastname' => 'Unittest', 'address1' => 'Pickhuben', 'address2' => '2-4', 'address3' => '', 'postal' => '20457', 'city' => 'Hamburg', 'state' => 'Hamburg', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '055544332211', 'email' => 'unitCustomer2@aimeos.org', 'telefax' => '055544332212', 'website' => 'unittest.aimeos.org', 'flag' => 0, 'pos' => '1' ),
+        array ( 'parentid' => 'customer/UTC002', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => 'Dr.', 'firstname' => 'Good', 'lastname' => 'Unittest', 'address1' => 'Pickhuben', 'address2' => '2-4', 'address3' => '', 'postal' => '11099', 'city' => 'Berlin', 'state' => 'Berlin', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '055544332221', 'email' => 'unitCustomer2@aimeos.org', 'telefax' => '055544333212', 'website' => 'unittest.aimeos.org', 'flag' => 0, 'pos' => '1' ),
+        array ( 'parentid' => 'customer/UTC003', 'company' => 'unitcompany', 'vatid' => 'DE999999999', 'salutation' => 'company', 'title' => 'unittitle', 'firstname' => 'unitfirstname', 'lastname' => 'unitlastname', 'address1' => 'unitaddress1', 'address2' => 'unitaddress2', 'address3' => 'unitaddress3', 'postal' => 'unitpostal', 'city' => 'unitcity', 'state' => 'unitstate', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '1234567890', 'email' => 'unitCustomer3@aimeos.org', 'telefax' => '1234567891', 'website' => 'unittest.aimeos.org', 'flag' => 0, 'pos' => '2' ),
+    ),
 );

Spacing +8 added lines, -8 removed lines

@@ -5,16 +5,16 @@
  * @copyright Aimeos (aimeos.org), 2016
  */
 
-return array (
+return array(
 	'customer' => array(
-		'customer/UTC001' => array( 'code' => 'UTC001', 'label' => 'unitCustomer1', 'salutation' => 'mr', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'title' => 'Dr.', 'firstname' => 'Max', 'lastname' => 'Mustermann', 'address1' => 'Musterstraße', 'address2' => '1a', 'address3' => '', 'postal' => '20001', 'city' => 'Musterstadt', 'state' => 'Hamburg', 'langid' => 'de', 'countryid' => 'DE', 'telephone' => '01234567890', 'email' => 'unitCustomer1@aimeos.org', 'telefax' => '01234567890', 'website' => 'unittest.aimeos.org', 'birthday' => '1970-01-01', 'status' => '1', 'password' => 'test' ),
-		'customer/UTC002' => array( 'code' => 'UTC002', 'label' => 'unitCustomer2', 'salutation' => 'mrs', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'title' => 'Prof. Dr.', 'firstname' => 'Erika', 'lastname' => 'Mustermann', 'address1' => 'Heidestraße', 'address2' => '17', 'address3' => '', 'postal' => '45632', 'city' => 'Köln', 'state' => '', 'langid' => 'de', 'countryid' => 'DE', 'telephone' => '09876543210', 'email' => 'unitCustomer2@aimeos.org', 'telefax' => '09876543210', 'website' => 'unittest.aimeos.org', 'birthday' => '1970-01-01', 'status' => '0','password' =>  'test' ),
-		'customer/UTC003' => array( 'code' => 'UTC003', 'label' => 'unitCustomer3', 'salutation' => 'mr', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'title' => '', 'firstname' => 'Franz-Xaver', 'lastname' => 'Gabler', 'address1' => 'Phantasiestraße', 'address2' => '2', 'address3' => '', 'postal' => '23643', 'city' => 'Berlin', 'state' => 'Berlin', 'langid' => 'de', 'countryid' => 'DE', 'telephone' => '01234509876', 'email' => 'unitCustomer3@aimeos.org', 'telefax' => '055544333212', 'website' => 'unittest.aimeos.org', 'birthday' => '1970-01-01', 'status' => '1', 'password' => 'test' ),
+		'customer/UTC001' => array('code' => 'UTC001', 'label' => 'unitCustomer1', 'salutation' => 'mr', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'title' => 'Dr.', 'firstname' => 'Max', 'lastname' => 'Mustermann', 'address1' => 'Musterstraße', 'address2' => '1a', 'address3' => '', 'postal' => '20001', 'city' => 'Musterstadt', 'state' => 'Hamburg', 'langid' => 'de', 'countryid' => 'DE', 'telephone' => '01234567890', 'email' => 'unitCustomer1@aimeos.org', 'telefax' => '01234567890', 'website' => 'unittest.aimeos.org', 'birthday' => '1970-01-01', 'status' => '1', 'password' => 'test'),
+		'customer/UTC002' => array('code' => 'UTC002', 'label' => 'unitCustomer2', 'salutation' => 'mrs', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'title' => 'Prof. Dr.', 'firstname' => 'Erika', 'lastname' => 'Mustermann', 'address1' => 'Heidestraße', 'address2' => '17', 'address3' => '', 'postal' => '45632', 'city' => 'Köln', 'state' => '', 'langid' => 'de', 'countryid' => 'DE', 'telephone' => '09876543210', 'email' => 'unitCustomer2@aimeos.org', 'telefax' => '09876543210', 'website' => 'unittest.aimeos.org', 'birthday' => '1970-01-01', 'status' => '0', 'password' =>  'test'),
+		'customer/UTC003' => array('code' => 'UTC003', 'label' => 'unitCustomer3', 'salutation' => 'mr', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'title' => '', 'firstname' => 'Franz-Xaver', 'lastname' => 'Gabler', 'address1' => 'Phantasiestraße', 'address2' => '2', 'address3' => '', 'postal' => '23643', 'city' => 'Berlin', 'state' => 'Berlin', 'langid' => 'de', 'countryid' => 'DE', 'telephone' => '01234509876', 'email' => 'unitCustomer3@aimeos.org', 'telefax' => '055544333212', 'website' => 'unittest.aimeos.org', 'birthday' => '1970-01-01', 'status' => '1', 'password' => 'test'),
 	),
 	'customer/address' => array(
-		array ( 'parentid' => 'customer/UTC001', 'company' => 'ABC', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => 'Dr', 'firstname' => 'Our', 'lastname' => 'Unittest', 'address1' => 'Pickhuben', 'address2' => '2-4', 'address3' => '', 'postal' => '20457', 'city' => 'Hamburg', 'state' => 'Hamburg', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '055544332211', 'email' => 'unitCustomer1@aimeos.org', 'telefax' => '055544332212', 'website' => 'unittest.aimeos.org', 'flag' => 0, 'pos' => '0' ),
-		array ( 'parentid' => 'customer/UTC002', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => 'Dr.', 'firstname' => 'Good', 'lastname' => 'Unittest', 'address1' => 'Pickhuben', 'address2' => '2-4', 'address3' => '', 'postal' => '20457', 'city' => 'Hamburg', 'state' => 'Hamburg', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '055544332211', 'email' => 'unitCustomer2@aimeos.org', 'telefax' => '055544332212', 'website' => 'unittest.aimeos.org', 'flag' => 0, 'pos' => '1' ),
-		array ( 'parentid' => 'customer/UTC002', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => 'Dr.', 'firstname' => 'Good', 'lastname' => 'Unittest', 'address1' => 'Pickhuben', 'address2' => '2-4', 'address3' => '', 'postal' => '11099', 'city' => 'Berlin', 'state' => 'Berlin', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '055544332221', 'email' => 'unitCustomer2@aimeos.org', 'telefax' => '055544333212', 'website' => 'unittest.aimeos.org', 'flag' => 0, 'pos' => '1' ),
-		array ( 'parentid' => 'customer/UTC003', 'company' => 'unitcompany', 'vatid' => 'DE999999999', 'salutation' => 'company', 'title' => 'unittitle', 'firstname' => 'unitfirstname', 'lastname' => 'unitlastname', 'address1' => 'unitaddress1', 'address2' => 'unitaddress2', 'address3' => 'unitaddress3', 'postal' => 'unitpostal', 'city' => 'unitcity', 'state' => 'unitstate', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '1234567890', 'email' => 'unitCustomer3@aimeos.org', 'telefax' => '1234567891', 'website' => 'unittest.aimeos.org', 'flag' => 0, 'pos' => '2' ),
+		array('parentid' => 'customer/UTC001', 'company' => 'ABC', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => 'Dr', 'firstname' => 'Our', 'lastname' => 'Unittest', 'address1' => 'Pickhuben', 'address2' => '2-4', 'address3' => '', 'postal' => '20457', 'city' => 'Hamburg', 'state' => 'Hamburg', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '055544332211', 'email' => 'unitCustomer1@aimeos.org', 'telefax' => '055544332212', 'website' => 'unittest.aimeos.org', 'flag' => 0, 'pos' => '0'),
+		array('parentid' => 'customer/UTC002', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => 'Dr.', 'firstname' => 'Good', 'lastname' => 'Unittest', 'address1' => 'Pickhuben', 'address2' => '2-4', 'address3' => '', 'postal' => '20457', 'city' => 'Hamburg', 'state' => 'Hamburg', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '055544332211', 'email' => 'unitCustomer2@aimeos.org', 'telefax' => '055544332212', 'website' => 'unittest.aimeos.org', 'flag' => 0, 'pos' => '1'),
+		array('parentid' => 'customer/UTC002', 'company' => 'ABC GmbH', 'vatid' => 'DE999999999', 'salutation' => 'mr', 'title' => 'Dr.', 'firstname' => 'Good', 'lastname' => 'Unittest', 'address1' => 'Pickhuben', 'address2' => '2-4', 'address3' => '', 'postal' => '11099', 'city' => 'Berlin', 'state' => 'Berlin', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '055544332221', 'email' => 'unitCustomer2@aimeos.org', 'telefax' => '055544333212', 'website' => 'unittest.aimeos.org', 'flag' => 0, 'pos' => '1'),
+		array('parentid' => 'customer/UTC003', 'company' => 'unitcompany', 'vatid' => 'DE999999999', 'salutation' => 'company', 'title' => 'unittitle', 'firstname' => 'unitfirstname', 'lastname' => 'unitlastname', 'address1' => 'unitaddress1', 'address2' => 'unitaddress2', 'address3' => 'unitaddress3', 'postal' => 'unitpostal', 'city' => 'unitcity', 'state' => 'unitstate', 'countryid' => 'DE', 'langid' => 'de', 'telephone' => '1234567890', 'email' => 'unitCustomer3@aimeos.org', 'telefax' => '1234567891', 'website' => 'unittest.aimeos.org', 'flag' => 0, 'pos' => '2'),
 	),
 );