Completed
Push — master ( d377d1...8216ee )
by Aimeos
12:16
created
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.