aimeos / ai-ezpublish

lib/custom/setup/unittest/CustomerAddEzpublishTestData.php

Braces +1 added lines, -2 removed lines

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

Indentation +97 added lines, -97 removed lines

@@ -14,134 +14,134 @@
  */
 class CustomerAddEzpublishTestData extends \Aimeos\MW\Setup\Task\CustomerAddTestData
 {
-	/**
-	 * Returns the list of task names which this task depends on.
-	 *
-	 * @return string[] List of task names
-	 */
-	public function getPreDependencies()
-	{
-		return array( 'TablesCreateEzpublish', 'EzuserAddAddress', 'MShopSetLocale', 'MediaAddTestData' );
-	}
+    /**
+     * Returns the list of task names which this task depends on.
+     *
+     * @return string[] List of task names
+     */
+    public function getPreDependencies()
+    {
+        return array( 'TablesCreateEzpublish', 'EzuserAddAddress', 'MShopSetLocale', 'MediaAddTestData' );
+    }
 
 
-	/**
-	 * Adds attribute test data.
-	 */
-	public function migrate()
-	{
-		$iface = '\\Aimeos\\MShop\\Context\\Item\\Iface';
-		if( !( $this->additional instanceof $iface ) ) {
-			throw new \Aimeos\MW\Setup\Exception( sprintf( 'Additionally provided object is not of type "%1$s"', $iface ) );
-		}
+    /**
+     * Adds attribute test data.
+     */
+    public function migrate()
+    {
+        $iface = '\\Aimeos\\MShop\\Context\\Item\\Iface';
+        if( !( $this->additional instanceof $iface ) ) {
+            throw new \Aimeos\MW\Setup\Exception( sprintf( 'Additionally provided object is not of type "%1$s"', $iface ) );
+        }
 
-		$context = $this->getEzContext( $this->additional );
+        $context = $this->getEzContext( $this->additional );
 
-		$this->msg( 'Adding ezPublish customer test data', 0 );
+        $this->msg( 'Adding ezPublish customer test data', 0 );
 
-		$parentIds = array();
-		$ds = DIRECTORY_SEPARATOR;
-		$context->setEditor( 'ai-ezpublish:unittest' );
-		$path = __DIR__ . $ds . 'data' . $ds . 'customer.php';
+        $parentIds = array();
+        $ds = DIRECTORY_SEPARATOR;
+        $context->setEditor( 'ai-ezpublish:unittest' );
+        $path = __DIR__ . $ds . 'data' . $ds . 'customer.php';
 
-		if( ( $testdata = include( $path ) ) === false ){
-			throw new \Aimeos\MShop\Exception( sprintf( 'No file "%1$s" found for customer domain', $path ) );
-		}
+        if( ( $testdata = include( $path ) ) === false ){
+            throw new \Aimeos\MShop\Exception( sprintf( 'No file "%1$s" found for customer domain', $path ) );
+        }
 
 
-		$customerManager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $context, 'Ezpublish' );
-		$customerAddressManager = $customerManager->getSubManager( 'address', 'Ezpublish' );
+        $customerManager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $context, 'Ezpublish' );
+        $customerAddressManager = $customerManager->getSubManager( 'address', 'Ezpublish' );
 
-		$search = $customerManager->createSearch();
-		$search->setConditions( $search->compare( '==', 'customer.code', array( 'UTC001', 'UTC002', 'UTC003' ) ) );
-		$items = $customerManager->searchItems( $search );
+        $search = $customerManager->createSearch();
+        $search->setConditions( $search->compare( '==', 'customer.code', array( 'UTC001', 'UTC002', 'UTC003' ) ) );
+        $items = $customerManager->searchItems( $search );
 
-		$this->conn->begin();
+        $this->conn->begin();
 
-		$customerManager->deleteItems( array_keys( $items ) );
-		$parentIds = $this->addCustomerData( $testdata, $customerManager, $customerAddressManager->createItem() );
-		$this->addCustomerAddressData( $testdata, $customerAddressManager, $parentIds );
+        $customerManager->deleteItems( array_keys( $items ) );
+        $parentIds = $this->addCustomerData( $testdata, $customerManager, $customerAddressManager->createItem() );
+        $this->addCustomerAddressData( $testdata, $customerAddressManager, $parentIds );
 
-		$this->conn->commit();
+        $this->conn->commit();
 
 
-		$this->status( 'done' );
-	}
+        $this->status( 'done' );
+    }
 
 
-	/**
-	 * Returns the Ezpublish context
-	 *
-	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
-	 * @return \Aimeos\MShop\Context\Item\Ezpublish Ezpublish context object
-	 */
-	protected function getEzContext( \Aimeos\MShop\Context\Item\Iface $context )
-	{
-		$class = '\Aimeos\MShop\Context\Item\Ezpublish';
-		if( is_a( $context, $class ) ) {
-			return $context;
-		}
+    /**
+     * Returns the Ezpublish context
+     *
+     * @param \Aimeos\MShop\Context\Item\Iface $context Context object
+     * @return \Aimeos\MShop\Context\Item\Ezpublish Ezpublish context object
+     */
+    protected function getEzContext( \Aimeos\MShop\Context\Item\Iface $context )
+    {
+        $class = '\Aimeos\MShop\Context\Item\Ezpublish';
+        if( is_a( $context, $class ) ) {
+            return $context;
+        }
 
-		$ctx = new \Aimeos\MShop\Context\Item\Ezpublish();
-		$ctx->setDatabaseManager( clone $context->getDatabaseManager() );
-		$ctx->setSession( clone $context->getSession() );
-		$ctx->setLogger( clone $context->getLogger() );
-		$ctx->setLocale( clone $context->getLocale() );
-		$ctx->setConfig( clone $context->getConfig() );
-		$ctx->setCache( clone $context->getCache() );
+        $ctx = new \Aimeos\MShop\Context\Item\Ezpublish();
+        $ctx->setDatabaseManager( clone $context->getDatabaseManager() );
+        $ctx->setSession( clone $context->getSession() );
+        $ctx->setLogger( clone $context->getLogger() );
+        $ctx->setLocale( clone $context->getLocale() );
+        $ctx->setConfig( clone $context->getConfig() );
+        $ctx->setCache( clone $context->getCache() );
 
 
-		$ctx->setEzUser( function( $id, $code, $email, $password, $status ) use ( $ctx ) {
+        $ctx->setEzUser( function( $id, $code, $email, $password, $status ) use ( $ctx ) {
 
-			$dbm = $ctx->getDatabaseManager();
-			$dbname = ( $ctx->getConfig()->get( 'resource/db-customer' ) ? 'db-customer' : 'db' );
-			$conn = $dbm->acquire( $dbname );
+            $dbm = $ctx->getDatabaseManager();
+            $dbname = ( $ctx->getConfig()->get( 'resource/db-customer' ) ? 'db-customer' : 'db' );
+            $conn = $dbm->acquire( $dbname );
 
-			try
-			{
-				$contentid = ( $id === null ? mt_rand( -0x7fffffff,-1 ) : $id );
+            try
+            {
+                $contentid = ( $id === null ? mt_rand( -0x7fffffff,-1 ) : $id );
 
-				if( $id === null ) {
-					$sql = 'INSERT INTO "ezuser" ( "email", "login", "login_normalized", "password_hash", "password_hash_type", "contentobject_id" ) VALUES ( ?, ?, ?, ?, 5, ? )';
-				} else {
-					$sql = 'UPDATE "ezuser" SET "email" = ?, "login" = ?, "login_normalized" = ?, "password_hash" = ?, "password_hash_type" = 5 WHERE "contentobject_id" = ?';
-				}
+                if( $id === null ) {
+                    $sql = 'INSERT INTO "ezuser" ( "email", "login", "login_normalized", "password_hash", "password_hash_type", "contentobject_id" ) VALUES ( ?, ?, ?, ?, 5, ? )';
+                } else {
+                    $sql = 'UPDATE "ezuser" SET "email" = ?, "login" = ?, "login_normalized" = ?, "password_hash" = ?, "password_hash_type" = 5 WHERE "contentobject_id" = ?';
+                }
 
-				$stmt = $conn->create( $sql );
-				$stmt->bind( 1, $email );
-				$stmt->bind( 2, $code );
-				$stmt->bind( 3, $code );
-				$stmt->bind( 4, $password );
-				$stmt->bind( 5, $contentid, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
+                $stmt = $conn->create( $sql );
+                $stmt->bind( 1, $email );
+                $stmt->bind( 2, $code );
+                $stmt->bind( 3, $code );
+                $stmt->bind( 4, $password );
+                $stmt->bind( 5, $contentid, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
 
-				$stmt->execute()->finish();
+                $stmt->execute()->finish();
 
 
-				if( $id === null ) {
-					$sql = 'INSERT INTO "ezuser_setting" ( "is_enabled", "user_id" ) VALUES ( ?, ? )';
-				} else {
-					$sql = 'UPDATE "ezuser_setting" SET "is_enabled" = ? WHERE "user_id" = ?';
-				}
+                if( $id === null ) {
+                    $sql = 'INSERT INTO "ezuser_setting" ( "is_enabled", "user_id" ) VALUES ( ?, ? )';
+                } else {
+                    $sql = 'UPDATE "ezuser_setting" SET "is_enabled" = ? WHERE "user_id" = ?';
+                }
 
-				$stmt = $conn->create( $sql );
-				$stmt->bind( 1, $status, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
-				$stmt->bind( 2, $contentid, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
+                $stmt = $conn->create( $sql );
+                $stmt->bind( 1, $status, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
+                $stmt->bind( 2, $contentid, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
 
-				$stmt->execute()->finish();
+                $stmt->execute()->finish();
 
 
-				$dbm->release( $conn, $dbname );
-			}
-			catch( \Exception $e )
-			{
-				$dbm->release( $conn, $dbname );
-				throw $e;
-			}
+                $dbm->release( $conn, $dbname );
+            }
+            catch( \Exception $e )
+            {
+                $dbm->release( $conn, $dbname );
+                throw $e;
+            }
 
-			return $contentid;
-		} );
+            return $contentid;
+        } );
 
 
-		return $ctx;
-	}
+        return $ctx;
+    }
 }

Spacing +43 added lines, -43 removed lines

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

lib/custom/tests/TestHelper.php

Braces +1 added lines, -2 removed lines

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

Indentation +91 added lines, -91 removed lines

@@ -8,140 +8,140 @@
  */
 class TestHelper
 {
-	private static $aimeos;
-	private static $context = array();
+    private static $aimeos;
+    private static $context = array();
 
 
-	public static function bootstrap()
-	{
-		$aimeos = self::getAimeos();
+    public static function bootstrap()
+    {
+        $aimeos = self::getAimeos();
 
-		$includepaths = $aimeos->getIncludePaths();
-		$includepaths[] = get_include_path();
-		set_include_path( implode( PATH_SEPARATOR, $includepaths ) );
-	}
+        $includepaths = $aimeos->getIncludePaths();
+        $includepaths[] = get_include_path();
+        set_include_path( implode( PATH_SEPARATOR, $includepaths ) );
+    }
 
 
-	public static function getContext( $site = 'unittest' )
-	{
-		if( !isset( self::$context[$site] ) ) {
-			self::$context[$site] = self::createContext( $site );
-		}
+    public static function getContext( $site = 'unittest' )
+    {
+        if( !isset( self::$context[$site] ) ) {
+            self::$context[$site] = self::createContext( $site );
+        }
 
-		return clone self::$context[$site];
-	}
+        return clone self::$context[$site];
+    }
 
 
-	private static function getAimeos()
-	{
-		if( !isset( self::$aimeos ) )
-		{
-			require_once 'Bootstrap.php';
-			spl_autoload_register( 'Aimeos\\Bootstrap::autoload' );
+    private static function getAimeos()
+    {
+        if( !isset( self::$aimeos ) )
+        {
+            require_once 'Bootstrap.php';
+            spl_autoload_register( 'Aimeos\\Bootstrap::autoload' );
 
-			$extdir = dirname( dirname( dirname( __DIR__ ) ) );
-			self::$aimeos = new \Aimeos\Bootstrap( array( $extdir ), true );
-		}
+            $extdir = dirname( dirname( dirname( __DIR__ ) ) );
+            self::$aimeos = new \Aimeos\Bootstrap( array( $extdir ), true );
+        }
 
-		return self::$aimeos;
-	}
+        return self::$aimeos;
+    }
 
 
-	/**
-	 * @param string $site
-	 */
-	private static function createContext( $site )
-	{
-		$ctx = new \Aimeos\MShop\Context\Item\Ezpublish();
-		$aimeos = self::getAimeos();
+    /**
+     * @param string $site
+     */
+    private static function createContext( $site )
+    {
+        $ctx = new \Aimeos\MShop\Context\Item\Ezpublish();
+        $aimeos = self::getAimeos();
 
 
-		$paths = $aimeos->getConfigPaths();
-		$paths[] = __DIR__ . DIRECTORY_SEPARATOR . 'config';
+        $paths = $aimeos->getConfigPaths();
+        $paths[] = __DIR__ . DIRECTORY_SEPARATOR . 'config';
 
-		$conf = new \Aimeos\MW\Config\PHPArray( array(), $paths );
-		$ctx->setConfig( $conf );
+        $conf = new \Aimeos\MW\Config\PHPArray( array(), $paths );
+        $ctx->setConfig( $conf );
 
 
-		$dbm = new \Aimeos\MW\DB\Manager\DBAL( $conf );
-		$ctx->setDatabaseManager( $dbm );
+        $dbm = new \Aimeos\MW\DB\Manager\DBAL( $conf );
+        $ctx->setDatabaseManager( $dbm );
 
 
-		$logger = new \Aimeos\MW\Logger\File( $site . '.log', \Aimeos\MW\Logger\Base::DEBUG );
-		$ctx->setLogger( $logger );
+        $logger = new \Aimeos\MW\Logger\File( $site . '.log', \Aimeos\MW\Logger\Base::DEBUG );
+        $ctx->setLogger( $logger );
 
 
-		$cache = new \Aimeos\MW\Cache\None();
-		$ctx->setCache( $cache );
+        $cache = new \Aimeos\MW\Cache\None();
+        $ctx->setCache( $cache );
 
 
-		$i18n = new \Aimeos\MW\Translation\None( 'de' );
-		$ctx->setI18n( array( 'de' => $i18n ) );
+        $i18n = new \Aimeos\MW\Translation\None( 'de' );
+        $ctx->setI18n( array( 'de' => $i18n ) );
 
 
-		$session = new \Aimeos\MW\Session\None();
-		$ctx->setSession( $session );
+        $session = new \Aimeos\MW\Session\None();
+        $ctx->setSession( $session );
 
 
-		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $ctx );
-		$localeItem = $localeManager->bootstrap( $site, '', '', false );
+        $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $ctx );
+        $localeItem = $localeManager->bootstrap( $site, '', '', false );
 
-		$ctx->setLocale( $localeItem );
+        $ctx->setLocale( $localeItem );
 
-		$ctx->setEditor( 'ai-ezpublish:unittest' );
+        $ctx->setEditor( 'ai-ezpublish:unittest' );
 
 
-		$ctx->setEzUser( function( $id, $code, $email, $password, $status ) use ( $ctx ) {
+        $ctx->setEzUser( function( $id, $code, $email, $password, $status ) use ( $ctx ) {
 
-			$dbm = $ctx->getDatabaseManager();
-			$dbname = ( $ctx->getConfig()->get( 'resource/db-customer' ) ? 'db-customer' : 'db' );
-			$conn = $dbm->acquire( $dbname );
+            $dbm = $ctx->getDatabaseManager();
+            $dbname = ( $ctx->getConfig()->get( 'resource/db-customer' ) ? 'db-customer' : 'db' );
+            $conn = $dbm->acquire( $dbname );
 
-			try
-			{
-				$contentid = ( $id === null ? mt_rand( -0x7fffffff,-1 ) : $id );
+            try
+            {
+                $contentid = ( $id === null ? mt_rand( -0x7fffffff,-1 ) : $id );
 
-				if( $id === null ) {
-					$sql = 'INSERT INTO "ezuser" ( "email", "login", "login_normalized", "password_hash", "password_hash_type", "contentobject_id" ) VALUES ( ?, ?, ?, ?, 5, ? )';
-				} else {
-					$sql = 'UPDATE "ezuser" SET "email" = ?, "login" = ?, "login_normalized" = ?, "password_hash" = ?, "password_hash_type" = 5 WHERE "contentobject_id" = ?';
-				}
+                if( $id === null ) {
+                    $sql = 'INSERT INTO "ezuser" ( "email", "login", "login_normalized", "password_hash", "password_hash_type", "contentobject_id" ) VALUES ( ?, ?, ?, ?, 5, ? )';
+                } else {
+                    $sql = 'UPDATE "ezuser" SET "email" = ?, "login" = ?, "login_normalized" = ?, "password_hash" = ?, "password_hash_type" = 5 WHERE "contentobject_id" = ?';
+                }
 
-				$stmt = $conn->create( $sql );
-				$stmt->bind( 1, $email );
-				$stmt->bind( 2, $code );
-				$stmt->bind( 3, $code );
-				$stmt->bind( 4, $password );
-				$stmt->bind( 5, $contentid, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
+                $stmt = $conn->create( $sql );
+                $stmt->bind( 1, $email );
+                $stmt->bind( 2, $code );
+                $stmt->bind( 3, $code );
+                $stmt->bind( 4, $password );
+                $stmt->bind( 5, $contentid, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
 
-				$stmt->execute()->finish();
+                $stmt->execute()->finish();
 
 
-				if( $id === null ) {
-					$sql = 'INSERT INTO "ezuser_setting" ( "is_enabled", "user_id" ) VALUES ( ?, ? )';
-				} else {
-					$sql = 'UPDATE "ezuser_setting" SET "is_enabled" = ? WHERE "user_id" = ?';
-				}
+                if( $id === null ) {
+                    $sql = 'INSERT INTO "ezuser_setting" ( "is_enabled", "user_id" ) VALUES ( ?, ? )';
+                } else {
+                    $sql = 'UPDATE "ezuser_setting" SET "is_enabled" = ? WHERE "user_id" = ?';
+                }
 
-				$stmt = $conn->create( $sql );
-				$stmt->bind( 1, $status, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
-				$stmt->bind( 2, $contentid, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
+                $stmt = $conn->create( $sql );
+                $stmt->bind( 1, $status, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
+                $stmt->bind( 2, $contentid, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
 
-				$stmt->execute()->finish();
+                $stmt->execute()->finish();
 
 
-				$dbm->release( $conn, $dbname );
-			}
-			catch( \Exception $e )
-			{
-				$dbm->release( $conn, $dbname );
-				throw $e;
-			}
+                $dbm->release( $conn, $dbname );
+            }
+            catch( \Exception $e )
+            {
+                $dbm->release( $conn, $dbname );
+                throw $e;
+            }
 
-			return $contentid;
-		} );
+            return $contentid;
+        } );
 
 
-		return $ctx;
-	}
+        return $ctx;
+    }
 }

Spacing +42 added lines, -42 removed lines

@@ -18,14 +18,14 @@ 
 
 		$includepaths = $aimeos->getIncludePaths();
 		$includepaths[] = get_include_path();
-		set_include_path( implode( PATH_SEPARATOR, $includepaths ) );
+		set_include_path(implode(PATH_SEPARATOR, $includepaths));
 	}
 
 
-	public static function getContext( $site = 'unittest' )
+	public static function getContext($site = 'unittest')
 	{
-		if( !isset( self::$context[$site] ) ) {
-			self::$context[$site] = self::createContext( $site );
+		if (!isset(self::$context[$site])) {
+			self::$context[$site] = self::createContext($site);
 		}
 
 		return clone self::$context[$site];
@@ -34,13 +34,13 @@ 
 
 	private static function getAimeos()
 	{
-		if( !isset( self::$aimeos ) )
+		if (!isset(self::$aimeos))
 		{
 			require_once 'Bootstrap.php';
-			spl_autoload_register( 'Aimeos\\Bootstrap::autoload' );
+			spl_autoload_register('Aimeos\\Bootstrap::autoload');
 
-			$extdir = dirname( dirname( dirname( __DIR__ ) ) );
-			self::$aimeos = new \Aimeos\Bootstrap( array( $extdir ), true );
+			$extdir = dirname(dirname(dirname(__DIR__)));
+			self::$aimeos = new \Aimeos\Bootstrap(array($extdir), true);
 		}
 
 		return self::$aimeos;
@@ -50,91 +50,91 @@ 
 	/**
 	 * @param string $site
 	 */
-	private static function createContext( $site )
+	private static function createContext($site)
 	{
 		$ctx = new \Aimeos\MShop\Context\Item\Ezpublish();
 		$aimeos = self::getAimeos();
 
 
 		$paths = $aimeos->getConfigPaths();
-		$paths[] = __DIR__ . DIRECTORY_SEPARATOR . 'config';
+		$paths[] = __DIR__.DIRECTORY_SEPARATOR.'config';
 
-		$conf = new \Aimeos\MW\Config\PHPArray( array(), $paths );
-		$ctx->setConfig( $conf );
+		$conf = new \Aimeos\MW\Config\PHPArray(array(), $paths);
+		$ctx->setConfig($conf);
 
 
-		$dbm = new \Aimeos\MW\DB\Manager\DBAL( $conf );
-		$ctx->setDatabaseManager( $dbm );
+		$dbm = new \Aimeos\MW\DB\Manager\DBAL($conf);
+		$ctx->setDatabaseManager($dbm);
 
 
-		$logger = new \Aimeos\MW\Logger\File( $site . '.log', \Aimeos\MW\Logger\Base::DEBUG );
-		$ctx->setLogger( $logger );
+		$logger = new \Aimeos\MW\Logger\File($site.'.log', \Aimeos\MW\Logger\Base::DEBUG);
+		$ctx->setLogger($logger);
 
 
 		$cache = new \Aimeos\MW\Cache\None();
-		$ctx->setCache( $cache );
+		$ctx->setCache($cache);
 
 
-		$i18n = new \Aimeos\MW\Translation\None( 'de' );
-		$ctx->setI18n( array( 'de' => $i18n ) );
+		$i18n = new \Aimeos\MW\Translation\None('de');
+		$ctx->setI18n(array('de' => $i18n));
 
 
 		$session = new \Aimeos\MW\Session\None();
-		$ctx->setSession( $session );
+		$ctx->setSession($session);
 
 
-		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $ctx );
-		$localeItem = $localeManager->bootstrap( $site, '', '', false );
+		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($ctx);
+		$localeItem = $localeManager->bootstrap($site, '', '', false);
 
-		$ctx->setLocale( $localeItem );
+		$ctx->setLocale($localeItem);
 
-		$ctx->setEditor( 'ai-ezpublish:unittest' );
+		$ctx->setEditor('ai-ezpublish:unittest');
 
 
-		$ctx->setEzUser( function( $id, $code, $email, $password, $status ) use ( $ctx ) {
+		$ctx->setEzUser(function($id, $code, $email, $password, $status) use ($ctx) {
 
 			$dbm = $ctx->getDatabaseManager();
-			$dbname = ( $ctx->getConfig()->get( 'resource/db-customer' ) ? 'db-customer' : 'db' );
-			$conn = $dbm->acquire( $dbname );
+			$dbname = ($ctx->getConfig()->get('resource/db-customer') ? 'db-customer' : 'db');
+			$conn = $dbm->acquire($dbname);
 
 			try
 			{
-				$contentid = ( $id === null ? mt_rand( -0x7fffffff,-1 ) : $id );
+				$contentid = ($id === null ? mt_rand( -0x7fffffff, -1 ) : $id);
 
-				if( $id === null ) {
+				if ($id === null) {
 					$sql = 'INSERT INTO "ezuser" ( "email", "login", "login_normalized", "password_hash", "password_hash_type", "contentobject_id" ) VALUES ( ?, ?, ?, ?, 5, ? )';
 				} else {
 					$sql = 'UPDATE "ezuser" SET "email" = ?, "login" = ?, "login_normalized" = ?, "password_hash" = ?, "password_hash_type" = 5 WHERE "contentobject_id" = ?';
 				}
 
-				$stmt = $conn->create( $sql );
-				$stmt->bind( 1, $email );
-				$stmt->bind( 2, $code );
-				$stmt->bind( 3, $code );
-				$stmt->bind( 4, $password );
-				$stmt->bind( 5, $contentid, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
+				$stmt = $conn->create($sql);
+				$stmt->bind(1, $email);
+				$stmt->bind(2, $code);
+				$stmt->bind(3, $code);
+				$stmt->bind(4, $password);
+				$stmt->bind(5, $contentid, \Aimeos\MW\DB\Statement\Base::PARAM_INT);
 
 				$stmt->execute()->finish();
 
 
-				if( $id === null ) {
+				if ($id === null) {
 					$sql = 'INSERT INTO "ezuser_setting" ( "is_enabled", "user_id" ) VALUES ( ?, ? )';
 				} else {
 					$sql = 'UPDATE "ezuser_setting" SET "is_enabled" = ? WHERE "user_id" = ?';
 				}
 
-				$stmt = $conn->create( $sql );
-				$stmt->bind( 1, $status, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
-				$stmt->bind( 2, $contentid, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
+				$stmt = $conn->create($sql);
+				$stmt->bind(1, $status, \Aimeos\MW\DB\Statement\Base::PARAM_INT);
+				$stmt->bind(2, $contentid, \Aimeos\MW\DB\Statement\Base::PARAM_INT);
 
 				$stmt->execute()->finish();
 
 
-				$dbm->release( $conn, $dbname );
+				$dbm->release($conn, $dbname);
 			}
-			catch( \Exception $e )
+			catch (\Exception $e)
 			{
-				$dbm->release( $conn, $dbname );
+				$dbm->release($conn, $dbname);
 				throw $e;
 			}
 

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

Indentation +211 added lines, -211 removed lines

@@ -11,215 +11,215 @@
 
 class EzpublishTest extends \PHPUnit_Framework_TestCase
 {
-	private $fixture = null;
-	private $object = null;
-	private $editor = '';
-
-
-	protected function setUp()
-	{
-		$context = \TestHelper::getContext();
-		$this->editor = $context->getEditor();
-		$customer = new \Aimeos\MShop\Customer\Manager\Ezpublish( $context );
-
-		$search = $customer->createSearch();
-		$conditions = array(
-			$search->compare( '==', 'customer.code', 'UTC001' ),
-			$search->compare( '==', 'customer.editor', $this->editor )
-		);
-		$search->setConditions( $search->combine( '&&', $conditions ) );
-		$result = $customer->searchItems( $search );
-
-		if( ( $customerItem = reset( $result ) ) === false ) {
-			throw new \Exception( sprintf( 'No customer item found for code "%1$s"', 'UTC001' ) );
-		}
-
-		$this->fixture = array(
-			'customer.address.parentid' => $customerItem->getId(),
-			'customer.address.company' => 'ABC GmbH',
-			'customer.address.vatid' => 'DE999999999',
-			'customer.address.salutation' => \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MR,
-			'customer.address.title' => 'Herr',
-			'customer.address.firstname' => 'firstunit',
-			'customer.address.lastname' => 'lastunit',
-			'customer.address.address1' => 'unit str.',
-			'customer.address.address2' => ' 166',
-			'customer.address.address3' => '4.OG',
-			'customer.address.postal' => '22769',
-			'customer.address.city' => 'Hamburg',
-			'customer.address.state' => 'Hamburg',
-			'customer.address.countryid' => 'de',
-			'customer.address.languageid' => 'de',
-			'customer.address.telephone' => '05554433221',
-			'customer.address.email' => 'unittest@aimeos.org',
-			'customer.address.telefax' => '05554433222',
-			'customer.address.website' => 'unittest.aimeos.org',
-			'customer.address.position' => 1,
-			'customer.address.siteid' => $context->getLocale()->getSiteId(),
-		);
-
-		$this->object = $customer->getSubManager( 'address', 'Ezpublish' );
-	}
-
-
-	protected function tearDown()
-	{
-		unset( $this->object, $this->fixture );
-	}
-
-
-	public function testCleanup()
-	{
-		$this->object->cleanup( array( -1 ) );
-	}
-
-	public function testGetSearchAttributes()
-	{
-		foreach( $this->object->getSearchAttributes() as $attribute ) {
-			$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute );
-		}
-	}
-
-	public function testGetSubManager()
-	{
-		$this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
-		$this->object->getSubManager( 'unknown' );
-	}
-
-	public function testCreateItem()
-	{
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Address\\Iface', $this->object->createItem() );
-	}
-
-	public function testGetItem()
-	{
-		$search = $this->object->createSearch();
-		$search->setConditions( $search->compare( '~=', 'customer.address.company', 'ABC GmbH' ) );
-
-		$items = $this->object->searchItems( $search );
-
-		if( ( $item = reset( $items ) ) === false ) {
-			throw new \Exception( 'No address item with company "ABC" found' );
-		}
-
-		$this->assertEquals( $item, $this->object->getItem( $item->getId() ) );
-	}
-
-	public function testSaveUpdateDeleteItem()
-	{
-		$item = new \Aimeos\MShop\Common\Item\Address\Standard( 'customer.address.', $this->fixture );
-		$item->setId( null );
-		$this->object->saveItem( $item );
-		$itemSaved = $this->object->getItem( $item->getId() );
-
-		$itemExp = clone $itemSaved;
-		$itemExp->setPosition( 1 );
-		$itemExp->setCity( 'Berlin' );
-		$itemExp->setState( 'Berlin' );
-		$this->object->saveItem( $itemExp );
-		$itemUpd = $this->object->getItem( $itemExp->getId() );
-
-		$this->object->deleteItem( $itemSaved->getId() );
-
-
-		$this->assertTrue( $item->getId() !== null );
-		$this->assertEquals( $item->getId(), $itemSaved->getId() );
-		$this->assertEquals( $item->getParentId(), $itemSaved->getParentId());
-		$this->assertEquals( $item->getPosition(), $itemSaved->getPosition());
-		$this->assertEquals( $item->getCompany(), $itemSaved->getCompany());
-		$this->assertEquals( $item->getVatID(), $itemSaved->getVatID());
-		$this->assertEquals( $item->getSalutation(), $itemSaved->getSalutation());
-		$this->assertEquals( $item->getTitle(), $itemSaved->getTitle());
-		$this->assertEquals( $item->getFirstname(), $itemSaved->getFirstname());
-		$this->assertEquals( $item->getLastname(), $itemSaved->getLastname());
-		$this->assertEquals( $item->getAddress1(), $itemSaved->getAddress1());
-		$this->assertEquals( $item->getAddress2(), $itemSaved->getAddress2());
-		$this->assertEquals( $item->getAddress3(), $itemSaved->getAddress3());
-		$this->assertEquals( $item->getPostal(), $itemSaved->getPostal());
-		$this->assertEquals( $item->getCity(), $itemSaved->getCity());
-		$this->assertEquals( $item->getState(), $itemSaved->getState());
-		$this->assertEquals( $item->getCountryId(), $itemSaved->getCountryId());
-		$this->assertEquals( $item->getLanguageId(), $itemSaved->getLanguageId());
-		$this->assertEquals( $item->getTelephone(), $itemSaved->getTelephone());
-		$this->assertEquals( $item->getEmail(), $itemSaved->getEmail());
-		$this->assertEquals( $item->getTelefax(), $itemSaved->getTelefax());
-		$this->assertEquals( $item->getWebsite(), $itemSaved->getWebsite());
-		$this->assertEquals( $item->getFlag(), $itemSaved->getFlag());
-
-		$this->assertEquals( $this->editor, $itemSaved->getEditor() );
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated() );
-		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified());
-
-		$this->assertEquals( $itemExp->getId(), $itemUpd->getId() );
-		$this->assertEquals( $itemExp->getParentId(), $itemUpd->getParentId());
-		$this->assertEquals( $itemExp->getPosition(), $itemUpd->getPosition());
-		$this->assertEquals( $itemExp->getCompany(), $itemUpd->getCompany());
-		$this->assertEquals( $itemExp->getVatID(), $itemUpd->getVatID());
-		$this->assertEquals( $itemExp->getSalutation(), $itemUpd->getSalutation());
-		$this->assertEquals( $itemExp->getTitle(), $itemUpd->getTitle());
-		$this->assertEquals( $itemExp->getFirstname(), $itemUpd->getFirstname());
-		$this->assertEquals( $itemExp->getLastname(), $itemUpd->getLastname());
-		$this->assertEquals( $itemExp->getAddress1(), $itemUpd->getAddress1());
-		$this->assertEquals( $itemExp->getAddress2(), $itemUpd->getAddress2());
-		$this->assertEquals( $itemExp->getAddress3(), $itemUpd->getAddress3());
-		$this->assertEquals( $itemExp->getPostal(), $itemUpd->getPostal());
-		$this->assertEquals( $itemExp->getCity(), $itemUpd->getCity());
-		$this->assertEquals( $itemExp->getState(), $itemUpd->getState());
-		$this->assertEquals( $itemExp->getCountryId(), $itemUpd->getCountryId());
-		$this->assertEquals( $itemExp->getLanguageId(), $itemUpd->getLanguageId());
-		$this->assertEquals( $itemExp->getTelephone(), $itemUpd->getTelephone());
-		$this->assertEquals( $itemExp->getEmail(), $itemUpd->getEmail());
-		$this->assertEquals( $itemExp->getTelefax(), $itemUpd->getTelefax());
-		$this->assertEquals( $itemExp->getWebsite(), $itemUpd->getWebsite());
-		$this->assertEquals( $itemExp->getFlag(), $itemUpd->getFlag());
-
-		$this->assertEquals( $this->editor, $itemUpd->getEditor() );
-		$this->assertEquals( $itemExp->getTimeCreated(), $itemUpd->getTimeCreated() );
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified() );
-
-		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
-		$this->object->getItem( $itemSaved->getId() );
-	}
-
-	public function testCreateSearch()
-	{
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $this->object->createSearch() );
-	}
-
-
-	public function testSearchItem()
-	{
-		$search = $this->object->createSearch();
-
-		$conditions = array(
-			$search->compare( '==', 'customer.address.company', 'ABC' ),
-			$search->compare( '==', 'customer.address.editor', $this->editor )
-		);
-		$search->setConditions( $search->combine( '&&', $conditions ) );
-		$this->assertEquals( 1, count( $this->object->searchItems( $search ) ) );
-	}
-
-
-	public function testSearchItemTotal()
-	{
-		$total = 0;
-		$search = $this->object->createSearch();
-
-		$conditions = array(
-			$search->compare( '~=', 'customer.address.company', 'ABC GmbH' ),
-			$search->compare( '==', 'customer.address.editor', $this->editor )
-		);
-
-		$search->setConditions( $search->combine( '&&', $conditions ) );
-		$search->setSlice( 0, 1 );
-
-		$results = $this->object->searchItems( $search, array(), $total );
-
-		$this->assertEquals( 1, count( $results ) );
-		$this->assertEquals( 2, $total );
-
-		foreach( $results as $id => $item ) {
-			$this->assertEquals( $id, $item->getId() );
-		}
-	}
+    private $fixture = null;
+    private $object = null;
+    private $editor = '';
+
+
+    protected function setUp()
+    {
+        $context = \TestHelper::getContext();
+        $this->editor = $context->getEditor();
+        $customer = new \Aimeos\MShop\Customer\Manager\Ezpublish( $context );
+
+        $search = $customer->createSearch();
+        $conditions = array(
+            $search->compare( '==', 'customer.code', 'UTC001' ),
+            $search->compare( '==', 'customer.editor', $this->editor )
+        );
+        $search->setConditions( $search->combine( '&&', $conditions ) );
+        $result = $customer->searchItems( $search );
+
+        if( ( $customerItem = reset( $result ) ) === false ) {
+            throw new \Exception( sprintf( 'No customer item found for code "%1$s"', 'UTC001' ) );
+        }
+
+        $this->fixture = array(
+            'customer.address.parentid' => $customerItem->getId(),
+            'customer.address.company' => 'ABC GmbH',
+            'customer.address.vatid' => 'DE999999999',
+            'customer.address.salutation' => \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MR,
+            'customer.address.title' => 'Herr',
+            'customer.address.firstname' => 'firstunit',
+            'customer.address.lastname' => 'lastunit',
+            'customer.address.address1' => 'unit str.',
+            'customer.address.address2' => ' 166',
+            'customer.address.address3' => '4.OG',
+            'customer.address.postal' => '22769',
+            'customer.address.city' => 'Hamburg',
+            'customer.address.state' => 'Hamburg',
+            'customer.address.countryid' => 'de',
+            'customer.address.languageid' => 'de',
+            'customer.address.telephone' => '05554433221',
+            'customer.address.email' => 'unittest@aimeos.org',
+            'customer.address.telefax' => '05554433222',
+            'customer.address.website' => 'unittest.aimeos.org',
+            'customer.address.position' => 1,
+            'customer.address.siteid' => $context->getLocale()->getSiteId(),
+        );
+
+        $this->object = $customer->getSubManager( 'address', 'Ezpublish' );
+    }
+
+
+    protected function tearDown()
+    {
+        unset( $this->object, $this->fixture );
+    }
+
+
+    public function testCleanup()
+    {
+        $this->object->cleanup( array( -1 ) );
+    }
+
+    public function testGetSearchAttributes()
+    {
+        foreach( $this->object->getSearchAttributes() as $attribute ) {
+            $this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute );
+        }
+    }
+
+    public function testGetSubManager()
+    {
+        $this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
+        $this->object->getSubManager( 'unknown' );
+    }
+
+    public function testCreateItem()
+    {
+        $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Address\\Iface', $this->object->createItem() );
+    }
+
+    public function testGetItem()
+    {
+        $search = $this->object->createSearch();
+        $search->setConditions( $search->compare( '~=', 'customer.address.company', 'ABC GmbH' ) );
+
+        $items = $this->object->searchItems( $search );
+
+        if( ( $item = reset( $items ) ) === false ) {
+            throw new \Exception( 'No address item with company "ABC" found' );
+        }
+
+        $this->assertEquals( $item, $this->object->getItem( $item->getId() ) );
+    }
+
+    public function testSaveUpdateDeleteItem()
+    {
+        $item = new \Aimeos\MShop\Common\Item\Address\Standard( 'customer.address.', $this->fixture );
+        $item->setId( null );
+        $this->object->saveItem( $item );
+        $itemSaved = $this->object->getItem( $item->getId() );
+
+        $itemExp = clone $itemSaved;
+        $itemExp->setPosition( 1 );
+        $itemExp->setCity( 'Berlin' );
+        $itemExp->setState( 'Berlin' );
+        $this->object->saveItem( $itemExp );
+        $itemUpd = $this->object->getItem( $itemExp->getId() );
+
+        $this->object->deleteItem( $itemSaved->getId() );
+
+
+        $this->assertTrue( $item->getId() !== null );
+        $this->assertEquals( $item->getId(), $itemSaved->getId() );
+        $this->assertEquals( $item->getParentId(), $itemSaved->getParentId());
+        $this->assertEquals( $item->getPosition(), $itemSaved->getPosition());
+        $this->assertEquals( $item->getCompany(), $itemSaved->getCompany());
+        $this->assertEquals( $item->getVatID(), $itemSaved->getVatID());
+        $this->assertEquals( $item->getSalutation(), $itemSaved->getSalutation());
+        $this->assertEquals( $item->getTitle(), $itemSaved->getTitle());
+        $this->assertEquals( $item->getFirstname(), $itemSaved->getFirstname());
+        $this->assertEquals( $item->getLastname(), $itemSaved->getLastname());
+        $this->assertEquals( $item->getAddress1(), $itemSaved->getAddress1());
+        $this->assertEquals( $item->getAddress2(), $itemSaved->getAddress2());
+        $this->assertEquals( $item->getAddress3(), $itemSaved->getAddress3());
+        $this->assertEquals( $item->getPostal(), $itemSaved->getPostal());
+        $this->assertEquals( $item->getCity(), $itemSaved->getCity());
+        $this->assertEquals( $item->getState(), $itemSaved->getState());
+        $this->assertEquals( $item->getCountryId(), $itemSaved->getCountryId());
+        $this->assertEquals( $item->getLanguageId(), $itemSaved->getLanguageId());
+        $this->assertEquals( $item->getTelephone(), $itemSaved->getTelephone());
+        $this->assertEquals( $item->getEmail(), $itemSaved->getEmail());
+        $this->assertEquals( $item->getTelefax(), $itemSaved->getTelefax());
+        $this->assertEquals( $item->getWebsite(), $itemSaved->getWebsite());
+        $this->assertEquals( $item->getFlag(), $itemSaved->getFlag());
+
+        $this->assertEquals( $this->editor, $itemSaved->getEditor() );
+        $this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated() );
+        $this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified());
+
+        $this->assertEquals( $itemExp->getId(), $itemUpd->getId() );
+        $this->assertEquals( $itemExp->getParentId(), $itemUpd->getParentId());
+        $this->assertEquals( $itemExp->getPosition(), $itemUpd->getPosition());
+        $this->assertEquals( $itemExp->getCompany(), $itemUpd->getCompany());
+        $this->assertEquals( $itemExp->getVatID(), $itemUpd->getVatID());
+        $this->assertEquals( $itemExp->getSalutation(), $itemUpd->getSalutation());
+        $this->assertEquals( $itemExp->getTitle(), $itemUpd->getTitle());
+        $this->assertEquals( $itemExp->getFirstname(), $itemUpd->getFirstname());
+        $this->assertEquals( $itemExp->getLastname(), $itemUpd->getLastname());
+        $this->assertEquals( $itemExp->getAddress1(), $itemUpd->getAddress1());
+        $this->assertEquals( $itemExp->getAddress2(), $itemUpd->getAddress2());
+        $this->assertEquals( $itemExp->getAddress3(), $itemUpd->getAddress3());
+        $this->assertEquals( $itemExp->getPostal(), $itemUpd->getPostal());
+        $this->assertEquals( $itemExp->getCity(), $itemUpd->getCity());
+        $this->assertEquals( $itemExp->getState(), $itemUpd->getState());
+        $this->assertEquals( $itemExp->getCountryId(), $itemUpd->getCountryId());
+        $this->assertEquals( $itemExp->getLanguageId(), $itemUpd->getLanguageId());
+        $this->assertEquals( $itemExp->getTelephone(), $itemUpd->getTelephone());
+        $this->assertEquals( $itemExp->getEmail(), $itemUpd->getEmail());
+        $this->assertEquals( $itemExp->getTelefax(), $itemUpd->getTelefax());
+        $this->assertEquals( $itemExp->getWebsite(), $itemUpd->getWebsite());
+        $this->assertEquals( $itemExp->getFlag(), $itemUpd->getFlag());
+
+        $this->assertEquals( $this->editor, $itemUpd->getEditor() );
+        $this->assertEquals( $itemExp->getTimeCreated(), $itemUpd->getTimeCreated() );
+        $this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified() );
+
+        $this->setExpectedException('\\Aimeos\\MShop\\Exception');
+        $this->object->getItem( $itemSaved->getId() );
+    }
+
+    public function testCreateSearch()
+    {
+        $this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $this->object->createSearch() );
+    }
+
+
+    public function testSearchItem()
+    {
+        $search = $this->object->createSearch();
+
+        $conditions = array(
+            $search->compare( '==', 'customer.address.company', 'ABC' ),
+            $search->compare( '==', 'customer.address.editor', $this->editor )
+        );
+        $search->setConditions( $search->combine( '&&', $conditions ) );
+        $this->assertEquals( 1, count( $this->object->searchItems( $search ) ) );
+    }
+
+
+    public function testSearchItemTotal()
+    {
+        $total = 0;
+        $search = $this->object->createSearch();
+
+        $conditions = array(
+            $search->compare( '~=', 'customer.address.company', 'ABC GmbH' ),
+            $search->compare( '==', 'customer.address.editor', $this->editor )
+        );
+
+        $search->setConditions( $search->combine( '&&', $conditions ) );
+        $search->setSlice( 0, 1 );
+
+        $results = $this->object->searchItems( $search, array(), $total );
+
+        $this->assertEquals( 1, count( $results ) );
+        $this->assertEquals( 2, $total );
+
+        foreach( $results as $id => $item ) {
+            $this->assertEquals( $id, $item->getId() );
+        }
+    }
 }

Spacing +100 added lines, -100 removed lines

@@ -20,18 +20,18 @@ 
 	{
 		$context = \TestHelper::getContext();
 		$this->editor = $context->getEditor();
-		$customer = new \Aimeos\MShop\Customer\Manager\Ezpublish( $context );
+		$customer = new \Aimeos\MShop\Customer\Manager\Ezpublish($context);
 
 		$search = $customer->createSearch();
 		$conditions = array(
-			$search->compare( '==', 'customer.code', 'UTC001' ),
-			$search->compare( '==', 'customer.editor', $this->editor )
+			$search->compare('==', 'customer.code', 'UTC001'),
+			$search->compare('==', 'customer.editor', $this->editor)
 		);
-		$search->setConditions( $search->combine( '&&', $conditions ) );
-		$result = $customer->searchItems( $search );
+		$search->setConditions($search->combine('&&', $conditions));
+		$result = $customer->searchItems($search);
 
-		if( ( $customerItem = reset( $result ) ) === false ) {
-			throw new \Exception( sprintf( 'No customer item found for code "%1$s"', 'UTC001' ) );
+		if (($customerItem = reset($result)) === false) {
+			throw new \Exception(sprintf('No customer item found for code "%1$s"', 'UTC001'));
 		}
 
 		$this->fixture = array(
@@ -58,132 +58,132 @@ 
 			'customer.address.siteid' => $context->getLocale()->getSiteId(),
 		);
 
-		$this->object = $customer->getSubManager( 'address', 'Ezpublish' );
+		$this->object = $customer->getSubManager('address', 'Ezpublish');
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->object, $this->fixture );
+		unset($this->object, $this->fixture);
 	}
 
 
 	public function testCleanup()
 	{
-		$this->object->cleanup( array( -1 ) );
+		$this->object->cleanup(array( -1 ));
 	}
 
 	public function testGetSearchAttributes()
 	{
-		foreach( $this->object->getSearchAttributes() as $attribute ) {
-			$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute );
+		foreach ($this->object->getSearchAttributes() as $attribute) {
+			$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute);
 		}
 	}
 
 	public function testGetSubManager()
 	{
-		$this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
-		$this->object->getSubManager( 'unknown' );
+		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
+		$this->object->getSubManager('unknown');
 	}
 
 	public function testCreateItem()
 	{
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Address\\Iface', $this->object->createItem() );
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Address\\Iface', $this->object->createItem());
 	}
 
 	public function testGetItem()
 	{
 		$search = $this->object->createSearch();
-		$search->setConditions( $search->compare( '~=', 'customer.address.company', 'ABC GmbH' ) );
+		$search->setConditions($search->compare('~=', 'customer.address.company', 'ABC GmbH'));
 
-		$items = $this->object->searchItems( $search );
+		$items = $this->object->searchItems($search);
 
-		if( ( $item = reset( $items ) ) === false ) {
-			throw new \Exception( 'No address item with company "ABC" found' );
+		if (($item = reset($items)) === false) {
+			throw new \Exception('No address item with company "ABC" found');
 		}
 
-		$this->assertEquals( $item, $this->object->getItem( $item->getId() ) );
+		$this->assertEquals($item, $this->object->getItem($item->getId()));
 	}
 
 	public function testSaveUpdateDeleteItem()
 	{
-		$item = new \Aimeos\MShop\Common\Item\Address\Standard( 'customer.address.', $this->fixture );
-		$item->setId( null );
-		$this->object->saveItem( $item );
-		$itemSaved = $this->object->getItem( $item->getId() );
+		$item = new \Aimeos\MShop\Common\Item\Address\Standard('customer.address.', $this->fixture);
+		$item->setId(null);
+		$this->object->saveItem($item);
+		$itemSaved = $this->object->getItem($item->getId());
 
 		$itemExp = clone $itemSaved;
-		$itemExp->setPosition( 1 );
-		$itemExp->setCity( 'Berlin' );
-		$itemExp->setState( 'Berlin' );
-		$this->object->saveItem( $itemExp );
-		$itemUpd = $this->object->getItem( $itemExp->getId() );
-
-		$this->object->deleteItem( $itemSaved->getId() );
-
-
-		$this->assertTrue( $item->getId() !== null );
-		$this->assertEquals( $item->getId(), $itemSaved->getId() );
-		$this->assertEquals( $item->getParentId(), $itemSaved->getParentId());
-		$this->assertEquals( $item->getPosition(), $itemSaved->getPosition());
-		$this->assertEquals( $item->getCompany(), $itemSaved->getCompany());
-		$this->assertEquals( $item->getVatID(), $itemSaved->getVatID());
-		$this->assertEquals( $item->getSalutation(), $itemSaved->getSalutation());
-		$this->assertEquals( $item->getTitle(), $itemSaved->getTitle());
-		$this->assertEquals( $item->getFirstname(), $itemSaved->getFirstname());
-		$this->assertEquals( $item->getLastname(), $itemSaved->getLastname());
-		$this->assertEquals( $item->getAddress1(), $itemSaved->getAddress1());
-		$this->assertEquals( $item->getAddress2(), $itemSaved->getAddress2());
-		$this->assertEquals( $item->getAddress3(), $itemSaved->getAddress3());
-		$this->assertEquals( $item->getPostal(), $itemSaved->getPostal());
-		$this->assertEquals( $item->getCity(), $itemSaved->getCity());
-		$this->assertEquals( $item->getState(), $itemSaved->getState());
-		$this->assertEquals( $item->getCountryId(), $itemSaved->getCountryId());
-		$this->assertEquals( $item->getLanguageId(), $itemSaved->getLanguageId());
-		$this->assertEquals( $item->getTelephone(), $itemSaved->getTelephone());
-		$this->assertEquals( $item->getEmail(), $itemSaved->getEmail());
-		$this->assertEquals( $item->getTelefax(), $itemSaved->getTelefax());
-		$this->assertEquals( $item->getWebsite(), $itemSaved->getWebsite());
-		$this->assertEquals( $item->getFlag(), $itemSaved->getFlag());
-
-		$this->assertEquals( $this->editor, $itemSaved->getEditor() );
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated() );
+		$itemExp->setPosition(1);
+		$itemExp->setCity('Berlin');
+		$itemExp->setState('Berlin');
+		$this->object->saveItem($itemExp);
+		$itemUpd = $this->object->getItem($itemExp->getId());
+
+		$this->object->deleteItem($itemSaved->getId());
+
+
+		$this->assertTrue($item->getId() !== null);
+		$this->assertEquals($item->getId(), $itemSaved->getId());
+		$this->assertEquals($item->getParentId(), $itemSaved->getParentId());
+		$this->assertEquals($item->getPosition(), $itemSaved->getPosition());
+		$this->assertEquals($item->getCompany(), $itemSaved->getCompany());
+		$this->assertEquals($item->getVatID(), $itemSaved->getVatID());
+		$this->assertEquals($item->getSalutation(), $itemSaved->getSalutation());
+		$this->assertEquals($item->getTitle(), $itemSaved->getTitle());
+		$this->assertEquals($item->getFirstname(), $itemSaved->getFirstname());
+		$this->assertEquals($item->getLastname(), $itemSaved->getLastname());
+		$this->assertEquals($item->getAddress1(), $itemSaved->getAddress1());
+		$this->assertEquals($item->getAddress2(), $itemSaved->getAddress2());
+		$this->assertEquals($item->getAddress3(), $itemSaved->getAddress3());
+		$this->assertEquals($item->getPostal(), $itemSaved->getPostal());
+		$this->assertEquals($item->getCity(), $itemSaved->getCity());
+		$this->assertEquals($item->getState(), $itemSaved->getState());
+		$this->assertEquals($item->getCountryId(), $itemSaved->getCountryId());
+		$this->assertEquals($item->getLanguageId(), $itemSaved->getLanguageId());
+		$this->assertEquals($item->getTelephone(), $itemSaved->getTelephone());
+		$this->assertEquals($item->getEmail(), $itemSaved->getEmail());
+		$this->assertEquals($item->getTelefax(), $itemSaved->getTelefax());
+		$this->assertEquals($item->getWebsite(), $itemSaved->getWebsite());
+		$this->assertEquals($item->getFlag(), $itemSaved->getFlag());
+
+		$this->assertEquals($this->editor, $itemSaved->getEditor());
+		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated());
 		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified());
 
-		$this->assertEquals( $itemExp->getId(), $itemUpd->getId() );
-		$this->assertEquals( $itemExp->getParentId(), $itemUpd->getParentId());
-		$this->assertEquals( $itemExp->getPosition(), $itemUpd->getPosition());
-		$this->assertEquals( $itemExp->getCompany(), $itemUpd->getCompany());
-		$this->assertEquals( $itemExp->getVatID(), $itemUpd->getVatID());
-		$this->assertEquals( $itemExp->getSalutation(), $itemUpd->getSalutation());
-		$this->assertEquals( $itemExp->getTitle(), $itemUpd->getTitle());
-		$this->assertEquals( $itemExp->getFirstname(), $itemUpd->getFirstname());
-		$this->assertEquals( $itemExp->getLastname(), $itemUpd->getLastname());
-		$this->assertEquals( $itemExp->getAddress1(), $itemUpd->getAddress1());
-		$this->assertEquals( $itemExp->getAddress2(), $itemUpd->getAddress2());
-		$this->assertEquals( $itemExp->getAddress3(), $itemUpd->getAddress3());
-		$this->assertEquals( $itemExp->getPostal(), $itemUpd->getPostal());
-		$this->assertEquals( $itemExp->getCity(), $itemUpd->getCity());
-		$this->assertEquals( $itemExp->getState(), $itemUpd->getState());
-		$this->assertEquals( $itemExp->getCountryId(), $itemUpd->getCountryId());
-		$this->assertEquals( $itemExp->getLanguageId(), $itemUpd->getLanguageId());
-		$this->assertEquals( $itemExp->getTelephone(), $itemUpd->getTelephone());
-		$this->assertEquals( $itemExp->getEmail(), $itemUpd->getEmail());
-		$this->assertEquals( $itemExp->getTelefax(), $itemUpd->getTelefax());
-		$this->assertEquals( $itemExp->getWebsite(), $itemUpd->getWebsite());
-		$this->assertEquals( $itemExp->getFlag(), $itemUpd->getFlag());
-
-		$this->assertEquals( $this->editor, $itemUpd->getEditor() );
-		$this->assertEquals( $itemExp->getTimeCreated(), $itemUpd->getTimeCreated() );
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified() );
+		$this->assertEquals($itemExp->getId(), $itemUpd->getId());
+		$this->assertEquals($itemExp->getParentId(), $itemUpd->getParentId());
+		$this->assertEquals($itemExp->getPosition(), $itemUpd->getPosition());
+		$this->assertEquals($itemExp->getCompany(), $itemUpd->getCompany());
+		$this->assertEquals($itemExp->getVatID(), $itemUpd->getVatID());
+		$this->assertEquals($itemExp->getSalutation(), $itemUpd->getSalutation());
+		$this->assertEquals($itemExp->getTitle(), $itemUpd->getTitle());
+		$this->assertEquals($itemExp->getFirstname(), $itemUpd->getFirstname());
+		$this->assertEquals($itemExp->getLastname(), $itemUpd->getLastname());
+		$this->assertEquals($itemExp->getAddress1(), $itemUpd->getAddress1());
+		$this->assertEquals($itemExp->getAddress2(), $itemUpd->getAddress2());
+		$this->assertEquals($itemExp->getAddress3(), $itemUpd->getAddress3());
+		$this->assertEquals($itemExp->getPostal(), $itemUpd->getPostal());
+		$this->assertEquals($itemExp->getCity(), $itemUpd->getCity());
+		$this->assertEquals($itemExp->getState(), $itemUpd->getState());
+		$this->assertEquals($itemExp->getCountryId(), $itemUpd->getCountryId());
+		$this->assertEquals($itemExp->getLanguageId(), $itemUpd->getLanguageId());
+		$this->assertEquals($itemExp->getTelephone(), $itemUpd->getTelephone());
+		$this->assertEquals($itemExp->getEmail(), $itemUpd->getEmail());
+		$this->assertEquals($itemExp->getTelefax(), $itemUpd->getTelefax());
+		$this->assertEquals($itemExp->getWebsite(), $itemUpd->getWebsite());
+		$this->assertEquals($itemExp->getFlag(), $itemUpd->getFlag());
+
+		$this->assertEquals($this->editor, $itemUpd->getEditor());
+		$this->assertEquals($itemExp->getTimeCreated(), $itemUpd->getTimeCreated());
+		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified());
 
 		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
-		$this->object->getItem( $itemSaved->getId() );
+		$this->object->getItem($itemSaved->getId());
 	}
 
 	public function testCreateSearch()
 	{
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $this->object->createSearch() );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $this->object->createSearch());
 	}
 
 
@@ -192,11 +192,11 @@ 
 		$search = $this->object->createSearch();
 
 		$conditions = array(
-			$search->compare( '==', 'customer.address.company', 'ABC' ),
-			$search->compare( '==', 'customer.address.editor', $this->editor )
+			$search->compare('==', 'customer.address.company', 'ABC'),
+			$search->compare('==', 'customer.address.editor', $this->editor)
 		);
-		$search->setConditions( $search->combine( '&&', $conditions ) );
-		$this->assertEquals( 1, count( $this->object->searchItems( $search ) ) );
+		$search->setConditions($search->combine('&&', $conditions));
+		$this->assertEquals(1, count($this->object->searchItems($search)));
 	}
 
 
@@ -206,20 +206,20 @@ 
 		$search = $this->object->createSearch();
 
 		$conditions = array(
-			$search->compare( '~=', 'customer.address.company', 'ABC GmbH' ),
-			$search->compare( '==', 'customer.address.editor', $this->editor )
+			$search->compare('~=', 'customer.address.company', 'ABC GmbH'),
+			$search->compare('==', 'customer.address.editor', $this->editor)
 		);
 
-		$search->setConditions( $search->combine( '&&', $conditions ) );
-		$search->setSlice( 0, 1 );
+		$search->setConditions($search->combine('&&', $conditions));
+		$search->setSlice(0, 1);
 
-		$results = $this->object->searchItems( $search, array(), $total );
+		$results = $this->object->searchItems($search, array(), $total);
 
-		$this->assertEquals( 1, count( $results ) );
-		$this->assertEquals( 2, $total );
+		$this->assertEquals(1, count($results));
+		$this->assertEquals(2, $total);
 
-		foreach( $results as $id => $item ) {
-			$this->assertEquals( $id, $item->getId() );
+		foreach ($results as $id => $item) {
+			$this->assertEquals($id, $item->getId());
 		}
 	}
 }

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

Indentation +103 added lines, -103 removed lines

@@ -11,137 +11,137 @@
 
 class EzpublishTest extends \PHPUnit_Framework_TestCase
 {
-	private $object;
-	private $editor = '';
+    private $object;
+    private $editor = '';
 
 
-	protected function setUp()
-	{
-		$this->editor = \TestHelper::getContext()->getEditor();
-		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( \TestHelper::getContext(), 'Ezpublish' );
+    protected function setUp()
+    {
+        $this->editor = \TestHelper::getContext()->getEditor();
+        $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( \TestHelper::getContext(), 'Ezpublish' );
 
-		$listManager = $manager->getSubManager( 'lists', 'Ezpublish' );
-		$this->object = $listManager->getSubManager( 'type', 'Ezpublish' );
-	}
+        $listManager = $manager->getSubManager( 'lists', 'Ezpublish' );
+        $this->object = $listManager->getSubManager( 'type', 'Ezpublish' );
+    }
 
 
-	protected function tearDown()
-	{
-		unset( $this->object );
-	}
+    protected function tearDown()
+    {
+        unset( $this->object );
+    }
 
 
-	public function testCleanup()
-	{
-		$this->object->cleanup( array( -1 ) );
-	}
+    public function testCleanup()
+    {
+        $this->object->cleanup( array( -1 ) );
+    }
 
 
-	public function testGetSubManager()
-	{
-		$this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
-		$this->object->getSubManager( 'unknown' );
-	}
+    public function testGetSubManager()
+    {
+        $this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
+        $this->object->getSubManager( 'unknown' );
+    }
 
 
-	public function testCreateItem()
-	{
-		$item = $this->object->createItem();
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Type\\Iface', $item );
-	}
+    public function testCreateItem()
+    {
+        $item = $this->object->createItem();
+        $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Type\\Iface', $item );
+    }
 
 
-	public function testGetItem()
-	{
-		$search = $this->object->createSearch();
-		$search->setSlice(0, 1);
-		$results = $this->object->searchItems($search);
+    public function testGetItem()
+    {
+        $search = $this->object->createSearch();
+        $search->setSlice(0, 1);
+        $results = $this->object->searchItems($search);
 
-		if( ( $expected = reset($results) ) === false ) {
-			throw new \Exception( 'No list type item found' );
-		}
+        if( ( $expected = reset($results) ) === false ) {
+            throw new \Exception( 'No list type item found' );
+        }
 
-		$this->assertEquals( $expected, $this->object->getItem( $expected->getId() ) );
-	}
+        $this->assertEquals( $expected, $this->object->getItem( $expected->getId() ) );
+    }
 
 
-	public function testSaveUpdateDeleteItem()
-	{
-		$search = $this->object->createSearch();
-		$search->setSlice(0, 1);
-		$results = $this->object->searchItems($search);
+    public function testSaveUpdateDeleteItem()
+    {
+        $search = $this->object->createSearch();
+        $search->setSlice(0, 1);
+        $results = $this->object->searchItems($search);
 
-		if( ( $item = reset($results) ) === false ) {
-			throw new \Exception( 'No type item found' );
-		}
+        if( ( $item = reset($results) ) === false ) {
+            throw new \Exception( 'No type item found' );
+        }
 
-		$item->setId(null);
-		$item->setCode( 'unitTestInit' );
-		$this->object->saveItem( $item );
-		$itemSaved = $this->object->getItem( $item->getId() );
+        $item->setId(null);
+        $item->setCode( 'unitTestInit' );
+        $this->object->saveItem( $item );
+        $itemSaved = $this->object->getItem( $item->getId() );
 
-		$itemExp = clone $itemSaved;
-		$itemExp->setCode( 'unitTestSave' );
-		$this->object->saveItem( $itemExp );
-		$itemUpd = $this->object->getItem( $itemExp->getId() );
+        $itemExp = clone $itemSaved;
+        $itemExp->setCode( 'unitTestSave' );
+        $this->object->saveItem( $itemExp );
+        $itemUpd = $this->object->getItem( $itemExp->getId() );
 
-		$this->object->deleteItem( $itemSaved->getId() );
+        $this->object->deleteItem( $itemSaved->getId() );
 
 
-		$this->assertTrue( $item->getId() !== null );
-		$this->assertEquals( $item->getId(), $itemSaved->getId() );
-		$this->assertEquals( $item->getSiteId(), $itemSaved->getSiteId() );
-		$this->assertEquals( $item->getCode(), $itemSaved->getCode() );
-		$this->assertEquals( $item->getDomain(), $itemSaved->getDomain() );
-		$this->assertEquals( $item->getLabel(), $itemSaved->getLabel() );
-		$this->assertEquals( $item->getStatus(), $itemSaved->getStatus() );
+        $this->assertTrue( $item->getId() !== null );
+        $this->assertEquals( $item->getId(), $itemSaved->getId() );
+        $this->assertEquals( $item->getSiteId(), $itemSaved->getSiteId() );
+        $this->assertEquals( $item->getCode(), $itemSaved->getCode() );
+        $this->assertEquals( $item->getDomain(), $itemSaved->getDomain() );
+        $this->assertEquals( $item->getLabel(), $itemSaved->getLabel() );
+        $this->assertEquals( $item->getStatus(), $itemSaved->getStatus() );
 
-		$this->assertEquals( $this->editor, $itemSaved->getEditor() );
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated() );
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified() );
+        $this->assertEquals( $this->editor, $itemSaved->getEditor() );
+        $this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated() );
+        $this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified() );
 
-		$this->assertEquals( $itemExp->getId(), $itemUpd->getId() );
-		$this->assertEquals( $itemExp->getSiteId(), $itemUpd->getSiteId() );
-		$this->assertEquals( $itemExp->getCode(), $itemUpd->getCode() );
-		$this->assertEquals( $itemExp->getDomain(), $itemUpd->getDomain() );
-		$this->assertEquals( $itemExp->getLabel(), $itemUpd->getLabel() );
-		$this->assertEquals( $itemExp->getStatus(), $itemUpd->getStatus() );
+        $this->assertEquals( $itemExp->getId(), $itemUpd->getId() );
+        $this->assertEquals( $itemExp->getSiteId(), $itemUpd->getSiteId() );
+        $this->assertEquals( $itemExp->getCode(), $itemUpd->getCode() );
+        $this->assertEquals( $itemExp->getDomain(), $itemUpd->getDomain() );
+        $this->assertEquals( $itemExp->getLabel(), $itemUpd->getLabel() );
+        $this->assertEquals( $itemExp->getStatus(), $itemUpd->getStatus() );
 
-		$this->assertEquals( $this->editor, $itemUpd->getEditor() );
-		$this->assertEquals( $itemExp->getTimeCreated(), $itemUpd->getTimeCreated() );
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified() );
+        $this->assertEquals( $this->editor, $itemUpd->getEditor() );
+        $this->assertEquals( $itemExp->getTimeCreated(), $itemUpd->getTimeCreated() );
+        $this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified() );
 
-		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
-		$this->object->getItem( $itemSaved->getId() );
-	}
+        $this->setExpectedException('\\Aimeos\\MShop\\Exception');
+        $this->object->getItem( $itemSaved->getId() );
+    }
 
 
-	public function testSearchItems()
-	{
-		$total = 0;
-		$search = $this->object->createSearch();
-
-		$expr = array();
-		$expr[] = $search->compare( '!=', 'customer.lists.type.id', 0 );
-		$expr[] = $search->compare( '!=', 'customer.lists.type.siteid', null );
-		$expr[] = $search->compare( '==', 'customer.lists.type.code', 'default' );
-		$expr[] = $search->compare( '==', 'customer.lists.type.domain', 'text' );
-		$expr[] = $search->compare( '==', 'customer.lists.type.label', 'Standard' );
-		$expr[] = $search->compare( '==', 'customer.lists.type.status', 1 );
-		$expr[] = $search->compare( '>=', 'customer.lists.type.mtime', '1970-01-01 00:00:00' );
-		$expr[] = $search->compare( '>=', 'customer.lists.type.ctime', '1970-01-01 00:00:00' );
-		$expr[] = $search->compare( '==', 'customer.lists.type.editor', $this->editor );
-
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSlice(0, 1);
-
-		$results = $this->object->searchItems( $search, array(), $total );
-		$this->assertEquals( 1, count( $results ) );
-		$this->assertEquals( 1, $total );
-
-		foreach($results as $itemId => $item) {
-			$this->assertEquals( $itemId, $item->getId() );
-		}
-	}
+    public function testSearchItems()
+    {
+        $total = 0;
+        $search = $this->object->createSearch();
+
+        $expr = array();
+        $expr[] = $search->compare( '!=', 'customer.lists.type.id', 0 );
+        $expr[] = $search->compare( '!=', 'customer.lists.type.siteid', null );
+        $expr[] = $search->compare( '==', 'customer.lists.type.code', 'default' );
+        $expr[] = $search->compare( '==', 'customer.lists.type.domain', 'text' );
+        $expr[] = $search->compare( '==', 'customer.lists.type.label', 'Standard' );
+        $expr[] = $search->compare( '==', 'customer.lists.type.status', 1 );
+        $expr[] = $search->compare( '>=', 'customer.lists.type.mtime', '1970-01-01 00:00:00' );
+        $expr[] = $search->compare( '>=', 'customer.lists.type.ctime', '1970-01-01 00:00:00' );
+        $expr[] = $search->compare( '==', 'customer.lists.type.editor', $this->editor );
+
+        $search->setConditions( $search->combine( '&&', $expr ) );
+        $search->setSlice(0, 1);
+
+        $results = $this->object->searchItems( $search, array(), $total );
+        $this->assertEquals( 1, count( $results ) );
+        $this->assertEquals( 1, $total );
+
+        foreach($results as $itemId => $item) {
+            $this->assertEquals( $itemId, $item->getId() );
+        }
+    }
 
 }

Spacing +56 added lines, -56 removed lines

@@ -18,36 +18,36 @@ 
 	protected function setUp()
 	{
 		$this->editor = \TestHelper::getContext()->getEditor();
-		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( \TestHelper::getContext(), 'Ezpublish' );
+		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager(\TestHelper::getContext(), 'Ezpublish');
 
-		$listManager = $manager->getSubManager( 'lists', 'Ezpublish' );
-		$this->object = $listManager->getSubManager( 'type', 'Ezpublish' );
+		$listManager = $manager->getSubManager('lists', 'Ezpublish');
+		$this->object = $listManager->getSubManager('type', 'Ezpublish');
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->object );
+		unset($this->object);
 	}
 
 
 	public function testCleanup()
 	{
-		$this->object->cleanup( array( -1 ) );
+		$this->object->cleanup(array( -1 ));
 	}
 
 
 	public function testGetSubManager()
 	{
-		$this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
-		$this->object->getSubManager( 'unknown' );
+		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
+		$this->object->getSubManager('unknown');
 	}
 
 
 	public function testCreateItem()
 	{
 		$item = $this->object->createItem();
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Type\\Iface', $item );
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Type\\Iface', $item);
 	}
 
 
@@ -57,11 +57,11 @@ 
 		$search->setSlice(0, 1);
 		$results = $this->object->searchItems($search);
 
-		if( ( $expected = reset($results) ) === false ) {
-			throw new \Exception( 'No list type item found' );
+		if (($expected = reset($results)) === false) {
+			throw new \Exception('No list type item found');
 		}
 
-		$this->assertEquals( $expected, $this->object->getItem( $expected->getId() ) );
+		$this->assertEquals($expected, $this->object->getItem($expected->getId()));
 	}
 
 
@@ -71,48 +71,48 @@ 
 		$search->setSlice(0, 1);
 		$results = $this->object->searchItems($search);
 
-		if( ( $item = reset($results) ) === false ) {
-			throw new \Exception( 'No type item found' );
+		if (($item = reset($results)) === false) {
+			throw new \Exception('No type item found');
 		}
 
 		$item->setId(null);
-		$item->setCode( 'unitTestInit' );
-		$this->object->saveItem( $item );
-		$itemSaved = $this->object->getItem( $item->getId() );
+		$item->setCode('unitTestInit');
+		$this->object->saveItem($item);
+		$itemSaved = $this->object->getItem($item->getId());
 
 		$itemExp = clone $itemSaved;
-		$itemExp->setCode( 'unitTestSave' );
-		$this->object->saveItem( $itemExp );
-		$itemUpd = $this->object->getItem( $itemExp->getId() );
+		$itemExp->setCode('unitTestSave');
+		$this->object->saveItem($itemExp);
+		$itemUpd = $this->object->getItem($itemExp->getId());
 
-		$this->object->deleteItem( $itemSaved->getId() );
+		$this->object->deleteItem($itemSaved->getId());
 
 
-		$this->assertTrue( $item->getId() !== null );
-		$this->assertEquals( $item->getId(), $itemSaved->getId() );
-		$this->assertEquals( $item->getSiteId(), $itemSaved->getSiteId() );
-		$this->assertEquals( $item->getCode(), $itemSaved->getCode() );
-		$this->assertEquals( $item->getDomain(), $itemSaved->getDomain() );
-		$this->assertEquals( $item->getLabel(), $itemSaved->getLabel() );
-		$this->assertEquals( $item->getStatus(), $itemSaved->getStatus() );
+		$this->assertTrue($item->getId() !== null);
+		$this->assertEquals($item->getId(), $itemSaved->getId());
+		$this->assertEquals($item->getSiteId(), $itemSaved->getSiteId());
+		$this->assertEquals($item->getCode(), $itemSaved->getCode());
+		$this->assertEquals($item->getDomain(), $itemSaved->getDomain());
+		$this->assertEquals($item->getLabel(), $itemSaved->getLabel());
+		$this->assertEquals($item->getStatus(), $itemSaved->getStatus());
 
-		$this->assertEquals( $this->editor, $itemSaved->getEditor() );
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated() );
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified() );
+		$this->assertEquals($this->editor, $itemSaved->getEditor());
+		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated());
+		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified());
 
-		$this->assertEquals( $itemExp->getId(), $itemUpd->getId() );
-		$this->assertEquals( $itemExp->getSiteId(), $itemUpd->getSiteId() );
-		$this->assertEquals( $itemExp->getCode(), $itemUpd->getCode() );
-		$this->assertEquals( $itemExp->getDomain(), $itemUpd->getDomain() );
-		$this->assertEquals( $itemExp->getLabel(), $itemUpd->getLabel() );
-		$this->assertEquals( $itemExp->getStatus(), $itemUpd->getStatus() );
+		$this->assertEquals($itemExp->getId(), $itemUpd->getId());
+		$this->assertEquals($itemExp->getSiteId(), $itemUpd->getSiteId());
+		$this->assertEquals($itemExp->getCode(), $itemUpd->getCode());
+		$this->assertEquals($itemExp->getDomain(), $itemUpd->getDomain());
+		$this->assertEquals($itemExp->getLabel(), $itemUpd->getLabel());
+		$this->assertEquals($itemExp->getStatus(), $itemUpd->getStatus());
 
-		$this->assertEquals( $this->editor, $itemUpd->getEditor() );
-		$this->assertEquals( $itemExp->getTimeCreated(), $itemUpd->getTimeCreated() );
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified() );
+		$this->assertEquals($this->editor, $itemUpd->getEditor());
+		$this->assertEquals($itemExp->getTimeCreated(), $itemUpd->getTimeCreated());
+		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified());
 
 		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
-		$this->object->getItem( $itemSaved->getId() );
+		$this->object->getItem($itemSaved->getId());
 	}
 
 
@@ -122,25 +122,25 @@ 
 		$search = $this->object->createSearch();
 
 		$expr = array();
-		$expr[] = $search->compare( '!=', 'customer.lists.type.id', 0 );
-		$expr[] = $search->compare( '!=', 'customer.lists.type.siteid', null );
-		$expr[] = $search->compare( '==', 'customer.lists.type.code', 'default' );
-		$expr[] = $search->compare( '==', 'customer.lists.type.domain', 'text' );
-		$expr[] = $search->compare( '==', 'customer.lists.type.label', 'Standard' );
-		$expr[] = $search->compare( '==', 'customer.lists.type.status', 1 );
-		$expr[] = $search->compare( '>=', 'customer.lists.type.mtime', '1970-01-01 00:00:00' );
-		$expr[] = $search->compare( '>=', 'customer.lists.type.ctime', '1970-01-01 00:00:00' );
-		$expr[] = $search->compare( '==', 'customer.lists.type.editor', $this->editor );
-
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$expr[] = $search->compare('!=', 'customer.lists.type.id', 0);
+		$expr[] = $search->compare('!=', 'customer.lists.type.siteid', null);
+		$expr[] = $search->compare('==', 'customer.lists.type.code', 'default');
+		$expr[] = $search->compare('==', 'customer.lists.type.domain', 'text');
+		$expr[] = $search->compare('==', 'customer.lists.type.label', 'Standard');
+		$expr[] = $search->compare('==', 'customer.lists.type.status', 1);
+		$expr[] = $search->compare('>=', 'customer.lists.type.mtime', '1970-01-01 00:00:00');
+		$expr[] = $search->compare('>=', 'customer.lists.type.ctime', '1970-01-01 00:00:00');
+		$expr[] = $search->compare('==', 'customer.lists.type.editor', $this->editor);
+
+		$search->setConditions($search->combine('&&', $expr));
 		$search->setSlice(0, 1);
 
-		$results = $this->object->searchItems( $search, array(), $total );
-		$this->assertEquals( 1, count( $results ) );
-		$this->assertEquals( 1, $total );
+		$results = $this->object->searchItems($search, array(), $total);
+		$this->assertEquals(1, count($results));
+		$this->assertEquals(1, $total);
 
-		foreach($results as $itemId => $item) {
-			$this->assertEquals( $itemId, $item->getId() );
+		foreach ($results as $itemId => $item) {
+			$this->assertEquals($itemId, $item->getId());
 		}
 	}
 

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

Indentation +134 added lines, -134 removed lines

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

Spacing +104 added lines, -104 removed lines

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

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

Indentation +11 added lines, -11 removed lines

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

Spacing +2 added lines, -2 removed lines

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

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

Indentation +58 added lines, -58 removed lines

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

Spacing +8 added lines, -8 removed lines

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