aimeos / ai-laravel

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

Spacing +7 added lines, -7 removed lines

@@ -17,27 +17,27 @@
 
 	protected function setUp()
 	{
-		if( !class_exists( '\Illuminate\Http\Response' ) ) {
-			$this->markTestSkipped( '\Illuminate\Http\Response is not available' );
+		if (!class_exists('\Illuminate\Http\Response')) {
+			$this->markTestSkipped('\Illuminate\Http\Response 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();
-		$this->object = new \Aimeos\MW\View\Helper\Response\Laravel5( $view );
+		$this->object = new \Aimeos\MW\View\Helper\Response\Laravel5($view);
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->object, $this->mock );
+		unset($this->object, $this->mock);
 	}
 
 
 	public function testTransform()
 	{
-		$this->assertInstanceOf( '\Aimeos\MW\View\Helper\Response\Laravel5', $this->object->transform() );
+		$this->assertInstanceOf('\Aimeos\MW\View\Helper\Response\Laravel5', $this->object->transform());
 	}
 }

lib/custom/src/MW/View/Helper/Request/Laravel5.php

Spacing +16 added lines, -16 removed lines

@@ -34,11 +34,11 @@ 
 	 * @param \\Aimeos\MW\View\Iface $view View instance with registered view helpers
 	 * @param \Illuminate\Http\Request $request Laravel request object
 	 */
-	public function __construct( \Aimeos\MW\View\Iface $view, \Illuminate\Http\Request $request )
+	public function __construct(\Aimeos\MW\View\Iface $view, \Illuminate\Http\Request $request)
 	{
 		$this->request = $request;
 
-		parent::__construct( $view, $this->createRequest( $request ) );
+		parent::__construct($view, $this->createRequest($request));
 	}
 
 
@@ -60,7 +60,7 @@ 
 	 */
 	public function getTarget()
 	{
-		if( ( $route = $this->request->route() ) !== null ) {
+		if (($route = $this->request->route()) !== null) {
 			return $route->getName();
 		}
 	}
@@ -72,10 +72,10 @@ 
 	 * @param \Illuminate\Http\Request $nativeRequest Laravel request object
 	 * @return \Psr\Http\Message\ServerRequestInterface PSR-7 request object
 	 */
-	protected function createRequest( \Illuminate\Http\Request $nativeRequest )
+	protected function createRequest(\Illuminate\Http\Request $nativeRequest)
 	{
-		$files = ServerRequestFactory::normalizeFiles( $this->getFiles( $nativeRequest->files->all() ) );
-		$server = ServerRequestFactory::normalizeServer( $nativeRequest->server->all() );
+		$files = ServerRequestFactory::normalizeFiles($this->getFiles($nativeRequest->files->all()));
+		$server = ServerRequestFactory::normalizeServer($nativeRequest->server->all());
 		$headers = $nativeRequest->headers->all();
 		$cookies = $nativeRequest->cookies->all();
 		$post = $nativeRequest->request->all();
@@ -83,13 +83,13 @@ 
 		$method = $nativeRequest->getMethod();
 		$uri = $nativeRequest->getUri();
 
-		$body = new Stream( 'php://temp', 'wb+' );
-		$body->write( $nativeRequest->getContent() );
+		$body = new Stream('php://temp', 'wb+');
+		$body->write($nativeRequest->getContent());
 
-		$request = new ServerRequest( $server, $files, $uri, $method, $body, $headers, $cookies, $query, $post );
+		$request = new ServerRequest($server, $files, $uri, $method, $body, $headers, $cookies, $query, $post);
 
-		foreach( $nativeRequest->attributes->all() as $key => $value ) {
-			$request = $request->withAttribute( $key, $value );
+		foreach ($nativeRequest->attributes->all() as $key => $value) {
+			$request = $request->withAttribute($key, $value);
 		}
 
 		return $request;
@@ -102,13 +102,13 @@ 
 	 * @param array $files Multi-dimensional list of uploaded files from Symfony request
 	 * @return array Multi-dimensional list of uploaded files as PSR-7 objects
 	 */
-	protected function getFiles( array $files )
+	protected function getFiles(array $files)
 	{
 		$list = array();
 
-		foreach( $files as $key => $value )
+		foreach ($files as $key => $value)
 		{
-			if( $value instanceof \Symfony\Component\HttpFoundation\File\UploadedFile )
+			if ($value instanceof \Symfony\Component\HttpFoundation\File\UploadedFile)
 			{
 				$list[$key] = new \Zend\Diactoros\UploadedFile(
 					$value->getRealPath(),
@@ -118,9 +118,9 @@ 
 					$value->getClientMimeType()
 				);
 			}
-			elseif( is_array( $value ) )
+			elseif (is_array($value))
 			{
-				$list[$key] = $this->getFiles( $value );
+				$list[$key] = $this->getFiles($value);
 			}
 		}
 

lib/custom/src/MW/View/Helper/Url/Laravel5.php

Spacing +8 added lines, -8 removed lines

@@ -32,9 +32,9 @@ 
 	 * @param \Illuminate\Contracts\Routing\UrlGenerator $builder Laravel URL builder object
 	 * @param array Associative list of fixed parameters that should be available for all routes
 	 */
-	public function __construct( \Aimeos\MW\View\Iface $view, \Illuminate\Contracts\Routing\UrlGenerator $builder, array $fixed )
+	public function __construct(\Aimeos\MW\View\Iface $view, \Illuminate\Contracts\Routing\UrlGenerator $builder, array $fixed)
 	{
-		parent::__construct( $view );
+		parent::__construct($view);
 
 		$this->builder = $builder;
 		$this->fixed = $fixed;
@@ -52,12 +52,12 @@ 
 	 * @param array $config Additional configuration parameter per URL
 	 * @return string Complete URL that can be used in the template
 	 */
-	public function transform( $target = null, $controller = null, $action = null, array $params = array(), array $trailing = array(), array $config = array() )
+	public function transform($target = null, $controller = null, $action = null, array $params = array(), array $trailing = array(), array $config = array())
 	{
-		$params = $this->sanitize( $params );
-		$values = $this->getValues( $config );
+		$params = $this->sanitize($params);
+		$values = $this->getValues($config);
 
-		return $this->builder->route( $target, $params + $this->fixed, $values['absoluteUri'] );
+		return $this->builder->route($target, $params + $this->fixed, $values['absoluteUri']);
 	}
 
 
@@ -67,13 +67,13 @@ 
 	 * @param array $config Associative list of key/value pairs
 	 * @return array Associative list of sanitized key/value pairs
 	 */
-	protected function getValues( array $config )
+	protected function getValues(array $config)
 	{
 		$values = array(
 			'absoluteUri' => false,
 		);
 
-		if( isset( $config['absoluteUri'] ) ) {
+		if (isset($config['absoluteUri'])) {
 			$values['absoluteUri'] = (bool) $config['absoluteUri'];
 		}
 

lib/custom/tests/MW/Logger/Laravel5Test.php

Spacing +21 added lines, -21 removed lines

@@ -20,12 +20,12 @@ 
 	 */
 	protected function setUp()
 	{
-		if( interface_exists( '\\Illuminate\\Contracts\\Logging\\Log' ) === false ) {
-			$this->markTestSkipped( 'Class \\Illuminate\\Contracts\\Logging\\Log not found' );
+		if (interface_exists('\\Illuminate\\Contracts\\Logging\\Log') === false) {
+			$this->markTestSkipped('Class \\Illuminate\\Contracts\\Logging\\Log not found');
 		}
 
-		$this->mock = $this->getMockBuilder( '\\Illuminate\\Contracts\\Logging\\Log' )->getMock();
-		$this->object = new \Aimeos\MW\Logger\Laravel5( $this->mock );
+		$this->mock = $this->getMockBuilder('\\Illuminate\\Contracts\\Logging\\Log')->getMock();
+		$this->object = new \Aimeos\MW\Logger\Laravel5($this->mock);
 	}
 
 
@@ -37,42 +37,42 @@ 
 	 */
 	protected function tearDown()
 	{
-		unset( $this->mock, $this->object );
+		unset($this->mock, $this->object);
 	}
 
 
 	public function testLog()
 	{
-		$this->mock->expects( $this->once() )->method( 'log' )
-			->with( $this->equalTo( 'msg' ), $this->equalTo( 'error' ) );
-		$this->object->log( 'msg' );
+		$this->mock->expects($this->once())->method('log')
+			->with($this->equalTo('msg'), $this->equalTo('error'));
+		$this->object->log('msg');
 	}
 
 
 	public function testNonScalarLog()
 	{
-		$this->mock->expects( $this->once() )->method( 'log' )
-			->with( $this->equalTo( '["error","error2",2]' ), $this->equalTo( 'error' ) );
-		$this->object->log( array( 'error', 'error2', 2 ) );
+		$this->mock->expects($this->once())->method('log')
+			->with($this->equalTo('["error","error2",2]'), $this->equalTo('error'));
+		$this->object->log(array('error', 'error2', 2));
 	}
 
 
 	public function testLogDebug()
 	{
-		$this->object->log( 'emergency', \Aimeos\MW\Logger\Base::EMERG );
-		$this->object->log( 'alert', \Aimeos\MW\Logger\Base::ALERT );
-		$this->object->log( 'critical', \Aimeos\MW\Logger\Base::CRIT );
-		$this->object->log( 'error', \Aimeos\MW\Logger\Base::ERR );
-		$this->object->log( 'warning', \Aimeos\MW\Logger\Base::WARN );
-		$this->object->log( 'notice', \Aimeos\MW\Logger\Base::NOTICE );
-		$this->object->log( 'info', \Aimeos\MW\Logger\Base::INFO );
-		$this->object->log( 'debug', \Aimeos\MW\Logger\Base::DEBUG );
+		$this->object->log('emergency', \Aimeos\MW\Logger\Base::EMERG);
+		$this->object->log('alert', \Aimeos\MW\Logger\Base::ALERT);
+		$this->object->log('critical', \Aimeos\MW\Logger\Base::CRIT);
+		$this->object->log('error', \Aimeos\MW\Logger\Base::ERR);
+		$this->object->log('warning', \Aimeos\MW\Logger\Base::WARN);
+		$this->object->log('notice', \Aimeos\MW\Logger\Base::NOTICE);
+		$this->object->log('info', \Aimeos\MW\Logger\Base::INFO);
+		$this->object->log('debug', \Aimeos\MW\Logger\Base::DEBUG);
 	}
 
 
 	public function testBadPriority()
 	{
-		$this->setExpectedException( '\\Aimeos\\MW\\Logger\\Exception' );
-		$this->object->log( 'error', -1 );
+		$this->setExpectedException('\\Aimeos\\MW\\Logger\\Exception');
+		$this->object->log('error', -1);
 	}
 }

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, array() );
+		$this->mock = $this->getMockBuilder('\\Illuminate\\Contracts\\Routing\\UrlGenerator')->getMock();
+		$this->object = new \Aimeos\MW\View\Helper\Url\Laravel5($view, $this->mock, array());
 	}
 
 
@@ -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( array() ), $this->equalTo( true ) );
+		$this->mock->expects($this->once())->method('route')
+			->with($this->equalTo('route'), $this->equalTo(array()), $this->equalTo(true));
 
-		$options = array( 'absoluteUri' => true );
-		$this->object->transform( 'route', 'catalog', 'lists', array(), array(), $options );
+		$options = array('absoluteUri' => true);
+		$this->object->transform('route', 'catalog', 'lists', array(), array(), $options);
 	}
 }

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

Spacing +124 added lines, -124 removed lines

@@ -11,348 +11,348 @@
 
 	protected function setUp()
 	{
-		if( !interface_exists( '\\Illuminate\\Contracts\\Filesystem\\Filesystem' ) ) {
-			$this->markTestSkipped( 'Install Laravel framework first' );
+		if (!interface_exists('\\Illuminate\\Contracts\\Filesystem\\Filesystem')) {
+			$this->markTestSkipped('Install Laravel framework first');
 		}
 
-		$this->mock = $this->getMockBuilder( '\\Illuminate\\Contracts\\Filesystem\\Filesystem' )
+		$this->mock = $this->getMockBuilder('\\Illuminate\\Contracts\\Filesystem\\Filesystem')
 			->disableOriginalConstructor()
 			->getMock();
 
-		$this->object = new \Aimeos\MW\Filesystem\Laravel( $this->mock, sys_get_temp_dir() );
+		$this->object = new \Aimeos\MW\Filesystem\Laravel($this->mock, sys_get_temp_dir());
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->object );
+		unset($this->object);
 	}
 
 
 	public function testIsdir()
 	{
-		$this->mock->expects( $this->once() )->method( 'directories' )
-			->will( $this->returnValue( array( 't', 'test', 'es' ) ) );
+		$this->mock->expects($this->once())->method('directories')
+			->will($this->returnValue(array('t', 'test', 'es')));
 
-		$this->assertTrue( $this->object->isdir( 'test' ) );
+		$this->assertTrue($this->object->isdir('test'));
 	}
 
 
 	public function testIsdirFalse()
 	{
-		$this->mock->expects( $this->once() )->method( 'directories' )
-			->will( $this->returnValue( array( 't', 'es' ) ) );
+		$this->mock->expects($this->once())->method('directories')
+			->will($this->returnValue(array('t', 'es')));
 
-		$this->assertFalse( $this->object->isdir( 'test' ) );
+		$this->assertFalse($this->object->isdir('test'));
 	}
 
 
 	public function testMkdir()
 	{
-		$this->mock->expects( $this->once() )->method( 'makeDirectory' );
+		$this->mock->expects($this->once())->method('makeDirectory');
 
-		$this->object->mkdir( 'test' );
+		$this->object->mkdir('test');
 	}
 
 
 	public function testMkdirException()
 	{
-		$this->mock->expects( $this->once() )->method( 'makeDirectory' )
-			->will( $this->throwException( new \RuntimeException() ) );
+		$this->mock->expects($this->once())->method('makeDirectory')
+			->will($this->throwException(new \RuntimeException()));
 
-		$this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' );
-		$this->object->mkdir( 'test' );
+		$this->setExpectedException('\Aimeos\MW\Filesystem\Exception');
+		$this->object->mkdir('test');
 	}
 
 
 	public function testRmdir()
 	{
-		$this->mock->expects( $this->once() )->method( 'deleteDirectory' );
+		$this->mock->expects($this->once())->method('deleteDirectory');
 
-		$this->object->rmdir( 'test' );
+		$this->object->rmdir('test');
 	}
 
 
 	public function testRmdirException()
 	{
-		$this->mock->expects( $this->once() )->method( 'deleteDirectory' )
-			->will( $this->throwException( new \RuntimeException() ) );
+		$this->mock->expects($this->once())->method('deleteDirectory')
+			->will($this->throwException(new \RuntimeException()));
 
-		$this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' );
-		$this->object->rmdir( 'test' );
+		$this->setExpectedException('\Aimeos\MW\Filesystem\Exception');
+		$this->object->rmdir('test');
 	}
 
 
 	public function testScan()
 	{
-		$list = array( 't', 'es', 'st' );
+		$list = array('t', 'es', 'st');
 
-		$this->mock->expects( $this->once() )->method( 'directories' )
-			->will( $this->returnValue( array( 't', 'es' ) ) );
+		$this->mock->expects($this->once())->method('directories')
+			->will($this->returnValue(array('t', 'es')));
 
-		$this->mock->expects( $this->once() )->method( 'files' )
-			->will( $this->returnValue( array( 'st' ) ) );
+		$this->mock->expects($this->once())->method('files')
+			->will($this->returnValue(array('st')));
 
 		$result = $this->object->scan();
 
-		$this->assertInternalType( 'array', $result );
+		$this->assertInternalType('array', $result);
 
-		foreach( $result as $entry ) {
-			$this->assertTrue( in_array( $entry, $list ) );
+		foreach ($result as $entry) {
+			$this->assertTrue(in_array($entry, $list));
 		}
 	}
 
 
 	public function testScanException()
 	{
-		$this->mock->expects( $this->once() )->method( 'directories' )
-			->will( $this->throwException( new \RuntimeException() ) );
+		$this->mock->expects($this->once())->method('directories')
+			->will($this->throwException(new \RuntimeException()));
 
-		$this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' );
-		$this->object->scan( 'test' );
+		$this->setExpectedException('\Aimeos\MW\Filesystem\Exception');
+		$this->object->scan('test');
 	}
 
 
 	public function testSize()
 	{
-		$this->mock->expects( $this->once() )->method( 'size' )
-			->will( $this->returnValue( 4 ) );
+		$this->mock->expects($this->once())->method('size')
+			->will($this->returnValue(4));
 
-		$result = $this->object->size( 'test' );
+		$result = $this->object->size('test');
 
-		$this->assertEquals( 4, $result );
+		$this->assertEquals(4, $result);
 	}
 
 
 	public function testSizeException()
 	{
-		$this->mock->expects( $this->once() )->method( 'size' )
-			->will( $this->throwException( new \RuntimeException() ) );
+		$this->mock->expects($this->once())->method('size')
+			->will($this->throwException(new \RuntimeException()));
 
-		$this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' );
-		$this->object->size( 'test' );
+		$this->setExpectedException('\Aimeos\MW\Filesystem\Exception');
+		$this->object->size('test');
 	}
 
 
 	public function testTime()
 	{
-		$this->mock->expects( $this->once() )->method( 'lastModified' )
-			->will( $this->returnValue( 1 ) );
+		$this->mock->expects($this->once())->method('lastModified')
+			->will($this->returnValue(1));
 
-		$result = $this->object->time( 'test' );
+		$result = $this->object->time('test');
 
-		$this->assertGreaterThan( 0, $result );
+		$this->assertGreaterThan(0, $result);
 	}
 
 
 	public function testTimeException()
 	{
-		$this->mock->expects( $this->once() )->method( 'lastModified' )
-			->will( $this->throwException( new \RuntimeException() ) );
+		$this->mock->expects($this->once())->method('lastModified')
+			->will($this->throwException(new \RuntimeException()));
 
-		$this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' );
-		$this->object->time( 'test' );
+		$this->setExpectedException('\Aimeos\MW\Filesystem\Exception');
+		$this->object->time('test');
 	}
 
 
 	public function testRm()
 	{
-		$this->mock->expects( $this->once() )->method( 'delete' );
+		$this->mock->expects($this->once())->method('delete');
 
-		$this->object->rm( 'test' );
+		$this->object->rm('test');
 	}
 
 
 	public function testRmException()
 	{
-		$this->mock->expects( $this->once() )->method( 'delete' )
-			->will( $this->throwException( new \RuntimeException() ) );
+		$this->mock->expects($this->once())->method('delete')
+			->will($this->throwException(new \RuntimeException()));
 
-		$this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' );
-		$this->object->rm( 'test' );
+		$this->setExpectedException('\Aimeos\MW\Filesystem\Exception');
+		$this->object->rm('test');
 	}
 
 
 	public function testHas()
 	{
-		$this->mock->expects( $this->once() )->method( 'exists' )
-			->will( $this->returnValue( true ) );
+		$this->mock->expects($this->once())->method('exists')
+			->will($this->returnValue(true));
 
-		$result = $this->object->has( 'test' );
+		$result = $this->object->has('test');
 
-		$this->assertTrue( $result );
+		$this->assertTrue($result);
 	}
 
 
 	public function testHasFalse()
 	{
-		$this->mock->expects( $this->once() )->method( 'exists' )
-			->will( $this->returnValue( false ) );
+		$this->mock->expects($this->once())->method('exists')
+			->will($this->returnValue(false));
 
-		$result = $this->object->has( 'test' );
+		$result = $this->object->has('test');
 
-		$this->assertFalse( $result );
+		$this->assertFalse($result);
 	}
 
 
 	public function testRead()
 	{
-		$this->mock->expects( $this->once() )->method( 'get' )
-			->will( $this->returnValue( 'test' ) );
+		$this->mock->expects($this->once())->method('get')
+			->will($this->returnValue('test'));
 
-		$result = $this->object->read( 'file' );
+		$result = $this->object->read('file');
 
-		$this->assertEquals( 'test', $result );
+		$this->assertEquals('test', $result);
 	}
 
 
 	public function testReadException()
 	{
-		$this->mock->expects( $this->once() )->method( 'get' )
-			->will( $this->throwException( new \RuntimeException() ) );
+		$this->mock->expects($this->once())->method('get')
+			->will($this->throwException(new \RuntimeException()));
 
-		$this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' );
-		$this->object->read( 'readinvalid' );
+		$this->setExpectedException('\Aimeos\MW\Filesystem\Exception');
+		$this->object->read('readinvalid');
 	}
 
 
 	public function testReadf()
 	{
-		$this->mock->expects( $this->once() )->method( 'get' )
-			->will( $this->returnValue( 'test' ) );
+		$this->mock->expects($this->once())->method('get')
+			->will($this->returnValue('test'));
 
-		$result = $this->object->readf( 'file' );
+		$result = $this->object->readf('file');
 
-		$this->assertEquals( 'test', file_get_contents( $result ) );
-		unlink( $result );
+		$this->assertEquals('test', file_get_contents($result));
+		unlink($result);
 	}
 
 
 	public function testReads()
 	{
-		$this->mock->expects( $this->once() )->method( 'get' )
-			->will( $this->returnValue( 'test' ) );
+		$this->mock->expects($this->once())->method('get')
+			->will($this->returnValue('test'));
 
-		$handle = $this->object->reads( 'file' );
+		$handle = $this->object->reads('file');
 
-		$this->assertInternalType( 'resource', $handle );
-		$this->assertEquals( 'test', fgets( $handle ) );
+		$this->assertInternalType('resource', $handle);
+		$this->assertEquals('test', fgets($handle));
 
-		fclose( $handle );
+		fclose($handle);
 	}
 
 
 	public function testReadsException()
 	{
-		$this->mock->expects( $this->once() )->method( 'get' )
-			->will( $this->throwException( new \RuntimeException() ) );
+		$this->mock->expects($this->once())->method('get')
+			->will($this->throwException(new \RuntimeException()));
 
-		$this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' );
-		$this->object->reads( 'readinvalid' );
+		$this->setExpectedException('\Aimeos\MW\Filesystem\Exception');
+		$this->object->reads('readinvalid');
 	}
 
 
 	public function testWrite()
 	{
-		$this->mock->expects( $this->once() )->method( 'put' );
+		$this->mock->expects($this->once())->method('put');
 
-		$this->object->write( 'file', 'test' );
+		$this->object->write('file', 'test');
 	}
 
 
 	public function testWriteException()
 	{
-		$this->mock->expects( $this->once() )->method( 'put' )
-			->will( $this->throwException( new \RuntimeException() ) );
+		$this->mock->expects($this->once())->method('put')
+			->will($this->throwException(new \RuntimeException()));
 
-		$this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' );
-		$this->object->write( '', 'test' );
+		$this->setExpectedException('\Aimeos\MW\Filesystem\Exception');
+		$this->object->write('', 'test');
 	}
 
 
 	public function testWritef()
 	{
-		$file = sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'file99';
-		file_put_contents( $file, 'test' );
+		$file = sys_get_temp_dir().DIRECTORY_SEPARATOR.'file99';
+		file_put_contents($file, 'test');
 
-		$this->mock->expects( $this->once() )->method( 'put' );
+		$this->mock->expects($this->once())->method('put');
 
-		$this->object->writef( 'file', $file );
+		$this->object->writef('file', $file);
 
-		unlink( $file );
+		unlink($file);
 	}
 
 
 	public function testWritefException()
 	{
-		$this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' );
-		$this->object->writef( '', 'invalid' );
+		$this->setExpectedException('\Aimeos\MW\Filesystem\Exception');
+		$this->object->writef('', 'invalid');
 	}
 
 
 	public function testWrites()
 	{
-		$this->mock->expects( $this->once() )->method( 'put' );
+		$this->mock->expects($this->once())->method('put');
 
-		$handle = fopen( __FILE__, 'r' );
+		$handle = fopen(__FILE__, 'r');
 
-		$this->object->writes( 'file', $handle );
+		$this->object->writes('file', $handle);
 
-		fclose( $handle );
+		fclose($handle);
 	}
 
 
 	public function testWritesException()
 	{
-		$this->mock->expects( $this->once() )->method( 'put' )
-			->will( $this->throwException( new \RuntimeException() ) );
+		$this->mock->expects($this->once())->method('put')
+			->will($this->throwException(new \RuntimeException()));
 
-		$handle = fopen( __FILE__, 'r' );
+		$handle = fopen(__FILE__, 'r');
 
-		$this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' );
-		$this->object->writes( 'file', $handle );
+		$this->setExpectedException('\Aimeos\MW\Filesystem\Exception');
+		$this->object->writes('file', $handle);
 	}
 
 
 	public function testWritesException2()
 	{
-		$this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' );
-		$this->object->writes( 'file', null );
+		$this->setExpectedException('\Aimeos\MW\Filesystem\Exception');
+		$this->object->writes('file', null);
 	}
 
 
 	public function testMove()
 	{
-		$this->mock->expects( $this->once() )->method( 'move' );
+		$this->mock->expects($this->once())->method('move');
 
-		$this->object->move( 'file1', 'file2' );
+		$this->object->move('file1', 'file2');
 	}
 
 
 	public function testMoveException()
 	{
-		$this->mock->expects( $this->once() )->method( 'move' )
-			->will( $this->throwException( new \RuntimeException() ) );
+		$this->mock->expects($this->once())->method('move')
+			->will($this->throwException(new \RuntimeException()));
 
-		$this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' );
-		$this->object->move( 'file1', 'file2' );
+		$this->setExpectedException('\Aimeos\MW\Filesystem\Exception');
+		$this->object->move('file1', 'file2');
 	}
 
 
 	public function testCopy()
 	{
-		$this->mock->expects( $this->once() )->method( 'copy' );
+		$this->mock->expects($this->once())->method('copy');
 
-		$this->object->copy( 'file1', 'file2' );
+		$this->object->copy('file1', 'file2');
 	}
 
 
 	public function testCopyException()
 	{
-		$this->mock->expects( $this->once() )->method( 'copy' )
-			->will( $this->throwException( new \RuntimeException() ) );
+		$this->mock->expects($this->once())->method('copy')
+			->will($this->throwException(new \RuntimeException()));
 
-		$this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' );
-		$this->object->copy( 'file1', 'file2' );
+		$this->setExpectedException('\Aimeos\MW\Filesystem\Exception');
+		$this->object->copy('file1', 'file2');
 	}
 }

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

Spacing +56 added lines, -56 removed lines

@@ -22,10 +22,10 @@ 
 	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');
 	}
 
 
@@ -37,20 +37,20 @@ 
 	 */
 	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);
 	}
 
 
@@ -60,18 +60,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');
 	}
 
 
@@ -81,48 +81,48 @@ 
 		$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' );
-		$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());
 	}
 
 
@@ -132,25 +132,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

Spacing +131 added lines, -131 removed lines

@@ -8,152 +8,152 @@
 
 return array(
 	'table' => array(
-		'users' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
-
-			$table = $schema->createTable( 'users' );
-
-			$table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) );
-			$table->addColumn( 'label', 'string', array( 'length' => 255 ) );
-			$table->addColumn( 'name', 'string', array( 'length' => 255 ) );
-			$table->addColumn( 'remember_token', 'string', array( 'length' => 100, 'notnull' => false ) );
-			$table->addColumn( 'salutation', 'string', array( 'length' => 8 ) );
-			$table->addColumn( 'company', 'string', array( 'length' => 100 ) );
-			$table->addColumn( 'vatid', 'string', array( 'length' => 32 ) );
-			$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( 'telefax', 'string', array( 'length' => 32 ) );
-			$table->addColumn( 'website', 'string', array( 'length' => 255 ) );
-			$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() );
-			$table->addColumn( 'updated_at', 'datetime', array() );
-			$table->addColumn( 'created_at', 'datetime', array() );
-			$table->addColumn( 'editor', 'string', array('length' => 255 ) );
-
-			$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('label', 'string', array('length' => 255));
+			$table->addColumn('name', 'string', array('length' => 255));
+			$table->addColumn('remember_token', 'string', array('length' => 100, 'notnull' => false));
+			$table->addColumn('salutation', 'string', array('length' => 8));
+			$table->addColumn('company', 'string', array('length' => 100));
+			$table->addColumn('vatid', 'string', array('length' => 32));
+			$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('telefax', 'string', array('length' => 32));
+			$table->addColumn('website', 'string', array('length' => 255));
+			$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());
+			$table->addColumn('updated_at', 'datetime', array());
+			$table->addColumn('created_at', 'datetime', array());
+			$table->addColumn('editor', 'string', array('length' => 255));
+
+			$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', 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' => 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', 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_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_lvusr_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', 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' => 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', 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_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_lvusr_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', 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_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', 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_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', 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_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/tests/MShop/Customer/Manager/LaravelTest.php

Spacing +138 added lines, -138 removed lines

@@ -22,14 +22,14 @@ 
 	{
 		$context = \TestHelper::getContext();
 		$this->editor = $context->getEditor();
-		$this->object = new \Aimeos\MShop\Customer\Manager\Laravel( $context );
+		$this->object = new \Aimeos\MShop\Customer\Manager\Laravel($context);
 
 		$this->fixture = array(
 			'label' => 'unitTest',
 			'status' => 2,
 		);
 
-		$this->address = new \Aimeos\MShop\Common\Item\Address\Standard( 'common.address.' );
+		$this->address = new \Aimeos\MShop\Common\Item\Address\Standard('common.address.');
 	}
 
 
@@ -38,28 +38,28 @@ 
 	 */
 	protected function tearDown()
 	{
-		unset( $this->object, $this->fixture, $this->address );
+		unset($this->object, $this->fixture, $this->address);
 	}
 
 
 	public function testCleanup()
 	{
-		$this->object->cleanup( array( -1 ) );
+		$this->object->cleanup(array( -1 ));
 	}
 
 
 	public function testGetSearchAttributes()
 	{
-		foreach( $this->object->getSearchAttributes() as $attribute )
+		foreach ($this->object->getSearchAttributes() as $attribute)
 		{
-			$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute );
+			$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute);
 		}
 	}
 
 
 	public function testCreateItem()
 	{
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Customer\\Item\\Iface', $this->object->createItem() );
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Customer\\Item\\Iface', $this->object->createItem());
 	}
 
 
@@ -67,21 +67,21 @@ 
 	{
 		$search = $this->object->createSearch();
 		$conditions = array(
-			$search->compare( '==', 'customer.code', 'unitCustomer3' ),
-			$search->compare( '==', 'customer.editor', $this->editor )
+			$search->compare('==', 'customer.code', 'unitCustomer3'),
+			$search->compare('==', 'customer.editor', $this->editor)
 		);
-		$search->setConditions( $search->combine( '&&', $conditions ) );
-		$items = $this->object->searchItems( $search, array( 'text' ) );
+		$search->setConditions($search->combine('&&', $conditions));
+		$items = $this->object->searchItems($search, array('text'));
 
-		if( ( $expected = reset( $items ) ) === false ) {
-			throw new \RuntimeException( 'No customer item with code "unitCustomer3" found' );
+		if (($expected = reset($items)) === false) {
+			throw new \RuntimeException('No customer item with code "unitCustomer3" found');
 		}
 
-		$actual = $this->object->getItem( $expected->getId(), array( 'text' ) );
+		$actual = $this->object->getItem($expected->getId(), array('text'));
 
-		$this->assertEquals( $expected, $actual );
-		$this->assertEquals( 3, count( $actual->getListItems( 'text' ) ) );
-		$this->assertEquals( 3, count( $actual->getRefItems( 'text' ) ) );
+		$this->assertEquals($expected, $actual);
+		$this->assertEquals(3, count($actual->getListItems('text')));
+		$this->assertEquals(3, count($actual->getRefItems('text')));
 	}
 
 
@@ -89,54 +89,54 @@ 
 	{
 		$item = $this->object->createItem();
 
-		$item->setCode( 'unitTest' );
-		$item->setLabel( 'unitTest' );
-		$this->object->saveItem( $item );
-		$itemSaved = $this->object->getItem( $item->getId() );
+		$item->setCode('unitTest');
+		$item->setLabel('unitTest');
+		$this->object->saveItem($item);
+		$itemSaved = $this->object->getItem($item->getId());
 
 		$itemExp = clone $itemSaved;
-		$itemExp->setCode( 'unitTest2' );
-		$itemExp->setLabel( 'unitTest2' );
-		$this->object->saveItem( $itemExp );
-		$itemUpd = $this->object->getItem( $itemExp->getId() );
-
-		$this->object->deleteItem( $item->getId() );
-
-		$this->assertTrue( $item->getId() !== null );
-		$this->assertEquals( $item->getId(), $itemSaved->getId() );
-		$this->assertEquals( $item->getSiteId(), $itemSaved->getSiteId() );
-		$this->assertEquals( $item->getStatus(), $itemSaved->getStatus() );
-		$this->assertEquals( $item->getCode(), $itemSaved->getCode() );
-		$this->assertEquals( $item->getLabel(), $itemSaved->getLabel() );
-		$this->assertEquals( $item->getPaymentAddress(), $itemSaved->getPaymentAddress() );
-		$this->assertEquals( $item->getBirthday(), $itemSaved->getBirthday() );
-		$this->assertEquals( $item->getPassword(), $itemSaved->getPassword() );
-
-		$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->getStatus(), $itemUpd->getStatus() );
-		$this->assertEquals( $itemExp->getCode(), $itemUpd->getCode() );
-		$this->assertEquals( $itemExp->getLabel(), $itemUpd->getLabel() );
-		$this->assertEquals( $itemExp->getPaymentAddress(), $itemUpd->getPaymentAddress() );
-		$this->assertEquals( $itemExp->getBirthday(), $itemUpd->getBirthday() );
-		$this->assertEquals( $itemExp->getPassword(), $itemUpd->getPassword() );
-
-		$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( $item->getId() );
+		$itemExp->setCode('unitTest2');
+		$itemExp->setLabel('unitTest2');
+		$this->object->saveItem($itemExp);
+		$itemUpd = $this->object->getItem($itemExp->getId());
+
+		$this->object->deleteItem($item->getId());
+
+		$this->assertTrue($item->getId() !== null);
+		$this->assertEquals($item->getId(), $itemSaved->getId());
+		$this->assertEquals($item->getSiteId(), $itemSaved->getSiteId());
+		$this->assertEquals($item->getStatus(), $itemSaved->getStatus());
+		$this->assertEquals($item->getCode(), $itemSaved->getCode());
+		$this->assertEquals($item->getLabel(), $itemSaved->getLabel());
+		$this->assertEquals($item->getPaymentAddress(), $itemSaved->getPaymentAddress());
+		$this->assertEquals($item->getBirthday(), $itemSaved->getBirthday());
+		$this->assertEquals($item->getPassword(), $itemSaved->getPassword());
+
+		$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->getStatus(), $itemUpd->getStatus());
+		$this->assertEquals($itemExp->getCode(), $itemUpd->getCode());
+		$this->assertEquals($itemExp->getLabel(), $itemUpd->getLabel());
+		$this->assertEquals($itemExp->getPaymentAddress(), $itemUpd->getPaymentAddress());
+		$this->assertEquals($itemExp->getBirthday(), $itemUpd->getBirthday());
+		$this->assertEquals($itemExp->getPassword(), $itemUpd->getPassword());
+
+		$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($item->getId());
 	}
 
 
 	public function testCreateSearch()
 	{
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $this->object->createSearch() );
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $this->object->createSearch());
 	}
 
 
@@ -146,69 +146,69 @@ 
 		$search = $this->object->createSearch();
 
 		$expr = array();
-		$expr[] = $search->compare( '!=', 'customer.id', null );
-		$expr[] = $search->compare( '==', 'customer.label', 'Erika Mustermann' );
-		$expr[] = $search->compare( '==', 'customer.code', 'unitCustomer2' );
-
-		$expr[] = $search->compare( '>=', 'customer.salutation', '' );
-		$expr[] = $search->compare( '>=', 'customer.company', '' );
-		$expr[] = $search->compare( '>=', 'customer.vatid', '' );
-		$expr[] = $search->compare( '>=', 'customer.title', '' );
-		$expr[] = $search->compare( '>=', 'customer.firstname', '' );
-		$expr[] = $search->compare( '>=', 'customer.lastname', '' );
-		$expr[] = $search->compare( '>=', 'customer.address1', '' );
-		$expr[] = $search->compare( '>=', 'customer.address2', '' );
-		$expr[] = $search->compare( '>=', 'customer.address3', '' );
-		$expr[] = $search->compare( '>=', 'customer.postal', '' );
-		$expr[] = $search->compare( '>=', 'customer.city', '' );
-		$expr[] = $search->compare( '>=', 'customer.state', '' );
-		$expr[] = $search->compare( '!=', 'customer.languageid', null );
-		$expr[] = $search->compare( '>=', 'customer.countryid', '' );
-		$expr[] = $search->compare( '>=', 'customer.telephone', '' );
-		$expr[] = $search->compare( '>=', 'customer.email', '' );
-		$expr[] = $search->compare( '>=', 'customer.telefax', '' );
-		$expr[] = $search->compare( '>=', 'customer.website', '' );
-		$expr[] = $search->compare( '>=', 'customer.longitude', '10.0' );
-		$expr[] = $search->compare( '>=', 'customer.latitude', '50.0' );
-
-		$expr[] = $search->compare( '==', 'customer.birthday', '1970-01-01' );
-		$expr[] = $search->compare( '>=', 'customer.password', '' );
-		$expr[] = $search->compare( '==', 'customer.status', 0 );
-		$expr[] = $search->compare( '!=', 'customer.mtime', '1970-01-01 00:00:00' );
-		$expr[] = $search->compare( '!=', 'customer.ctime', '1970-01-01 00:00:00' );
-		$expr[] = $search->compare( '==', 'customer.editor', $this->editor );
-
-		$expr[] = $search->compare( '!=', 'customer.address.id', null );
-		$expr[] = $search->compare( '!=', 'customer.address.parentid', null );
-		$expr[] = $search->compare( '==', 'customer.address.company', 'ABC GmbH' );
-		$expr[] = $search->compare( '==', 'customer.address.vatid', 'DE999999999' );
-		$expr[] = $search->compare( '==', 'customer.address.salutation', 'mr' );
-		$expr[] = $search->compare( '==', 'customer.address.title', 'Dr.' );
-		$expr[] = $search->compare( '==', 'customer.address.firstname', 'Good' );
-		$expr[] = $search->compare( '==', 'customer.address.lastname', 'Unittest' );
-		$expr[] = $search->compare( '==', 'customer.address.address1', 'Pickhuben' );
-		$expr[] = $search->compare( '==', 'customer.address.address2', '2-4' );
-		$expr[] = $search->compare( '==', 'customer.address.address3', '' );
-		$expr[] = $search->compare( '==', 'customer.address.postal', '11099' );
-		$expr[] = $search->compare( '==', 'customer.address.city', 'Berlin' );
-		$expr[] = $search->compare( '==', 'customer.address.state', 'Berlin' );
-		$expr[] = $search->compare( '==', 'customer.address.languageid', 'de' );
-		$expr[] = $search->compare( '==', 'customer.address.countryid', 'DE' );
-		$expr[] = $search->compare( '==', 'customer.address.telephone', '055544332221' );
-		$expr[] = $search->compare( '==', 'customer.address.email', 'unitCustomer2@aimeos.org' );
-		$expr[] = $search->compare( '==', 'customer.address.telefax', '055544333212' );
-		$expr[] = $search->compare( '==', 'customer.address.website', 'unittest.aimeos.org' );
-		$expr[] = $search->compare( '>=', 'customer.address.longitude', '10.0' );
-		$expr[] = $search->compare( '>=', 'customer.address.latitude', '50.0' );
-		$expr[] = $search->compare( '==', 'customer.address.flag', 0 );
-		$expr[] = $search->compare( '==', 'customer.address.position', 1 );
-		$expr[] = $search->compare( '!=', 'customer.address.mtime', '1970-01-01 00:00:00' );
-		$expr[] = $search->compare( '!=', 'customer.address.ctime', '1970-01-01 00:00:00' );
-		$expr[] = $search->compare( '==', 'customer.address.editor', $this->editor );
-
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$result = $this->object->searchItems( $search, array(), $total );
-		$this->assertEquals( 1, count( $result ) );
+		$expr[] = $search->compare('!=', 'customer.id', null);
+		$expr[] = $search->compare('==', 'customer.label', 'Erika Mustermann');
+		$expr[] = $search->compare('==', 'customer.code', 'unitCustomer2');
+
+		$expr[] = $search->compare('>=', 'customer.salutation', '');
+		$expr[] = $search->compare('>=', 'customer.company', '');
+		$expr[] = $search->compare('>=', 'customer.vatid', '');
+		$expr[] = $search->compare('>=', 'customer.title', '');
+		$expr[] = $search->compare('>=', 'customer.firstname', '');
+		$expr[] = $search->compare('>=', 'customer.lastname', '');
+		$expr[] = $search->compare('>=', 'customer.address1', '');
+		$expr[] = $search->compare('>=', 'customer.address2', '');
+		$expr[] = $search->compare('>=', 'customer.address3', '');
+		$expr[] = $search->compare('>=', 'customer.postal', '');
+		$expr[] = $search->compare('>=', 'customer.city', '');
+		$expr[] = $search->compare('>=', 'customer.state', '');
+		$expr[] = $search->compare('!=', 'customer.languageid', null);
+		$expr[] = $search->compare('>=', 'customer.countryid', '');
+		$expr[] = $search->compare('>=', 'customer.telephone', '');
+		$expr[] = $search->compare('>=', 'customer.email', '');
+		$expr[] = $search->compare('>=', 'customer.telefax', '');
+		$expr[] = $search->compare('>=', 'customer.website', '');
+		$expr[] = $search->compare('>=', 'customer.longitude', '10.0');
+		$expr[] = $search->compare('>=', 'customer.latitude', '50.0');
+
+		$expr[] = $search->compare('==', 'customer.birthday', '1970-01-01');
+		$expr[] = $search->compare('>=', 'customer.password', '');
+		$expr[] = $search->compare('==', 'customer.status', 0);
+		$expr[] = $search->compare('!=', 'customer.mtime', '1970-01-01 00:00:00');
+		$expr[] = $search->compare('!=', 'customer.ctime', '1970-01-01 00:00:00');
+		$expr[] = $search->compare('==', 'customer.editor', $this->editor);
+
+		$expr[] = $search->compare('!=', 'customer.address.id', null);
+		$expr[] = $search->compare('!=', 'customer.address.parentid', null);
+		$expr[] = $search->compare('==', 'customer.address.company', 'ABC GmbH');
+		$expr[] = $search->compare('==', 'customer.address.vatid', 'DE999999999');
+		$expr[] = $search->compare('==', 'customer.address.salutation', 'mr');
+		$expr[] = $search->compare('==', 'customer.address.title', 'Dr.');
+		$expr[] = $search->compare('==', 'customer.address.firstname', 'Good');
+		$expr[] = $search->compare('==', 'customer.address.lastname', 'Unittest');
+		$expr[] = $search->compare('==', 'customer.address.address1', 'Pickhuben');
+		$expr[] = $search->compare('==', 'customer.address.address2', '2-4');
+		$expr[] = $search->compare('==', 'customer.address.address3', '');
+		$expr[] = $search->compare('==', 'customer.address.postal', '11099');
+		$expr[] = $search->compare('==', 'customer.address.city', 'Berlin');
+		$expr[] = $search->compare('==', 'customer.address.state', 'Berlin');
+		$expr[] = $search->compare('==', 'customer.address.languageid', 'de');
+		$expr[] = $search->compare('==', 'customer.address.countryid', 'DE');
+		$expr[] = $search->compare('==', 'customer.address.telephone', '055544332221');
+		$expr[] = $search->compare('==', 'customer.address.email', 'unitCustomer2@aimeos.org');
+		$expr[] = $search->compare('==', 'customer.address.telefax', '055544333212');
+		$expr[] = $search->compare('==', 'customer.address.website', 'unittest.aimeos.org');
+		$expr[] = $search->compare('>=', 'customer.address.longitude', '10.0');
+		$expr[] = $search->compare('>=', 'customer.address.latitude', '50.0');
+		$expr[] = $search->compare('==', 'customer.address.flag', 0);
+		$expr[] = $search->compare('==', 'customer.address.position', 1);
+		$expr[] = $search->compare('!=', 'customer.address.mtime', '1970-01-01 00:00:00');
+		$expr[] = $search->compare('!=', 'customer.address.ctime', '1970-01-01 00:00:00');
+		$expr[] = $search->compare('==', 'customer.address.editor', $this->editor);
+
+		$search->setConditions($search->combine('&&', $expr));
+		$result = $this->object->searchItems($search, array(), $total);
+		$this->assertEquals(1, count($result));
 	}
 
 
@@ -217,44 +217,44 @@ 
 		$total = 0;
 
 		$search = $this->object->createSearch();
-		$search->setConditions( $search->compare( '==', 'customer.address.editor', $this->editor ) );
-		$search->setSlice( 0, 2 );
+		$search->setConditions($search->compare('==', 'customer.address.editor', $this->editor));
+		$search->setSlice(0, 2);
 
-		$results = $this->object->searchItems( $search, array(), $total );
-		$this->assertEquals( 2, count( $results ) );
-		$this->assertEquals( 3, $total );
+		$results = $this->object->searchItems($search, array(), $total);
+		$this->assertEquals(2, count($results));
+		$this->assertEquals(3, $total);
 
-		foreach($results as $itemId => $item) {
-			$this->assertEquals( $itemId, $item->getId() );
+		foreach ($results as $itemId => $item) {
+			$this->assertEquals($itemId, $item->getId());
 		}
 	}
 
 
 	public function testSearchItemsBaseCriteria()
 	{
-		$search = $this->object->createSearch( true );
+		$search = $this->object->createSearch(true);
 		$conditions = array(
-			$search->compare( '==', 'customer.address.editor', $this->editor ),
+			$search->compare('==', 'customer.address.editor', $this->editor),
 			$search->getConditions()
 		);
-		$search->setConditions( $search->combine( '&&', $conditions ) );
-		$this->assertEquals( 2, count( $this->object->searchItems( $search, array(), $total ) ) );
+		$search->setConditions($search->combine('&&', $conditions));
+		$this->assertEquals(2, count($this->object->searchItems($search, array(), $total)));
 	}
 
 
 	public function testGetSubManager()
 	{
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager( 'address' ) );
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager( 'address', 'Standard' ) );
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('address'));
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Manager\\Iface', $this->object->getSubManager('address', 'Standard'));
 
-		$this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
-		$this->object->getSubManager( 'unknown' );
+		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
+		$this->object->getSubManager('unknown');
 	}
 
 
 	public function testGetSubManagerInvalidName()
 	{
-		$this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
-		$this->object->getSubManager( 'address', 'unknown' );
+		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
+		$this->object->getSubManager('address', 'unknown');
 	}
 }