aimeos / aimeos-core

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

Braces +3 added lines, -2 removed lines

@@ -119,12 +119,13 @@
 					return false;
 				}
 			}
-		}
-		elseif( ( $addresses = $basket->getAddress( $paymentType ) ) !== [] ) // use billing address if no delivery address is available
+		} elseif( ( $addresses = $basket->getAddress( $paymentType ) ) !== [] ) {
+			// use billing address if no delivery address is available
 		{
 			foreach( $addresses as $address )
 			{
 				$code = $address->getPostal();
+		}
 
 				if( $this->checkPostalCode( $code, 'postal.delivery-include' ) === false
 					|| $this->checkPostalCode( $code, 'postal.delivery-exclude' ) === true

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

Braces +3 added lines, -2 removed lines

@@ -119,12 +119,13 @@
 					return false;
 				}
 			}
-		}
-		elseif( ( $addresses = $basket->getAddress( $paymentType ) ) !== [] ) // use billing address if no delivery address is available
+		} elseif( ( $addresses = $basket->getAddress( $paymentType ) ) !== [] ) {
+			// use billing address if no delivery address is available
 		{
 			foreach( $addresses as $address )
 			{
 				$code = strtoupper( $address->getCountryId() );
+		}
 
 				if( $this->checkCountryCode( $code, 'country.delivery-include' ) === false
 					|| $this->checkCountryCode( $code, 'country.delivery-exclude' ) === true

lib/mshoplib/tests/MShop/Catalog/Manager/StandardTest.php

Braces +2 added lines, -4 removed lines

@@ -77,8 +77,7 @@ 
 
 	public function testRegisterItemFilter()
 	{
-		$callback = function( \Aimeos\MShop\Common\Item\ListRef\Iface $item, $index )
-		{
+		$callback = function( \Aimeos\MShop\Common\Item\ListRef\Iface $item, $index ) {
 			return true;
 		};
 
@@ -290,8 +289,7 @@ 
 	{
 		$this->assertEquals( 2, count( $this->object->getTree()->getChildren() ) );
 
-		$callback = function( \Aimeos\MShop\Common\Item\ListRef\Iface $item, $index )
-		{
+		$callback = function( \Aimeos\MShop\Common\Item\ListRef\Iface $item, $index ) {
 			return (bool) $index % 2;
 		};
 

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

Braces +3 added lines, -6 removed lines

@@ -53,8 +53,7 @@ 
 			foreach( $value as $key => $product ) {
 				$value[$key] = $this->updatePrice( $product );
 			}
-		}
-		else
+		} else
 		{
 			$value = $this->updatePrice( $value );
 		}
@@ -130,8 +129,7 @@ 
 	{
 		$priceManager = \Aimeos\MShop::create( $this->getContext(), 'price' );
 
-		$sortFcn = function( $a, $b ) use( $priceManager, $attrQtys )
-		{
+		$sortFcn = function( $a, $b ) use( $priceManager, $attrQtys ) {
 			if( ( $pricesA = $a->getRefItems( 'price', 'default', 'default' ) ) === [] ) {
 				return 1;
 			}
@@ -194,8 +192,7 @@ 
 			{
 				$list = $this->sortByPrice( $list, $attrQtys );
 				$priceItem = $this->addPrices( $priceItem, $list, $attrQtys, (int) $prodConf[$type] );
-			}
-			else
+			} else
 			{
 				$priceItem = $this->addPrices( $priceItem, $list, $attrQtys, 0 );
 			}

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( '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_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' );
 
@@ -76,7 +76,7 @@ 
 			$table->addColumn( 'latitude', 'decimal', array( 'precision' => 8, 'scale' => 6, 'notnull' => false ) );
 			$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' );
@@ -94,7 +94,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' );
 
@@ -105,8 +105,8 @@ 
 			$table->addColumn( 'ordaddrid', 'bigint', array( 'notnull' => false ) );
 			$table->addColumn( 'type', 'string', array( 'length' => 32 ) );
 			$table->addColumn( 'prodid', 'string', array( 'length' => 32 ) );
-			$table->addColumn( 'prodcode', 'string', array( 'length' => 32  ) );
-			$table->addColumn( 'suppliercode', 'string', array( 'length' => 32  ) );
+			$table->addColumn( 'prodcode', 'string', array( 'length' => 32 ) );
+			$table->addColumn( 'suppliercode', 'string', array( 'length' => 32 ) );
 			$table->addColumn( 'stocktype', 'string', array( 'length' => 32 ) );
 			$table->addColumn( 'name', 'text', array( 'length' => 0xffff ) );
 			$table->addColumn( 'mediaurl', 'string', array( 'length' => 255 ) );
@@ -124,7 +124,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' );
@@ -138,7 +138,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' );
 
@@ -153,7 +153,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' );
@@ -165,7 +165,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' );
 
@@ -186,7 +186,7 @@ 
 			$table->addColumn( 'taxflag', '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_msordbase_id' );
 			$table->addUniqueIndex( array( 'siteid', 'baseid', 'code', 'type' ), 'unq_msordbase_sid_bid_cd_typ' );
@@ -199,7 +199,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' );
 
@@ -214,7 +214,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' );
@@ -226,7 +226,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' );
 
@@ -237,7 +237,7 @@ 
 			$table->addColumn( 'code', 'string', array( 'length' => 32 ) );
 			$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' );
@@ -253,7 +253,7 @@ 
 			return $schema;
 		},
 
-		'mshop_order' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+		'mshop_order' => function( \Doctrine\DBAL\Schema\Schema $schema ) {
 
 			$table = $schema->createTable( 'mshop_order' );
 
@@ -273,7 +273,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' );
@@ -297,7 +297,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' );
 
@@ -308,7 +308,7 @@ 
 			$table->addColumn( 'value', 'string', array( 'length' => 32 ) );
 			$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/setup/LocaleRemoveCharConstraints.php

Braces +2 added lines, -4 removed lines

@@ -53,8 +53,7 @@ 
 		) {
 			$this->execute( 'ALTER TABLE "mshop_locale" DROP FOREIGN KEY "fk_msloc_langid"', 'db-locale' );
 			$this->status( 'done' );
-		}
-		else
+		} else
 		{
 			$this->status( 'OK' );
 		}
@@ -66,8 +65,7 @@ 
 		) {
 			$this->execute( 'ALTER TABLE "mshop_locale" DROP FOREIGN KEY "fk_msloc_currid"', 'db-locale' );
 			$this->status( 'done' );
-		}
-		else
+		} else
 		{
 			$this->status( 'OK' );
 		}

lib/mshoplib/setup/unittest/data/text.php

Spacing +4 added lines, -4 removed lines

@@ -6,8 +6,8 @@ 
  * @copyright Aimeos (aimeos.org), 2015-2018
  */
 
-return array (
-	'text/type' => array (
+return array(
+	'text/type' => array(
 		'attribute/name' => array( 'domain' => 'attribute', 'code' => 'name', 'label' => 'Name', 'status' => 1 ),
 		'attribute/short' => array( 'domain' => 'attribute', 'code' => 'short', 'label' => 'Short description', 'status' => 1 ),
 		'attribute/long' => array( 'domain' => 'attribute', 'code' => 'long', 'label' => 'Long description', 'status' => 1 ),
@@ -48,10 +48,10 @@ 
 		'supplier/long' => array( 'domain' => 'supplier', 'code' => 'long', 'label' => 'Long description', 'status' => 1 ),
 	),
 
-	'text' => array (
+	'text' => array(
 
 //supplier
-		'text/supplier/description' => array( 'langid' => null, 'type' => 'description', 'domain' => 'supplier', 'label' => 'supplier/description', 'content' => 'Supplier description', 'status' => 1),
+		'text/supplier/description' => array( 'langid' => null, 'type' => 'description', 'domain' => 'supplier', 'label' => 'supplier/description', 'content' => 'Supplier description', 'status' => 1 ),
 //ATTR
 //size
 		'text/size/XS' => array( 'langid' => null, 'type' => 'name', 'domain' => 'attribute', 'label' => 'size/XS', 'content' => 'XS', 'status' => 1 ),

lib/mshoplib/setup/unittest/data/customer.php

Spacing +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
 				'customer.address.telefax' => '055544332212', 'customer.address.website' => 'www.example.com',
 				'customer.address.longitude' => '10.5', 'customer.address.latitude' => '51.0',
 				'customer.address.position' => '0',
-			],[
+			], [
 				'customer.address.company' => 'Example company LLC', 'customer.address.vatid' => 'DE999999999',
 				'customer.address.salutation' => 'mr', 'customer.address.title' => 'Dr.',
 				'customer.address.firstname' => 'Good', 'customer.address.lastname' => 'Unittest',

lib/mshoplib/setup/unittest/CustomerAddTestData.php

Braces +6 added lines, -2 removed lines

@@ -142,9 +142,13 @@
 		{
 			foreach( $data['customer/group'] as $entry )
 			{
-				try {
+				try
+				{
 					$groupManager->saveItem( $groupManager->createItem()->fromArray( $entry ), false );
-				} catch( \Exception $e ) { echo $e->getMessage(); } // ignore duplicates
+				}
+				catch( \Exception $e )
+				{
+echo $e->getMessage(); } // ignore duplicates
 			}
 		}
 	}