Completed
Push — master ( 1f8deb...0d5a25 )
by Aimeos
22:06
created
lib/custom/src/MW/View/Helper/Response/Laravel5.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -26,8 +26,8 @@
 block discarded – undo
26 26
 	 *
27 27
 	 * @param \Aimeos\MW\View\Iface $view View instance with registered view helpers
28 28
 	 */
29
-	public function __construct( \Aimeos\MW\View\Iface $view )
29
+	public function __construct(\Aimeos\MW\View\Iface $view)
30 30
 	{
31
-		parent::__construct( $view, new \Zend\Diactoros\Response() );
31
+		parent::__construct($view, new \Zend\Diactoros\Response());
32 32
 	}
33 33
 }
Please login to merge, or discard this patch.
lib/custom/tests/MW/View/Helper/Request/Laravel5Test.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -17,42 +17,42 @@
 block discarded – undo
17 17
 
18 18
 	protected function setUp()
19 19
 	{
20
-		if( !class_exists( '\Illuminate\Http\Request' ) ) {
21
-			$this->markTestSkipped( '\Illuminate\Http\Request is not available' );
20
+		if (!class_exists('\Illuminate\Http\Request')) {
21
+			$this->markTestSkipped('\Illuminate\Http\Request is not available');
22 22
 		}
23 23
 
24
-		if( !class_exists( '\Zend\Diactoros\Response' ) ) {
25
-			$this->markTestSkipped( '\Zend\Diactoros\Response is not available' );
24
+		if (!class_exists('\Zend\Diactoros\Response')) {
25
+			$this->markTestSkipped('\Zend\Diactoros\Response is not available');
26 26
 		}
27 27
 
28 28
 		$view = new \Aimeos\MW\View\Standard();
29
-		$param = array( 'HTTP_HOST' => 'localhost', 'REMOTE_ADDR' => '127.0.0.1' );
30
-		$request = new \Illuminate\Http\Request( array(), array(), array(), array(), array(), $param, 'Content' );
29
+		$param = array('HTTP_HOST' => 'localhost', 'REMOTE_ADDR' => '127.0.0.1');
30
+		$request = new \Illuminate\Http\Request(array(), array(), array(), array(), array(), $param, 'Content');
31 31
 
32
-		$this->object = new \Aimeos\MW\View\Helper\Request\Laravel5( $view, $request );
32
+		$this->object = new \Aimeos\MW\View\Helper\Request\Laravel5($view, $request);
33 33
 	}
34 34
 
35 35
 
36 36
 	protected function tearDown()
37 37
 	{
38
-		unset( $this->object, $this->mock );
38
+		unset($this->object, $this->mock);
39 39
 	}
40 40
 
41 41
 
42 42
 	public function testTransform()
43 43
 	{
44
-		$this->assertInstanceOf( '\Aimeos\MW\View\Helper\Request\Laravel5', $this->object->transform() );
44
+		$this->assertInstanceOf('\Aimeos\MW\View\Helper\Request\Laravel5', $this->object->transform());
45 45
 	}
46 46
 
47 47
 
48 48
 	public function testGetClientAddress()
49 49
 	{
50
-		$this->assertEquals( '127.0.0.1', $this->object->getClientAddress() );
50
+		$this->assertEquals('127.0.0.1', $this->object->getClientAddress());
51 51
 	}
52 52
 
53 53
 
54 54
 	public function testGetTarget()
55 55
 	{
56
-		$this->assertEquals( null, $this->object->getTarget() );
56
+		$this->assertEquals(null, $this->object->getTarget());
57 57
 	}
58 58
 }
Please login to merge, or discard this patch.
lib/custom/tests/MW/View/Helper/Response/Laravel5Test.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -17,27 +17,27 @@
 block discarded – undo
17 17
 
18 18
 	protected function setUp()
19 19
 	{
20
-		if( !class_exists( '\Illuminate\Http\Response' ) ) {
21
-			$this->markTestSkipped( '\Illuminate\Http\Response is not available' );
20
+		if (!class_exists('\Illuminate\Http\Response')) {
21
+			$this->markTestSkipped('\Illuminate\Http\Response is not available');
22 22
 		}
23 23
 
24
-		if( !class_exists( '\Zend\Diactoros\Response' ) ) {
25
-			$this->markTestSkipped( '\Zend\Diactoros\Response is not available' );
24
+		if (!class_exists('\Zend\Diactoros\Response')) {
25
+			$this->markTestSkipped('\Zend\Diactoros\Response is not available');
26 26
 		}
27 27
 
28 28
 		$view = new \Aimeos\MW\View\Standard();
29
-		$this->object = new \Aimeos\MW\View\Helper\Response\Laravel5( $view );
29
+		$this->object = new \Aimeos\MW\View\Helper\Response\Laravel5($view);
30 30
 	}
31 31
 
32 32
 
33 33
 	protected function tearDown()
34 34
 	{
35
-		unset( $this->object, $this->mock );
35
+		unset($this->object, $this->mock);
36 36
 	}
37 37
 
38 38
 
39 39
 	public function testTransform()
40 40
 	{
41
-		$this->assertInstanceOf( '\Aimeos\MW\View\Helper\Response\Laravel5', $this->object->transform() );
41
+		$this->assertInstanceOf('\Aimeos\MW\View\Helper\Response\Laravel5', $this->object->transform());
42 42
 	}
43 43
 }
Please login to merge, or discard this patch.
lib/custom/src/MW/View/Helper/Request/Laravel5.php 3 patches
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -34,11 +34,11 @@  discard block
 block discarded – undo
34 34
 	 * @param \\Aimeos\MW\View\Iface $view View instance with registered view helpers
35 35
 	 * @param \Illuminate\Http\Request $request Laravel request object
36 36
 	 */
37
-	public function __construct( \Aimeos\MW\View\Iface $view, \Illuminate\Http\Request $request )
37
+	public function __construct(\Aimeos\MW\View\Iface $view, \Illuminate\Http\Request $request)
38 38
 	{
39 39
 		$this->request = $request;
40 40
 
41
-		parent::__construct( $view, $this->createRequest( $request ) );
41
+		parent::__construct($view, $this->createRequest($request));
42 42
 	}
43 43
 
44 44
 
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
 	 */
61 61
 	public function getTarget()
62 62
 	{
63
-		if( ( $route = $this->request->route() ) !== null ) {
63
+		if (($route = $this->request->route()) !== null) {
64 64
 			return $route->getName();
65 65
 		}
66 66
 	}
@@ -72,10 +72,10 @@  discard block
 block discarded – undo
72 72
 	 * @param \Illuminate\Http\Request $nativeRequest Laravel request object
73 73
 	 * @return \Psr\Http\Message\ServerRequestInterface PSR-7 request object
74 74
 	 */
75
-	protected function createRequest( \Illuminate\Http\Request $nativeRequest )
75
+	protected function createRequest(\Illuminate\Http\Request $nativeRequest)
76 76
 	{
77
-		$files = ServerRequestFactory::normalizeFiles( $this->getFiles( $nativeRequest->files->all() ) );
78
-		$server = ServerRequestFactory::normalizeServer( $nativeRequest->server->all() );
77
+		$files = ServerRequestFactory::normalizeFiles($this->getFiles($nativeRequest->files->all()));
78
+		$server = ServerRequestFactory::normalizeServer($nativeRequest->server->all());
79 79
 		$headers = $nativeRequest->headers->all();
80 80
 		$cookies = $nativeRequest->cookies->all();
81 81
 		$post = $nativeRequest->request->all();
@@ -83,13 +83,13 @@  discard block
 block discarded – undo
83 83
 		$method = $nativeRequest->getMethod();
84 84
 		$uri = $nativeRequest->getUri();
85 85
 
86
-		$body = new Stream( 'php://temp', 'wb+' );
87
-		$body->write( $nativeRequest->getContent() );
86
+		$body = new Stream('php://temp', 'wb+');
87
+		$body->write($nativeRequest->getContent());
88 88
 
89
-		$request = new ServerRequest( $server, $files, $uri, $method, $body, $headers, $cookies, $query, $post );
89
+		$request = new ServerRequest($server, $files, $uri, $method, $body, $headers, $cookies, $query, $post);
90 90
 
91
-		foreach( $nativeRequest->attributes->all() as $key => $value ) {
92
-			$request = $request->withAttribute( $key, $value );
91
+		foreach ($nativeRequest->attributes->all() as $key => $value) {
92
+			$request = $request->withAttribute($key, $value);
93 93
 		}
94 94
 
95 95
 		return $request;
@@ -102,13 +102,13 @@  discard block
 block discarded – undo
102 102
 	 * @param array $files Multi-dimensional list of uploaded files from Symfony request
103 103
 	 * @return array Multi-dimensional list of uploaded files as PSR-7 objects
104 104
 	 */
105
-	protected function getFiles( array $files )
105
+	protected function getFiles(array $files)
106 106
 	{
107 107
 		$list = array();
108 108
 
109
-		foreach( $files as $key => $value )
109
+		foreach ($files as $key => $value)
110 110
 		{
111
-			if( $value instanceof \Symfony\Component\HttpFoundation\File\UploadedFile )
111
+			if ($value instanceof \Symfony\Component\HttpFoundation\File\UploadedFile)
112 112
 			{
113 113
 				$list[$key] = new \Zend\Diactoros\UploadedFile(
114 114
 					$value->getRealPath(),
@@ -118,9 +118,9 @@  discard block
 block discarded – undo
118 118
 					$value->getClientMimeType()
119 119
 				);
120 120
 			}
121
-			elseif( is_array( $value ) )
121
+			elseif (is_array($value))
122 122
 			{
123
-				$list[$key] = $this->getFiles( $value );
123
+				$list[$key] = $this->getFiles($value);
124 124
 			}
125 125
 		}
126 126
 
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@
 block discarded – undo
31 31
 	/**
32 32
 	 * Initializes the request view helper.
33 33
 	 *
34
-	 * @param \\Aimeos\MW\View\Iface $view View instance with registered view helpers
34
+	 * @param \Aimeos\MW\View\Iface $view View instance with registered view helpers
35 35
 	 * @param \Illuminate\Http\Request $request Laravel request object
36 36
 	 */
37 37
 	public function __construct( \Aimeos\MW\View\Iface $view, \Illuminate\Http\Request $request )
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -117,8 +117,7 @@
 block discarded – undo
117 117
 					$value->getClientOriginalName(),
118 118
 					$value->getClientMimeType()
119 119
 				);
120
-			}
121
-			elseif( is_array( $value ) )
120
+			} elseif( is_array( $value ) )
122 121
 			{
123 122
 				$list[$key] = $this->getFiles( $value );
124 123
 			}
Please login to merge, or discard this patch.
lib/custom/src/MW/View/Helper/Url/Laravel5.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -32,9 +32,9 @@  discard block
 block discarded – undo
32 32
 	 * @param \Illuminate\Contracts\Routing\UrlGenerator $builder Laravel URL builder object
33 33
 	 * @param array Associative list of fixed parameters that should be available for all routes
34 34
 	 */
35
-	public function __construct( \Aimeos\MW\View\Iface $view, \Illuminate\Contracts\Routing\UrlGenerator $builder, array $fixed )
35
+	public function __construct(\Aimeos\MW\View\Iface $view, \Illuminate\Contracts\Routing\UrlGenerator $builder, array $fixed)
36 36
 	{
37
-		parent::__construct( $view );
37
+		parent::__construct($view);
38 38
 
39 39
 		$this->builder = $builder;
40 40
 		$this->fixed = $fixed;
@@ -52,12 +52,12 @@  discard block
 block discarded – undo
52 52
 	 * @param array $config Additional configuration parameter per URL
53 53
 	 * @return string Complete URL that can be used in the template
54 54
 	 */
55
-	public function transform( $target = null, $controller = null, $action = null, array $params = array(), array $trailing = array(), array $config = array() )
55
+	public function transform($target = null, $controller = null, $action = null, array $params = array(), array $trailing = array(), array $config = array())
56 56
 	{
57
-		$params = $this->sanitize( $params );
58
-		$values = $this->getValues( $config );
57
+		$params = $this->sanitize($params);
58
+		$values = $this->getValues($config);
59 59
 
60
-		return $this->builder->route( $target, $params + $this->fixed, $values['absoluteUri'] );
60
+		return $this->builder->route($target, $params + $this->fixed, $values['absoluteUri']);
61 61
 	}
62 62
 
63 63
 
@@ -67,13 +67,13 @@  discard block
 block discarded – undo
67 67
 	 * @param array $config Associative list of key/value pairs
68 68
 	 * @return array Associative list of sanitized key/value pairs
69 69
 	 */
70
-	protected function getValues( array $config )
70
+	protected function getValues(array $config)
71 71
 	{
72 72
 		$values = array(
73 73
 			'absoluteUri' => false,
74 74
 		);
75 75
 
76
-		if( isset( $config['absoluteUri'] ) ) {
76
+		if (isset($config['absoluteUri'])) {
77 77
 			$values['absoluteUri'] = (bool) $config['absoluteUri'];
78 78
 		}
79 79
 
Please login to merge, or discard this patch.
lib/custom/tests/MW/Logger/Laravel5Test.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -20,12 +20,12 @@  discard block
 block discarded – undo
20 20
 	 */
21 21
 	protected function setUp()
22 22
 	{
23
-		if( interface_exists( '\\Illuminate\\Contracts\\Logging\\Log' ) === false ) {
24
-			$this->markTestSkipped( 'Class \\Illuminate\\Contracts\\Logging\\Log not found' );
23
+		if (interface_exists('\\Illuminate\\Contracts\\Logging\\Log') === false) {
24
+			$this->markTestSkipped('Class \\Illuminate\\Contracts\\Logging\\Log not found');
25 25
 		}
26 26
 
27
-		$this->mock = $this->getMockBuilder( '\\Illuminate\\Contracts\\Logging\\Log' )->getMock();
28
-		$this->object = new \Aimeos\MW\Logger\Laravel5( $this->mock );
27
+		$this->mock = $this->getMockBuilder('\\Illuminate\\Contracts\\Logging\\Log')->getMock();
28
+		$this->object = new \Aimeos\MW\Logger\Laravel5($this->mock);
29 29
 	}
30 30
 
31 31
 
@@ -37,42 +37,42 @@  discard block
 block discarded – undo
37 37
 	 */
38 38
 	protected function tearDown()
39 39
 	{
40
-		unset( $this->mock, $this->object );
40
+		unset($this->mock, $this->object);
41 41
 	}
42 42
 
43 43
 
44 44
 	public function testLog()
45 45
 	{
46
-		$this->mock->expects( $this->once() )->method( 'log' )
47
-			->with( $this->equalTo( 'msg' ), $this->equalTo( 'error' ) );
48
-		$this->object->log( 'msg' );
46
+		$this->mock->expects($this->once())->method('log')
47
+			->with($this->equalTo('msg'), $this->equalTo('error'));
48
+		$this->object->log('msg');
49 49
 	}
50 50
 
51 51
 
52 52
 	public function testNonScalarLog()
53 53
 	{
54
-		$this->mock->expects( $this->once() )->method( 'log' )
55
-			->with( $this->equalTo( '["error","error2",2]' ), $this->equalTo( 'error' ) );
56
-		$this->object->log( array( 'error', 'error2', 2 ) );
54
+		$this->mock->expects($this->once())->method('log')
55
+			->with($this->equalTo('["error","error2",2]'), $this->equalTo('error'));
56
+		$this->object->log(array('error', 'error2', 2));
57 57
 	}
58 58
 
59 59
 
60 60
 	public function testLogDebug()
61 61
 	{
62
-		$this->object->log( 'emergency', \Aimeos\MW\Logger\Base::EMERG );
63
-		$this->object->log( 'alert', \Aimeos\MW\Logger\Base::ALERT );
64
-		$this->object->log( 'critical', \Aimeos\MW\Logger\Base::CRIT );
65
-		$this->object->log( 'error', \Aimeos\MW\Logger\Base::ERR );
66
-		$this->object->log( 'warning', \Aimeos\MW\Logger\Base::WARN );
67
-		$this->object->log( 'notice', \Aimeos\MW\Logger\Base::NOTICE );
68
-		$this->object->log( 'info', \Aimeos\MW\Logger\Base::INFO );
69
-		$this->object->log( 'debug', \Aimeos\MW\Logger\Base::DEBUG );
62
+		$this->object->log('emergency', \Aimeos\MW\Logger\Base::EMERG);
63
+		$this->object->log('alert', \Aimeos\MW\Logger\Base::ALERT);
64
+		$this->object->log('critical', \Aimeos\MW\Logger\Base::CRIT);
65
+		$this->object->log('error', \Aimeos\MW\Logger\Base::ERR);
66
+		$this->object->log('warning', \Aimeos\MW\Logger\Base::WARN);
67
+		$this->object->log('notice', \Aimeos\MW\Logger\Base::NOTICE);
68
+		$this->object->log('info', \Aimeos\MW\Logger\Base::INFO);
69
+		$this->object->log('debug', \Aimeos\MW\Logger\Base::DEBUG);
70 70
 	}
71 71
 
72 72
 
73 73
 	public function testBadPriority()
74 74
 	{
75
-		$this->setExpectedException( '\\Aimeos\\MW\\Logger\\Exception' );
76
-		$this->object->log( 'error', -1 );
75
+		$this->setExpectedException('\\Aimeos\\MW\\Logger\\Exception');
76
+		$this->object->log('error', -1);
77 77
 	}
78 78
 }
Please login to merge, or discard this patch.
lib/custom/tests/MW/View/Helper/Url/Laravel5Test.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -21,13 +21,13 @@  discard block
 block discarded – undo
21 21
 	 */
22 22
 	protected function setUp()
23 23
 	{
24
-		if( !interface_exists( '\\Illuminate\\Contracts\\Routing\\UrlGenerator' ) ) {
25
-			$this->markTestSkipped( '\\Illuminate\\Contracts\\Routing\\UrlGenerator is not available' );
24
+		if (!interface_exists('\\Illuminate\\Contracts\\Routing\\UrlGenerator')) {
25
+			$this->markTestSkipped('\\Illuminate\\Contracts\\Routing\\UrlGenerator is not available');
26 26
 		}
27 27
 
28 28
 		$view = new \Aimeos\MW\View\Standard();
29
-		$this->mock = $this->getMockBuilder( '\\Illuminate\\Contracts\\Routing\\UrlGenerator' )->getMock();
30
-		$this->object = new \Aimeos\MW\View\Helper\Url\Laravel5( $view, $this->mock, array() );
29
+		$this->mock = $this->getMockBuilder('\\Illuminate\\Contracts\\Routing\\UrlGenerator')->getMock();
30
+		$this->object = new \Aimeos\MW\View\Helper\Url\Laravel5($view, $this->mock, array());
31 31
 	}
32 32
 
33 33
 
@@ -39,25 +39,25 @@  discard block
 block discarded – undo
39 39
 	 */
40 40
 	protected function tearDown()
41 41
 	{
42
-		unset( $this->object, $this->mock );
42
+		unset($this->object, $this->mock);
43 43
 	}
44 44
 
45 45
 
46 46
 	public function testTransform()
47 47
 	{
48
-		$this->mock->expects( $this->once() )->method( 'route' )
49
-			->with( $this->equalTo( 'route'), $this->equalTo( array( 'key' => 'value' ) ), $this->equalTo( false ) );
48
+		$this->mock->expects($this->once())->method('route')
49
+			->with($this->equalTo('route'), $this->equalTo(array('key' => 'value')), $this->equalTo(false));
50 50
 
51
-		$this->object->transform( 'route', 'catalog', 'lists', array( 'key' => 'value' ) );
51
+		$this->object->transform('route', 'catalog', 'lists', array('key' => 'value'));
52 52
 	}
53 53
 
54 54
 
55 55
 	public function testTransformAbsolute()
56 56
 	{
57
-		$this->mock->expects( $this->once() )->method( 'route' )
58
-			->with( $this->equalTo( 'route'), $this->equalTo( array() ), $this->equalTo( true ) );
57
+		$this->mock->expects($this->once())->method('route')
58
+			->with($this->equalTo('route'), $this->equalTo(array()), $this->equalTo(true));
59 59
 
60
-		$options = array( 'absoluteUri' => true );
61
-		$this->object->transform( 'route', 'catalog', 'lists', array(), array(), $options );
60
+		$options = array('absoluteUri' => true);
61
+		$this->object->transform('route', 'catalog', 'lists', array(), array(), $options);
62 62
 	}
63 63
 }
Please login to merge, or discard this patch.
lib/custom/tests/MW/Filesystem/LaravelTest.php 1 patch
Spacing   +124 added lines, -124 removed lines patch added patch discarded remove patch
@@ -11,348 +11,348 @@
 block discarded – undo
11 11
 
12 12
 	protected function setUp()
13 13
 	{
14
-		if( !interface_exists( '\\Illuminate\\Contracts\\Filesystem\\Filesystem' ) ) {
15
-			$this->markTestSkipped( 'Install Laravel framework first' );
14
+		if (!interface_exists('\\Illuminate\\Contracts\\Filesystem\\Filesystem')) {
15
+			$this->markTestSkipped('Install Laravel framework first');
16 16
 		}
17 17
 
18
-		$this->mock = $this->getMockBuilder( '\\Illuminate\\Contracts\\Filesystem\\Filesystem' )
18
+		$this->mock = $this->getMockBuilder('\\Illuminate\\Contracts\\Filesystem\\Filesystem')
19 19
 			->disableOriginalConstructor()
20 20
 			->getMock();
21 21
 
22
-		$this->object = new \Aimeos\MW\Filesystem\Laravel( $this->mock, sys_get_temp_dir() );
22
+		$this->object = new \Aimeos\MW\Filesystem\Laravel($this->mock, sys_get_temp_dir());
23 23
 	}
24 24
 
25 25
 
26 26
 	protected function tearDown()
27 27
 	{
28
-		unset( $this->object );
28
+		unset($this->object);
29 29
 	}
30 30
 
31 31
 
32 32
 	public function testIsdir()
33 33
 	{
34
-		$this->mock->expects( $this->once() )->method( 'directories' )
35
-			->will( $this->returnValue( array( 't', 'test', 'es' ) ) );
34
+		$this->mock->expects($this->once())->method('directories')
35
+			->will($this->returnValue(array('t', 'test', 'es')));
36 36
 
37
-		$this->assertTrue( $this->object->isdir( 'test' ) );
37
+		$this->assertTrue($this->object->isdir('test'));
38 38
 	}
39 39
 
40 40
 
41 41
 	public function testIsdirFalse()
42 42
 	{
43
-		$this->mock->expects( $this->once() )->method( 'directories' )
44
-			->will( $this->returnValue( array( 't', 'es' ) ) );
43
+		$this->mock->expects($this->once())->method('directories')
44
+			->will($this->returnValue(array('t', 'es')));
45 45
 
46
-		$this->assertFalse( $this->object->isdir( 'test' ) );
46
+		$this->assertFalse($this->object->isdir('test'));
47 47
 	}
48 48
 
49 49
 
50 50
 	public function testMkdir()
51 51
 	{
52
-		$this->mock->expects( $this->once() )->method( 'makeDirectory' );
52
+		$this->mock->expects($this->once())->method('makeDirectory');
53 53
 
54
-		$this->object->mkdir( 'test' );
54
+		$this->object->mkdir('test');
55 55
 	}
56 56
 
57 57
 
58 58
 	public function testMkdirException()
59 59
 	{
60
-		$this->mock->expects( $this->once() )->method( 'makeDirectory' )
61
-			->will( $this->throwException( new \RuntimeException() ) );
60
+		$this->mock->expects($this->once())->method('makeDirectory')
61
+			->will($this->throwException(new \RuntimeException()));
62 62
 
63
-		$this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' );
64
-		$this->object->mkdir( 'test' );
63
+		$this->setExpectedException('\Aimeos\MW\Filesystem\Exception');
64
+		$this->object->mkdir('test');
65 65
 	}
66 66
 
67 67
 
68 68
 	public function testRmdir()
69 69
 	{
70
-		$this->mock->expects( $this->once() )->method( 'deleteDirectory' );
70
+		$this->mock->expects($this->once())->method('deleteDirectory');
71 71
 
72
-		$this->object->rmdir( 'test' );
72
+		$this->object->rmdir('test');
73 73
 	}
74 74
 
75 75
 
76 76
 	public function testRmdirException()
77 77
 	{
78
-		$this->mock->expects( $this->once() )->method( 'deleteDirectory' )
79
-			->will( $this->throwException( new \RuntimeException() ) );
78
+		$this->mock->expects($this->once())->method('deleteDirectory')
79
+			->will($this->throwException(new \RuntimeException()));
80 80
 
81
-		$this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' );
82
-		$this->object->rmdir( 'test' );
81
+		$this->setExpectedException('\Aimeos\MW\Filesystem\Exception');
82
+		$this->object->rmdir('test');
83 83
 	}
84 84
 
85 85
 
86 86
 	public function testScan()
87 87
 	{
88
-		$list = array( 't', 'es', 'st' );
88
+		$list = array('t', 'es', 'st');
89 89
 
90
-		$this->mock->expects( $this->once() )->method( 'directories' )
91
-			->will( $this->returnValue( array( 't', 'es' ) ) );
90
+		$this->mock->expects($this->once())->method('directories')
91
+			->will($this->returnValue(array('t', 'es')));
92 92
 
93
-		$this->mock->expects( $this->once() )->method( 'files' )
94
-			->will( $this->returnValue( array( 'st' ) ) );
93
+		$this->mock->expects($this->once())->method('files')
94
+			->will($this->returnValue(array('st')));
95 95
 
96 96
 		$result = $this->object->scan();
97 97
 
98
-		$this->assertInternalType( 'array', $result );
98
+		$this->assertInternalType('array', $result);
99 99
 
100
-		foreach( $result as $entry ) {
101
-			$this->assertTrue( in_array( $entry, $list ) );
100
+		foreach ($result as $entry) {
101
+			$this->assertTrue(in_array($entry, $list));
102 102
 		}
103 103
 	}
104 104
 
105 105
 
106 106
 	public function testScanException()
107 107
 	{
108
-		$this->mock->expects( $this->once() )->method( 'directories' )
109
-			->will( $this->throwException( new \RuntimeException() ) );
108
+		$this->mock->expects($this->once())->method('directories')
109
+			->will($this->throwException(new \RuntimeException()));
110 110
 
111
-		$this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' );
112
-		$this->object->scan( 'test' );
111
+		$this->setExpectedException('\Aimeos\MW\Filesystem\Exception');
112
+		$this->object->scan('test');
113 113
 	}
114 114
 
115 115
 
116 116
 	public function testSize()
117 117
 	{
118
-		$this->mock->expects( $this->once() )->method( 'size' )
119
-			->will( $this->returnValue( 4 ) );
118
+		$this->mock->expects($this->once())->method('size')
119
+			->will($this->returnValue(4));
120 120
 
121
-		$result = $this->object->size( 'test' );
121
+		$result = $this->object->size('test');
122 122
 
123
-		$this->assertEquals( 4, $result );
123
+		$this->assertEquals(4, $result);
124 124
 	}
125 125
 
126 126
 
127 127
 	public function testSizeException()
128 128
 	{
129
-		$this->mock->expects( $this->once() )->method( 'size' )
130
-			->will( $this->throwException( new \RuntimeException() ) );
129
+		$this->mock->expects($this->once())->method('size')
130
+			->will($this->throwException(new \RuntimeException()));
131 131
 
132
-		$this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' );
133
-		$this->object->size( 'test' );
132
+		$this->setExpectedException('\Aimeos\MW\Filesystem\Exception');
133
+		$this->object->size('test');
134 134
 	}
135 135
 
136 136
 
137 137
 	public function testTime()
138 138
 	{
139
-		$this->mock->expects( $this->once() )->method( 'lastModified' )
140
-			->will( $this->returnValue( 1 ) );
139
+		$this->mock->expects($this->once())->method('lastModified')
140
+			->will($this->returnValue(1));
141 141
 
142
-		$result = $this->object->time( 'test' );
142
+		$result = $this->object->time('test');
143 143
 
144
-		$this->assertGreaterThan( 0, $result );
144
+		$this->assertGreaterThan(0, $result);
145 145
 	}
146 146
 
147 147
 
148 148
 	public function testTimeException()
149 149
 	{
150
-		$this->mock->expects( $this->once() )->method( 'lastModified' )
151
-			->will( $this->throwException( new \RuntimeException() ) );
150
+		$this->mock->expects($this->once())->method('lastModified')
151
+			->will($this->throwException(new \RuntimeException()));
152 152
 
153
-		$this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' );
154
-		$this->object->time( 'test' );
153
+		$this->setExpectedException('\Aimeos\MW\Filesystem\Exception');
154
+		$this->object->time('test');
155 155
 	}
156 156
 
157 157
 
158 158
 	public function testRm()
159 159
 	{
160
-		$this->mock->expects( $this->once() )->method( 'delete' );
160
+		$this->mock->expects($this->once())->method('delete');
161 161
 
162
-		$this->object->rm( 'test' );
162
+		$this->object->rm('test');
163 163
 	}
164 164
 
165 165
 
166 166
 	public function testRmException()
167 167
 	{
168
-		$this->mock->expects( $this->once() )->method( 'delete' )
169
-			->will( $this->throwException( new \RuntimeException() ) );
168
+		$this->mock->expects($this->once())->method('delete')
169
+			->will($this->throwException(new \RuntimeException()));
170 170
 
171
-		$this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' );
172
-		$this->object->rm( 'test' );
171
+		$this->setExpectedException('\Aimeos\MW\Filesystem\Exception');
172
+		$this->object->rm('test');
173 173
 	}
174 174
 
175 175
 
176 176
 	public function testHas()
177 177
 	{
178
-		$this->mock->expects( $this->once() )->method( 'exists' )
179
-			->will( $this->returnValue( true ) );
178
+		$this->mock->expects($this->once())->method('exists')
179
+			->will($this->returnValue(true));
180 180
 
181
-		$result = $this->object->has( 'test' );
181
+		$result = $this->object->has('test');
182 182
 
183
-		$this->assertTrue( $result );
183
+		$this->assertTrue($result);
184 184
 	}
185 185
 
186 186
 
187 187
 	public function testHasFalse()
188 188
 	{
189
-		$this->mock->expects( $this->once() )->method( 'exists' )
190
-			->will( $this->returnValue( false ) );
189
+		$this->mock->expects($this->once())->method('exists')
190
+			->will($this->returnValue(false));
191 191
 
192
-		$result = $this->object->has( 'test' );
192
+		$result = $this->object->has('test');
193 193
 
194
-		$this->assertFalse( $result );
194
+		$this->assertFalse($result);
195 195
 	}
196 196
 
197 197
 
198 198
 	public function testRead()
199 199
 	{
200
-		$this->mock->expects( $this->once() )->method( 'get' )
201
-			->will( $this->returnValue( 'test' ) );
200
+		$this->mock->expects($this->once())->method('get')
201
+			->will($this->returnValue('test'));
202 202
 
203
-		$result = $this->object->read( 'file' );
203
+		$result = $this->object->read('file');
204 204
 
205
-		$this->assertEquals( 'test', $result );
205
+		$this->assertEquals('test', $result);
206 206
 	}
207 207
 
208 208
 
209 209
 	public function testReadException()
210 210
 	{
211
-		$this->mock->expects( $this->once() )->method( 'get' )
212
-			->will( $this->throwException( new \RuntimeException() ) );
211
+		$this->mock->expects($this->once())->method('get')
212
+			->will($this->throwException(new \RuntimeException()));
213 213
 
214
-		$this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' );
215
-		$this->object->read( 'readinvalid' );
214
+		$this->setExpectedException('\Aimeos\MW\Filesystem\Exception');
215
+		$this->object->read('readinvalid');
216 216
 	}
217 217
 
218 218
 
219 219
 	public function testReadf()
220 220
 	{
221
-		$this->mock->expects( $this->once() )->method( 'get' )
222
-			->will( $this->returnValue( 'test' ) );
221
+		$this->mock->expects($this->once())->method('get')
222
+			->will($this->returnValue('test'));
223 223
 
224
-		$result = $this->object->readf( 'file' );
224
+		$result = $this->object->readf('file');
225 225
 
226
-		$this->assertEquals( 'test', file_get_contents( $result ) );
227
-		unlink( $result );
226
+		$this->assertEquals('test', file_get_contents($result));
227
+		unlink($result);
228 228
 	}
229 229
 
230 230
 
231 231
 	public function testReads()
232 232
 	{
233
-		$this->mock->expects( $this->once() )->method( 'get' )
234
-			->will( $this->returnValue( 'test' ) );
233
+		$this->mock->expects($this->once())->method('get')
234
+			->will($this->returnValue('test'));
235 235
 
236
-		$handle = $this->object->reads( 'file' );
236
+		$handle = $this->object->reads('file');
237 237
 
238
-		$this->assertInternalType( 'resource', $handle );
239
-		$this->assertEquals( 'test', fgets( $handle ) );
238
+		$this->assertInternalType('resource', $handle);
239
+		$this->assertEquals('test', fgets($handle));
240 240
 
241
-		fclose( $handle );
241
+		fclose($handle);
242 242
 	}
243 243
 
244 244
 
245 245
 	public function testReadsException()
246 246
 	{
247
-		$this->mock->expects( $this->once() )->method( 'get' )
248
-			->will( $this->throwException( new \RuntimeException() ) );
247
+		$this->mock->expects($this->once())->method('get')
248
+			->will($this->throwException(new \RuntimeException()));
249 249
 
250
-		$this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' );
251
-		$this->object->reads( 'readinvalid' );
250
+		$this->setExpectedException('\Aimeos\MW\Filesystem\Exception');
251
+		$this->object->reads('readinvalid');
252 252
 	}
253 253
 
254 254
 
255 255
 	public function testWrite()
256 256
 	{
257
-		$this->mock->expects( $this->once() )->method( 'put' );
257
+		$this->mock->expects($this->once())->method('put');
258 258
 
259
-		$this->object->write( 'file', 'test' );
259
+		$this->object->write('file', 'test');
260 260
 	}
261 261
 
262 262
 
263 263
 	public function testWriteException()
264 264
 	{
265
-		$this->mock->expects( $this->once() )->method( 'put' )
266
-			->will( $this->throwException( new \RuntimeException() ) );
265
+		$this->mock->expects($this->once())->method('put')
266
+			->will($this->throwException(new \RuntimeException()));
267 267
 
268
-		$this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' );
269
-		$this->object->write( '', 'test' );
268
+		$this->setExpectedException('\Aimeos\MW\Filesystem\Exception');
269
+		$this->object->write('', 'test');
270 270
 	}
271 271
 
272 272
 
273 273
 	public function testWritef()
274 274
 	{
275
-		$file = sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'file99';
276
-		file_put_contents( $file, 'test' );
275
+		$file = sys_get_temp_dir().DIRECTORY_SEPARATOR.'file99';
276
+		file_put_contents($file, 'test');
277 277
 
278
-		$this->mock->expects( $this->once() )->method( 'put' );
278
+		$this->mock->expects($this->once())->method('put');
279 279
 
280
-		$this->object->writef( 'file', $file );
280
+		$this->object->writef('file', $file);
281 281
 
282
-		unlink( $file );
282
+		unlink($file);
283 283
 	}
284 284
 
285 285
 
286 286
 	public function testWritefException()
287 287
 	{
288
-		$this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' );
289
-		$this->object->writef( '', 'invalid' );
288
+		$this->setExpectedException('\Aimeos\MW\Filesystem\Exception');
289
+		$this->object->writef('', 'invalid');
290 290
 	}
291 291
 
292 292
 
293 293
 	public function testWrites()
294 294
 	{
295
-		$this->mock->expects( $this->once() )->method( 'put' );
295
+		$this->mock->expects($this->once())->method('put');
296 296
 
297
-		$handle = fopen( __FILE__, 'r' );
297
+		$handle = fopen(__FILE__, 'r');
298 298
 
299
-		$this->object->writes( 'file', $handle );
299
+		$this->object->writes('file', $handle);
300 300
 
301
-		fclose( $handle );
301
+		fclose($handle);
302 302
 	}
303 303
 
304 304
 
305 305
 	public function testWritesException()
306 306
 	{
307
-		$this->mock->expects( $this->once() )->method( 'put' )
308
-			->will( $this->throwException( new \RuntimeException() ) );
307
+		$this->mock->expects($this->once())->method('put')
308
+			->will($this->throwException(new \RuntimeException()));
309 309
 
310
-		$handle = fopen( __FILE__, 'r' );
310
+		$handle = fopen(__FILE__, 'r');
311 311
 
312
-		$this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' );
313
-		$this->object->writes( 'file', $handle );
312
+		$this->setExpectedException('\Aimeos\MW\Filesystem\Exception');
313
+		$this->object->writes('file', $handle);
314 314
 	}
315 315
 
316 316
 
317 317
 	public function testWritesException2()
318 318
 	{
319
-		$this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' );
320
-		$this->object->writes( 'file', null );
319
+		$this->setExpectedException('\Aimeos\MW\Filesystem\Exception');
320
+		$this->object->writes('file', null);
321 321
 	}
322 322
 
323 323
 
324 324
 	public function testMove()
325 325
 	{
326
-		$this->mock->expects( $this->once() )->method( 'move' );
326
+		$this->mock->expects($this->once())->method('move');
327 327
 
328
-		$this->object->move( 'file1', 'file2' );
328
+		$this->object->move('file1', 'file2');
329 329
 	}
330 330
 
331 331
 
332 332
 	public function testMoveException()
333 333
 	{
334
-		$this->mock->expects( $this->once() )->method( 'move' )
335
-			->will( $this->throwException( new \RuntimeException() ) );
334
+		$this->mock->expects($this->once())->method('move')
335
+			->will($this->throwException(new \RuntimeException()));
336 336
 
337
-		$this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' );
338
-		$this->object->move( 'file1', 'file2' );
337
+		$this->setExpectedException('\Aimeos\MW\Filesystem\Exception');
338
+		$this->object->move('file1', 'file2');
339 339
 	}
340 340
 
341 341
 
342 342
 	public function testCopy()
343 343
 	{
344
-		$this->mock->expects( $this->once() )->method( 'copy' );
344
+		$this->mock->expects($this->once())->method('copy');
345 345
 
346
-		$this->object->copy( 'file1', 'file2' );
346
+		$this->object->copy('file1', 'file2');
347 347
 	}
348 348
 
349 349
 
350 350
 	public function testCopyException()
351 351
 	{
352
-		$this->mock->expects( $this->once() )->method( 'copy' )
353
-			->will( $this->throwException( new \RuntimeException() ) );
352
+		$this->mock->expects($this->once())->method('copy')
353
+			->will($this->throwException(new \RuntimeException()));
354 354
 
355
-		$this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' );
356
-		$this->object->copy( 'file1', 'file2' );
355
+		$this->setExpectedException('\Aimeos\MW\Filesystem\Exception');
356
+		$this->object->copy('file1', 'file2');
357 357
 	}
358 358
 }
Please login to merge, or discard this patch.
lib/custom/tests/MShop/Customer/Manager/Lists/Type/LaravelTest.php 1 patch
Spacing   +56 added lines, -56 removed lines patch added patch discarded remove patch
@@ -22,10 +22,10 @@  discard block
 block discarded – undo
22 22
 	protected function setUp()
23 23
 	{
24 24
 		$this->editor = \TestHelper::getContext()->getEditor();
25
-		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( \TestHelper::getContext(), 'Laravel' );
25
+		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager(\TestHelper::getContext(), 'Laravel');
26 26
 
27
-		$listManager = $manager->getSubManager( 'lists', 'Laravel' );
28
-		$this->object = $listManager->getSubManager( 'type', 'Laravel' );
27
+		$listManager = $manager->getSubManager('lists', 'Laravel');
28
+		$this->object = $listManager->getSubManager('type', 'Laravel');
29 29
 	}
30 30
 
31 31
 
@@ -37,20 +37,20 @@  discard block
 block discarded – undo
37 37
 	 */
38 38
 	protected function tearDown()
39 39
 	{
40
-		unset( $this->object );
40
+		unset($this->object);
41 41
 	}
42 42
 
43 43
 
44 44
 	public function testCleanup()
45 45
 	{
46
-		$this->object->cleanup( array( -1 ) );
46
+		$this->object->cleanup(array( -1 ));
47 47
 	}
48 48
 
49 49
 
50 50
 	public function testCreateItem()
51 51
 	{
52 52
 		$item = $this->object->createItem();
53
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Type\\Iface', $item );
53
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Type\\Iface', $item);
54 54
 	}
55 55
 
56 56
 
@@ -60,18 +60,18 @@  discard block
 block discarded – undo
60 60
 		$search->setSlice(0, 1);
61 61
 		$results = $this->object->searchItems($search);
62 62
 
63
-		if( ( $expected = reset($results) ) === false ) {
64
-			throw new \RuntimeException( 'No list type item found' );
63
+		if (($expected = reset($results)) === false) {
64
+			throw new \RuntimeException('No list type item found');
65 65
 		}
66 66
 
67
-		$this->assertEquals( $expected, $this->object->getItem( $expected->getId() ) );
67
+		$this->assertEquals($expected, $this->object->getItem($expected->getId()));
68 68
 	}
69 69
 
70 70
 
71 71
 	public function testGetSubManager()
72 72
 	{
73
-		$this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
74
-		$this->object->getSubManager( 'unknown' );
73
+		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
74
+		$this->object->getSubManager('unknown');
75 75
 	}
76 76
 
77 77
 
@@ -81,48 +81,48 @@  discard block
 block discarded – undo
81 81
 		$search->setSlice(0, 1);
82 82
 		$results = $this->object->searchItems($search);
83 83
 
84
-		if( ( $item = reset($results) ) === false ) {
85
-			throw new \RuntimeException( 'No type item found' );
84
+		if (($item = reset($results)) === false) {
85
+			throw new \RuntimeException('No type item found');
86 86
 		}
87 87
 
88 88
 		$item->setId(null);
89
-		$item->setCode( 'unitTestInit' );
90
-		$this->object->saveItem( $item );
91
-		$itemSaved = $this->object->getItem( $item->getId() );
89
+		$item->setCode('unitTestInit');
90
+		$this->object->saveItem($item);
91
+		$itemSaved = $this->object->getItem($item->getId());
92 92
 
93 93
 		$itemExp = clone $itemSaved;
94
-		$itemExp->setCode( 'unitTestSave' );
95
-		$this->object->saveItem( $itemExp );
96
-		$itemUpd = $this->object->getItem( $itemExp->getId() );
94
+		$itemExp->setCode('unitTestSave');
95
+		$this->object->saveItem($itemExp);
96
+		$itemUpd = $this->object->getItem($itemExp->getId());
97 97
 
98
-		$this->object->deleteItem( $itemSaved->getId() );
98
+		$this->object->deleteItem($itemSaved->getId());
99 99
 
100 100
 
101
-		$this->assertTrue( $item->getId() !== null );
102
-		$this->assertEquals( $item->getId(), $itemSaved->getId() );
103
-		$this->assertEquals( $item->getSiteId(), $itemSaved->getSiteId() );
104
-		$this->assertEquals( $item->getCode(), $itemSaved->getCode() );
105
-		$this->assertEquals( $item->getDomain(), $itemSaved->getDomain() );
106
-		$this->assertEquals( $item->getLabel(), $itemSaved->getLabel() );
107
-		$this->assertEquals( $item->getStatus(), $itemSaved->getStatus() );
101
+		$this->assertTrue($item->getId() !== null);
102
+		$this->assertEquals($item->getId(), $itemSaved->getId());
103
+		$this->assertEquals($item->getSiteId(), $itemSaved->getSiteId());
104
+		$this->assertEquals($item->getCode(), $itemSaved->getCode());
105
+		$this->assertEquals($item->getDomain(), $itemSaved->getDomain());
106
+		$this->assertEquals($item->getLabel(), $itemSaved->getLabel());
107
+		$this->assertEquals($item->getStatus(), $itemSaved->getStatus());
108 108
 
109
-		$this->assertEquals( $this->editor, $itemSaved->getEditor() );
110
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated() );
111
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified() );
109
+		$this->assertEquals($this->editor, $itemSaved->getEditor());
110
+		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated());
111
+		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified());
112 112
 
113
-		$this->assertEquals( $itemExp->getId(), $itemUpd->getId() );
114
-		$this->assertEquals( $itemExp->getSiteId(), $itemUpd->getSiteId() );
115
-		$this->assertEquals( $itemExp->getCode(), $itemUpd->getCode() );
116
-		$this->assertEquals( $itemExp->getDomain(), $itemUpd->getDomain() );
117
-		$this->assertEquals( $itemExp->getLabel(), $itemUpd->getLabel() );
118
-		$this->assertEquals( $itemExp->getStatus(), $itemUpd->getStatus() );
113
+		$this->assertEquals($itemExp->getId(), $itemUpd->getId());
114
+		$this->assertEquals($itemExp->getSiteId(), $itemUpd->getSiteId());
115
+		$this->assertEquals($itemExp->getCode(), $itemUpd->getCode());
116
+		$this->assertEquals($itemExp->getDomain(), $itemUpd->getDomain());
117
+		$this->assertEquals($itemExp->getLabel(), $itemUpd->getLabel());
118
+		$this->assertEquals($itemExp->getStatus(), $itemUpd->getStatus());
119 119
 
120
-		$this->assertEquals( $this->editor, $itemUpd->getEditor() );
121
-		$this->assertEquals( $itemExp->getTimeCreated(), $itemUpd->getTimeCreated() );
122
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified() );
120
+		$this->assertEquals($this->editor, $itemUpd->getEditor());
121
+		$this->assertEquals($itemExp->getTimeCreated(), $itemUpd->getTimeCreated());
122
+		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified());
123 123
 
124 124
 		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
125
-		$this->object->getItem( $itemSaved->getId() );
125
+		$this->object->getItem($itemSaved->getId());
126 126
 	}
127 127
 
128 128
 
@@ -132,25 +132,25 @@  discard block
 block discarded – undo
132 132
 		$search = $this->object->createSearch();
133 133
 
134 134
 		$expr = array();
135
-		$expr[] = $search->compare( '!=', 'customer.lists.type.id', 0 );
136
-		$expr[] = $search->compare( '!=', 'customer.lists.type.siteid', null );
137
-		$expr[] = $search->compare( '==', 'customer.lists.type.code', 'default' );
138
-		$expr[] = $search->compare( '==', 'customer.lists.type.domain', 'text' );
139
-		$expr[] = $search->compare( '==', 'customer.lists.type.label', 'Standard' );
140
-		$expr[] = $search->compare( '==', 'customer.lists.type.status', 1 );
141
-		$expr[] = $search->compare( '>=', 'customer.lists.type.mtime', '1970-01-01 00:00:00' );
142
-		$expr[] = $search->compare( '>=', 'customer.lists.type.ctime', '1970-01-01 00:00:00' );
143
-		$expr[] = $search->compare( '==', 'customer.lists.type.editor', $this->editor );
144
-
145
-		$search->setConditions( $search->combine( '&&', $expr ) );
135
+		$expr[] = $search->compare('!=', 'customer.lists.type.id', 0);
136
+		$expr[] = $search->compare('!=', 'customer.lists.type.siteid', null);
137
+		$expr[] = $search->compare('==', 'customer.lists.type.code', 'default');
138
+		$expr[] = $search->compare('==', 'customer.lists.type.domain', 'text');
139
+		$expr[] = $search->compare('==', 'customer.lists.type.label', 'Standard');
140
+		$expr[] = $search->compare('==', 'customer.lists.type.status', 1);
141
+		$expr[] = $search->compare('>=', 'customer.lists.type.mtime', '1970-01-01 00:00:00');
142
+		$expr[] = $search->compare('>=', 'customer.lists.type.ctime', '1970-01-01 00:00:00');
143
+		$expr[] = $search->compare('==', 'customer.lists.type.editor', $this->editor);
144
+
145
+		$search->setConditions($search->combine('&&', $expr));
146 146
 		$search->setSlice(0, 1);
147 147
 
148
-		$results = $this->object->searchItems( $search, array(), $total );
149
-		$this->assertEquals( 1, count( $results ) );
150
-		$this->assertEquals( 1, $total );
148
+		$results = $this->object->searchItems($search, array(), $total);
149
+		$this->assertEquals(1, count($results));
150
+		$this->assertEquals(1, $total);
151 151
 
152
-		foreach($results as $itemId => $item) {
153
-			$this->assertEquals( $itemId, $item->getId() );
152
+		foreach ($results as $itemId => $item) {
153
+			$this->assertEquals($itemId, $item->getId());
154 154
 		}
155 155
 	}
156 156
 
Please login to merge, or discard this patch.