aimeos / aimeos-core

lib/mshoplib/src/MShop/Plugin/Provider/Order/ProductStock.php

Spacing +1 added lines, -1 removed lines

@@ -91,7 +91,7 @@
 		}
 
 		foreach( $this->getStockItems( $productCodes, $stockTypes ) as $stockItem ) {
-			$stockMap[ $stockItem->getProductCode() ][ $stockItem->getType() ] = $stockItem;
+			$stockMap[$stockItem->getProductCode()][$stockItem->getType()] = $stockItem;
 		}
 
 		return $this->checkStockLevels( $order, $stockMap );

lib/mshoplib/src/MShop/Service/Provider/Payment/PayPalExpress.php

Spacing +6 added lines, -6 removed lines

@@ -725,7 +725,7 @@ 
 					$lastPos++;
 				}
 			}
-			catch( \Exception $e ) { ; } // If no delivery service is available
+			catch( \Exception $e ) {; } // If no delivery service is available
 		}
 
 
@@ -818,7 +818,7 @@ 
 	 */
 	public function send( $target, $method, $payload )
 	{
-		if( ( $curl = curl_init() )=== false ) {
+		if( ( $curl = curl_init() ) === false ) {
 			throw new \Aimeos\MShop\Service\Exception( 'Could not initialize curl' );
 		}
 
@@ -829,16 +829,16 @@ 
 			curl_setopt( $curl, CURLOPT_CUSTOMREQUEST, strtoupper( $method ) );
 			curl_setopt( $curl, CURLOPT_POSTFIELDS, $payload );
 			curl_setopt( $curl, CURLOPT_CONNECTTIMEOUT, 25 );
-			curl_setopt( $curl, CURLOPT_RETURNTRANSFER, true );   // return data as string
+			curl_setopt( $curl, CURLOPT_RETURNTRANSFER, true ); // return data as string
 
 			curl_setopt( $curl, CURLOPT_SSL_VERIFYPEER, true );
 
-			if ( ( $response = curl_exec( $curl ) ) === false ) {
+			if( ( $response = curl_exec( $curl ) ) === false ) {
 				throw new \Aimeos\MShop\Service\Exception( sprintf( 'Sending order failed: "%1$s"', curl_error( $curl ) ) );
 			}
 
-			if ( curl_errno($curl) ) {
-				throw new \Aimeos\MShop\Service\Exception( sprintf( 'Curl error: "%1$s" - "%2$s"', curl_errno($curl), curl_error($curl) ) );
+			if( curl_errno( $curl ) ) {
+				throw new \Aimeos\MShop\Service\Exception( sprintf( 'Curl error: "%1$s" - "%2$s"', curl_errno( $curl ), curl_error( $curl ) ) );
 			}
 
 			curl_close( $curl );

Braces +3 added lines, -1 removed lines

@@ -725,7 +725,9 @@
 					$lastPos++;
 				}
 			}
-			catch( \Exception $e ) { ; } // If no delivery service is available
+			catch( \Exception $e )
+			{
+; } // If no delivery service is available
 		}
 
 

lib/mshoplib/src/MShop/Service/Provider/Decorator/Delivery.php

Braces +3 added lines, -1 removed lines

@@ -129,7 +129,9 @@
 				$feconfig['delivery.type']['default'] = $values;
 			}
 		}
-		catch( \Aimeos\MShop\Service\Exception $e ) {} // If service isn't available
+		catch( \Aimeos\MShop\Service\Exception $e )
+		{
+} // If service isn't available
 
 		return array_merge( $this->getProvider()->getConfigFE( $basket ), $this->getConfigItems( $feconfig ) );
 	}

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

Spacing +20 added lines, -20 removed lines

@@ -16,7 +16,7 @@ 
 
 	'table' => array(
 
-		'mshop_order_base' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'mshop_order_base' => function( \Doctrine\DBAL\Schema\Schema $schema ) {
 
 			$table = $schema->createTable( 'mshop_order_base' );
 
@@ -35,7 +35,7 @@ 
 			$table->addColumn( 'comment', 'text', array( 'length' => 0xfff ) );
 			$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_msordba_id' );
 			$table->addIndex( array( 'sitecode', 'customerid' ), 'idx_msordba_scode_custid' );
@@ -45,7 +45,7 @@ 
 			return $schema;
 		},
 
-		'mshop_order_base_address' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'mshop_order_base_address' => function( \Doctrine\DBAL\Schema\Schema $schema ) {
 
 			$table = $schema->createTable( 'mshop_order_base_address' );
 
@@ -77,7 +77,7 @@ 
 			$table->addColumn( 'pos', 'integer', [] );
 			$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_msordbaad_id' );
 			$table->addUniqueIndex( array( 'baseid', 'type' ), 'unq_msordbaad_bid_type' );
@@ -95,7 +95,7 @@ 
 			return $schema;
 		},
 
-		'mshop_order_base_product' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'mshop_order_base_product' => function( \Doctrine\DBAL\Schema\Schema $schema ) {
 
 			$table = $schema->createTable( 'mshop_order_base_product' );
 
@@ -106,8 +106,8 @@ 
 			$table->addColumn( 'ordaddrid', 'bigint', array( 'notnull' => false ) );
 			$table->addColumn( 'type', 'string', array( 'length' => 64 ) );
 			$table->addColumn( 'prodid', 'string', array( 'length' => 32 ) );
-			$table->addColumn( 'prodcode', 'string', array( 'length' => 64  ) );
-			$table->addColumn( 'suppliercode', 'string', array( 'length' => 64  ) );
+			$table->addColumn( 'prodcode', 'string', array( 'length' => 64 ) );
+			$table->addColumn( 'suppliercode', 'string', array( 'length' => 64 ) );
 			$table->addColumn( 'stocktype', 'string', array( 'length' => 64 ) );
 			$table->addColumn( 'name', 'text', array( 'length' => 0xffff ) );
 			$table->addColumn( 'description', 'text', array( 'length' => 0xffff ) );
@@ -127,7 +127,7 @@ 
 			$table->addColumn( 'status', 'smallint', array( 'default' => -1 ) );
 			$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_msordbapr_id' );
 			$table->addUniqueIndex( array( 'baseid', 'pos' ), 'unq_msordbapr_bid_pos' );
@@ -141,7 +141,7 @@ 
 			return $schema;
 		},
 
-		'mshop_order_base_product_attr' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'mshop_order_base_product_attr' => function( \Doctrine\DBAL\Schema\Schema $schema ) {
 
 			$table = $schema->createTable( 'mshop_order_base_product_attr' );
 
@@ -156,7 +156,7 @@ 
 			$table->addColumn( 'quantity', 'integer', [] );
 			$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_msordbaprat_id' );
 			$table->addUniqueIndex( array( 'ordprodid', 'attrid', 'type', 'code' ), 'unq_msordbaprat_oid_aid_ty_cd' );
@@ -168,7 +168,7 @@ 
 			return $schema;
 		},
 
-		'mshop_order_base_service' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'mshop_order_base_service' => function( \Doctrine\DBAL\Schema\Schema $schema ) {
 
 			$table = $schema->createTable( 'mshop_order_base_service' );
 
@@ -190,7 +190,7 @@ 
 			$table->addColumn( 'pos', 'integer', [] );
 			$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_msordbase_id' );
 			$table->addUniqueIndex( array( 'siteid', 'baseid', 'code', 'type' ), 'unq_msordbase_sid_bid_cd_typ' );
@@ -203,7 +203,7 @@ 
 			return $schema;
 		},
 
-		'mshop_order_base_service_attr' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'mshop_order_base_service_attr' => function( \Doctrine\DBAL\Schema\Schema $schema ) {
 
 			$table = $schema->createTable( 'mshop_order_base_service_attr' );
 
@@ -218,7 +218,7 @@ 
 			$table->addColumn( 'quantity', 'integer', [] );
 			$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_msordbaseat_id' );
 			$table->addUniqueIndex( array( 'ordservid', 'attrid', 'type', 'code' ), 'unq_msordbaseat_oid_aid_ty_cd' );
@@ -230,7 +230,7 @@ 
 			return $schema;
 		},
 
-		'mshop_order_base_coupon' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'mshop_order_base_coupon' => function( \Doctrine\DBAL\Schema\Schema $schema ) {
 
 			$table = $schema->createTable( 'mshop_order_base_coupon' );
 
@@ -241,7 +241,7 @@ 
 			$table->addColumn( 'code', 'string', array( 'length' => 64 ) );
 			$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_msordbaco_id' );
 			$table->addIndex( array( 'siteid', 'baseid', 'code' ), 'idx_msordbaco_sid_bid_code' );
@@ -257,7 +257,7 @@ 
 			return $schema;
 		},
 
-		'mshop_order' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'mshop_order' => function( \Doctrine\DBAL\Schema\Schema $schema ) {
 
 			$table = $schema->createTable( 'mshop_order' );
 
@@ -277,7 +277,7 @@ 
 			$table->addColumn( 'chour', 'string', array( 'length' => 2 ) );
 			$table->addColumn( 'ctime', 'datetime', [] );
 			$table->addColumn( 'mtime', 'datetime', [] );
-			$table->addColumn( 'editor', 'string', array('length' => 255 ) );
+			$table->addColumn( 'editor', 'string', array( 'length' => 255 ) );
 
 			$table->setPrimaryKey( array( 'id' ), 'pk_msord_id' );
 			$table->addIndex( array( 'siteid', 'type' ), 'idx_msord_sid_type' );
@@ -301,7 +301,7 @@ 
 			return $schema;
 		},
 
-		'mshop_order_status' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'mshop_order_status' => function( \Doctrine\DBAL\Schema\Schema $schema ) {
 
 			$table = $schema->createTable( 'mshop_order_status' );
 
@@ -312,7 +312,7 @@ 
 			$table->addColumn( 'value', 'string', array( 'length' => 64 ) );
 			$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_msordst_id' );
 			$table->addIndex( array( 'siteid', 'parentid', 'type', 'value' ), 'idx_msordstatus_val_sid' );

lib/mshoplib/tests/MShop/Common/Item/PropertyRef/TraitsTest.php

Spacing +2 added lines, -2 removed lines

@@ -29,8 +29,8 @@
 
 	protected function setUp()
 	{
-		$this->propItem = new \Aimeos\MShop\Common\Item\Property\Standard( 'c.', ['.languageid' => 'de', 'c.type' => 'test', 'c.value' => 'value']);
-		$this->propItem2 = new \Aimeos\MShop\Common\Item\Property\Standard( 'c.', ['.languageid' => 'de', 'c.languageid' => 'en', 'c.type' => 'test2']);
+		$this->propItem = new \Aimeos\MShop\Common\Item\Property\Standard( 'c.', ['.languageid' => 'de', 'c.type' => 'test', 'c.value' => 'value'] );
+		$this->propItem2 = new \Aimeos\MShop\Common\Item\Property\Standard( 'c.', ['.languageid' => 'de', 'c.languageid' => 'en', 'c.type' => 'test2'] );
 
 		$this->object = new TraitsClass();
 		$this->object->addPropertyItem( $this->propItem );

lib/mwlib/src/MW/DB/Statement/PDO/Prepared.php

Braces +5 added lines, -2 removed lines

@@ -59,9 +59,12 @@
 	 */
 	public function execute()
 	{
-		try {
+		try
+		{
 			$stmt = $this->exec();
-		} catch( \PDOException $e ) {
+		}
+		catch( \PDOException $e )
+		{
 			throw new \Aimeos\MW\DB\Exception( $e->getMessage() . ': ' . $this->sql, $e->getCode(), $e->errorInfo );
 		}
 

lib/mwlib/src/MW/DB/Statement/DBAL/Prepared.php

Braces +5 added lines, -2 removed lines

@@ -58,9 +58,12 @@
 	 */
 	public function execute()
 	{
-		try {
+		try
+		{
 			$stmt = $this->exec();
-		} catch( \PDOException $e ) {
+		}
+		catch( \PDOException $e )
+		{
 			throw new \Aimeos\MW\DB\Exception( $e->getMessage() . ': ' . $this->sql, $e->getCode() );
 		}
 

lib/mshoplib/setup/AttributeMigrateKey.php

Braces +1 added lines, -2 removed lines

@@ -69,8 +69,7 @@
 			$dbm->release( $conn, $rname );
 
 			$this->status( 'done' );
-		}
-		else
+		} else
 		{
 			$this->status( 'OK' );
 		}

lib/mshoplib/setup/TablesMigratePropertyKey.php

Braces +1 added lines, -2 removed lines

@@ -80,8 +80,7 @@
 				$dbm->release( $conn, $rname );
 
 				$this->status( 'done' );
-			}
-			else
+			} else
 			{
 				$this->status( 'OK' );
 			}