aimeos / aimeos-core

lib/mshoplib/src/MShop/Stock/Manager/Factory.php

Spacing +2 added lines, -2 removed lines

@@ -71,12 +71,12 @@
 
 		if( ctype_alnum( $name ) === false )
 		{
-			$classname = is_string( $name ) ? '\\Aimeos\\MShop\\Stock\\Manager\\' . $name : '<not a string>';
+			$classname = is_string( $name ) ? '\\Aimeos\\MShop\\Stock\\Manager\\'.$name : '<not a string>';
 			throw new \Aimeos\MShop\Stock\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
 		}
 
 		$iface = '\\Aimeos\\MShop\\Stock\\Manager\\Iface';
-		$classname = '\\Aimeos\\MShop\\Stock\\Manager\\' . $name;
+		$classname = '\\Aimeos\\MShop\\Stock\\Manager\\'.$name;
 
 		$manager = self::createManagerBase( $context, $classname, $iface );
 

lib/mshoplib/src/MShop/Stock/Item/Standard.php

Spacing +2 added lines, -2 removed lines

@@ -91,7 +91,7 @@ 
 	 */
 	public function setTypeId( $id )
 	{
-		if ( $id == $this->getTypeId() ) { return $this; }
+		if( $id == $this->getTypeId() ) { return $this; }
 
 		$this->values['stock.typeid'] = (int) $id;
 		$this->setModified();
@@ -189,7 +189,7 @@ 
 	{
 		if( $backdate == $this->getDateBack() ) { return $this; }
 
-		$this->values['stock.backdate'] = $this->checkDateFormat( $backdate );;
+		$this->values['stock.backdate'] = $this->checkDateFormat( $backdate ); ;
 		$this->setModified();
 
 		return $this;

lib/mshoplib/setup/StockMigrateProductcode.php

Braces +4 added lines, -8 removed lines

@@ -72,8 +72,7 @@ 
 				{
 					$this->execute( $stmt );
 					$this->status( 'done' );
-				}
-				else
+				} else
 				{
 					$this->status( 'OK' );
 				}
@@ -86,8 +85,7 @@ 
 			{
 				$this->executeList( $this->updates );
 				$this->status( 'done' );
-			}
-			else
+			} else
 			{
 				$this->status( 'OK' );
 			}
@@ -101,8 +99,7 @@ 
 				{
 					$this->execute( $stmt );
 					$this->status( 'done' );
-				}
-				else
+				} else
 				{
 					$this->status( 'OK' );
 				}
@@ -114,8 +111,7 @@ 
 			{
 				$this->execute( $this->column );
 				$this->status( 'done' );
-			}
-			else
+			} else
 			{
 				$this->status( 'OK' );
 			}

lib/mshoplib/tests/MShop/Service/Provider/Decorator/CategoryTest.php

Doc Comments +3 added lines

@@ -197,6 +197,9 @@
 	}
 
 
+	/**
+	 * @param string $code
+	 */
 	protected function getOrderProduct( $code )
 	{
 		$productManager = \Aimeos\MShop\Factory::createManager( $this->context, 'product' );

lib/mshoplib/src/MShop/Factory.php

Spacing +6 added lines, -6 removed lines

@@ -91,7 +91,7 @@ 
 
 			if( self::$cache === false || !isset( self::$managers[$id][$domain] ) )
 			{
-				$factory = '\\Aimeos\\MShop\\' . ucwords( $domain ) . '\\Manager\\Factory';
+				$factory = '\\Aimeos\\MShop\\'.ucwords( $domain ).'\\Manager\\Factory';
 
 				if( class_exists( $factory ) === false ) {
 					throw new \Aimeos\MShop\Exception( sprintf( 'Class "%1$s" not available', $factory ) );
@@ -111,14 +111,14 @@ 
 
 			foreach( $parts as $part )
 			{
-				$subpath .= $part . '/';
-				$classname = $context->getConfig()->get( 'mshop/' . $domain . '/manager/' . $subpath . 'name' );
+				$subpath .= $part.'/';
+				$classname = $context->getConfig()->get( 'mshop/'.$domain.'/manager/'.$subpath.'name' );
 
-				if( self::$cache === false || !isset( self::$managers[$id][$tmppath . '/' . $part] ) ) {
-					self::$managers[$id][$tmppath . '/' . $part] = self::$managers[$id][$tmppath]->getSubManager( $part, $classname );
+				if( self::$cache === false || !isset( self::$managers[$id][$tmppath.'/'.$part] ) ) {
+					self::$managers[$id][$tmppath.'/'.$part] = self::$managers[$id][$tmppath]->getSubManager( $part, $classname );
 				}
 
-				$tmppath .= '/' . $part;
+				$tmppath .= '/'.$part;
 			}
 		}
 

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/src/Controller/Common/Media/Standard.php

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 );
 	}

Braces +4 added lines, -3 removed lines

@@ -61,8 +61,7 @@ 
 			$filepath = $this->getFilePath( $file->getClientFilename(), 'preview', $mimeprev );
 			$this->storeFile( $media->save( null, $mimetype ), $fsname, $filepath, $item->getPreview() );
 			$item->setPreview( $filepath );
-		}
-		else
+		} else
 		{
 			$mimetype = $media->getMimeType();
 			$item->setPreview( $this->getMimeIcon( $mimetype ) );
@@ -103,7 +102,9 @@ 
 				$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( '' );
 	}

lib/mwlib/src/MW/Media/Factory.php

Spacing +3 added lines, -3 removed lines

@@ -49,17 +49,17 @@
 		$mime = explode( '/', $mimetype );
 
 		$type = ( $mime[0] === 'image' ? 'Image' : 'Application' );
-		$name = ( isset( $options[ $mime[0] ]['name'] ) ? ucfirst( $options[ $mime[0] ]['name'] ) : 'Standard' );
+		$name = ( isset( $options[$mime[0]]['name'] ) ? ucfirst( $options[$mime[0]]['name'] ) : 'Standard' );
 
 
 		if( ctype_alnum( $name ) === false )
 		{
-			$classname = is_string( $name ) ? '\\Aimeos\\MW\\Media\\' . $name : '<not a string>';
+			$classname = is_string( $name ) ? '\\Aimeos\\MW\\Media\\'.$name : '<not a string>';
 			throw new \Aimeos\MW\Container\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
 		}
 
 		$iface = '\\Aimeos\\MW\\Media\\Iface';
-		$classname = '\\Aimeos\\MW\\Media\\' . $type . '\\' . $name;
+		$classname = '\\Aimeos\\MW\\Media\\'.$type.'\\'.$name;
 
 		if( class_exists( $classname ) === false ) {
 			throw new \Aimeos\MW\Media\Exception( sprintf( 'Class "%1$s" not available', $classname ) );

lib/mwlib/src/MW/Media/Image/Standard.php

Spacing +6 added lines, -6 removed lines

@@ -41,7 +41,7 @@ 
 		parent::__construct( $mimetype );
 
 		if( ( $this->image = @imagecreatefromstring( $content ) ) === false ) {
-			throw new \Aimeos\MW\Media\Exception( sprintf( 'The image type isn\'t supported by GDlib.') );
+			throw new \Aimeos\MW\Media\Exception( sprintf( 'The image type isn\'t supported by GDlib.' ) );
 		}
 
 		if( ( $this->info = getimagesizefromstring( $content ) ) === false ) {
@@ -49,7 +49,7 @@ 
 		}
 
 		if( imagealphablending( $this->image, false ) === false ) {
-			throw new \Aimeos\MW\Media\Exception( sprintf( 'GD library failed (imagealphablending)') );
+			throw new \Aimeos\MW\Media\Exception( sprintf( 'GD library failed (imagealphablending)' ) );
 		}
 
 		$this->options = $options;
@@ -115,7 +115,7 @@ 
 				case 'image/png':
 
 					if( imagesavealpha( $this->image, true ) === false ) {
-						throw new \Aimeos\MW\Media\Exception( sprintf( 'GD library failed (imagesavealpha)') );
+						throw new \Aimeos\MW\Media\Exception( sprintf( 'GD library failed (imagesavealpha)' ) );
 					}
 
 					if( @imagepng( $this->image, $filename, (int) 10 - $quality / 10 ) === false ) {
@@ -198,15 +198,15 @@ 
 		try
 		{
 			if( imagealphablending( $newImage, false ) === false ) {
-				throw new \Aimeos\MW\Media\Exception( sprintf( 'GD library failed (imagealphablending)') );
+				throw new \Aimeos\MW\Media\Exception( sprintf( 'GD library failed (imagealphablending)' ) );
 			}
 
 			if( ( $transparent = imagecolorallocatealpha( $newImage, 255, 255, 255, 127 ) ) === false ) {
-				throw new \Aimeos\MW\Media\Exception( sprintf( 'GD library failed (imagecolorallocatealpha)') );
+				throw new \Aimeos\MW\Media\Exception( sprintf( 'GD library failed (imagecolorallocatealpha)' ) );
 			}
 
 			if( imagefilledrectangle( $newImage, 0, 0, $destWidth, $destHeight, $transparent ) === false ) {
-				throw new \Aimeos\MW\Media\Exception( sprintf( 'GD library failed (imagefilledrectangle)') );
+				throw new \Aimeos\MW\Media\Exception( sprintf( 'GD library failed (imagefilledrectangle)' ) );
 			}
 
 			if( imagecopyresampled( $newImage, $image, 0, 0, 0, 0, $destWidth, $destHeight, $srcWidth, $srcHeight ) === false ) {

Braces +1 added lines, -2 removed lines

@@ -166,8 +166,7 @@
 			}
 
 			$this->image = $result;
-		}
-		else
+		} else
 		{
 			$this->image = $this->resample( $this->image, $this->info[0], $this->info[1], $width, $height );
 		}