aimeos / aimeos-core

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

Braces +1 added lines, -2 removed lines

@@ -164,8 +164,7 @@
 				$newMedia->image->cropThumbnailImage( (int) $width, (int) $height );
 				// see https://www.php.net/manual/en/imagick.cropthumbnailimage.php#106710
 				$newMedia->image->setImagePage( 0, 0, 0, 0 );
-			}
-			else
+			} else
 			{
 				$newMedia->image->resizeImage( $width, $height, \Imagick::FILTER_CUBIC, 0.8 );
 			}

Spacing +2 added lines, -2 removed lines

@@ -202,8 +202,8 @@
 		$wh = self::$watermark->getImageWidth();
 
 		$ratio = min( $this->getWidth() / $ww, $this->getHeight() / $wh );
-		$newHeight = (int) ($wh * $ratio);
-		$newWidth = (int) ($ww * $ratio);
+		$newHeight = (int) ( $wh * $ratio );
+		$newWidth = (int) ( $ww * $ratio );
 
 		$dx = (int) ( $this->getWidth() - $newWidth ) / 2;
 		$dy = (int) ( $this->getHeight() - $newHeight ) / 2;

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

Spacing +5 added lines, -5 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::class, $object );
 		$this->assertInstanceOf( \Aimeos\MW\Media\Image\Iface::class, $object );
@@ -26,8 +26,8 @@ 
 	public function testGetImageAsResource()
 	{
 		$ds = DIRECTORY_SEPARATOR;
-		if( ( $resource = fopen( __DIR__ . $ds .'_testfiles' . $ds . 'image.png', 'rw' ) ) === false ) {
-			throw new \RuntimeException( 'Failed to open ' . __DIR__ . $ds .'_testfiles' . $ds . 'image.png' );
+		if( ( $resource = fopen( __DIR__ . $ds . '_testfiles' . $ds . 'image.png', 'rw' ) ) === false ) {
+			throw new \RuntimeException( 'Failed to open ' . __DIR__ . $ds . '_testfiles' . $ds . 'image.png' );
 		}
 
 		$object = \Aimeos\MW\Media\Factory::get( $resource );
@@ -41,7 +41,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::class, $object );
@@ -64,7 +64,7 @@ 
 	public function testGetSvg()
 	{
 		$ds = DIRECTORY_SEPARATOR;
-		$object = \Aimeos\MW\Media\Factory::get( __DIR__ . $ds .'_testfiles' . $ds . 'image.svgz' );
+		$object = \Aimeos\MW\Media\Factory::get( __DIR__ . $ds . '_testfiles' . $ds . 'image.svgz' );
 
 		$this->assertInstanceOf( \Aimeos\MW\Media\Iface::class, $object );
 		$this->assertInstanceOf( \Aimeos\MW\Media\Image\Iface::class, $object );

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

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
 		$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( $mimetype === 'image/svg+xml'
 			|| in_array( $mimetype, ['application/gzip', 'application/x-gzip'] )

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

Braces +2 added lines, -4 removed lines

@@ -176,8 +176,7 @@ 
 			if( $w <= $newWidth && $h <= $newHeight ) {
 				return $this;
 			}
-		}
-		elseif( $width && $height )
+		} elseif( $width && $height )
 		{
 			$ratio = ( $w < $h ? $width / $w : $height / $h );
 			$newHeight = (int) $h * $ratio;
@@ -224,8 +223,7 @@ 
 
 			imagedestroy( $result );
 			$newMedia->image = $newImage;
-		}
-		else
+		} else
 		{
 			$newMedia->image = $result;
 		}

Spacing +6 added lines, -6 removed lines

@@ -49,18 +49,18 @@ 
 			}
 
 			if( ( $image = @imagecreatefromstring( $watermark ) ) === false ) {
-				throw new \Aimeos\MW\Media\Exception( sprintf( 'The watermark image isn\'t supported by GDlib') );
+				throw new \Aimeos\MW\Media\Exception( sprintf( 'The watermark image isn\'t supported by GDlib' ) );
 			}
 
 			self::$watermark = $image;
 		}
 
 		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( imagealphablending( $this->image, true ) === 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;
@@ -148,7 +148,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 ) {
@@ -264,8 +264,8 @@ 
 		$wh = imagesy( self::$watermark );
 
 		$ratio = min( $this->getWidth() / $ww, $this->getHeight() / $wh );
-		$newHeight = (int) ($wh * $ratio);
-		$newWidth = (int) ($ww * $ratio);
+		$newHeight = (int) ( $wh * $ratio );
+		$newWidth = (int) ( $ww * $ratio );
 
 		if( ( $wimage = imagescale( self::$watermark, $newWidth, $newHeight, IMG_BICUBIC ) ) === false ) {
 			throw new \Aimeos\MW\Media\Exception( 'Unable to scale image' );

lib/mshoplib/tests/MShop/Price/Manager/Property/Type/StandardTest.php

Spacing +8 added lines, -8 removed lines

@@ -19,13 +19,13 @@ 
 	{
 		$this->editor = \TestHelperMShop::getContext()->getEditor();
 		$manager = \Aimeos\MShop\Price\Manager\Factory::create( \TestHelperMShop::getContext() );
-		$this->object = $manager->getSubManager( 'property' )->getSubManager('type');
+		$this->object = $manager->getSubManager( 'property' )->getSubManager( 'type' );
 	}
 
 
 	protected function tearDown()
 	{
-		unset($this->object);
+		unset( $this->object );
 	}
 
 
@@ -68,7 +68,7 @@ 
 
 		$results = $this->object->searchItems( $search );
 
-		if( ($expected = reset($results) ) === false )
+		if( ( $expected = reset( $results ) ) === false )
 		{
 			throw new \RuntimeException( 'No property type item found.' );
 		}
@@ -90,13 +90,13 @@ 
 	{
 		$search = $this->object->createSearch();
 		$search->setConditions( $search->compare( '==', 'price.property.type.editor', $this->editor ) );
-		$results = $this->object->searchItems($search);
+		$results = $this->object->searchItems( $search );
 
-		if( ( $item = reset($results) ) === false ) {
+		if( ( $item = reset( $results ) ) === false ) {
 			throw new \RuntimeException( 'No type item found' );
 		}
 
-		$item->setId(null);
+		$item->setId( null );
 		$item->setCode( 'unitTestSave' );
 		$resultSaved = $this->object->saveItem( $item );
 		$itemSaved = $this->object->getItem( $item->getId() );
@@ -157,7 +157,7 @@ 
 		$expr[] = $search->compare( '>=', 'price.property.type.ctime', '1970-01-01 00:00:00' );
 		$expr[] = $search->compare( '==', 'price.property.type.editor', $this->editor );
 
-		$search->setConditions( $search->combine('&&', $expr) );
+		$search->setConditions( $search->combine( '&&', $expr ) );
 		$results = $this->object->searchItems( $search, [], $total );
 
 		$this->assertEquals( 1, count( $results ) );
@@ -167,6 +167,6 @@ 
 	public function testGetSubManager()
 	{
 		$this->setExpectedException( \Aimeos\MShop\Exception::class );
-		$this->object->getSubManager('unknown');
+		$this->object->getSubManager( 'unknown' );
 	}
 }

lib/mshoplib/setup/default/schema/price.php

Spacing +7 added lines, -7 removed lines

@@ -8,7 +8,7 @@ 
 
 return array(
 	'table' => array(
-		'mshop_price_type' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'mshop_price_type' => function( \Doctrine\DBAL\Schema\Schema $schema ) {
 
 			$table = $schema->createTable( 'mshop_price_type' );
 
@@ -32,7 +32,7 @@ 
 			return $schema;
 		},
 
-		'mshop_price' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'mshop_price' => function( \Doctrine\DBAL\Schema\Schema $schema ) {
 
 			$table = $schema->createTable( 'mshop_price' );
 
@@ -50,7 +50,7 @@ 
 			$table->addColumn( 'status', 'smallint', [] );
 			$table->addColumn( 'mtime', 'datetime', [] );
 			$table->addColumn( 'ctime', 'datetime', [] );
-			$table->addColumn( 'editor', 'string', array('length' => 255 ) );
+			$table->addColumn( 'editor', 'string', array( 'length' => 255 ) );
 
 			$table->setPrimaryKey( array( 'id' ), 'pk_mspri_id' );
 			$table->addIndex( array( 'siteid', 'domain', 'currencyid' ), 'idx_mspri_sid_dom_currid' );
@@ -63,7 +63,7 @@ 
 			return $schema;
 		},
 
-		'mshop_price_list_type' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'mshop_price_list_type' => function( \Doctrine\DBAL\Schema\Schema $schema ) {
 
 			$table = $schema->createTable( 'mshop_price_list_type' );
 
@@ -87,7 +87,7 @@ 
 			return $schema;
 		},
 
-		'mshop_price_list' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'mshop_price_list' => function( \Doctrine\DBAL\Schema\Schema $schema ) {
 
 			$table = $schema->createTable( 'mshop_price_list' );
 
@@ -118,7 +118,7 @@ 
 			return $schema;
 		},
 
-		'mshop_price_property_type' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'mshop_price_property_type' => function( \Doctrine\DBAL\Schema\Schema $schema ) {
 
 			$table = $schema->createTable( 'mshop_price_property_type' );
 
@@ -142,7 +142,7 @@ 
 			return $schema;
 		},
 
-		'mshop_price_property' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'mshop_price_property' => function( \Doctrine\DBAL\Schema\Schema $schema ) {
 
 			$table = $schema->createTable( 'mshop_price_property' );
 

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

Spacing +1 added lines, -1 removed lines

@@ -147,7 +147,7 @@
 					$fs->rm( $preview );
 				}
 			}
-			catch( \Exception $e ) { ; } // Can be a mime icon with relative path
+			catch( \Exception $e ) {; } // Can be a mime icon with relative path
 		}
 
 		return $item->setUrl( '' )->setPreviews( [] )->deletePropertyItems( $item->getPropertyItems() );

Braces +10 added lines, -5 removed lines

@@ -53,8 +53,7 @@ 
 		if( $media instanceof \Aimeos\MW\Media\Image\Iface )
 		{
 			$item = $this->addImages( $item, $media, md5( $file->getClientFilename() ), $fsname );
-		}
-		else
+		} else
 		{
 			$mimetype = $media->getMimeType();
 			$filepath = $this->getFilePath( $file->getClientFilename(), 'files', $mimetype );
@@ -106,7 +105,9 @@ 
 					$fs->copy( $preview, $newPath );
 					$previews[$size] = $newPath;
 				}
-				catch( \Aimeos\MW\Filesystem\Exception $e ) {} // mime icons can't be copied
+				catch( \Aimeos\MW\Filesystem\Exception $e )
+				{
+} // mime icons can't be copied
 			}
 		}
 
@@ -147,7 +148,9 @@ 
 					$fs->rm( $preview );
 				}
 			}
-			catch( \Exception $e ) { ; } // Can be a mime icon with relative path
+			catch( \Exception $e )
+			{
+; } // Can be a mime icon with relative path
 		}
 
 		return $item->setUrl( '' )->setPreviews( [] )->deletePropertyItems( $item->getPropertyItems() );
@@ -665,7 +668,9 @@ 
 				$fs->rm( $oldpath );
 			}
 		}
-		catch( \Aimeos\MW\Filesystem\Exception $e ) {} // continue if removing file fails
+		catch( \Aimeos\MW\Filesystem\Exception $e )
+		{
+} // continue if removing file fails
 
 		$fs->write( $filepath, $content );
 	}

lib/mshoplib/setup/OrderMigrateTaxrate.php

Braces +2 added lines, -4 removed lines

@@ -83,8 +83,7 @@ 
 			$this->release( $conn, $dbdomain );
 
 			$this->status( 'done' );
-		}
-		else
+		} else
 		{
 			$this->status( 'OK' );
 		}
@@ -129,8 +128,7 @@ 
 			$this->release( $conn, $dbdomain );
 
 			$this->status( 'done' );
-		}
-		else
+		} else
 		{
 			$this->status( 'OK' );
 		}

lib/mshoplib/tests/MShop/Price/Manager/Property/StandardTest.php

Spacing +9 added lines, -9 removed lines

@@ -54,11 +54,11 @@ 
 		$search->setConditions( $search->compare( '==', 'price.property.editor', $this->editor ) );
 		$results = $this->object->searchItems( $search );
 
-		if( ( $item = reset($results) ) === false ) {
+		if( ( $item = reset( $results ) ) === false ) {
 			throw new \RuntimeException( 'No property item found' );
 		}
 
-		$item->setId(null);
+		$item->setId( null );
 		$item->setLanguageId( 'en' );
 		$resultSaved = $this->object->saveItem( $item );
 		$itemSaved = $this->object->getItem( $item->getId() );
@@ -109,13 +109,13 @@ 
 	{
 		$search = $this->object->createSearch()->setSlice( 0, 1 );
 		$conditions = array(
-			$search->compare( '~=', 'price.property.value', 'NY'),
+			$search->compare( '~=', 'price.property.value', 'NY' ),
 			$search->compare( '==', 'price.property.editor', $this->editor )
 		);
 		$search->setConditions( $search->combine( '&&', $conditions ) );
 		$results = $this->object->searchItems( $search );
 
-		if( ($expected = reset($results)) === false ) {
+		if( ( $expected = reset( $results ) ) === false ) {
 			throw new \RuntimeException( sprintf( 'No price property item found for value "%1$s".', 'NY' ) );
 		}
 
@@ -154,7 +154,7 @@ 
 		$expr[] = $search->compare( '==', 'price.property.value', 'NY' );
 		$expr[] = $search->compare( '==', 'price.property.editor', $this->editor );
 
-		$search->setConditions( $search->combine('&&', $expr) );
+		$search->setConditions( $search->combine( '&&', $expr ) );
 		$results = $this->object->searchItems( $search, [], $total );
 		$this->assertEquals( 2, count( $results ) );
 	}
@@ -162,17 +162,17 @@ 
 
 	public function testGetSubManager()
 	{
-		$this->assertInstanceOf( \Aimeos\MShop\Common\Manager\Iface::class, $this->object->getSubManager('type') );
-		$this->assertInstanceOf( \Aimeos\MShop\Common\Manager\Iface::class, $this->object->getSubManager('type', 'Standard') );
+		$this->assertInstanceOf( \Aimeos\MShop\Common\Manager\Iface::class, $this->object->getSubManager( 'type' ) );
+		$this->assertInstanceOf( \Aimeos\MShop\Common\Manager\Iface::class, $this->object->getSubManager( 'type', 'Standard' ) );
 
 		$this->setExpectedException( \Aimeos\MShop\Exception::class );
-		$this->object->getSubManager('unknown');
+		$this->object->getSubManager( 'unknown' );
 	}
 
 
 	public function testGetSubManagerInvalidName()
 	{
 		$this->setExpectedException( \Aimeos\MShop\Exception::class );
-		$this->object->getSubManager('type', 'unknown');
+		$this->object->getSubManager( 'type', 'unknown' );
 	}
 }