aimeos / ai-laravel

lib/custom/tests/MW/View/Helper/Request/Laravel5Test.php

Spacing +11 added lines, -11 removed lines

@@ -17,42 +17,42 @@
 
 	protected function setUp()
 	{
-		if( !class_exists( '\Illuminate\Http\Request' ) ) {
-			$this->markTestSkipped( '\Illuminate\Http\Request is not available' );
+		if (!class_exists('\Illuminate\Http\Request')) {
+			$this->markTestSkipped('\Illuminate\Http\Request is not available');
 		}
 
-		if( !class_exists( '\Zend\Diactoros\Response' ) ) {
-			$this->markTestSkipped( '\Zend\Diactoros\Response is not available' );
+		if (!class_exists('\Zend\Diactoros\Response')) {
+			$this->markTestSkipped('\Zend\Diactoros\Response is not available');
 		}
 
 		$view = new \Aimeos\MW\View\Standard();
-		$param = array( 'HTTP_HOST' => 'localhost', 'REMOTE_ADDR' => '127.0.0.1' );
-		$request = new \Illuminate\Http\Request( [], [], [], [], [], $param, 'Content' );
+		$param = array('HTTP_HOST' => 'localhost', 'REMOTE_ADDR' => '127.0.0.1');
+		$request = new \Illuminate\Http\Request([], [], [], [], [], $param, 'Content');
 
-		$this->object = new \Aimeos\MW\View\Helper\Request\Laravel5( $view, $request );
+		$this->object = new \Aimeos\MW\View\Helper\Request\Laravel5($view, $request);
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->object, $this->mock );
+		unset($this->object, $this->mock);
 	}
 
 
 	public function testTransform()
 	{
-		$this->assertInstanceOf( '\Aimeos\MW\View\Helper\Request\Laravel5', $this->object->transform() );
+		$this->assertInstanceOf('\Aimeos\MW\View\Helper\Request\Laravel5', $this->object->transform());
 	}
 
 
 	public function testGetClientAddress()
 	{
-		$this->assertEquals( '127.0.0.1', $this->object->getClientAddress() );
+		$this->assertEquals('127.0.0.1', $this->object->getClientAddress());
 	}
 
 
 	public function testGetTarget()
 	{
-		$this->assertEquals( null, $this->object->getTarget() );
+		$this->assertEquals(null, $this->object->getTarget());
 	}
 }

lib/custom/tests/MW/View/Helper/Url/Laravel5Test.php

Spacing +12 added lines, -12 removed lines

@@ -21,13 +21,13 @@ 
 	 */
 	protected function setUp()
 	{
-		if( !interface_exists( '\\Illuminate\\Contracts\\Routing\\UrlGenerator' ) ) {
-			$this->markTestSkipped( '\\Illuminate\\Contracts\\Routing\\UrlGenerator is not available' );
+		if (!interface_exists('\\Illuminate\\Contracts\\Routing\\UrlGenerator')) {
+			$this->markTestSkipped('\\Illuminate\\Contracts\\Routing\\UrlGenerator is not available');
 		}
 
 		$view = new \Aimeos\MW\View\Standard();
-		$this->mock = $this->getMockBuilder( '\\Illuminate\\Contracts\\Routing\\UrlGenerator' )->getMock();
-		$this->object = new \Aimeos\MW\View\Helper\Url\Laravel5( $view, $this->mock, [] );
+		$this->mock = $this->getMockBuilder('\\Illuminate\\Contracts\\Routing\\UrlGenerator')->getMock();
+		$this->object = new \Aimeos\MW\View\Helper\Url\Laravel5($view, $this->mock, []);
 	}
 
 
@@ -39,25 +39,25 @@ 
 	 */
 	protected function tearDown()
 	{
-		unset( $this->object, $this->mock );
+		unset($this->object, $this->mock);
 	}
 
 
 	public function testTransform()
 	{
-		$this->mock->expects( $this->once() )->method( 'route' )
-			->with( $this->equalTo( 'route'), $this->equalTo( array( 'key' => 'value' ) ), $this->equalTo( false ) );
+		$this->mock->expects($this->once())->method('route')
+			->with($this->equalTo('route'), $this->equalTo(array('key' => 'value')), $this->equalTo(false));
 
-		$this->object->transform( 'route', 'catalog', 'lists', array( 'key' => 'value' ) );
+		$this->object->transform('route', 'catalog', 'lists', array('key' => 'value'));
 	}
 
 
 	public function testTransformAbsolute()
 	{
-		$this->mock->expects( $this->once() )->method( 'route' )
-			->with( $this->equalTo( 'route'), $this->equalTo( [] ), $this->equalTo( true ) );
+		$this->mock->expects($this->once())->method('route')
+			->with($this->equalTo('route'), $this->equalTo([]), $this->equalTo(true));
 
-		$options = array( 'absoluteUri' => true );
-		$this->object->transform( 'route', 'catalog', 'lists', [], [], $options );
+		$options = array('absoluteUri' => true);
+		$this->object->transform('route', 'catalog', 'lists', [], [], $options);
 	}
 }

lib/custom/tests/MW/Filesystem/Manager/LaravelTest.php

Spacing +16 added lines, -16 removed lines

@@ -12,50 +12,50 @@
 
 	protected function setUp()
 	{
-		if( !class_exists( '\Illuminate\Filesystem\FilesystemManager' ) ) {
-			$this->markTestSkipped( 'Install the Laravel framework first' );
+		if (!class_exists('\Illuminate\Filesystem\FilesystemManager')) {
+			$this->markTestSkipped('Install the Laravel framework first');
 		}
 
-		$this->storage = $this->getMockBuilder( '\Illuminate\Filesystem\FilesystemManager' )
-			->setMethods( array( 'get' ) )
+		$this->storage = $this->getMockBuilder('\Illuminate\Filesystem\FilesystemManager')
+			->setMethods(array('get'))
 			->disableOriginalConstructor()
 			->getMock();
 
-		$this->config = new \Aimeos\MW\Config\Decorator\Memory( new \Aimeos\MW\Config\PHPArray( [], [] ) );
-		$this->object = new \Aimeos\MW\Filesystem\Manager\Laravel( $this->storage, $this->config, sys_get_temp_dir() );
+		$this->config = new \Aimeos\MW\Config\Decorator\Memory(new \Aimeos\MW\Config\PHPArray([], []));
+		$this->object = new \Aimeos\MW\Filesystem\Manager\Laravel($this->storage, $this->config, sys_get_temp_dir());
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->config, $this->object, $this->storage );
+		unset($this->config, $this->object, $this->storage);
 	}
 
 
 	public function testGet()
 	{
-		$fs = $this->getMockBuilder( 'Illuminate\Contracts\Filesystem\Filesystem' )
+		$fs = $this->getMockBuilder('Illuminate\Contracts\Filesystem\Filesystem')
 			->disableOriginalConstructor()
 			->getMock();
 
-		$this->storage->expects( $this->once() )->method( 'get' )
-			->will( $this->returnValue( $fs ) );
+		$this->storage->expects($this->once())->method('get')
+			->will($this->returnValue($fs));
 
-		$this->config->set( 'resource/fs-media', 'local' );
-		$this->assertInstanceof( 'Aimeos\MW\Filesystem\Iface', $this->object->get( 'fs-media' ) );
+		$this->config->set('resource/fs-media', 'local');
+		$this->assertInstanceof('Aimeos\MW\Filesystem\Iface', $this->object->get('fs-media'));
 	}
 
 
 	public function testGetFallback()
 	{
-		$this->config->set( 'resource/fs', array( 'adapter' => 'Standard', 'basedir' => __DIR__ ) );
-		$this->assertInstanceof( 'Aimeos\MW\Filesystem\Iface', $this->object->get( 'fs-media' ) );
+		$this->config->set('resource/fs', array('adapter' => 'Standard', 'basedir' => __DIR__));
+		$this->assertInstanceof('Aimeos\MW\Filesystem\Iface', $this->object->get('fs-media'));
 	}
 
 
 	public function testGetException()
 	{
-		$this->setExpectedException( 'Aimeos\MW\Filesystem\Exception' );
-		$this->object->get( 'fs-media' );
+		$this->setExpectedException('Aimeos\MW\Filesystem\Exception');
+		$this->object->get('fs-media');
 	}
 }

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

Spacing +9 added lines, -9 removed lines

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

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

Spacing +9 added lines, -9 removed lines

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

lib/custom/src/MShop/Customer/Manager/Address/Laravel.php

Spacing +10 added lines, -10 removed lines

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

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

Spacing +132 added lines, -132 removed lines

@@ -8,153 +8,153 @@
 
 return array(
 	'table' => array(
-		'users' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
-
-			$table = $schema->createTable( 'users' );
-
-			$table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) );
-			$table->addColumn( 'siteid', 'integer', array( 'notnull' => false ) );
-			$table->addColumn( 'label', 'string', array( 'length' => 255, 'default' => '' ) );
-			$table->addColumn( 'name', 'string', array( 'length' => 255 ) );
-			$table->addColumn( 'remember_token', 'string', array( 'length' => 100, 'notnull' => false ) );
-			$table->addColumn( 'salutation', 'string', array( 'length' => 8, 'default' => '' ) );
-			$table->addColumn( 'company', 'string', array( 'length' => 100, 'default' => '' ) );
-			$table->addColumn( 'vatid', 'string', array( 'length' => 32, 'default' => '' ) );
-			$table->addColumn( 'title', 'string', array( 'length' => 64, 'default' => '' ) );
-			$table->addColumn( 'firstname', 'string', array( 'length' => 64, 'default' => '' ) );
-			$table->addColumn( 'lastname', 'string', array( 'length' => 64, 'default' => '' ) );
-			$table->addColumn( 'address1', 'string', array( 'length' => 200, 'default' => '' ) );
-			$table->addColumn( 'address2', 'string', array( 'length' => 200, 'default' => '' ) );
-			$table->addColumn( 'address3', 'string', array( 'length' => 200, 'default' => '' ) );
-			$table->addColumn( 'postal', 'string', array( 'length' => 16, 'default' => '' ) );
-			$table->addColumn( 'city', 'string', array( 'length' => 200, 'default' => '' ) );
-			$table->addColumn( 'state', 'string', array( 'length' => 200, 'default' => '' ) );
-			$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, 'default' => '' ) );
-			$table->addColumn( 'telefax', 'string', array( 'length' => 32, 'default' => '' ) );
-			$table->addColumn( 'website', 'string', array( 'length' => 255, 'default' => '' ) );
-			$table->addColumn( 'email', 'string', array( 'length' => 255 ) );
-			$table->addColumn( 'password', 'string', array( 'length' => 255 ) );
-			$table->addColumn( 'longitude', 'decimal', array( 'precision' => 8, 'scale' => 6, 'notnull' => false ) );
-			$table->addColumn( 'latitude', 'decimal', array( 'precision' => 8, 'scale' => 6, 'notnull' => false ) );
-			$table->addColumn( 'birthday', 'date', array( 'notnull' => false ) );
-			$table->addColumn( 'vdate', 'date', array( 'notnull' => false ) );
-			$table->addColumn( 'status', 'smallint', array( 'default' => 1 ) );
-			$table->addColumn( 'updated_at', 'datetime', [] );
-			$table->addColumn( 'created_at', 'datetime', [] );
-			$table->addColumn( 'editor', 'string', array('length' => 255, 'default' => '' ) );
-
-			$table->setPrimaryKey( array( 'id' ), 'pk_lvusr_id' );
-			$table->addUniqueIndex( array( 'email' ), 'unq_lvusr_email' );
-			$table->addIndex( array( 'langid' ), 'idx_lvusr_langid' );
-			$table->addIndex( array( 'lastname', 'firstname' ), 'idx_lvusr_last_first' );
-			$table->addIndex( array( 'postal', 'address1' ), 'idx_lvusr_post_addr1' );
-			$table->addIndex( array( 'postal', 'city' ), 'idx_lvusr_post_city' );
-			$table->addIndex( array( 'lastname' ), 'idx_lvusr_lastname' );
-			$table->addIndex( array( 'address1' ), 'idx_lvusr_address1' );
-			$table->addIndex( array( 'city' ), 'idx_lvusr_city' );
+		'users' => function(\Doctrine\DBAL\Schema\Schema $schema) {
+
+			$table = $schema->createTable('users');
+
+			$table->addColumn('id', 'integer', array('autoincrement' => true));
+			$table->addColumn('siteid', 'integer', array('notnull' => false));
+			$table->addColumn('label', 'string', array('length' => 255, 'default' => ''));
+			$table->addColumn('name', 'string', array('length' => 255));
+			$table->addColumn('remember_token', 'string', array('length' => 100, 'notnull' => false));
+			$table->addColumn('salutation', 'string', array('length' => 8, 'default' => ''));
+			$table->addColumn('company', 'string', array('length' => 100, 'default' => ''));
+			$table->addColumn('vatid', 'string', array('length' => 32, 'default' => ''));
+			$table->addColumn('title', 'string', array('length' => 64, 'default' => ''));
+			$table->addColumn('firstname', 'string', array('length' => 64, 'default' => ''));
+			$table->addColumn('lastname', 'string', array('length' => 64, 'default' => ''));
+			$table->addColumn('address1', 'string', array('length' => 200, 'default' => ''));
+			$table->addColumn('address2', 'string', array('length' => 200, 'default' => ''));
+			$table->addColumn('address3', 'string', array('length' => 200, 'default' => ''));
+			$table->addColumn('postal', 'string', array('length' => 16, 'default' => ''));
+			$table->addColumn('city', 'string', array('length' => 200, 'default' => ''));
+			$table->addColumn('state', 'string', array('length' => 200, 'default' => ''));
+			$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, 'default' => ''));
+			$table->addColumn('telefax', 'string', array('length' => 32, 'default' => ''));
+			$table->addColumn('website', 'string', array('length' => 255, 'default' => ''));
+			$table->addColumn('email', 'string', array('length' => 255));
+			$table->addColumn('password', 'string', array('length' => 255));
+			$table->addColumn('longitude', 'decimal', array('precision' => 8, 'scale' => 6, 'notnull' => false));
+			$table->addColumn('latitude', 'decimal', array('precision' => 8, 'scale' => 6, 'notnull' => false));
+			$table->addColumn('birthday', 'date', array('notnull' => false));
+			$table->addColumn('vdate', 'date', array('notnull' => false));
+			$table->addColumn('status', 'smallint', array('default' => 1));
+			$table->addColumn('updated_at', 'datetime', []);
+			$table->addColumn('created_at', 'datetime', []);
+			$table->addColumn('editor', 'string', array('length' => 255, 'default' => ''));
+
+			$table->setPrimaryKey(array('id'), 'pk_lvusr_id');
+			$table->addUniqueIndex(array('email'), 'unq_lvusr_email');
+			$table->addIndex(array('langid'), 'idx_lvusr_langid');
+			$table->addIndex(array('lastname', 'firstname'), 'idx_lvusr_last_first');
+			$table->addIndex(array('postal', 'address1'), 'idx_lvusr_post_addr1');
+			$table->addIndex(array('postal', 'city'), 'idx_lvusr_post_city');
+			$table->addIndex(array('lastname'), 'idx_lvusr_lastname');
+			$table->addIndex(array('address1'), 'idx_lvusr_address1');
+			$table->addIndex(array('city'), 'idx_lvusr_city');
 
 			return $schema;
 		},
 
-		'users_address' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
-
-			$table = $schema->createTable( 'users_address' );
-
-			$table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) );
-			$table->addColumn( 'siteid', 'integer', [] );
-			$table->addColumn( 'parentid', 'integer', [] );
-			$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' => 200 ) );
-			$table->addColumn( 'address2', 'string', array( 'length' => 200 ) );
-			$table->addColumn( 'address3', 'string', array( 'length' => 200 ) );
-			$table->addColumn( 'postal', 'string', array( 'length' => 16 ) );
-			$table->addColumn( 'city', 'string', array( 'length' => 200 ) );
-			$table->addColumn( 'state', 'string', array( 'length' => 200 ) );
-			$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( 'longitude', 'decimal', array( 'precision' => 8, 'scale' => 6, 'notnull' => false ) );
-			$table->addColumn( 'latitude', 'decimal', array( 'precision' => 8, 'scale' => 6, 'notnull' => false ) );
-			$table->addColumn( 'flag', 'integer', [] );
-			$table->addColumn( 'pos', 'smallint', [] );
-			$table->addColumn( 'mtime', 'datetime', [] );
-			$table->addColumn( 'ctime', 'datetime', [] );
-			$table->addColumn( 'editor', 'string', array('length' => 255 ) );
-
-			$table->setPrimaryKey( array( 'id' ), 'pk_lvuad_id' );
-			$table->addIndex( array( 'parentid' ), 'idx_lvuad_pid' );
-			$table->addIndex( array( 'lastname', 'firstname' ), 'idx_lvuad_last_first' );
-			$table->addIndex( array( 'postal', 'address1' ), 'idx_lvuad_post_addr1' );
-			$table->addIndex( array( 'postal', 'city' ), 'idx_lvuad_post_city' );
-			$table->addIndex( array( 'address1' ), 'idx_lvuad_address1' );
-			$table->addIndex( array( 'city' ), 'idx_lvuad_city' );
-			$table->addIndex( array( 'email' ), 'idx_lvuad_email' );
+		'users_address' => function(\Doctrine\DBAL\Schema\Schema $schema) {
+
+			$table = $schema->createTable('users_address');
+
+			$table->addColumn('id', 'integer', array('autoincrement' => true));
+			$table->addColumn('siteid', 'integer', []);
+			$table->addColumn('parentid', 'integer', []);
+			$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' => 200));
+			$table->addColumn('address2', 'string', array('length' => 200));
+			$table->addColumn('address3', 'string', array('length' => 200));
+			$table->addColumn('postal', 'string', array('length' => 16));
+			$table->addColumn('city', 'string', array('length' => 200));
+			$table->addColumn('state', 'string', array('length' => 200));
+			$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('longitude', 'decimal', array('precision' => 8, 'scale' => 6, 'notnull' => false));
+			$table->addColumn('latitude', 'decimal', array('precision' => 8, 'scale' => 6, 'notnull' => false));
+			$table->addColumn('flag', 'integer', []);
+			$table->addColumn('pos', 'smallint', []);
+			$table->addColumn('mtime', 'datetime', []);
+			$table->addColumn('ctime', 'datetime', []);
+			$table->addColumn('editor', 'string', array('length' => 255));
+
+			$table->setPrimaryKey(array('id'), 'pk_lvuad_id');
+			$table->addIndex(array('parentid'), 'idx_lvuad_pid');
+			$table->addIndex(array('lastname', 'firstname'), 'idx_lvuad_last_first');
+			$table->addIndex(array('postal', 'address1'), 'idx_lvuad_post_addr1');
+			$table->addIndex(array('postal', 'city'), 'idx_lvuad_post_city');
+			$table->addIndex(array('address1'), 'idx_lvuad_address1');
+			$table->addIndex(array('city'), 'idx_lvuad_city');
+			$table->addIndex(array('email'), 'idx_lvuad_email');
 
 			return $schema;
 		},
 
-		'users_list_type' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'users_list_type' => function(\Doctrine\DBAL\Schema\Schema $schema) {
 
-			$table = $schema->createTable( 'users_list_type' );
+			$table = $schema->createTable('users_list_type');
 
-			$table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) );
-			$table->addColumn( 'siteid', 'integer', [] );
-			$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', [] );
-			$table->addColumn( 'mtime', 'datetime', [] );
-			$table->addColumn( 'ctime', 'datetime', [] );
-			$table->addColumn( 'editor', 'string', array( 'length' => 255 ) );
+			$table->addColumn('id', 'integer', array('autoincrement' => true));
+			$table->addColumn('siteid', 'integer', []);
+			$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', []);
+			$table->addColumn('mtime', 'datetime', []);
+			$table->addColumn('ctime', 'datetime', []);
+			$table->addColumn('editor', 'string', array('length' => 255));
 
-			$table->setPrimaryKey( array( 'id' ), 'pk_lvulity_id' );
-			$table->addUniqueIndex( array( 'siteid', 'domain', 'code' ), 'unq_lvulity_sid_dom_code' );
-			$table->addIndex( array( 'siteid', 'status' ), 'idx_lvulity_sid_status' );
-			$table->addIndex( array( 'siteid', 'label' ), 'idx_lvulity_sid_label' );
-			$table->addIndex( array( 'siteid', 'code' ), 'idx_lvulity_sid_code' );
+			$table->setPrimaryKey(array('id'), 'pk_lvulity_id');
+			$table->addUniqueIndex(array('siteid', 'domain', 'code'), 'unq_lvulity_sid_dom_code');
+			$table->addIndex(array('siteid', 'status'), 'idx_lvulity_sid_status');
+			$table->addIndex(array('siteid', 'label'), 'idx_lvulity_sid_label');
+			$table->addIndex(array('siteid', 'code'), 'idx_lvulity_sid_code');
 
 			return $schema;
 		},
 
-		'users_list' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
-
-			$table = $schema->createTable( 'users_list' );
-
-			$table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) );
-			$table->addColumn( 'parentid', 'integer', [] );
-			$table->addColumn( 'siteid', 'integer', [] );
-			$table->addColumn( 'typeid', 'integer', [] );
-			$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', [] );
-			$table->addColumn( 'status', 'smallint', [] );
-			$table->addColumn( 'mtime', 'datetime', [] );
-			$table->addColumn( 'ctime', 'datetime', [] );
-			$table->addColumn( 'editor', 'string', array( 'length' => 255 ) );
-
-			$table->setPrimaryKey( array( 'id' ), 'pk_lvuli_id' );
-			$table->addUniqueIndex( array( 'siteid', 'domain', 'refid', 'typeid', 'parentid' ), 'unq_lvuli_sid_dm_rid_tid_pid' );
-			$table->addIndex( array( 'siteid', 'status', 'start', 'end' ), 'idx_lvuli_sid_stat_start_end' );
-			$table->addIndex( array( 'parentid', 'siteid', 'refid', 'domain', 'typeid' ), 'idx_lvuli_pid_sid_rid_dom_tid' );
-			$table->addIndex( array( 'parentid', 'siteid', 'start' ), 'idx_lvuli_pid_sid_start' );
-			$table->addIndex( array( 'parentid', 'siteid', 'end' ), 'idx_lvuli_pid_sid_end' );
-			$table->addIndex( array( 'parentid', 'siteid', 'pos' ), 'idx_lvuli_pid_sid_pos' );
-
-			$table->addForeignKeyConstraint( 'users_list_type', array( 'typeid' ), array( 'id' ),
-				array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_lvuli_typeid' );
+		'users_list' => function(\Doctrine\DBAL\Schema\Schema $schema) {
+
+			$table = $schema->createTable('users_list');
+
+			$table->addColumn('id', 'integer', array('autoincrement' => true));
+			$table->addColumn('parentid', 'integer', []);
+			$table->addColumn('siteid', 'integer', []);
+			$table->addColumn('typeid', 'integer', []);
+			$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', []);
+			$table->addColumn('status', 'smallint', []);
+			$table->addColumn('mtime', 'datetime', []);
+			$table->addColumn('ctime', 'datetime', []);
+			$table->addColumn('editor', 'string', array('length' => 255));
+
+			$table->setPrimaryKey(array('id'), 'pk_lvuli_id');
+			$table->addUniqueIndex(array('siteid', 'domain', 'refid', 'typeid', 'parentid'), 'unq_lvuli_sid_dm_rid_tid_pid');
+			$table->addIndex(array('siteid', 'status', 'start', 'end'), 'idx_lvuli_sid_stat_start_end');
+			$table->addIndex(array('parentid', 'siteid', 'refid', 'domain', 'typeid'), 'idx_lvuli_pid_sid_rid_dom_tid');
+			$table->addIndex(array('parentid', 'siteid', 'start'), 'idx_lvuli_pid_sid_start');
+			$table->addIndex(array('parentid', 'siteid', 'end'), 'idx_lvuli_pid_sid_end');
+			$table->addIndex(array('parentid', 'siteid', 'pos'), 'idx_lvuli_pid_sid_pos');
+
+			$table->addForeignKeyConstraint('users_list_type', array('typeid'), array('id'),
+				array('onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE'), 'fk_lvuli_typeid');
 
 			return $schema;
 		},

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

Spacing +12 added lines, -12 removed lines

@@ -5,19 +5,19 @@
  * @copyright Aimeos (aimeos.org), 2014-2016
  */
 
-return array (
-	'customer/lists/type' => array (
-		'customer/group/default' => array( 'domain' => 'customer/group', 'code' => 'default', 'label' => 'Standard', 'status' => 1 ),
-		'order/download' => array( 'domain' => 'order', 'code' => 'download', 'label' => 'Download', 'status' => 1 ),
-		'product/favorite' => array( 'domain' => 'product', 'code' => 'favorite', 'label' => 'Favorite', 'status' => 1 ),
-		'product/watch' => array( 'domain' => 'product', 'code' => 'watch', 'label' => 'Watch list', 'status' => 1 ),
-		'text/default' => array( 'domain' => 'text', 'code' => 'default', 'label' => 'Standard', 'status' => 1 ),
+return array(
+	'customer/lists/type' => array(
+		'customer/group/default' => array('domain' => 'customer/group', 'code' => 'default', 'label' => 'Standard', 'status' => 1),
+		'order/download' => array('domain' => 'order', 'code' => 'download', 'label' => 'Download', 'status' => 1),
+		'product/favorite' => array('domain' => 'product', 'code' => 'favorite', 'label' => 'Favorite', 'status' => 1),
+		'product/watch' => array('domain' => 'product', 'code' => 'watch', 'label' => 'Watch list', 'status' => 1),
+		'text/default' => array('domain' => 'text', 'code' => 'default', 'label' => 'Standard', 'status' => 1),
 	),
 
-	'customer/lists' => array (
-		array( 'parentid' => 'customer/unitCustomer3', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/information', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => [], 'pos' => 1, 'status' => 1 ),
-		array( 'parentid' => 'customer/unitCustomer3', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/notify', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => [], 'pos' => 2, 'status' => 1 ),
-		array( 'parentid' => 'customer/unitCustomer3', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/newsletter', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => [], 'pos' => 3, 'status' => 1 ),
-		array( 'parentid' => 'customer/unitCustomer1', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/information', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => [], 'pos' => 1, 'status' => 1 ),
+	'customer/lists' => array(
+		array('parentid' => 'customer/unitCustomer3', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/information', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => [], 'pos' => 1, 'status' => 1),
+		array('parentid' => 'customer/unitCustomer3', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/notify', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => [], 'pos' => 2, 'status' => 1),
+		array('parentid' => 'customer/unitCustomer3', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/newsletter', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => [], 'pos' => 3, 'status' => 1),
+		array('parentid' => 'customer/unitCustomer1', 'typeid' => 'text/default', 'domain' => 'text', 'refid' => 'text/customer/information', 'start' => '2010-01-01 00:00:00', 'end' => '2100-01-01 00:00:00', 'config' => [], 'pos' => 1, 'status' => 1),
 	),
 );
\ No newline at end of file

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

Spacing +58 added lines, -58 removed lines

@@ -16,29 +16,29 @@ 
 	protected function setUp()
 	{
 		$this->editor = \TestHelper::getContext()->getEditor();
-		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( \TestHelper::getContext(), 'Laravel' );
+		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager(\TestHelper::getContext(), 'Laravel');
 
-		$listManager = $manager->getSubManager( 'lists', 'Laravel' );
-		$this->object = $listManager->getSubManager( 'type', 'Laravel' );
+		$listManager = $manager->getSubManager('lists', 'Laravel');
+		$this->object = $listManager->getSubManager('type', 'Laravel');
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->object );
+		unset($this->object);
 	}
 
 
 	public function testCleanup()
 	{
-		$this->object->cleanup( array( -1 ) );
+		$this->object->cleanup(array( -1 ));
 	}
 
 
 	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);
 	}
 
 
@@ -48,18 +48,18 @@ 
 		$search->setSlice(0, 1);
 		$results = $this->object->searchItems($search);
 
-		if( ( $expected = reset($results) ) === false ) {
-			throw new \RuntimeException( 'No list type item found' );
+		if (($expected = reset($results)) === false) {
+			throw new \RuntimeException('No list type item found');
 		}
 
-		$this->assertEquals( $expected, $this->object->getItem( $expected->getId() ) );
+		$this->assertEquals($expected, $this->object->getItem($expected->getId()));
 	}
 
 
 	public function testGetSubManager()
 	{
-		$this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
-		$this->object->getSubManager( 'unknown' );
+		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
+		$this->object->getSubManager('unknown');
 	}
 
 
@@ -69,51 +69,51 @@ 
 		$search->setSlice(0, 1);
 		$results = $this->object->searchItems($search);
 
-		if( ( $item = reset($results) ) === false ) {
-			throw new \RuntimeException( 'No type item found' );
+		if (($item = reset($results)) === false) {
+			throw new \RuntimeException('No type item found');
 		}
 
 		$item->setId(null);
-		$item->setCode( 'unitTestInit' );
-		$resultSaved = $this->object->saveItem( $item );
-		$itemSaved = $this->object->getItem( $item->getId() );
+		$item->setCode('unitTestInit');
+		$resultSaved = $this->object->saveItem($item);
+		$itemSaved = $this->object->getItem($item->getId());
 
 		$itemExp = clone $itemSaved;
-		$itemExp->setCode( 'unitTestSave' );
-		$resultUpd = $this->object->saveItem( $itemExp );
-		$itemUpd = $this->object->getItem( $itemExp->getId() );
+		$itemExp->setCode('unitTestSave');
+		$resultUpd = $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->assertInstanceOf( '\Aimeos\MShop\Common\Item\Iface', $resultSaved );
-		$this->assertInstanceOf( '\Aimeos\MShop\Common\Item\Iface', $resultUpd );
+		$this->assertInstanceOf('\Aimeos\MShop\Common\Item\Iface', $resultSaved);
+		$this->assertInstanceOf('\Aimeos\MShop\Common\Item\Iface', $resultUpd);
 
 		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
-		$this->object->getItem( $itemSaved->getId() );
+		$this->object->getItem($itemSaved->getId());
 	}
 
 
@@ -123,25 +123,25 @@ 
 		$search = $this->object->createSearch();
 
 		$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 ) );
+		$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, [], $total );
-		$this->assertEquals( 1, count( $results ) );
-		$this->assertEquals( 1, $total );
+		$results = $this->object->searchItems($search, [], $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());
 		}
 	}