aimeos / aimeos-core

controller/common/src/Controller/Common/Media/Standard.php

Doc Comments +3 added lines, -2 removed lines

@@ -471,10 +471,11 @@
 	/**
 	 * Stores a binary file and returns it's new relative file name
 	 *
-	 * @param \Aimeos\MW\Media\Iface $media Media object
-	 * @param string $type Type of the image like "preview" or "files"
 	 * @param string $filepath Path of the new file
 	 * @param string Name of the file system to store the files at
+	 * @param string|null $content
+	 * @param string $fsname
+	 * @param string $oldpath
 	 * @return string Relative path to the new file
 	 * @throws \Aimeos\Controller\Common\Exception If an error occurs
 	 */

Spacing +6 added lines, -6 removed lines

@@ -103,7 +103,7 @@ 
 				$fs->rm( $path );
 			}
 		}
-		catch( \Exception $e ) { ; } // Can be a mime icon with relative path
+		catch( \Exception $e ) {; } // Can be a mime icon with relative path
 
 		$item->setPreview( '' );
 	}
@@ -233,7 +233,7 @@ 
 			default: $ext = '';
 		}
 
-		$filename = md5( $filename . getmypid() . microtime( true ) );
+		$filename = md5( $filename.getmypid().microtime( true ) );
 
 		return "${type}/${filename[0]}/${filename[1]}/${filename}${ext}";
 	}
@@ -320,7 +320,7 @@ 
 		 */
 		$ext = $config->get( 'controller/common/media/standard/mimeicon/extension', '.png' );
 
-		return $mimedir . DIRECTORY_SEPARATOR . $mimetype . $ext;
+		return $mimedir.DIRECTORY_SEPARATOR.$mimetype.$ext;
 	}
 
 
@@ -364,7 +364,7 @@ 
 		 * @category User
 		 */
 		$default = array( 'image/jpeg', 'image/png', 'image/gif' );
-		$allowed = $config->get( 'controller/common/media/standard/' . $type . '/allowedtypes', $default );
+		$allowed = $config->get( 'controller/common/media/standard/'.$type.'/allowedtypes', $default );
 
 		if( in_array( $mimetype, $allowed ) === false )
 		{
@@ -425,7 +425,7 @@ 
 		 * @category Developer
 		 * @category User
 		 */
-		$maxwidth = $config->get( 'controller/common/media/standard/' . $type . '/maxwidth', null );
+		$maxwidth = $config->get( 'controller/common/media/standard/'.$type.'/maxwidth', null );
 
 		/** controller/common/media/standard/files/maxheight
 		 * Maximum height of the uploaded images
@@ -462,7 +462,7 @@ 
 		 * @category Developer
 		 * @category User
 		 */
-		$maxheight = $config->get( 'controller/common/media/standard/' . $type . '/maxheight', null );
+		$maxheight = $config->get( 'controller/common/media/standard/'.$type.'/maxheight', null );
 
 		return $media->scale( $maxwidth, $maxheight );
 	}

lib/mwlib/tests/MW/Media/Application/StandardTest.php

Spacing +4 added lines, -4 removed lines

@@ -14,7 +14,7 @@ 
 	public function testConstruct()
 	{
 		$ds = DIRECTORY_SEPARATOR;
-		$content = file_get_contents( dirname( __DIR__ ) . $ds . '_testfiles' . $ds . 'application.txt' );
+		$content = file_get_contents( dirname( __DIR__ ).$ds.'_testfiles'.$ds.'application.txt' );
 
 		$media = new \Aimeos\MW\Media\Application\Standard( $content, 'application/octet-stream', array() );
 
@@ -25,7 +25,7 @@ 
 	public function testSave()
 	{
 		$ds = DIRECTORY_SEPARATOR;
-		$content = file_get_contents( dirname( __DIR__ ) . $ds . '_testfiles' . $ds . 'application.txt' );
+		$content = file_get_contents( dirname( __DIR__ ).$ds.'_testfiles'.$ds.'application.txt' );
 
 		$media = new \Aimeos\MW\Media\Application\Standard( $content, 'application/octet-stream', array() );
 
@@ -36,8 +36,8 @@ 
 	public function testSaveFile()
 	{
 		$ds = DIRECTORY_SEPARATOR;
-		$content = file_get_contents( dirname( __DIR__ ) . $ds . '_testfiles' . $ds . 'application.txt' );
-		$dest = dirname( dirname( dirname( __DIR__ ) ) ) . $ds . 'tmp' . $ds . 'application.txt';
+		$content = file_get_contents( dirname( __DIR__ ).$ds.'_testfiles'.$ds.'application.txt' );
+		$dest = dirname( dirname( dirname( __DIR__ ) ) ).$ds.'tmp'.$ds.'application.txt';
 
 		$media = new \Aimeos\MW\Media\Application\Standard( $content, 'application/octet-stream', array() );
 		$media->save( $dest );

lib/mwlib/tests/MW/Media/FactoryTest.php

Spacing +4 added lines, -4 removed lines

@@ -15,7 +15,7 @@ 
 	public function testGetImage()
 	{
 		$ds = DIRECTORY_SEPARATOR;
-		$object = \Aimeos\MW\Media\Factory::get( __DIR__ . $ds .'_testfiles' . $ds . 'image.png' );
+		$object = \Aimeos\MW\Media\Factory::get( __DIR__.$ds.'_testfiles'.$ds.'image.png' );
 
 		$this->assertInstanceOf( '\\Aimeos\\MW\\Media\\Iface', $object );
 		$this->assertInstanceOf( '\\Aimeos\\MW\\Media\\Image\\Iface', $object );
@@ -25,7 +25,7 @@ 
 	public function testGetImageAsResource()
 	{
 		$ds = DIRECTORY_SEPARATOR;
-		$resource = fopen( __DIR__ . $ds .'_testfiles' . $ds . 'image.png', 'rw' );
+		$resource = fopen( __DIR__.$ds.'_testfiles'.$ds.'image.png', 'rw' );
 		$object = \Aimeos\MW\Media\Factory::get( $resource );
 
 		$this->assertInstanceOf( '\\Aimeos\\MW\\Media\\Iface', $object );
@@ -36,7 +36,7 @@ 
 	public function testGetImageAsString()
 	{
 		$ds = DIRECTORY_SEPARATOR;
-		$content = file_get_contents( __DIR__ . $ds .'_testfiles' . $ds . 'image.png' );
+		$content = file_get_contents( __DIR__.$ds.'_testfiles'.$ds.'image.png' );
 		$object = \Aimeos\MW\Media\Factory::get( $content );
 
 		$this->assertInstanceOf( '\\Aimeos\\MW\\Media\\Iface', $object );
@@ -48,7 +48,7 @@ 
 	public function testGetBinary()
 	{
 		$ds = DIRECTORY_SEPARATOR;
-		$object = \Aimeos\MW\Media\Factory::get( __DIR__ . $ds . '_testfiles' . $ds . 'application.txt' );
+		$object = \Aimeos\MW\Media\Factory::get( __DIR__.$ds.'_testfiles'.$ds.'application.txt' );
 
 		$this->assertInstanceOf( '\\Aimeos\\MW\\Media\\Iface', $object );
 		$this->assertInstanceOf( '\\Aimeos\\MW\\Media\\Application\\Iface', $object );

controller/common/tests/Controller/Common/Media/StandardTest.php

Spacing +15 added lines, -15 removed lines

@@ -40,7 +40,7 @@ 
 
 		$file = $this->getMockBuilder( '\Psr\Http\Message\UploadedFileInterface' )->getMock();
 		$file->expects( $this->once() )->method( 'getStream' )
-			->will( $this->returnValue( file_get_contents( __DIR__ . '/testfiles/test.gif' ) ) );
+			->will( $this->returnValue( file_get_contents( __DIR__.'/testfiles/test.gif' ) ) );
 
 		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'media' )->createItem();
 
@@ -60,7 +60,7 @@ 
 
 		$file = $this->getMockBuilder( '\Psr\Http\Message\UploadedFileInterface' )->getMock();
 		$file->expects( $this->once() )->method( 'getStream' )
-			->will( $this->returnValue( file_get_contents( __DIR__ . '/testfiles/test.pdf' ) ) );
+			->will( $this->returnValue( file_get_contents( __DIR__.'/testfiles/test.pdf' ) ) );
 
 		$item = \Aimeos\MShop\Factory::createManager( $this->context, 'media' )->createItem();
 
@@ -108,7 +108,7 @@ 
 			->getMock();
 
 		$object->expects( $this->once() )->method( 'getFileContent' )
-			->will( $this->returnValue( file_get_contents( __DIR__ . '/testfiles/test.png' ) ) );
+			->will( $this->returnValue( file_get_contents( __DIR__.'/testfiles/test.png' ) ) );
 
 		$object->expects( $this->exactly( 2 ) )->method( 'storeFile' );
 
@@ -204,9 +204,9 @@ 
 
 	public function testGetFileContent()
 	{
-		$dest = dirname( dirname( dirname( __DIR__ ) ) ) . '/tmp/';
+		$dest = dirname( dirname( dirname( __DIR__ ) ) ).'/tmp/';
 		if( !is_dir( $dest ) ) { mkdir( $dest, 0755, true ); }
-		copy( __DIR__ . '/testfiles/test.gif', $dest . 'test.gif' );
+		copy( __DIR__.'/testfiles/test.gif', $dest.'test.gif' );
 
 		$result = $this->access( 'getFileContent' )->invokeArgs( $this->object, array( 'test.gif', 'fs-media' ) );
 
@@ -296,7 +296,7 @@ 
 
 	public function testGetMimeType()
 	{
-		$file = \Aimeos\MW\Media\Factory::get( __DIR__ . '/testfiles/test.png' );
+		$file = \Aimeos\MW\Media\Factory::get( __DIR__.'/testfiles/test.png' );
 
 		$result = $this->access( 'getMimeType' )->invokeArgs( $this->object, array( $file, 'files' ) );
 		$this->assertEquals( 'image/png', $result );
@@ -305,7 +305,7 @@ 
 
 	public function testGetMimeTypeNotAllowed()
 	{
-		$file = \Aimeos\MW\Media\Factory::get( __DIR__ . '/testfiles/test.gif' );
+		$file = \Aimeos\MW\Media\Factory::get( __DIR__.'/testfiles/test.gif' );
 		$this->context->getConfig()->set( 'controller/common/media/standard/files/allowedtypes', array( 'image/jpeg' ) );
 
 		$result = $this->access( 'getMimeType' )->invokeArgs( $this->object, array( $file, 'files' ) );
@@ -315,7 +315,7 @@ 
 
 	public function testGetMimeTypeNoTypes()
 	{
-		$file = \Aimeos\MW\Media\Factory::get( __DIR__ . '/testfiles/test.gif' );
+		$file = \Aimeos\MW\Media\Factory::get( __DIR__.'/testfiles/test.gif' );
 		$this->context->getConfig()->set( 'controller/common/media/standard/files/allowedtypes', array() );
 
 		$this->setExpectedException( '\Aimeos\Controller\Common\Exception' );
@@ -325,7 +325,7 @@ 
 
 	public function testScaleImage()
 	{
-		$file = \Aimeos\MW\Media\Factory::get( __DIR__ . '/testfiles/test.gif' );
+		$file = \Aimeos\MW\Media\Factory::get( __DIR__.'/testfiles/test.gif' );
 
 		$this->access( 'scaleImage' )->invokeArgs( $this->object, array( $file, 'files' ) );
 	}
@@ -333,18 +333,18 @@ 
 
 	public function testStoreFile()
 	{
-		$content = file_get_contents( __DIR__ . '/testfiles/test.gif' );
+		$content = file_get_contents( __DIR__.'/testfiles/test.gif' );
 
-		$dest = dirname( dirname( dirname( __DIR__ ) ) ) . '/tmp/';
+		$dest = dirname( dirname( dirname( __DIR__ ) ) ).'/tmp/';
 		if( !is_dir( $dest ) ) { mkdir( $dest, 0755, true ); }
-		copy( __DIR__ . '/testfiles/test.gif', $dest . 'test2.gif' );
+		copy( __DIR__.'/testfiles/test.gif', $dest.'test2.gif' );
 
 		$this->access( 'storeFile' )->invokeArgs( $this->object, array( $content, 'fs-media', 'test.gif', 'test2.gif' ) );
 
-		$this->assertFalse( file_exists( $dest . 'test2.gif' ) );
-		$this->assertTrue( file_exists( $dest . 'test.gif' ) );
+		$this->assertFalse( file_exists( $dest.'test2.gif' ) );
+		$this->assertTrue( file_exists( $dest.'test.gif' ) );
 
-		unlink( $dest . 'test.gif' );
+		unlink( $dest.'test.gif' );
 	}