@@ -47,8 +47,8 @@ discard block |
||
47 | 47 | } |
48 | 48 | |
49 | 49 | $ds = DIRECTORY_SEPARATOR; |
50 | - $this->basedir = realpath( str_replace( '/', $ds, rtrim( $config['basedir'], '/' ) ) ) . $ds; |
|
51 | - $this->tempdir = realpath( str_replace( '/', $ds, rtrim( $config['tempdir'], '/' ) ) ) . $ds; |
|
50 | + $this->basedir = realpath( str_replace( '/', $ds, rtrim( $config['basedir'], '/' ) ) ).$ds; |
|
51 | + $this->tempdir = realpath( str_replace( '/', $ds, rtrim( $config['tempdir'], '/' ) ) ).$ds; |
|
52 | 52 | } |
53 | 53 | |
54 | 54 | |
@@ -349,6 +349,6 @@ discard block |
||
349 | 349 | throw new Exception( sprintf( 'No ".." allowed in path "%1$s"', $path ) ); |
350 | 350 | } |
351 | 351 | |
352 | - return $this->basedir . str_replace( '/', DIRECTORY_SEPARATOR, $path ); |
|
352 | + return $this->basedir.str_replace( '/', DIRECTORY_SEPARATOR, $path ); |
|
353 | 353 | } |
354 | 354 | } |
@@ -104,9 +104,12 @@ |
||
104 | 104 | */ |
105 | 105 | public function scan( $path = null ) |
106 | 106 | { |
107 | - try { |
|
107 | + try |
|
108 | + { |
|
108 | 109 | return new \DirectoryIterator( $this->resolve( $path ) ); |
109 | - } catch( \Exception $e ) { |
|
110 | + } |
|
111 | + catch( \Exception $e ) |
|
112 | + { |
|
110 | 113 | throw new Exception( $e->getMessage(), 0, $e ); |
111 | 114 | } |
112 | 115 | } |
@@ -62,7 +62,7 @@ |
||
62 | 62 | */ |
63 | 63 | protected function getConfig( $name ) |
64 | 64 | { |
65 | - if( ( $conf = $this->config->get( 'resource/' . $name ) ) !== null ) { |
|
65 | + if( ( $conf = $this->config->get( 'resource/'.$name ) ) !== null ) { |
|
66 | 66 | return $conf; |
67 | 67 | } |
68 | 68 |
@@ -36,7 +36,7 @@ |
||
36 | 36 | */ |
37 | 37 | public function __construct( \Aimeos\MW\DB\Connection\Iface $conn, $queue, $sql, $rtime ) |
38 | 38 | { |
39 | - $this->cname = md5( microtime(true) . getmypid() ); |
|
39 | + $this->cname = md5( microtime( true ).getmypid() ); |
|
40 | 40 | $this->conn = $conn; |
41 | 41 | $this->queue = $queue; |
42 | 42 | $this->sql = $sql; |
@@ -32,7 +32,7 @@ |
||
32 | 32 | throw new \Aimeos\MW\MQueue\Exception( 'Message queue not configured' ); |
33 | 33 | } |
34 | 34 | |
35 | - $classname = '\\Aimeos\\MW\\MQueue\\' . ucfirst( (string) $config['adapter'] ); |
|
35 | + $classname = '\\Aimeos\\MW\\MQueue\\'.ucfirst( (string) $config['adapter'] ); |
|
36 | 36 | |
37 | 37 | if( !class_exists( $classname ) ) { |
38 | 38 | throw new \Aimeos\MW\MQueue\Exception( sprintf( 'Message queue "%1$s" not found', $config['adapter'] ) ); |
@@ -66,7 +66,7 @@ |
||
66 | 66 | */ |
67 | 67 | protected function getConfig( &$resource ) |
68 | 68 | { |
69 | - if( ( $conf = $this->config->get( 'resource/' . $resource ) ) !== null ) { |
|
69 | + if( ( $conf = $this->config->get( 'resource/'.$resource ) ) !== null ) { |
|
70 | 70 | return $conf; |
71 | 71 | } |
72 | 72 |
@@ -56,7 +56,7 @@ |
||
56 | 56 | } |
57 | 57 | |
58 | 58 | foreach( $names as $name ) { |
59 | - $result .= '[' . $name . ']'; |
|
59 | + $result .= '['.$name.']'; |
|
60 | 60 | } |
61 | 61 | |
62 | 62 | return $result; |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | throw new \Aimeos\MW\Common\Exception( sprintf( 'Invalid name "%1$s"', $name ) ); |
103 | 103 | } |
104 | 104 | |
105 | - return $transname . ' ' . self::$operators[$this->operator]; |
|
105 | + return $transname.' '.self::$operators[$this->operator]; |
|
106 | 106 | } |
107 | 107 | |
108 | 108 | |
@@ -128,10 +128,10 @@ discard block |
||
128 | 128 | $value = (float) $value; break; |
129 | 129 | case \Aimeos\MW\DB\Statement\Base::PARAM_STR: |
130 | 130 | if( $operator == '~=' ) { |
131 | - $value = '\'%' . $this->conn->escape( $value ) . '%\''; break; |
|
131 | + $value = '\'%'.$this->conn->escape( $value ).'%\''; break; |
|
132 | 132 | } |
133 | 133 | default: |
134 | - $value = '\'' . $this->conn->escape( $value ) . '\''; |
|
134 | + $value = '\''.$this->conn->escape( $value ).'\''; |
|
135 | 135 | } |
136 | 136 | |
137 | 137 | return (string) $value; |
@@ -189,12 +189,10 @@ |
||
189 | 189 | } |
190 | 190 | |
191 | 191 | return \Aimeos\MW\DB\Statement\Base::PARAM_STR; |
192 | - } |
|
193 | - else if( strpos( $item, '.' ) !== false ) |
|
192 | + } else if( strpos( $item, '.' ) !== false ) |
|
194 | 193 | { |
195 | 194 | return \Aimeos\MW\DB\Statement\Base::PARAM_FLOAT; |
196 | - } |
|
197 | - else if( ctype_digit( $item ) !== false ) |
|
195 | + } else if( ctype_digit( $item ) !== false ) |
|
198 | 196 | { |
199 | 197 | return \Aimeos\MW\DB\Statement\Base::PARAM_INT; |
200 | 198 | } |
@@ -32,12 +32,12 @@ |
||
32 | 32 | { |
33 | 33 | if( ctype_alnum( $type ) === false ) |
34 | 34 | { |
35 | - $classname = is_string( $type ) ? '\\Aimeos\\MW\\Container\\' . $type : '<not a string>'; |
|
35 | + $classname = is_string( $type ) ? '\\Aimeos\\MW\\Container\\'.$type : '<not a string>'; |
|
36 | 36 | throw new \Aimeos\MW\Container\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) ); |
37 | 37 | } |
38 | 38 | |
39 | 39 | $iface = '\\Aimeos\\MW\\Container\\Iface'; |
40 | - $classname = '\\Aimeos\\MW\\Container\\' . $type; |
|
40 | + $classname = '\\Aimeos\\MW\\Container\\'.$type; |
|
41 | 41 | |
42 | 42 | if( class_exists( $classname ) === false ) { |
43 | 43 | throw new \Aimeos\MW\Container\Exception( sprintf( 'Class "%1$s" not available', $classname ) ); |
@@ -37,8 +37,8 @@ discard block |
||
37 | 37 | { |
38 | 38 | $manifest = $this->getManifest( $filename ); |
39 | 39 | |
40 | - $this->baseURL = rtrim( $baseURL, '/' ) . '/'; |
|
41 | - $this->basePath = dirname( $filename ) . '/'; |
|
40 | + $this->baseURL = rtrim( $baseURL, '/' ).'/'; |
|
41 | + $this->basePath = dirname( $filename ).'/'; |
|
42 | 42 | |
43 | 43 | $this->registeredPackages = $this->getPackages( $manifest, $filter ); |
44 | 44 | } |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | foreach( $packageList as $package ) |
63 | 63 | { |
64 | 64 | foreach( $package->fileIncludes as $singleFile ) { |
65 | - $files[] = $this->basePath . $singleFile->path . $singleFile->text; |
|
65 | + $files[] = $this->basePath.$singleFile->path.$singleFile->text; |
|
66 | 66 | } |
67 | 67 | } |
68 | 68 | } |
@@ -117,10 +117,10 @@ discard block |
||
117 | 117 | switch( $type ) |
118 | 118 | { |
119 | 119 | case 'js': |
120 | - $html .= '<script type="text/javascript" src="' . $file . '"></script>' . PHP_EOL; |
|
120 | + $html .= '<script type="text/javascript" src="'.$file.'"></script>'.PHP_EOL; |
|
121 | 121 | break; |
122 | 122 | case 'css': |
123 | - $html .= '<link rel="stylesheet" type="text/css" href="' . $file . '"/>' . PHP_EOL; |
|
123 | + $html .= '<link rel="stylesheet" type="text/css" href="'.$file.'"/>'.PHP_EOL; |
|
124 | 124 | break; |
125 | 125 | } |
126 | 126 | } |
@@ -144,13 +144,13 @@ discard block |
||
144 | 144 | |
145 | 145 | foreach( $package->fileIncludes as $singleFile ) |
146 | 146 | { |
147 | - $filename = $this->basePath . $singleFile->path . $singleFile->text; |
|
147 | + $filename = $this->basePath.$singleFile->path.$singleFile->text; |
|
148 | 148 | |
149 | 149 | if( !is_file( $filename ) || ( $fileTime = filemtime( $filename ) ) === false ) { |
150 | 150 | throw new \Aimeos\MW\Jsb2\Exception( sprintf( 'Unable to read filetime of file "%1$s"', $filename ) ); |
151 | 151 | } |
152 | 152 | |
153 | - $list[] = $this->baseURL . $singleFile->path . $singleFile->text . sprintf( $version, $fileTime ); |
|
153 | + $list[] = $this->baseURL.$singleFile->path.$singleFile->text.sprintf( $version, $fileTime ); |
|
154 | 154 | } |
155 | 155 | |
156 | 156 | return $list; |