Completed
Push — master ( d602fd...5769bf )
by Aimeos
02:45
created
lib/custom/src/MW/Cache/Laravel5.php 1 patch
Spacing   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 	 *
30 30
 	 * @param \Illuminate\Contracts\Cache\Store $cache Laravel cache object
31 31
 	 */
32
-	public function __construct( \Illuminate\Contracts\Cache\Store $cache )
32
+	public function __construct(\Illuminate\Contracts\Cache\Store $cache)
33 33
 	{
34 34
 		$this->object = $cache;
35 35
 	}
@@ -53,9 +53,9 @@  discard block
 block discarded – undo
53 53
 	 *
54 54
 	 * @param string $key Key string that identifies the single cache entry
55 55
 	 */
56
-	public function delete( $key )
56
+	public function delete($key)
57 57
 	{
58
-		$this->object->forget( $key );
58
+		$this->object->forget($key);
59 59
 	}
60 60
 
61 61
 
@@ -67,10 +67,10 @@  discard block
 block discarded – undo
67 67
 	 * @param \Traversable|array $keys List of key strings that identify the cache entries
68 68
 	 * 	that should be removed
69 69
 	 */
70
-	public function deleteMultiple( $keys )
70
+	public function deleteMultiple($keys)
71 71
 	{
72
-		foreach( $keys as $key ) {
73
-			$this->object->forget( $key );
72
+		foreach ($keys as $key) {
73
+			$this->object->forget($key);
74 74
 		}
75 75
 	}
76 76
 
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
 	 * @param string[] $tags List of tag strings that are associated to one or more
84 84
 	 * 	cache entries that should be removed
85 85
 	 */
86
-	public function deleteByTags( array $tags )
86
+	public function deleteByTags(array $tags)
87 87
 	{
88 88
 		// $this->object->tags( $tag )->flush();
89 89
 		$this->object->flush();
@@ -99,9 +99,9 @@  discard block
 block discarded – undo
99 99
 	 * @param string $default Value returned if requested key isn't found
100 100
 	 * @return mixed Value associated to the requested key
101 101
 	 */
102
-	public function get( $name, $default = null )
102
+	public function get($name, $default = null)
103 103
 	{
104
-		if( ( $entry = $this->object->get( $name ) ) !== null ) {
104
+		if (($entry = $this->object->get($name)) !== null) {
105 105
 			return $entry;
106 106
 		}
107 107
 
@@ -120,13 +120,13 @@  discard block
 block discarded – undo
120 120
 	 * 	entries. If a cache entry doesn't exist, neither its key nor a value
121 121
 	 * 	will be in the result list
122 122
 	 */
123
-	public function getMultiple( $keys, $default = null )
123
+	public function getMultiple($keys, $default = null)
124 124
 	{
125 125
 		$result = [];
126 126
 
127
-		foreach( $keys as $key )
127
+		foreach ($keys as $key)
128 128
 		{
129
-			if( ( $entry = $this->object->get( $key ) ) !== false ) {
129
+			if (($entry = $this->object->get($key)) !== false) {
130 130
 				$result[$key] = $entry;
131 131
 			} else {
132 132
 				$result[$key] = $default;
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
 	 * 	entries. If a tag isn't associated to any cache entry, nothing is returned
148 148
 	 * 	for that tag
149 149
 	 */
150
-	public function getMultipleByTags( array $tags )
150
+	public function getMultipleByTags(array $tags)
151 151
 	{
152 152
 		return [];
153 153
 	}
@@ -165,14 +165,14 @@  discard block
 block discarded – undo
165 165
 	 * @param array $tags List of tag strings that should be assoicated to the
166 166
 	 * 	given value in the cache
167 167
 	 */
168
-	public function set( $key, $value, $expires = null, array $tags = [] )
168
+	public function set($key, $value, $expires = null, array $tags = [])
169 169
 	{
170
-		if( is_string( $expires ) ) {
171
-			$this->object->put( $key, $value, (int) ( date_create( $expires )->getTimestamp() - time() ) / 60 );
172
-		} elseif( is_int( $expires ) ) {
173
-			$this->object->put( $key, $value, (int) $expires / 60 );
170
+		if (is_string($expires)) {
171
+			$this->object->put($key, $value, (int) (date_create($expires)->getTimestamp() - time())/60);
172
+		} elseif (is_int($expires)) {
173
+			$this->object->put($key, $value, (int) $expires/60);
174 174
 		} else {
175
-			$this->object->forever( $key, $value );
175
+			$this->object->forever($key, $value);
176 176
 		}
177 177
 	}
178 178
 
@@ -191,14 +191,14 @@  discard block
 block discarded – undo
191 191
 	 *  should be associated to the values identified by their key. The value
192 192
 	 *  associated to the key can either be a tag string or an array of tag strings
193 193
 	 */
194
-	public function setMultiple( $pairs, $expires = null, array $tags = [] )
194
+	public function setMultiple($pairs, $expires = null, array $tags = [])
195 195
 	{
196
-		foreach( $pairs as $key => $value )
196
+		foreach ($pairs as $key => $value)
197 197
 		{
198
-			$tagList = ( isset( $tags[$key] ) ? (array) $tags[$key] : [] );
199
-			$keyExpire = ( isset( $expires[$key] ) ? $expires[$key] : null );
198
+			$tagList = (isset($tags[$key]) ? (array) $tags[$key] : []);
199
+			$keyExpire = (isset($expires[$key]) ? $expires[$key] : null);
200 200
 
201
-			$this->set( $key, $value, $keyExpire, $tagList );
201
+			$this->set($key, $value, $keyExpire, $tagList);
202 202
 		}
203 203
 	}
204 204
 }
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 $trailing = [], array $config = [] )
55
+	public function transform($target = null, $controller = null, $action = null, array $params = [], array $trailing = [], array $config = [])
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/TestHelper.php 1 patch
Spacing   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -12,14 +12,14 @@  discard block
 block discarded – undo
12 12
 
13 13
 		$includepaths = $aimeos->getIncludePaths();
14 14
 		$includepaths[] = get_include_path();
15
-		set_include_path( implode( PATH_SEPARATOR, $includepaths ) );
15
+		set_include_path(implode(PATH_SEPARATOR, $includepaths));
16 16
 	}
17 17
 
18 18
 
19
-	public static function getContext( $site = 'unittest' )
19
+	public static function getContext($site = 'unittest')
20 20
 	{
21
-		if( !isset( self::$context[$site] ) ) {
22
-			self::$context[$site] = self::createContext( $site );
21
+		if (!isset(self::$context[$site])) {
22
+			self::$context[$site] = self::createContext($site);
23 23
 		}
24 24
 
25 25
 		return clone self::$context[$site];
@@ -28,54 +28,54 @@  discard block
 block discarded – undo
28 28
 
29 29
 	private static function getAimeos()
30 30
 	{
31
-		if( !isset( self::$aimeos ) )
31
+		if (!isset(self::$aimeos))
32 32
 		{
33 33
 			require_once 'Bootstrap.php';
34
-			spl_autoload_register( 'Aimeos\\Bootstrap::autoload' );
34
+			spl_autoload_register('Aimeos\\Bootstrap::autoload');
35 35
 
36
-			$extdir = dirname( dirname( dirname( __DIR__ ) ) );
37
-			self::$aimeos = new \Aimeos\Bootstrap( array( $extdir ), false );
36
+			$extdir = dirname(dirname(dirname(__DIR__)));
37
+			self::$aimeos = new \Aimeos\Bootstrap(array($extdir), false);
38 38
 		}
39 39
 
40 40
 		return self::$aimeos;
41 41
 	}
42 42
 
43 43
 
44
-	private static function createContext( $site )
44
+	private static function createContext($site)
45 45
 	{
46 46
 		$ctx = new \Aimeos\MShop\Context\Item\Standard();
47 47
 		$aimeos = self::getAimeos();
48 48
 
49 49
 
50
-		$paths = $aimeos->getConfigPaths( 'mysql' );
51
-		$paths[] = __DIR__ . DIRECTORY_SEPARATOR . 'config';
50
+		$paths = $aimeos->getConfigPaths('mysql');
51
+		$paths[] = __DIR__.DIRECTORY_SEPARATOR.'config';
52 52
 
53
-		$conf = new \Aimeos\MW\Config\PHPArray( [], $paths );
54
-		$ctx->setConfig( $conf );
53
+		$conf = new \Aimeos\MW\Config\PHPArray([], $paths);
54
+		$ctx->setConfig($conf);
55 55
 
56 56
 
57
-		$dbm = new \Aimeos\MW\DB\Manager\PDO( $conf );
58
-		$ctx->setDatabaseManager( $dbm );
57
+		$dbm = new \Aimeos\MW\DB\Manager\PDO($conf);
58
+		$ctx->setDatabaseManager($dbm);
59 59
 
60 60
 
61
-		$logger = new \Aimeos\MW\Logger\File( $site . '.log', \Aimeos\MW\Logger\Base::DEBUG );
62
-		$ctx->setLogger( $logger );
61
+		$logger = new \Aimeos\MW\Logger\File($site.'.log', \Aimeos\MW\Logger\Base::DEBUG);
62
+		$ctx->setLogger($logger);
63 63
 
64 64
 
65
-		$i18n = new \Aimeos\MW\Translation\None( 'de' );
66
-		$ctx->setI18n( array( 'de' => $i18n ) );
65
+		$i18n = new \Aimeos\MW\Translation\None('de');
66
+		$ctx->setI18n(array('de' => $i18n));
67 67
 
68 68
 
69 69
 		$session = new \Aimeos\MW\Session\None();
70
-		$ctx->setSession( $session );
70
+		$ctx->setSession($session);
71 71
 
72 72
 
73
-		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $ctx );
74
-		$localeItem = $localeManager->bootstrap( $site, '', '', false );
73
+		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager($ctx);
74
+		$localeItem = $localeManager->bootstrap($site, '', '', false);
75 75
 
76
-		$ctx->setLocale( $localeItem );
76
+		$ctx->setLocale($localeItem);
77 77
 
78
-		$ctx->setEditor( 'ai-laravel:unittest' );
78
+		$ctx->setEditor('ai-laravel:unittest');
79 79
 
80 80
 		return $ctx;
81 81
 	}
Please login to merge, or discard this patch.
lib/custom/tests/MW/Cache/Laravel5Test.php 1 patch
Spacing   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -17,107 +17,107 @@
 block discarded – undo
17 17
 
18 18
 	protected function setUp()
19 19
 	{
20
-		if( interface_exists( '\\Illuminate\\Contracts\\Cache\\Store' ) === false ) {
21
-			$this->markTestSkipped( 'Class \\Illuminate\\Contracts\\Cache\\Store not found' );
20
+		if (interface_exists('\\Illuminate\\Contracts\\Cache\\Store') === false) {
21
+			$this->markTestSkipped('Class \\Illuminate\\Contracts\\Cache\\Store not found');
22 22
 		}
23 23
 
24
-		$this->mock = $this->getMockBuilder( '\\Illuminate\\Contracts\\Cache\\Store' )->getMock();
25
-		$this->object = new \Aimeos\MW\Cache\Laravel5( $this->mock );
24
+		$this->mock = $this->getMockBuilder('\\Illuminate\\Contracts\\Cache\\Store')->getMock();
25
+		$this->object = new \Aimeos\MW\Cache\Laravel5($this->mock);
26 26
 	}
27 27
 
28 28
 
29 29
 	protected function tearDown()
30 30
 	{
31
-		unset( $this->mock, $this->object );
31
+		unset($this->mock, $this->object);
32 32
 	}
33 33
 
34 34
 
35 35
 	public function testDelete()
36 36
 	{
37
-		$this->mock->expects( $this->once() )->method( 'forget' )->with( $this->equalTo( 'key' ) );
38
-		$this->object->delete( 'key' );
37
+		$this->mock->expects($this->once())->method('forget')->with($this->equalTo('key'));
38
+		$this->object->delete('key');
39 39
 	}
40 40
 
41 41
 
42 42
 	public function testDeleteMultiple()
43 43
 	{
44
-		$this->mock->expects( $this->exactly( 2 ) )->method( 'forget' )->with( $this->equalTo( 'key' ) );
45
-		$this->object->deleteMultiple( array( 'key', 'key' ) );
44
+		$this->mock->expects($this->exactly(2))->method('forget')->with($this->equalTo('key'));
45
+		$this->object->deleteMultiple(array('key', 'key'));
46 46
 	}
47 47
 
48 48
 
49 49
 	public function testDeleteByTags()
50 50
 	{
51
-		$this->mock->expects( $this->once() )->method( 'flush' );
52
-		$this->object->deleteByTags( array( 'tag', 'tag' ) );
51
+		$this->mock->expects($this->once())->method('flush');
52
+		$this->object->deleteByTags(array('tag', 'tag'));
53 53
 	}
54 54
 
55 55
 
56 56
 	public function testClear()
57 57
 	{
58
-		$this->mock->expects( $this->once() )->method( 'flush' );
58
+		$this->mock->expects($this->once())->method('flush');
59 59
 		$this->object->clear();
60 60
 	}
61 61
 
62 62
 
63 63
 	public function testGet()
64 64
 	{
65
-		$this->mock->expects( $this->once() )->method( 'get' )
66
-			->with( $this->equalTo( 'key' ) )->will( $this->returnValue( 'value' ) );
65
+		$this->mock->expects($this->once())->method('get')
66
+			->with($this->equalTo('key'))->will($this->returnValue('value'));
67 67
 
68
-		$this->assertEquals( 'value', $this->object->get( 'key', 'default' ) );
68
+		$this->assertEquals('value', $this->object->get('key', 'default'));
69 69
 	}
70 70
 
71 71
 
72 72
 	public function testGetDefault()
73 73
 	{
74
-		$this->mock->expects( $this->once() )->method( 'get' )
75
-			->with( $this->equalTo( 'key' ) )->will( $this->returnValue( null ) );
74
+		$this->mock->expects($this->once())->method('get')
75
+			->with($this->equalTo('key'))->will($this->returnValue(null));
76 76
 
77
-		$this->assertEquals( 'default', $this->object->get( 'key', 'default' ) );
77
+		$this->assertEquals('default', $this->object->get('key', 'default'));
78 78
 	}
79 79
 
80 80
 
81 81
 	public function testGetMultiple()
82 82
 	{
83
-		$this->mock->expects( $this->exactly( 2 ) )->method( 'get' )
84
-			->will( $this->returnValue( 'value' ) );
83
+		$this->mock->expects($this->exactly(2))->method('get')
84
+			->will($this->returnValue('value'));
85 85
 
86
-		$expected = array( 'key1' => 'value', 'key2' => 'value' );
87
-		$this->assertEquals( $expected, $this->object->getMultiple( array( 'key1', 'key2' ) ) );
86
+		$expected = array('key1' => 'value', 'key2' => 'value');
87
+		$this->assertEquals($expected, $this->object->getMultiple(array('key1', 'key2')));
88 88
 	}
89 89
 
90 90
 
91 91
 	public function testGetMultipleByTags()
92 92
 	{
93
-		$this->assertEquals( [], $this->object->getMultipleByTags( array( 'key', 'key' ) ) );
93
+		$this->assertEquals([], $this->object->getMultipleByTags(array('key', 'key')));
94 94
 	}
95 95
 
96 96
 
97 97
 	public function testSet()
98 98
 	{
99
-		$this->mock->expects( $this->once() )->method( 'put' )
100
-			->with( $this->equalTo( 'key' ), $this->equalTo( 'value' ), $this->greaterThan( 0 ) );
99
+		$this->mock->expects($this->once())->method('put')
100
+			->with($this->equalTo('key'), $this->equalTo('value'), $this->greaterThan(0));
101 101
 
102
-		$this->object->set( 'key', 'value', '2100-01-01 00:00:00', array( 'tag' ) );
102
+		$this->object->set('key', 'value', '2100-01-01 00:00:00', array('tag'));
103 103
 	}
104 104
 
105 105
 
106 106
 	public function testSetForever()
107 107
 	{
108
-		$this->mock->expects( $this->once() )->method( 'forever' )
109
-			->with( $this->equalTo( 'key' ), $this->equalTo( 'value' ) );
108
+		$this->mock->expects($this->once())->method('forever')
109
+			->with($this->equalTo('key'), $this->equalTo('value'));
110 110
 
111
-		$this->object->set( 'key', 'value', null, array( 'tag' ) );
111
+		$this->object->set('key', 'value', null, array('tag'));
112 112
 	}
113 113
 
114 114
 
115 115
 	public function testSetMultiple()
116 116
 	{
117
-		$this->mock->expects( $this->once() )->method( 'put' )
118
-			->with( $this->equalTo( 'key' ), $this->equalTo( 'value' ), $this->greaterThan( 0 ) );
117
+		$this->mock->expects($this->once())->method('put')
118
+			->with($this->equalTo('key'), $this->equalTo('value'), $this->greaterThan(0));
119 119
 
120
-		$expires = array( 'key' => '2100-01-01 00:00:00' );
121
-		$this->object->setMultiple( array( 'key' => 'value' ), $expires, array( 'key' => array( 'tag' ) ) );
120
+		$expires = array('key' => '2100-01-01 00:00:00');
121
+		$this->object->setMultiple(array('key' => 'value'), $expires, array('key' => array('tag')));
122 122
 	}
123 123
 }
Please login to merge, or discard this patch.
lib/custom/tests/MW/View/Engine/BladeTest.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -16,41 +16,41 @@
 block discarded – undo
16 16
 
17 17
 	protected function setUp()
18 18
 	{
19
-		if( !class_exists( '\Illuminate\View\Factory' ) ) {
20
-			$this->markTestSkipped( '\Illuminate\View\Factory is not available' );
19
+		if (!class_exists('\Illuminate\View\Factory')) {
20
+			$this->markTestSkipped('\Illuminate\View\Factory is not available');
21 21
 		}
22 22
 
23
-		$this->mock = $this->getMockBuilder( '\Illuminate\View\Factory' )
24
-			->setMethods( array( 'file' ) )
23
+		$this->mock = $this->getMockBuilder('\Illuminate\View\Factory')
24
+			->setMethods(array('file'))
25 25
 			->disableOriginalConstructor()
26 26
 			->getMock();
27 27
 
28
-		$this->object = new \Aimeos\MW\View\Engine\Blade( $this->mock );
28
+		$this->object = new \Aimeos\MW\View\Engine\Blade($this->mock);
29 29
 	}
30 30
 
31 31
 
32 32
 	protected function tearDown()
33 33
 	{
34
-		unset( $this->object, $this->mock );
34
+		unset($this->object, $this->mock);
35 35
 	}
36 36
 
37 37
 
38 38
 	public function testRender()
39 39
 	{
40
-		$v = new \Aimeos\MW\View\Standard( [] );
40
+		$v = new \Aimeos\MW\View\Standard([]);
41 41
 
42
-		$view = $this->getMockBuilder( '\Illuminate\View\View' )
43
-			->setMethods( array( 'render' ) )
42
+		$view = $this->getMockBuilder('\Illuminate\View\View')
43
+			->setMethods(array('render'))
44 44
 			->disableOriginalConstructor()
45 45
 			->getMock();
46 46
 
47
-		$view->expects( $this->once() )->method( 'render' )
48
-			->will( $this->returnValue( 'test' ) );
47
+		$view->expects($this->once())->method('render')
48
+			->will($this->returnValue('test'));
49 49
 
50
-		$this->mock->expects( $this->once() )->method( 'file' )
51
-			->will( $this->returnValue( $view) );
50
+		$this->mock->expects($this->once())->method('file')
51
+			->will($this->returnValue($view));
52 52
 
53
-		$result = $this->object->render( $v, 'filepath', array( 'key' => 'value' ) );
54
-		$this->assertEquals( 'test', $result );
53
+		$result = $this->object->render($v, 'filepath', array('key' => 'value'));
54
+		$this->assertEquals('test', $result);
55 55
 	}
56 56
 }
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( [], [], [], [], [], $param, 'Content' );
29
+		$param = array('HTTP_HOST' => 'localhost', 'REMOTE_ADDR' => '127.0.0.1');
30
+		$request = new \Illuminate\Http\Request([], [], [], [], [], $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/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, [] );
29
+		$this->mock = $this->getMockBuilder('\\Illuminate\\Contracts\\Routing\\UrlGenerator')->getMock();
30
+		$this->object = new \Aimeos\MW\View\Helper\Url\Laravel5($view, $this->mock, []);
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( [] ), $this->equalTo( true ) );
57
+		$this->mock->expects($this->once())->method('route')
58
+			->with($this->equalTo('route'), $this->equalTo([]), $this->equalTo(true));
59 59
 
60
-		$options = array( 'absoluteUri' => true );
61
-		$this->object->transform( 'route', 'catalog', 'lists', [], [], $options );
60
+		$options = array('absoluteUri' => true);
61
+		$this->object->transform('route', 'catalog', 'lists', [], [], $options);
62 62
 	}
63 63
 }
Please login to merge, or discard this patch.
lib/custom/tests/MW/Filesystem/Manager/LaravelTest.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -12,50 +12,50 @@
 block discarded – undo
12 12
 
13 13
 	protected function setUp()
14 14
 	{
15
-		if( !class_exists( '\Illuminate\Filesystem\FilesystemManager' ) ) {
16
-			$this->markTestSkipped( 'Install the Laravel framework first' );
15
+		if (!class_exists('\Illuminate\Filesystem\FilesystemManager')) {
16
+			$this->markTestSkipped('Install the Laravel framework first');
17 17
 		}
18 18
 
19
-		$this->storage = $this->getMockBuilder( '\Illuminate\Filesystem\FilesystemManager' )
20
-			->setMethods( array( 'get' ) )
19
+		$this->storage = $this->getMockBuilder('\Illuminate\Filesystem\FilesystemManager')
20
+			->setMethods(array('get'))
21 21
 			->disableOriginalConstructor()
22 22
 			->getMock();
23 23
 
24
-		$this->config = new \Aimeos\MW\Config\Decorator\Memory( new \Aimeos\MW\Config\PHPArray( [], [] ) );
25
-		$this->object = new \Aimeos\MW\Filesystem\Manager\Laravel( $this->storage, $this->config, sys_get_temp_dir() );
24
+		$this->config = new \Aimeos\MW\Config\Decorator\Memory(new \Aimeos\MW\Config\PHPArray([], []));
25
+		$this->object = new \Aimeos\MW\Filesystem\Manager\Laravel($this->storage, $this->config, sys_get_temp_dir());
26 26
 	}
27 27
 
28 28
 
29 29
 	protected function tearDown()
30 30
 	{
31
-		unset( $this->config, $this->object, $this->storage );
31
+		unset($this->config, $this->object, $this->storage);
32 32
 	}
33 33
 
34 34
 
35 35
 	public function testGet()
36 36
 	{
37
-		$fs = $this->getMockBuilder( 'Illuminate\Contracts\Filesystem\Filesystem' )
37
+		$fs = $this->getMockBuilder('Illuminate\Contracts\Filesystem\Filesystem')
38 38
 			->disableOriginalConstructor()
39 39
 			->getMock();
40 40
 
41
-		$this->storage->expects( $this->once() )->method( 'get' )
42
-			->will( $this->returnValue( $fs ) );
41
+		$this->storage->expects($this->once())->method('get')
42
+			->will($this->returnValue($fs));
43 43
 
44
-		$this->config->set( 'resource/fs-media', 'local' );
45
-		$this->assertInstanceof( 'Aimeos\MW\Filesystem\Iface', $this->object->get( 'fs-media' ) );
44
+		$this->config->set('resource/fs-media', 'local');
45
+		$this->assertInstanceof('Aimeos\MW\Filesystem\Iface', $this->object->get('fs-media'));
46 46
 	}
47 47
 
48 48
 
49 49
 	public function testGetFallback()
50 50
 	{
51
-		$this->config->set( 'resource/fs', array( 'adapter' => 'Standard', 'basedir' => __DIR__ ) );
52
-		$this->assertInstanceof( 'Aimeos\MW\Filesystem\Iface', $this->object->get( 'fs-media' ) );
51
+		$this->config->set('resource/fs', array('adapter' => 'Standard', 'basedir' => __DIR__));
52
+		$this->assertInstanceof('Aimeos\MW\Filesystem\Iface', $this->object->get('fs-media'));
53 53
 	}
54 54
 
55 55
 
56 56
 	public function testGetException()
57 57
 	{
58
-		$this->setExpectedException( 'Aimeos\MW\Filesystem\Exception' );
59
-		$this->object->get( 'fs-media' );
58
+		$this->setExpectedException('Aimeos\MW\Filesystem\Exception');
59
+		$this->object->get('fs-media');
60 60
 	}
61 61
 }
Please login to merge, or discard this patch.
lib/custom/tests/MShop/Customer/Manager/Address/LaravelTest.php 1 patch
Spacing   +130 added lines, -130 removed lines patch added patch discarded remove patch
@@ -21,18 +21,18 @@  discard block
 block discarded – undo
21 21
 	{
22 22
 		$context = \TestHelper::getContext();
23 23
 		$this->editor = $context->getEditor();
24
-		$customer = new \Aimeos\MShop\Customer\Manager\Laravel( $context );
24
+		$customer = new \Aimeos\MShop\Customer\Manager\Laravel($context);
25 25
 
26 26
 		$search = $customer->createSearch();
27 27
 		$conditions = array(
28
-			$search->compare( '==', 'customer.code', 'unitCustomer1' ),
29
-			$search->compare( '==', 'customer.editor', $this->editor )
28
+			$search->compare('==', 'customer.code', 'unitCustomer1'),
29
+			$search->compare('==', 'customer.editor', $this->editor)
30 30
 		);
31
-		$search->setConditions( $search->combine( '&&', $conditions ) );
32
-		$result = $customer->searchItems( $search );
31
+		$search->setConditions($search->combine('&&', $conditions));
32
+		$result = $customer->searchItems($search);
33 33
 
34
-		if( ( $customerItem = reset( $result ) ) === false ) {
35
-			throw new \RuntimeException( sprintf( 'No customer item found for code "%1$s"', 'unitCustomer1' ) );
34
+		if (($customerItem = reset($result)) === false) {
35
+			throw new \RuntimeException(sprintf('No customer item found for code "%1$s"', 'unitCustomer1'));
36 36
 		}
37 37
 
38 38
 		$this->fixture = array(
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
 			'customer.address.siteid' => $context->getLocale()->getSiteId(),
62 62
 		);
63 63
 
64
-		$this->object = $customer->getSubManager( 'address', 'Laravel' );
64
+		$this->object = $customer->getSubManager('address', 'Laravel');
65 65
 	}
66 66
 
67 67
 
@@ -70,130 +70,130 @@  discard block
 block discarded – undo
70 70
 	 */
71 71
 	protected function tearDown()
72 72
 	{
73
-		unset( $this->object, $this->fixture );
73
+		unset($this->object, $this->fixture);
74 74
 	}
75 75
 
76 76
 
77 77
 	public function testCleanup()
78 78
 	{
79
-		$this->object->cleanup( array( -1 ) );
79
+		$this->object->cleanup(array( -1 ));
80 80
 	}
81 81
 
82 82
 	public function testGetSearchAttributes()
83 83
 	{
84
-		foreach( $this->object->getSearchAttributes() as $attribute ) {
85
-			$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute );
84
+		foreach ($this->object->getSearchAttributes() as $attribute) {
85
+			$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute);
86 86
 		}
87 87
 	}
88 88
 
89 89
 	public function testCreateItem()
90 90
 	{
91
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Address\\Iface', $this->object->createItem() );
91
+		$this->assertInstanceOf('\\Aimeos\\MShop\\Common\\Item\\Address\\Iface', $this->object->createItem());
92 92
 	}
93 93
 
94 94
 	public function testGetItem()
95 95
 	{
96 96
 		$search = $this->object->createSearch();
97
-		$search->setConditions( $search->compare( '~=', 'customer.address.company', 'ABC GmbH' ) );
97
+		$search->setConditions($search->compare('~=', 'customer.address.company', 'ABC GmbH'));
98 98
 
99
-		$items = $this->object->searchItems( $search );
99
+		$items = $this->object->searchItems($search);
100 100
 
101
-		if( ( $item = reset( $items ) ) === false ) {
102
-			throw new \RuntimeException( 'No address item with company "ABC" found' );
101
+		if (($item = reset($items)) === false) {
102
+			throw new \RuntimeException('No address item with company "ABC" found');
103 103
 		}
104 104
 
105
-		$this->assertEquals( $item, $this->object->getItem( $item->getId() ) );
105
+		$this->assertEquals($item, $this->object->getItem($item->getId()));
106 106
 	}
107 107
 
108 108
 	public function testGetSubManager()
109 109
 	{
110
-		$this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
111
-		$this->object->getSubManager( 'unknown' );
110
+		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
111
+		$this->object->getSubManager('unknown');
112 112
 	}
113 113
 
114 114
 	public function testSaveUpdateDeleteItem()
115 115
 	{
116
-		$item = new \Aimeos\MShop\Common\Item\Address\Standard( 'customer.address.', $this->fixture );
117
-		$item->setId( null );
118
-		$this->object->saveItem( $item );
119
-		$itemSaved = $this->object->getItem( $item->getId() );
116
+		$item = new \Aimeos\MShop\Common\Item\Address\Standard('customer.address.', $this->fixture);
117
+		$item->setId(null);
118
+		$this->object->saveItem($item);
119
+		$itemSaved = $this->object->getItem($item->getId());
120 120
 
121 121
 		$itemExp = clone $itemSaved;
122
-		$itemExp->setPosition( 1 );
123
-		$itemExp->setCity( 'Berlin' );
124
-		$itemExp->setState( 'Berlin' );
125
-		$this->object->saveItem( $itemExp );
126
-		$itemUpd = $this->object->getItem( $itemExp->getId() );
127
-
128
-		$this->object->deleteItem( $itemSaved->getId() );
129
-
130
-
131
-		$this->assertTrue( $item->getId() !== null );
132
-		$this->assertEquals( $item->getId(), $itemSaved->getId() );
133
-		$this->assertEquals( $item->getParentId(), $itemSaved->getParentId());
134
-		$this->assertEquals( $item->getPosition(), $itemSaved->getPosition());
135
-		$this->assertEquals( $item->getCompany(), $itemSaved->getCompany());
136
-		$this->assertEquals( $item->getVatID(), $itemSaved->getVatID());
137
-		$this->assertEquals( $item->getSalutation(), $itemSaved->getSalutation());
138
-		$this->assertEquals( $item->getTitle(), $itemSaved->getTitle());
139
-		$this->assertEquals( $item->getFirstname(), $itemSaved->getFirstname());
140
-		$this->assertEquals( $item->getLastname(), $itemSaved->getLastname());
141
-		$this->assertEquals( $item->getAddress1(), $itemSaved->getAddress1());
142
-		$this->assertEquals( $item->getAddress2(), $itemSaved->getAddress2());
143
-		$this->assertEquals( $item->getAddress3(), $itemSaved->getAddress3());
144
-		$this->assertEquals( $item->getPostal(), $itemSaved->getPostal());
145
-		$this->assertEquals( $item->getCity(), $itemSaved->getCity());
146
-		$this->assertEquals( $item->getState(), $itemSaved->getState());
147
-		$this->assertEquals( $item->getCountryId(), $itemSaved->getCountryId());
148
-		$this->assertEquals( $item->getLanguageId(), $itemSaved->getLanguageId());
149
-		$this->assertEquals( $item->getTelephone(), $itemSaved->getTelephone());
150
-		$this->assertEquals( $item->getEmail(), $itemSaved->getEmail());
151
-		$this->assertEquals( $item->getTelefax(), $itemSaved->getTelefax());
152
-		$this->assertEquals( $item->getWebsite(), $itemSaved->getWebsite());
153
-		$this->assertEquals( $item->getLongitude(), $itemSaved->getLongitude());
154
-		$this->assertEquals( $item->getLatitude(), $itemSaved->getLatitude());
155
-		$this->assertEquals( $item->getFlag(), $itemSaved->getFlag());
156
-
157
-		$this->assertEquals( $this->editor, $itemSaved->getEditor() );
158
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated() );
122
+		$itemExp->setPosition(1);
123
+		$itemExp->setCity('Berlin');
124
+		$itemExp->setState('Berlin');
125
+		$this->object->saveItem($itemExp);
126
+		$itemUpd = $this->object->getItem($itemExp->getId());
127
+
128
+		$this->object->deleteItem($itemSaved->getId());
129
+
130
+
131
+		$this->assertTrue($item->getId() !== null);
132
+		$this->assertEquals($item->getId(), $itemSaved->getId());
133
+		$this->assertEquals($item->getParentId(), $itemSaved->getParentId());
134
+		$this->assertEquals($item->getPosition(), $itemSaved->getPosition());
135
+		$this->assertEquals($item->getCompany(), $itemSaved->getCompany());
136
+		$this->assertEquals($item->getVatID(), $itemSaved->getVatID());
137
+		$this->assertEquals($item->getSalutation(), $itemSaved->getSalutation());
138
+		$this->assertEquals($item->getTitle(), $itemSaved->getTitle());
139
+		$this->assertEquals($item->getFirstname(), $itemSaved->getFirstname());
140
+		$this->assertEquals($item->getLastname(), $itemSaved->getLastname());
141
+		$this->assertEquals($item->getAddress1(), $itemSaved->getAddress1());
142
+		$this->assertEquals($item->getAddress2(), $itemSaved->getAddress2());
143
+		$this->assertEquals($item->getAddress3(), $itemSaved->getAddress3());
144
+		$this->assertEquals($item->getPostal(), $itemSaved->getPostal());
145
+		$this->assertEquals($item->getCity(), $itemSaved->getCity());
146
+		$this->assertEquals($item->getState(), $itemSaved->getState());
147
+		$this->assertEquals($item->getCountryId(), $itemSaved->getCountryId());
148
+		$this->assertEquals($item->getLanguageId(), $itemSaved->getLanguageId());
149
+		$this->assertEquals($item->getTelephone(), $itemSaved->getTelephone());
150
+		$this->assertEquals($item->getEmail(), $itemSaved->getEmail());
151
+		$this->assertEquals($item->getTelefax(), $itemSaved->getTelefax());
152
+		$this->assertEquals($item->getWebsite(), $itemSaved->getWebsite());
153
+		$this->assertEquals($item->getLongitude(), $itemSaved->getLongitude());
154
+		$this->assertEquals($item->getLatitude(), $itemSaved->getLatitude());
155
+		$this->assertEquals($item->getFlag(), $itemSaved->getFlag());
156
+
157
+		$this->assertEquals($this->editor, $itemSaved->getEditor());
158
+		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated());
159 159
 		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified());
160 160
 
161
-		$this->assertEquals( $itemExp->getId(), $itemUpd->getId() );
162
-		$this->assertEquals( $itemExp->getParentId(), $itemUpd->getParentId());
163
-		$this->assertEquals( $itemExp->getPosition(), $itemUpd->getPosition());
164
-		$this->assertEquals( $itemExp->getCompany(), $itemUpd->getCompany());
165
-		$this->assertEquals( $itemExp->getVatID(), $itemUpd->getVatID());
166
-		$this->assertEquals( $itemExp->getSalutation(), $itemUpd->getSalutation());
167
-		$this->assertEquals( $itemExp->getTitle(), $itemUpd->getTitle());
168
-		$this->assertEquals( $itemExp->getFirstname(), $itemUpd->getFirstname());
169
-		$this->assertEquals( $itemExp->getLastname(), $itemUpd->getLastname());
170
-		$this->assertEquals( $itemExp->getAddress1(), $itemUpd->getAddress1());
171
-		$this->assertEquals( $itemExp->getAddress2(), $itemUpd->getAddress2());
172
-		$this->assertEquals( $itemExp->getAddress3(), $itemUpd->getAddress3());
173
-		$this->assertEquals( $itemExp->getPostal(), $itemUpd->getPostal());
174
-		$this->assertEquals( $itemExp->getCity(), $itemUpd->getCity());
175
-		$this->assertEquals( $itemExp->getState(), $itemUpd->getState());
176
-		$this->assertEquals( $itemExp->getCountryId(), $itemUpd->getCountryId());
177
-		$this->assertEquals( $itemExp->getLanguageId(), $itemUpd->getLanguageId());
178
-		$this->assertEquals( $itemExp->getTelephone(), $itemUpd->getTelephone());
179
-		$this->assertEquals( $itemExp->getEmail(), $itemUpd->getEmail());
180
-		$this->assertEquals( $itemExp->getTelefax(), $itemUpd->getTelefax());
181
-		$this->assertEquals( $itemExp->getWebsite(), $itemUpd->getWebsite());
182
-		$this->assertEquals( $itemExp->getLongitude(), $itemUpd->getLongitude());
183
-		$this->assertEquals( $itemExp->getLatitude(), $itemUpd->getLatitude());
184
-		$this->assertEquals( $itemExp->getFlag(), $itemUpd->getFlag());
185
-
186
-		$this->assertEquals( $this->editor, $itemUpd->getEditor() );
187
-		$this->assertEquals( $itemExp->getTimeCreated(), $itemUpd->getTimeCreated() );
188
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified() );
161
+		$this->assertEquals($itemExp->getId(), $itemUpd->getId());
162
+		$this->assertEquals($itemExp->getParentId(), $itemUpd->getParentId());
163
+		$this->assertEquals($itemExp->getPosition(), $itemUpd->getPosition());
164
+		$this->assertEquals($itemExp->getCompany(), $itemUpd->getCompany());
165
+		$this->assertEquals($itemExp->getVatID(), $itemUpd->getVatID());
166
+		$this->assertEquals($itemExp->getSalutation(), $itemUpd->getSalutation());
167
+		$this->assertEquals($itemExp->getTitle(), $itemUpd->getTitle());
168
+		$this->assertEquals($itemExp->getFirstname(), $itemUpd->getFirstname());
169
+		$this->assertEquals($itemExp->getLastname(), $itemUpd->getLastname());
170
+		$this->assertEquals($itemExp->getAddress1(), $itemUpd->getAddress1());
171
+		$this->assertEquals($itemExp->getAddress2(), $itemUpd->getAddress2());
172
+		$this->assertEquals($itemExp->getAddress3(), $itemUpd->getAddress3());
173
+		$this->assertEquals($itemExp->getPostal(), $itemUpd->getPostal());
174
+		$this->assertEquals($itemExp->getCity(), $itemUpd->getCity());
175
+		$this->assertEquals($itemExp->getState(), $itemUpd->getState());
176
+		$this->assertEquals($itemExp->getCountryId(), $itemUpd->getCountryId());
177
+		$this->assertEquals($itemExp->getLanguageId(), $itemUpd->getLanguageId());
178
+		$this->assertEquals($itemExp->getTelephone(), $itemUpd->getTelephone());
179
+		$this->assertEquals($itemExp->getEmail(), $itemUpd->getEmail());
180
+		$this->assertEquals($itemExp->getTelefax(), $itemUpd->getTelefax());
181
+		$this->assertEquals($itemExp->getWebsite(), $itemUpd->getWebsite());
182
+		$this->assertEquals($itemExp->getLongitude(), $itemUpd->getLongitude());
183
+		$this->assertEquals($itemExp->getLatitude(), $itemUpd->getLatitude());
184
+		$this->assertEquals($itemExp->getFlag(), $itemUpd->getFlag());
185
+
186
+		$this->assertEquals($this->editor, $itemUpd->getEditor());
187
+		$this->assertEquals($itemExp->getTimeCreated(), $itemUpd->getTimeCreated());
188
+		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified());
189 189
 
190 190
 		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
191
-		$this->object->getItem( $itemSaved->getId() );
191
+		$this->object->getItem($itemSaved->getId());
192 192
 	}
193 193
 
194 194
 	public function testCreateSearch()
195 195
 	{
196
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $this->object->createSearch() );
196
+		$this->assertInstanceOf('\\Aimeos\\MW\\Criteria\\Iface', $this->object->createSearch());
197 197
 	}
198 198
 
199 199
 
@@ -202,36 +202,36 @@  discard block
 block discarded – undo
202 202
 		$search = $this->object->createSearch();
203 203
 
204 204
 		$expr = [];
205
-		$expr[] = $search->compare( '!=', 'customer.address.id', null );
206
-		$expr[] = $search->compare( '!=', 'customer.address.parentid', null );
207
-		$expr[] = $search->compare( '==', 'customer.address.company', 'ABC GmbH' );
208
-		$expr[] = $search->compare( '==', 'customer.address.vatid', 'DE999999999' );
209
-		$expr[] = $search->compare( '==', 'customer.address.salutation', 'mr' );
210
-		$expr[] = $search->compare( '==', 'customer.address.title', 'Dr.' );
211
-		$expr[] = $search->compare( '==', 'customer.address.firstname', 'Good' );
212
-		$expr[] = $search->compare( '==', 'customer.address.lastname', 'Unittest' );
213
-		$expr[] = $search->compare( '==', 'customer.address.address1', 'Pickhuben' );
214
-		$expr[] = $search->compare( '==', 'customer.address.address2', '2-4' );
215
-		$expr[] = $search->compare( '==', 'customer.address.address3', '' );
216
-		$expr[] = $search->compare( '==', 'customer.address.postal', '11099' );
217
-		$expr[] = $search->compare( '==', 'customer.address.city', 'Berlin' );
218
-		$expr[] = $search->compare( '==', 'customer.address.state', 'Berlin' );
219
-		$expr[] = $search->compare( '==', 'customer.address.languageid', 'de' );
220
-		$expr[] = $search->compare( '==', 'customer.address.countryid', 'DE' );
221
-		$expr[] = $search->compare( '==', 'customer.address.telephone', '055544332221' );
222
-		$expr[] = $search->compare( '==', 'customer.address.email', '[email protected]' );
223
-		$expr[] = $search->compare( '==', 'customer.address.telefax', '055544333212' );
224
-		$expr[] = $search->compare( '==', 'customer.address.website', 'unittest.aimeos.org' );
225
-		$expr[] = $search->compare( '>=', 'customer.address.longitude', '10.0' );
226
-		$expr[] = $search->compare( '>=', 'customer.address.latitude', '50.0' );
227
-		$expr[] = $search->compare( '==', 'customer.address.flag', 0 );
228
-		$expr[] = $search->compare( '==', 'customer.address.position', 1 );
229
-		$expr[] = $search->compare( '!=', 'customer.address.mtime', '1970-01-01 00:00:00' );
230
-		$expr[] = $search->compare( '!=', 'customer.address.ctime', '1970-01-01 00:00:00' );
231
-		$expr[] = $search->compare( '==', 'customer.address.editor', $this->editor );
232
-
233
-		$search->setConditions( $search->combine( '&&', $expr ) );
234
-		$this->assertEquals( 1, count( $this->object->searchItems( $search ) ) );
205
+		$expr[] = $search->compare('!=', 'customer.address.id', null);
206
+		$expr[] = $search->compare('!=', 'customer.address.parentid', null);
207
+		$expr[] = $search->compare('==', 'customer.address.company', 'ABC GmbH');
208
+		$expr[] = $search->compare('==', 'customer.address.vatid', 'DE999999999');
209
+		$expr[] = $search->compare('==', 'customer.address.salutation', 'mr');
210
+		$expr[] = $search->compare('==', 'customer.address.title', 'Dr.');
211
+		$expr[] = $search->compare('==', 'customer.address.firstname', 'Good');
212
+		$expr[] = $search->compare('==', 'customer.address.lastname', 'Unittest');
213
+		$expr[] = $search->compare('==', 'customer.address.address1', 'Pickhuben');
214
+		$expr[] = $search->compare('==', 'customer.address.address2', '2-4');
215
+		$expr[] = $search->compare('==', 'customer.address.address3', '');
216
+		$expr[] = $search->compare('==', 'customer.address.postal', '11099');
217
+		$expr[] = $search->compare('==', 'customer.address.city', 'Berlin');
218
+		$expr[] = $search->compare('==', 'customer.address.state', 'Berlin');
219
+		$expr[] = $search->compare('==', 'customer.address.languageid', 'de');
220
+		$expr[] = $search->compare('==', 'customer.address.countryid', 'DE');
221
+		$expr[] = $search->compare('==', 'customer.address.telephone', '055544332221');
222
+		$expr[] = $search->compare('==', 'customer.address.email', '[email protected]');
223
+		$expr[] = $search->compare('==', 'customer.address.telefax', '055544333212');
224
+		$expr[] = $search->compare('==', 'customer.address.website', 'unittest.aimeos.org');
225
+		$expr[] = $search->compare('>=', 'customer.address.longitude', '10.0');
226
+		$expr[] = $search->compare('>=', 'customer.address.latitude', '50.0');
227
+		$expr[] = $search->compare('==', 'customer.address.flag', 0);
228
+		$expr[] = $search->compare('==', 'customer.address.position', 1);
229
+		$expr[] = $search->compare('!=', 'customer.address.mtime', '1970-01-01 00:00:00');
230
+		$expr[] = $search->compare('!=', 'customer.address.ctime', '1970-01-01 00:00:00');
231
+		$expr[] = $search->compare('==', 'customer.address.editor', $this->editor);
232
+
233
+		$search->setConditions($search->combine('&&', $expr));
234
+		$this->assertEquals(1, count($this->object->searchItems($search)));
235 235
 	}
236 236
 
237 237
 
@@ -241,20 +241,20 @@  discard block
 block discarded – undo
241 241
 		$search = $this->object->createSearch();
242 242
 
243 243
 		$conditions = array(
244
-			$search->compare( '~=', 'customer.address.company', 'ABC GmbH' ),
245
-			$search->compare( '==', 'customer.address.editor', $this->editor )
244
+			$search->compare('~=', 'customer.address.company', 'ABC GmbH'),
245
+			$search->compare('==', 'customer.address.editor', $this->editor)
246 246
 		);
247 247
 
248
-		$search->setConditions( $search->combine( '&&', $conditions ) );
249
-		$search->setSlice( 0, 1 );
248
+		$search->setConditions($search->combine('&&', $conditions));
249
+		$search->setSlice(0, 1);
250 250
 
251
-		$results = $this->object->searchItems( $search, [], $total );
251
+		$results = $this->object->searchItems($search, [], $total);
252 252
 
253
-		$this->assertEquals( 1, count( $results ) );
254
-		$this->assertEquals( 2, $total );
253
+		$this->assertEquals(1, count($results));
254
+		$this->assertEquals(2, $total);
255 255
 
256
-		foreach( $results as $id => $item ) {
257
-			$this->assertEquals( $id, $item->getId() );
256
+		foreach ($results as $id => $item) {
257
+			$this->assertEquals($id, $item->getId());
258 258
 		}
259 259
 	}
260 260
 }
Please login to merge, or discard this patch.