Completed
Push — master ( d29f07...779818 )
by Aimeos
21:15
created
controller/common/tests/TestHelperCntl.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
 	{
49 49
 		if( !isset( self::$aimeos ) )
50 50
 		{
51
-			require_once dirname( dirname( dirname( __DIR__ ) ) ) . DIRECTORY_SEPARATOR . 'Bootstrap.php';
51
+			require_once dirname( dirname( dirname( __DIR__ ) ) ).DIRECTORY_SEPARATOR.'Bootstrap.php';
52 52
 
53 53
 			self::$aimeos = new \Aimeos\Bootstrap( [], false );
54 54
 		}
@@ -70,8 +70,8 @@  discard block
 block discarded – undo
70 70
 
71 71
 
72 72
 		$paths = $aimeos->getConfigPaths();
73
-		$paths[] = __DIR__ . DIRECTORY_SEPARATOR . 'config';
74
-		$file = __DIR__ . DIRECTORY_SEPARATOR . 'confdoc.ser';
73
+		$paths[] = __DIR__.DIRECTORY_SEPARATOR.'config';
74
+		$file = __DIR__.DIRECTORY_SEPARATOR.'confdoc.ser';
75 75
 
76 76
 		$conf = new \Aimeos\MW\Config\PHPArray( [], $paths );
77 77
 		$conf = new \Aimeos\MW\Config\Decorator\Memory( $conf );
Please login to merge, or discard this patch.
controller/jobs/src/Controller/Jobs/Common/Factory/Base.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -56,11 +56,11 @@  discard block
 block discarded – undo
56 56
 		{
57 57
 			if( ctype_alnum( $name ) === false )
58 58
 			{
59
-				$classname = is_string( $name ) ? $classprefix . $name : '<not a string>';
59
+				$classname = is_string( $name ) ? $classprefix.$name : '<not a string>';
60 60
 				throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
61 61
 			}
62 62
 
63
-			$classname = $classprefix . $name;
63
+			$classname = $classprefix.$name;
64 64
 
65 65
 			if( class_exists( $classname ) === false ) {
66 66
 				throw new \Aimeos\Controller\Jobs\Exception( sprintf( 'Class "%1$s" not available', $classname ) );
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 		 * @category Developer
120 120
 		 */
121 121
 		$decorators = $config->get( 'controller/jobs/common/decorators/default', [] );
122
-		$excludes = $config->get( 'controller/jobs/' . $domain . '/decorators/excludes', [] );
122
+		$excludes = $config->get( 'controller/jobs/'.$domain.'/decorators/excludes', [] );
123 123
 
124 124
 		foreach( $decorators as $key => $name )
125 125
 		{
@@ -132,11 +132,11 @@  discard block
 block discarded – undo
132 132
 		$controller = self::addDecorators( $context, $aimeos, $controller, $decorators, $classprefix );
133 133
 
134 134
 		$classprefix = '\\Aimeos\\Controller\\Jobs\\Common\\Decorator\\';
135
-		$decorators = $config->get( 'controller/jobs/' . $domain . '/decorators/global', [] );
135
+		$decorators = $config->get( 'controller/jobs/'.$domain.'/decorators/global', [] );
136 136
 		$controller = self::addDecorators( $context, $aimeos, $controller, $decorators, $classprefix );
137 137
 
138
-		$classprefix = '\\Aimeos\\Controller\\Jobs\\' . ucfirst( $localClass ) . '\\Decorator\\';
139
-		$decorators = $config->get( 'controller/jobs/' . $domain . '/decorators/local', [] );
138
+		$classprefix = '\\Aimeos\\Controller\\Jobs\\'.ucfirst( $localClass ).'\\Decorator\\';
139
+		$decorators = $config->get( 'controller/jobs/'.$domain.'/decorators/local', [] );
140 140
 		$controller = self::addDecorators( $context, $aimeos, $controller, $decorators, $classprefix );
141 141
 
142 142
 		return $controller;
Please login to merge, or discard this patch.
controller/jobs/tests/TestHelperJobs.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
 	{
49 49
 		if( !isset( self::$aimeos ) )
50 50
 		{
51
-			require_once dirname( dirname( dirname( __DIR__ ) ) ) . DIRECTORY_SEPARATOR . 'Bootstrap.php';
51
+			require_once dirname( dirname( dirname( __DIR__ ) ) ).DIRECTORY_SEPARATOR.'Bootstrap.php';
52 52
 
53 53
 			self::$aimeos = new \Aimeos\Bootstrap( [], false );
54 54
 		}
@@ -81,8 +81,8 @@  discard block
 block discarded – undo
81 81
 
82 82
 
83 83
 		$paths = $aimeos->getConfigPaths();
84
-		$paths[] = __DIR__ . DIRECTORY_SEPARATOR . 'config';
85
-		$file = __DIR__ . DIRECTORY_SEPARATOR . 'confdoc.ser';
84
+		$paths[] = __DIR__.DIRECTORY_SEPARATOR.'config';
85
+		$file = __DIR__.DIRECTORY_SEPARATOR.'confdoc.ser';
86 86
 
87 87
 		$conf = new \Aimeos\MW\Config\PHPArray( [], $paths );
88 88
 		$conf = new \Aimeos\MW\Config\Decorator\Memory( $conf );
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
 		$ctx->setConfig( $conf );
91 91
 
92 92
 
93
-		$logger = new \Aimeos\MW\Logger\File( $site . '.log', \Aimeos\MW\Logger\Base::DEBUG );
93
+		$logger = new \Aimeos\MW\Logger\File( $site.'.log', \Aimeos\MW\Logger\Base::DEBUG );
94 94
 		$ctx->setLogger( $logger );
95 95
 
96 96
 
Please login to merge, or discard this patch.
lib/mwlib/src/MW/Container/Zip.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
 	 */
42 42
 	public function __construct( $resourcepath, $format, array $options = [] )
43 43
 	{
44
-		$this->classname = '\\Aimeos\\MW\\Container\\Content\\' . $format;
44
+		$this->classname = '\\Aimeos\\MW\\Container\\Content\\'.$format;
45 45
 
46 46
 		if( class_exists( $this->classname ) === false ) {
47 47
 			throw new \Aimeos\MW\Container\Exception( sprintf( 'Unknown format "%1$s"', $format ) );
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
 		}
106 106
 
107 107
 		// $this->container->getStream( $name ) doesn't work correctly because the stream can't be rewinded
108
-		return new $this->classname( 'zip://' . $this->resourcepath . '#' . $name, $name, $this->getOptions() );
108
+		return new $this->classname( 'zip://'.$this->resourcepath.'#'.$name, $name, $this->getOptions() );
109 109
 	}
110 110
 
111 111
 
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
149 149
 		}
150 150
 
151 151
 		// $this->container->getStream( $name ) doesn't work correctly because the stream can't be rewinded
152
-		return new $this->classname( 'zip://' . $this->resourcepath . '#' . $name, $name, $this->getOptions() );
152
+		return new $this->classname( 'zip://'.$this->resourcepath.'#'.$name, $name, $this->getOptions() );
153 153
 	}
154 154
 
155 155
 
Please login to merge, or discard this patch.
lib/mwlib/src/MW/Container/Directory.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 	 */
39 39
 	public function __construct( $resourcepath, $format, array $options = [] )
40 40
 	{
41
-		$this->classname = '\\Aimeos\\MW\\Container\\Content\\' . $format;
41
+		$this->classname = '\\Aimeos\\MW\\Container\\Content\\'.$format;
42 42
 
43 43
 		if( class_exists( $this->classname ) === false ) {
44 44
 			throw new \Aimeos\MW\Container\Exception( sprintf( 'Unknown format "%1$s"', $format ) );
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 	 */
65 65
 	public function create( $name )
66 66
 	{
67
-		$resource = $this->resource->getPath() . DIRECTORY_SEPARATOR . $name;
67
+		$resource = $this->resource->getPath().DIRECTORY_SEPARATOR.$name;
68 68
 		return new $this->classname( $resource, $name, $this->getOptions() );
69 69
 	}
70 70
 
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
 	 */
89 89
 	public function get( $name )
90 90
 	{
91
-		return new $this->classname( $this->resource->getPath() . DIRECTORY_SEPARATOR . $name, $name, $this->getOptions() );
91
+		return new $this->classname( $this->resource->getPath().DIRECTORY_SEPARATOR.$name, $name, $this->getOptions() );
92 92
 	}
93 93
 
94 94
 
Please login to merge, or discard this patch.
lib/mwlib/src/MW/Template/Base.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
 	public function getMarkerNames()
118 118
 	{
119 119
 		$matches = [];
120
-		$regex = '/' . str_replace( '\$', '(.*)', preg_quote( $this->begin, '/' ) ) . '/U';
120
+		$regex = '/'.str_replace( '\$', '(.*)', preg_quote( $this->begin, '/' ) ).'/U';
121 121
 
122 122
 		if( preg_match_all( $regex, $this->text, $matches ) === false ) {
123 123
 			throw new \Aimeos\MW\Template\Exception( sprintf( 'Invalid regular expression: %1$s', $regex ) );
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
186 186
 		$matches = [];
187 187
 		$text = $this->text;
188 188
 
189
-		$regex = '/' . str_replace( '\$', '(.*)', preg_quote( $this->begin, '/' ) ) . '/U';
189
+		$regex = '/'.str_replace( '\$', '(.*)', preg_quote( $this->begin, '/' ) ).'/U';
190 190
 		if( preg_match_all( $regex, $text, $matches ) === false ) {
191 191
 			throw new \Aimeos\MW\Template\Exception( sprintf( 'Invalid regular expression: %1$s', $regex ) );
192 192
 		}
@@ -197,7 +197,7 @@  discard block
 block discarded – undo
197 197
 			$begin = str_replace( '\$', $match, preg_quote( $this->begin, '/' ) );
198 198
 			$end = str_replace( '\$', $match, preg_quote( $this->end, '/' ) );
199 199
 
200
-			$regex = '/' . $begin . '.*' . $end . '/smU';
200
+			$regex = '/'.$begin.'.*'.$end.'/smU';
201 201
 			if( ( $text = preg_replace( $regex, '', $text ) ) === null ) {
202 202
 				throw new \Aimeos\MW\Template\Exception( sprintf( 'Invalid regular expression: %1$s', $regex ) );
203 203
 			}
Please login to merge, or discard this patch.
lib/mwlib/src/MW/View/Helper/Url/Standard.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -52,13 +52,13 @@
 block discarded – undo
52 52
 	 */
53 53
 	public function transform( $target = null, $controller = null, $action = null, array $params = [], array $trailing = [], array $config = [] )
54 54
 	{
55
-		$path = ( $target !== null ? $target . '/' : '' );
56
-		$path .= ( $controller !== null ? $controller . '/' : '' );
57
-		$path .= ( $action !== null ? $action . '/' : '' );
55
+		$path = ( $target !== null ? $target.'/' : '' );
56
+		$path .= ( $controller !== null ? $controller.'/' : '' );
57
+		$path .= ( $action !== null ? $action.'/' : '' );
58 58
 
59
-		$parameter = ( count( $params ) > 0 ? '?' . http_build_query( $this->sanitize( $params ) ) : '' );
59
+		$parameter = ( count( $params ) > 0 ? '?'.http_build_query( $this->sanitize( $params ) ) : '' );
60 60
 		$pretty = ( count( $trailing ) > 0 ? implode( '-', $this->sanitize( $trailing ) ) : '' );
61 61
 
62
-		return $this->baseUrl . '/' . $path . $pretty . $parameter;
62
+		return $this->baseUrl.'/'.$path.$pretty.$parameter;
63 63
 	}
64 64
 }
65 65
\ No newline at end of file
Please login to merge, or discard this patch.
lib/mwlib/src/MW/Config/PHPArray.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
 	 * @param array $parts Configuration path parts to look for inside the array
87 87
 	 * @return mixed Found value or null if no value is available
88 88
 	 */
89
-	protected function getPart( $config,  $parts )
89
+	protected function getPart( $config, $parts )
90 90
 	{
91 91
 		if( ( $current = array_shift( $parts ) ) !== null && isset( $config[$current] ) )
92 92
 		{
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
 	{
138 138
 		if( ( $key = array_shift( $parts ) ) !== null )
139 139
 		{
140
-			$newPath = $path . DIRECTORY_SEPARATOR . $key;
140
+			$newPath = $path.DIRECTORY_SEPARATOR.$key;
141 141
 
142 142
 			if( is_dir( $newPath ) )
143 143
 			{
@@ -148,13 +148,13 @@  discard block
 block discarded – undo
148 148
 				$config[$key] = $this->load( $config[$key], $newPath, $parts );
149 149
 			}
150 150
 
151
-			if( file_exists( $newPath . '.php' ) )
151
+			if( file_exists( $newPath.'.php' ) )
152 152
 			{
153 153
 				if( !isset( $config[$key] ) ) {
154 154
 					$config[$key] = [];
155 155
 				}
156 156
 
157
-				$config[$key] = array_replace_recursive( $config[$key], $this->includeFile( $newPath . '.php' ) );
157
+				$config[$key] = array_replace_recursive( $config[$key], $this->includeFile( $newPath.'.php' ) );
158 158
 			}
159 159
 		}
160 160
 
Please login to merge, or discard this patch.
lib/mwlib/tests/MW/Media/Application/StandardTest.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
 	public function testConstruct()
15 15
 	{
16 16
 		$ds = DIRECTORY_SEPARATOR;
17
-		$content = file_get_contents( dirname( __DIR__ ) . $ds . '_testfiles' . $ds . 'application.txt' );
17
+		$content = file_get_contents( dirname( __DIR__ ).$ds.'_testfiles'.$ds.'application.txt' );
18 18
 
19 19
 		$media = new \Aimeos\MW\Media\Application\Standard( $content, 'application/octet-stream', [] );
20 20
 
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 	public function testSave()
26 26
 	{
27 27
 		$ds = DIRECTORY_SEPARATOR;
28
-		$content = file_get_contents( dirname( __DIR__ ) . $ds . '_testfiles' . $ds . 'application.txt' );
28
+		$content = file_get_contents( dirname( __DIR__ ).$ds.'_testfiles'.$ds.'application.txt' );
29 29
 
30 30
 		$media = new \Aimeos\MW\Media\Application\Standard( $content, 'application/octet-stream', [] );
31 31
 
@@ -36,8 +36,8 @@  discard block
 block discarded – undo
36 36
 	public function testSaveFile()
37 37
 	{
38 38
 		$ds = DIRECTORY_SEPARATOR;
39
-		$content = file_get_contents( dirname( __DIR__ ) . $ds . '_testfiles' . $ds . 'application.txt' );
40
-		$dest = dirname( dirname( dirname( __DIR__ ) ) ) . $ds . 'tmp' . $ds . 'application.txt';
39
+		$content = file_get_contents( dirname( __DIR__ ).$ds.'_testfiles'.$ds.'application.txt' );
40
+		$dest = dirname( dirname( dirname( __DIR__ ) ) ).$ds.'tmp'.$ds.'application.txt';
41 41
 
42 42
 		$media = new \Aimeos\MW\Media\Application\Standard( $content, 'application/octet-stream', [] );
43 43
 		$media->save( $dest );
Please login to merge, or discard this patch.