Completed
Push — master ( c7cb6f...a11e92 )
by Aimeos
10:48
created
lib/mwlib/tests/MW/Jsb2/StandardTest.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -20,43 +20,43 @@  discard block
 block discarded – undo
20 20
 	protected function setUp()
21 21
 	{
22 22
 		$ds = DIRECTORY_SEPARATOR;
23
-		$this->manifestPath = __DIR__ . $ds . 'manifests' . $ds;
24
-		$this->object = new \Aimeos\MW\Jsb2\Standard( $this->manifestPath . 'manifest.jsb2' );
23
+		$this->manifestPath = __DIR__.$ds.'manifests'.$ds;
24
+		$this->object = new \Aimeos\MW\Jsb2\Standard( $this->manifestPath.'manifest.jsb2' );
25 25
 	}
26 26
 
27 27
 
28 28
 	public function testConstructNoIncludeFilesExceptions()
29 29
 	{
30 30
 		$this->setExpectedException( '\\Aimeos\\MW\\Jsb2\\Exception' );
31
-		$this->object = new \Aimeos\MW\Jsb2\Standard( $this->manifestPath . 'manifest_invalid_fileinclude.jsb2' );
31
+		$this->object = new \Aimeos\MW\Jsb2\Standard( $this->manifestPath.'manifest_invalid_fileinclude.jsb2' );
32 32
 	}
33 33
 
34 34
 
35 35
 	public function testConstructNoPackageExceptions()
36 36
 	{
37 37
 		$this->setExpectedException( '\\Aimeos\\MW\\Jsb2\\Exception' );
38
-		$this->object = new \Aimeos\MW\Jsb2\Standard( $this->manifestPath . 'manifest_invalid_package.jsb2' );
38
+		$this->object = new \Aimeos\MW\Jsb2\Standard( $this->manifestPath.'manifest_invalid_package.jsb2' );
39 39
 	}
40 40
 
41 41
 
42 42
 	public function testConstructInvalidPackageContentExceptions()
43 43
 	{
44 44
 		$this->setExpectedException( '\\Aimeos\\MW\\Jsb2\\Exception' );
45
-		$this->object = new \Aimeos\MW\Jsb2\Standard( $this->manifestPath . 'manifest_invalid_package_content.jsb2' );
45
+		$this->object = new \Aimeos\MW\Jsb2\Standard( $this->manifestPath.'manifest_invalid_package_content.jsb2' );
46 46
 	}
47 47
 
48 48
 
49 49
 	public function testConstructNotJSONExceptions()
50 50
 	{
51 51
 		$this->setExpectedException( '\\Aimeos\\MW\\Jsb2\\Exception' );
52
-		$this->object = new \Aimeos\MW\Jsb2\Standard( $this->manifestPath . 'manifest_no_json.jsb2' );
52
+		$this->object = new \Aimeos\MW\Jsb2\Standard( $this->manifestPath.'manifest_no_json.jsb2' );
53 53
 	}
54 54
 
55 55
 
56 56
 	public function testConstructFileNotExistingExceptions()
57 57
 	{
58 58
 		$this->setExpectedException( '\\Aimeos\\MW\\Jsb2\\Exception' );
59
-		$this->object = new \Aimeos\MW\Jsb2\Standard( $this->manifestPath . 'manifest_not_existing.jsb2' );
59
+		$this->object = new \Aimeos\MW\Jsb2\Standard( $this->manifestPath.'manifest_not_existing.jsb2' );
60 60
 	}
61 61
 
62 62
 
@@ -72,9 +72,9 @@  discard block
 block discarded – undo
72 72
 	public function testGetHTML()
73 73
 	{
74 74
 		$html = '<script type="text/javascript" src="/./../%1$s"></script>';
75
-		$mtime = filemtime( __DIR__ . DIRECTORY_SEPARATOR . 'test.js' );
75
+		$mtime = filemtime( __DIR__.DIRECTORY_SEPARATOR.'test.js' );
76 76
 
77
-		$this->assertEquals( sprintf( $html, 'test.js?v=' . $mtime ), trim( $this->object->getHTML( 'js' ) ) );
77
+		$this->assertEquals( sprintf( $html, 'test.js?v='.$mtime ), trim( $this->object->getHTML( 'js' ) ) );
78 78
 	}
79 79
 
80 80
 
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
 
90 90
 	public function testGetUrlsFilemtimeException()
91 91
 	{
92
-		$object = new \Aimeos\MW\Jsb2\Standard( $this->manifestPath . 'manifest_filemtime_exception.jsb2' );
92
+		$object = new \Aimeos\MW\Jsb2\Standard( $this->manifestPath.'manifest_filemtime_exception.jsb2' );
93 93
 
94 94
 		$this->setExpectedException( '\\Aimeos\\MW\\Jsb2\\Exception' );
95 95
 		$object->getHTML( 'js' );
Please login to merge, or discard this patch.
lib/mwlib/tests/Perf/Config/ArrayTest.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -15,8 +15,8 @@  discard block
 block discarded – undo
15 15
 		$start = microtime( true );
16 16
 
17 17
 		$paths = array(
18
-			__DIR__ . DIRECTORY_SEPARATOR . 'one',
19
-			__DIR__ . DIRECTORY_SEPARATOR . 'two',
18
+			__DIR__.DIRECTORY_SEPARATOR.'one',
19
+			__DIR__.DIRECTORY_SEPARATOR.'two',
20 20
 		);
21 21
 
22 22
 		for( $i = 0; $i < 1000; $i++ )
@@ -29,6 +29,6 @@  discard block
 block discarded – undo
29 29
 		}
30 30
 
31 31
 		$stop = microtime( true );
32
-		echo "\n    config array: " . ( ( $stop - $start ) * 1000 ) . " msec\n";
32
+		echo "\n    config array: ".( ( $stop - $start ) * 1000 )." msec\n";
33 33
 	}
34 34
 }
Please login to merge, or discard this patch.
controller/common/src/Controller/Common/Media/Factory.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -85,12 +85,12 @@
 block discarded – undo
85 85
 		}
86 86
 
87 87
 		if( ctype_alnum( $name ) === false ) {
88
-			$classname = is_string( $name ) ? '\\Aimeos\\Controller\\Common\\Media\\' . $name : '<not a string>';
88
+			$classname = is_string( $name ) ? '\\Aimeos\\Controller\\Common\\Media\\'.$name : '<not a string>';
89 89
 			throw new \Aimeos\Controller\Common\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
90 90
 		}
91 91
 
92 92
 		$iface = '\\Aimeos\\Controller\\Common\\Media\\Iface';
93
-		$classname = '\\Aimeos\\Controller\\Common\\Media\\' . $name;
93
+		$classname = '\\Aimeos\\Controller\\Common\\Media\\'.$name;
94 94
 
95 95
 		if( isset( self::$objects[$classname] ) ) {
96 96
 			return self::$objects[$classname];
Please login to merge, or discard this patch.
controller/common/src/Controller/Common/Order/Factory.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -86,12 +86,12 @@
 block discarded – undo
86 86
 		}
87 87
 
88 88
 		if( ctype_alnum( $name ) === false ) {
89
-			$classname = is_string( $name ) ? '\\Aimeos\\Controller\\Common\\Order\\' . $name : '<not a string>';
89
+			$classname = is_string( $name ) ? '\\Aimeos\\Controller\\Common\\Order\\'.$name : '<not a string>';
90 90
 			throw new \Aimeos\Controller\Common\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
91 91
 		}
92 92
 
93 93
 		$iface = '\\Aimeos\\Controller\\Common\\Order\\Iface';
94
-		$classname = '\\Aimeos\\Controller\\Common\\Order\\' . $name;
94
+		$classname = '\\Aimeos\\Controller\\Common\\Order\\'.$name;
95 95
 
96 96
 		if( isset( self::$objects[$classname] ) ) {
97 97
 			return self::$objects[$classname];
Please login to merge, or discard this patch.
controller/common/tests/config/controller.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@
 block discarded – undo
11 11
 		'media' => array(
12 12
 			'standard' => array(
13 13
 				'mimeicon' => array(
14
-					'directory' => dirname( __DIR__ ) . '/tmp/media/mimeicons',
14
+					'directory' => dirname( __DIR__ ).'/tmp/media/mimeicons',
15 15
 				),
16 16
 			),
17 17
 		),
Please login to merge, or discard this patch.
controller/jobs/src/Controller/Jobs/Base.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -75,8 +75,8 @@
 block discarded – undo
75 75
 
76 76
 		$search = $manager->createSearch();
77 77
 		$expr = array(
78
-			$search->compare( '==', $prefix . '.domain', $domain ),
79
-			$search->compare( '==', $prefix . '.code', $code ),
78
+			$search->compare( '==', $prefix.'.domain', $domain ),
79
+			$search->compare( '==', $prefix.'.code', $code ),
80 80
 		);
81 81
 		$search->setConditions( $search->combine( '&&', $expr ) );
82 82
 		$result = $manager->searchItems( $search );
Please login to merge, or discard this patch.
Bootstrap.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -36,8 +36,8 @@  discard block
 block discarded – undo
36 36
 			$basedir = __DIR__;
37 37
 		}
38 38
 
39
-		if( $defaultdir === true && is_dir( $basedir . DIRECTORY_SEPARATOR . 'ext' ) === true ) {
40
-			$extdirs[] = realpath( $basedir . DIRECTORY_SEPARATOR . 'ext' );
39
+		if( $defaultdir === true && is_dir( $basedir.DIRECTORY_SEPARATOR.'ext' ) === true ) {
40
+			$extdirs[] = realpath( $basedir.DIRECTORY_SEPARATOR.'ext' );
41 41
 		}
42 42
 
43 43
 		$this->manifests[$basedir] = $this->getManifestFile( $basedir );
@@ -79,15 +79,15 @@  discard block
 block discarded – undo
79 79
 	 */
80 80
 	public static function autoload( $className )
81 81
 	{
82
-		$fileName = strtr( ltrim( $className, '\\' ), '\\_', DIRECTORY_SEPARATOR . DIRECTORY_SEPARATOR ) . '.php';
82
+		$fileName = strtr( ltrim( $className, '\\' ), '\\_', DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR ).'.php';
83 83
 
84
-		if( strncmp( $fileName, 'Aimeos' . DIRECTORY_SEPARATOR, 7 ) === 0 ) {
84
+		if( strncmp( $fileName, 'Aimeos'.DIRECTORY_SEPARATOR, 7 ) === 0 ) {
85 85
 			$fileName = substr( $fileName, 7 );
86 86
 		}
87 87
 
88 88
 		foreach( self::$includePaths as $path )
89 89
 		{
90
-			$file = $path . DIRECTORY_SEPARATOR . $fileName;
90
+			$file = $path.DIRECTORY_SEPARATOR.$fileName;
91 91
 
92 92
 			if( file_exists( $file ) === true && ( include_once $file ) !== false ) {
93 93
 				return true;
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
 
97 97
 		foreach( explode( PATH_SEPARATOR, get_include_path() ) as $path )
98 98
 		{
99
-			$file = $path . DIRECTORY_SEPARATOR . $fileName;
99
+			$file = $path.DIRECTORY_SEPARATOR.$fileName;
100 100
 
101 101
 			if( file_exists( $file ) === true && ( include_once $file ) !== false ) {
102 102
 				return true;
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
 			}
124 124
 
125 125
 			foreach( $manifest['i18n'] as $domain => $location ) {
126
-				$paths[$domain][] = $basePath . DIRECTORY_SEPARATOR . $location;
126
+				$paths[$domain][] = $basePath.DIRECTORY_SEPARATOR.$location;
127 127
 			}
128 128
 		}
129 129
 
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
 			}
148 148
 
149 149
 			foreach( $manifest['include'] as $paths ) {
150
-				$includes[] = $path . DIRECTORY_SEPARATOR . $paths;
150
+				$includes[] = $path.DIRECTORY_SEPARATOR.$paths;
151 151
 			}
152 152
 		}
153 153
 
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
 			}
172 172
 
173 173
 			foreach( (array) $manifest['config'] as $relpath ) {
174
-				$confpaths[] = $path . DIRECTORY_SEPARATOR . $relpath;
174
+				$confpaths[] = $path.DIRECTORY_SEPARATOR.$relpath;
175 175
 			}
176 176
 		}
177 177
 
@@ -218,9 +218,9 @@  discard block
 block discarded – undo
218 218
 
219 219
 			foreach( $manifest['setup'] as $relpath )
220 220
 			{
221
-				$setupPaths[] = $path . DIRECTORY_SEPARATOR . $relpath;
221
+				$setupPaths[] = $path.DIRECTORY_SEPARATOR.$relpath;
222 222
 
223
-				$sitePath = $path . DIRECTORY_SEPARATOR . $relpath . DIRECTORY_SEPARATOR . $site;
223
+				$sitePath = $path.DIRECTORY_SEPARATOR.$relpath.DIRECTORY_SEPARATOR.$site;
224 224
 
225 225
 				if( is_dir( realpath( $sitePath ) ) ) {
226 226
 					$setupPaths[] = $sitePath;
@@ -252,7 +252,7 @@  discard block
 block discarded – undo
252 252
 			{
253 253
 				$name = $file->getFilename();
254 254
 
255
-				if( $file->isFile() && preg_match('/^[a-z]{2,3}(_[A-Z]{2})?$/', $name ) ) {
255
+				if( $file->isFile() && preg_match( '/^[a-z]{2,3}(_[A-Z]{2})?$/', $name ) ) {
256 256
 					$list[$name] = null;
257 257
 				}
258 258
 			}
@@ -312,7 +312,7 @@  discard block
 block discarded – undo
312 312
 	 */
313 313
 	protected function getManifestFile( $dir )
314 314
 	{
315
-		$manifestFile = $dir . DIRECTORY_SEPARATOR . 'manifest.php';
315
+		$manifestFile = $dir.DIRECTORY_SEPARATOR.'manifest.php';
316 316
 
317 317
 		if( file_exists( $manifestFile ) ) {
318 318
 			return include $manifestFile;
@@ -335,8 +335,8 @@  discard block
 block discarded – undo
335 335
 
336 336
 		$ds = DIRECTORY_SEPARATOR;
337 337
 
338
-		if( is_file( __DIR__ . $ds . 'vendor' . $ds . 'autoload.php' ) ) {
339
-			require __DIR__ . $ds . 'vendor' . $ds . 'autoload.php';
338
+		if( is_file( __DIR__.$ds.'vendor'.$ds.'autoload.php' ) ) {
339
+			require __DIR__.$ds.'vendor'.$ds.'autoload.php';
340 340
 		}
341 341
 	}
342 342
 
Please login to merge, or discard this patch.
lib/mshoplib/tests/MShop/Context/Item/StandardTest.php 1 patch
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -207,7 +207,9 @@  discard block
 block discarded – undo
207 207
 		$this->assertEquals( '123', $this->object->getUserId() );
208 208
 		$this->assertInstanceOf( '\Aimeos\MShop\Context\Item\Iface', $return );
209 209
 
210
-		$return = $this->object->setUserId( function() { return 456; } );
210
+		$return = $this->object->setUserId( function()
211
+		{
212
+return 456; } );
211 213
 		$this->assertEquals( '456', $this->object->getUserId() );
212 214
 		$this->assertInstanceOf( '\Aimeos\MShop\Context\Item\Iface', $return );
213 215
 	}
@@ -220,7 +222,9 @@  discard block
 block discarded – undo
220 222
 		$this->assertEquals( array( '123' ), $this->object->getGroupIds() );
221 223
 		$this->assertInstanceOf( '\Aimeos\MShop\Context\Item\Iface', $return );
222 224
 
223
-		$return = $this->object->setGroupIds( function() { return array( 456 ); } );
225
+		$return = $this->object->setGroupIds( function()
226
+		{
227
+return array( 456 ); } );
224 228
 		$this->assertEquals( array( '456' ), $this->object->getGroupIds() );
225 229
 		$this->assertInstanceOf( '\Aimeos\MShop\Context\Item\Iface', $return );
226 230
 	}
Please login to merge, or discard this patch.
lib/mshoplib/setup/default/schema/cache.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 
9 9
 return array(
10 10
 	'table' => array(
11
-		'madmin_cache' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
11
+		'madmin_cache' => function( \Doctrine\DBAL\Schema\Schema $schema ) {
12 12
 
13 13
 			$table = $schema->createTable( 'madmin_cache' );
14 14
 
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
 			return $schema;
24 24
 		},
25 25
 
26
-		'madmin_cache_tag' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
26
+		'madmin_cache_tag' => function( \Doctrine\DBAL\Schema\Schema $schema ) {
27 27
 
28 28
 			$table = $schema->createTable( 'madmin_cache_tag' );
29 29
 
Please login to merge, or discard this patch.
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -8,7 +8,8 @@  discard block
 block discarded – undo
8 8
 
9 9
 return array(
10 10
 	'table' => array(
11
-		'madmin_cache' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
11
+		'madmin_cache' => function ( \Doctrine\DBAL\Schema\Schema $schema )
12
+		{
12 13
 
13 14
 			$table = $schema->createTable( 'madmin_cache' );
14 15
 
@@ -23,7 +24,8 @@  discard block
 block discarded – undo
23 24
 			return $schema;
24 25
 		},
25 26
 
26
-		'madmin_cache_tag' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
27
+		'madmin_cache_tag' => function ( \Doctrine\DBAL\Schema\Schema $schema )
28
+		{
27 29
 
28 30
 			$table = $schema->createTable( 'madmin_cache_tag' );
29 31
 
Please login to merge, or discard this patch.