@@ -86,12 +86,12 @@ |
||
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]; |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | $object->expects( $this->once() )->method( 'deleteFile' ); |
38 | 38 | $object->expects( $this->exactly( 2 ) )->method( 'storeImage' ); |
39 | 39 | $object->expects( $this->once() )->method( 'getTempFileName' ) |
40 | - ->will( $this->returnValue( __DIR__ . '/testfiles/test.gif' ) ); |
|
40 | + ->will( $this->returnValue( __DIR__.'/testfiles/test.gif' ) ); |
|
41 | 41 | |
42 | 42 | $file = $this->getMock( '\Psr\Http\Message\UploadedFileInterface' ); |
43 | 43 | $file->expects( $this->once() )->method( 'moveTo' ); |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | $object->expects( $this->once() )->method( 'deleteFile' ); |
61 | 61 | $object->expects( $this->once() )->method( 'storeFile' ); |
62 | 62 | $object->expects( $this->once() )->method( 'getTempFileName' ) |
63 | - ->will( $this->returnValue( __DIR__ . '/testfiles/test.pdf' ) ); |
|
63 | + ->will( $this->returnValue( __DIR__.'/testfiles/test.pdf' ) ); |
|
64 | 64 | |
65 | 65 | $file = $this->getMock( '\Psr\Http\Message\UploadedFileInterface' ); |
66 | 66 | $file->expects( $this->once() )->method( 'moveTo' ); |
@@ -239,7 +239,7 @@ discard block |
||
239 | 239 | |
240 | 240 | public function testGetMimeType() |
241 | 241 | { |
242 | - $file = \Aimeos\MW\Media\Factory::get( __DIR__ . '/testfiles/test.png' ); |
|
242 | + $file = \Aimeos\MW\Media\Factory::get( __DIR__.'/testfiles/test.png' ); |
|
243 | 243 | |
244 | 244 | $result = $this->access( 'getMimeType' )->invokeArgs( $this->object, array( $file, 'files' ) ); |
245 | 245 | $this->assertEquals( 'image/png', $result ); |
@@ -248,7 +248,7 @@ discard block |
||
248 | 248 | |
249 | 249 | public function testGetMimeTypeNotAllowed() |
250 | 250 | { |
251 | - $file = \Aimeos\MW\Media\Factory::get( __DIR__ . '/testfiles/test.gif' ); |
|
251 | + $file = \Aimeos\MW\Media\Factory::get( __DIR__.'/testfiles/test.gif' ); |
|
252 | 252 | $this->context->getConfig()->set( 'controller/common/media/standard/files/allowedtypes', array( 'image/jpeg' ) ); |
253 | 253 | |
254 | 254 | $result = $this->access( 'getMimeType' )->invokeArgs( $this->object, array( $file, 'files' ) ); |
@@ -258,7 +258,7 @@ discard block |
||
258 | 258 | |
259 | 259 | public function testGetMimeTypeNoTypes() |
260 | 260 | { |
261 | - $file = \Aimeos\MW\Media\Factory::get( __DIR__ . '/testfiles/test.gif' ); |
|
261 | + $file = \Aimeos\MW\Media\Factory::get( __DIR__.'/testfiles/test.gif' ); |
|
262 | 262 | $this->context->getConfig()->set( 'controller/common/media/standard/files/allowedtypes', array() ); |
263 | 263 | |
264 | 264 | $this->setExpectedException( '\Aimeos\Controller\Common\Exception' ); |
@@ -268,7 +268,7 @@ discard block |
||
268 | 268 | |
269 | 269 | public function testScaleImage() |
270 | 270 | { |
271 | - $file = \Aimeos\MW\Media\Factory::get( __DIR__ . '/testfiles/test.gif' ); |
|
271 | + $file = \Aimeos\MW\Media\Factory::get( __DIR__.'/testfiles/test.gif' ); |
|
272 | 272 | |
273 | 273 | $this->access( 'scaleImage' )->invokeArgs( $this->object, array( $file, 'files' ) ); |
274 | 274 | } |
@@ -294,11 +294,11 @@ discard block |
||
294 | 294 | $this->context->setFilesystemManager( $fsm ); |
295 | 295 | |
296 | 296 | |
297 | - $dest = dirname( dirname( dirname( __DIR__ ) ) ) . '/tmp/'; |
|
297 | + $dest = dirname( dirname( dirname( __DIR__ ) ) ).'/tmp/'; |
|
298 | 298 | if( !is_dir( $dest ) ) { mkdir( $dest, 0755, true ); } |
299 | - copy( __DIR__ . '/testfiles/test.gif', $dest . 'test.gif' ); |
|
299 | + copy( __DIR__.'/testfiles/test.gif', $dest.'test.gif' ); |
|
300 | 300 | |
301 | - $file = \Aimeos\MW\Media\Factory::get( $dest . 'test.gif' ); |
|
301 | + $file = \Aimeos\MW\Media\Factory::get( $dest.'test.gif' ); |
|
302 | 302 | |
303 | 303 | $this->access( 'storeFile' )->invokeArgs( $this->object, array( $file, 'files', 'test', 'fs-media' ) ); |
304 | 304 | } |
@@ -324,11 +324,11 @@ discard block |
||
324 | 324 | $this->context->setFilesystemManager( $fsm ); |
325 | 325 | |
326 | 326 | |
327 | - $dest = dirname( dirname( dirname( __DIR__ ) ) ) . '/tmp/'; |
|
327 | + $dest = dirname( dirname( dirname( __DIR__ ) ) ).'/tmp/'; |
|
328 | 328 | if( !is_dir( $dest ) ) { mkdir( $dest, 0755, true ); } |
329 | - copy( __DIR__ . '/testfiles/test.gif', $dest . 'test.gif' ); |
|
329 | + copy( __DIR__.'/testfiles/test.gif', $dest.'test.gif' ); |
|
330 | 330 | |
331 | - $file = \Aimeos\MW\Media\Factory::get( $dest . 'test.gif' ); |
|
331 | + $file = \Aimeos\MW\Media\Factory::get( $dest.'test.gif' ); |
|
332 | 332 | $result = $this->access( 'storeImage' )->invokeArgs( $this->object, array( $file, 'files', 'test', 'fs-media' ) ); |
333 | 333 | |
334 | 334 | $this->assertEquals( 'files/t/e/test.gif', $result ); |
@@ -335,6 +335,9 @@ |
||
335 | 335 | } |
336 | 336 | |
337 | 337 | |
338 | + /** |
|
339 | + * @param string $name |
|
340 | + */ |
|
338 | 341 | protected function access( $name ) |
339 | 342 | { |
340 | 343 | $class = new \ReflectionClass( '\Aimeos\Controller\Common\Media\Standard' ); |
@@ -11,7 +11,7 @@ |
||
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 | ), |
@@ -56,11 +56,11 @@ discard block |
||
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 |
||
119 | 119 | * @category Developer |
120 | 120 | */ |
121 | 121 | $decorators = $config->get( 'controller/jobs/common/decorators/default', array() ); |
122 | - $excludes = $config->get( 'controller/jobs/' . $domain . '/decorators/excludes', array() ); |
|
122 | + $excludes = $config->get( 'controller/jobs/'.$domain.'/decorators/excludes', array() ); |
|
123 | 123 | |
124 | 124 | foreach( $decorators as $key => $name ) |
125 | 125 | { |
@@ -132,11 +132,11 @@ discard block |
||
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', array() ); |
|
135 | + $decorators = $config->get( 'controller/jobs/'.$domain.'/decorators/global', array() ); |
|
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', array() ); |
|
138 | + $classprefix = '\\Aimeos\\Controller\\Jobs\\'.ucfirst( $localClass ).'\\Decorator\\'; |
|
139 | + $decorators = $config->get( 'controller/jobs/'.$domain.'/decorators/local', array() ); |
|
140 | 140 | $controller = self::addDecorators( $context, $aimeos, $controller, $decorators, $classprefix ); |
141 | 141 | |
142 | 142 | return $controller; |
@@ -75,8 +75,8 @@ |
||
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 ); |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | { |
34 | 34 | if( !isset( self::$aimeos ) ) |
35 | 35 | { |
36 | - require_once dirname( dirname( dirname( __DIR__ ) ) ) . DIRECTORY_SEPARATOR . 'Bootstrap.php'; |
|
36 | + require_once dirname( dirname( dirname( __DIR__ ) ) ).DIRECTORY_SEPARATOR.'Bootstrap.php'; |
|
37 | 37 | |
38 | 38 | self::$aimeos = new \Aimeos\Bootstrap( array(), false ); |
39 | 39 | } |
@@ -58,8 +58,8 @@ discard block |
||
58 | 58 | |
59 | 59 | |
60 | 60 | $paths = $aimeos->getConfigPaths( 'mysql' ); |
61 | - $paths[] = __DIR__ . DIRECTORY_SEPARATOR . 'config'; |
|
62 | - $file = __DIR__ . DIRECTORY_SEPARATOR . 'confdoc.ser'; |
|
61 | + $paths[] = __DIR__.DIRECTORY_SEPARATOR.'config'; |
|
62 | + $file = __DIR__.DIRECTORY_SEPARATOR.'confdoc.ser'; |
|
63 | 63 | |
64 | 64 | $conf = new \Aimeos\MW\Config\PHPArray( array(), $paths ); |
65 | 65 | $conf = new \Aimeos\MW\Config\Decorator\Memory( $conf ); |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | $ctx->setConfig( $conf ); |
68 | 68 | |
69 | 69 | |
70 | - $logger = new \Aimeos\MW\Logger\File( $site . '.log', \Aimeos\MW\Logger\Base::DEBUG ); |
|
70 | + $logger = new \Aimeos\MW\Logger\File( $site.'.log', \Aimeos\MW\Logger\Base::DEBUG ); |
|
71 | 71 | $ctx->setLogger( $logger ); |
72 | 72 | |
73 | 73 |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | { |
35 | 35 | if( !isset( self::$aimeos ) ) |
36 | 36 | { |
37 | - require_once dirname( dirname( dirname( __DIR__ ) ) ) . DIRECTORY_SEPARATOR . 'Bootstrap.php'; |
|
37 | + require_once dirname( dirname( dirname( __DIR__ ) ) ).DIRECTORY_SEPARATOR.'Bootstrap.php'; |
|
38 | 38 | |
39 | 39 | self::$aimeos = new \Aimeos\Bootstrap( array(), false ); |
40 | 40 | } |
@@ -53,8 +53,8 @@ discard block |
||
53 | 53 | |
54 | 54 | |
55 | 55 | $paths = $aimeos->getConfigPaths( 'mysql' ); |
56 | - $paths[] = __DIR__ . DIRECTORY_SEPARATOR . 'config'; |
|
57 | - $file = __DIR__ . DIRECTORY_SEPARATOR . 'confdoc.ser'; |
|
56 | + $paths[] = __DIR__.DIRECTORY_SEPARATOR.'config'; |
|
57 | + $file = __DIR__.DIRECTORY_SEPARATOR.'confdoc.ser'; |
|
58 | 58 | |
59 | 59 | $conf = new \Aimeos\MW\Config\PHPArray( array(), $paths ); |
60 | 60 | $conf = new \Aimeos\MW\Config\Decorator\Memory( $conf ); |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | { |
34 | 34 | if( !isset( self::$aimeos ) ) |
35 | 35 | { |
36 | - require_once dirname( dirname( dirname( __DIR__ ) ) ) . DIRECTORY_SEPARATOR . 'Bootstrap.php'; |
|
36 | + require_once dirname( dirname( dirname( __DIR__ ) ) ).DIRECTORY_SEPARATOR.'Bootstrap.php'; |
|
37 | 37 | |
38 | 38 | self::$aimeos = new \Aimeos\Bootstrap( array(), false ); |
39 | 39 | } |
@@ -58,8 +58,8 @@ discard block |
||
58 | 58 | |
59 | 59 | |
60 | 60 | $paths = $aimeos->getConfigPaths( 'mysql' ); |
61 | - $paths[] = __DIR__ . DIRECTORY_SEPARATOR . 'config'; |
|
62 | - $file = __DIR__ . DIRECTORY_SEPARATOR . 'confdoc.ser'; |
|
61 | + $paths[] = __DIR__.DIRECTORY_SEPARATOR.'config'; |
|
62 | + $file = __DIR__.DIRECTORY_SEPARATOR.'confdoc.ser'; |
|
63 | 63 | |
64 | 64 | $conf = new \Aimeos\MW\Config\PHPArray( array(), $paths ); |
65 | 65 | $conf = new \Aimeos\MW\Config\Decorator\Memory( $conf ); |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | $ctx->setConfig( $conf ); |
68 | 68 | |
69 | 69 | |
70 | - $logger = new \Aimeos\MW\Logger\File( $site . '.log', \Aimeos\MW\Logger\Base::DEBUG ); |
|
70 | + $logger = new \Aimeos\MW\Logger\File( $site.'.log', \Aimeos\MW\Logger\Base::DEBUG ); |
|
71 | 71 | $ctx->setLogger( $logger ); |
72 | 72 | |
73 | 73 |
@@ -42,7 +42,7 @@ |
||
42 | 42 | throw new \Aimeos\MShop\Coupon\Exception( sprintf( 'Invalid characters in class name "%1$s"', $name ) ); |
43 | 43 | } |
44 | 44 | |
45 | - $classname = $classprefix . $name; |
|
45 | + $classname = $classprefix.$name; |
|
46 | 46 | |
47 | 47 | if( class_exists( $classname ) === false ) { |
48 | 48 | throw new \Aimeos\MShop\Coupon\Exception( sprintf( 'Class "%1$s" not available', $classname ) ); |