aimeos / aimeos-core

lib/mshoplib/setup/default/DemoAddCustomerData.php

Braces +1 added lines, -2 removed lines

@@ -75,8 +75,7 @@
 			$this->saveCustomerItems( $data );
 
 			$this->status( 'added' );
-		}
-		else
+		} else
 		{
 			$this->status( 'removed' );
 		}

Spacing +1 added lines, -1 removed lines

@@ -75,7 +75,7 @@
 		if( $value === '1' )
 		{
 			$ds = DIRECTORY_SEPARATOR;
-			$path = __DIR__ . $ds . 'data' . $ds . 'demo-customer.php';
+			$path = __DIR__.$ds.'data'.$ds.'demo-customer.php';
 
 			if( ( $data = include( $path ) ) == false ) {
 				throw new \Aimeos\MShop\Exception( sprintf( 'No file "%1$s" found for customer domain', $path ) );

lib/mshoplib/setup/default/DemoAddProductData.php

Braces +1 added lines, -2 removed lines

@@ -77,8 +77,7 @@
 		{
 			$this->addDemoData();
 			$this->status( 'added' );
-		}
-		else
+		} else
 		{
 			$this->status( 'removed' );
 		}

Spacing +2 added lines, -2 removed lines

@@ -69,7 +69,7 @@ 
 			$this->removeItems( $item->getId(), 'product/lists', 'product', 'text' );
 			$this->removeListItems( $item->getId(), 'product/lists', 'product' );
 
-			$productCodes[] =  $item->getCode();
+			$productCodes[] = $item->getCode();
 		}
 
 		$this->removeStockItems( $productCodes );
@@ -96,7 +96,7 @@ 
 	protected function addDemoData()
 	{
 		$ds = DIRECTORY_SEPARATOR;
-		$path = __DIR__ . $ds . 'data' . $ds . 'demo-product.php';
+		$path = __DIR__.$ds.'data'.$ds.'demo-product.php';
 
 		if( ( $data = include( $path ) ) == false ) {
 			throw new \Aimeos\MShop\Exception( sprintf( 'No file "%1$s" found for product domain', $path ) );

lib/mshoplib/src/MAdmin/Cache/Manager/Standard.php

Braces +10 added lines, -4 removed lines

@@ -201,9 +201,12 @@ 
 			);
 			$dbm = $context->getDatabaseManager();
 
-			try {
+			try
+			{
 				$this->object = \Aimeos\MW\Cache\Factory::createManager( $name, $config, $dbm );
-			} catch( \Exception $e ) {
+			}
+			catch( \Exception $e )
+			{
 				$this->object = \Aimeos\MW\Cache\Factory::createManager( 'DB', $config, $dbm );
 			}
 		}
@@ -265,9 +268,12 @@ 
 	 */
 	public function createItem()
 	{
-		try {
+		try
+		{
 			$values = array( 'siteid' => $this->getContext()->getLocale()->getSiteId() );
-		} catch( \Exception $e ) {
+		}
+		catch( \Exception $e )
+		{
 			$values = array( 'siteid' => null );
 		}
 

lib/mshoplib/src/MShop/Common/Manager/Base.php

Braces +1 added lines, -2 removed lines

@@ -668,8 +668,7 @@
 
 		if( isset( $attributes[$name] ) && $attributes[$name] instanceof $iface ) {
 			return $attributes[$name]->getInternalDeps();
-		}
-		else if( isset( $attributes['id'] ) && $attributes['id'] instanceof $iface ) {
+		} else if( isset( $attributes['id'] ) && $attributes['id'] instanceof $iface ) {
 			return $attributes['id']->getInternalDeps();
 		}
 

Spacing +18 added lines, -18 removed lines

@@ -256,7 +256,7 @@ 
 		$conn = $dbm->acquire( $dbname );
 
 		$object = new \Aimeos\MW\Criteria\SQL( $conn );
-		$object->setConditions( $object->compare( '==', $domain . '.status', 1 ) );
+		$object->setConditions( $object->compare( '==', $domain.'.status', 1 ) );
 
 		$dbm->release( $conn, $dbname );
 
@@ -359,9 +359,9 @@ 
 	protected function getSqlConfig( $path )
 	{
 		$config = $this->getContext()->getConfig();
-		$adapter = $config->get( 'resource/' . $this->getResourceName() . '/adapter' );
+		$adapter = $config->get( 'resource/'.$this->getResourceName().'/adapter' );
 
-		return $config->get( $path . '/' . $adapter, $config->get( $path . '/ansi', $path ) );
+		return $config->get( $path.'/'.$adapter, $config->get( $path.'/ansi', $path ) );
 	}
 
 
@@ -377,7 +377,7 @@ 
 	{
 		$domain = strtolower( $domain );
 		$manager = strtolower( $manager );
-		$key = $domain . $manager . $name;
+		$key = $domain.$manager.$name;
 
 		if( !isset( $this->subManagers[$key] ) )
 		{
@@ -390,7 +390,7 @@ 
 			}
 
 			if( $name === null ) {
-				$path = 'mshop/' . $domain . '/manager/' . $manager . '/name';
+				$path = 'mshop/'.$domain.'/manager/'.$manager.'/name';
 				$name = $this->context->getConfig()->get( $path, 'Standard' );
 			}
 
@@ -401,8 +401,8 @@ 
 			$domainname = ucfirst( $domain );
 			$subnames = $this->createSubNames( $manager );
 
-			$classname = '\\Aimeos\\MShop\\' . $domainname . '\\Manager\\' . $subnames . '\\' . $name;
-			$interface = '\\Aimeos\\MShop\\' . $domainname . '\\Manager\\' . $subnames . '\\Iface';
+			$classname = '\\Aimeos\\MShop\\'.$domainname.'\\Manager\\'.$subnames.'\\'.$name;
+			$interface = '\\Aimeos\\MShop\\'.$domainname.'\\Manager\\'.$subnames.'\\Iface';
 
 			if( class_exists( $classname ) === false ) {
 				throw new \Aimeos\MShop\Exception( sprintf( 'Class "%1$s" not available', $classname ) );
@@ -441,7 +441,7 @@ 
 				throw new \Aimeos\MShop\Exception( sprintf( 'Invalid characters in class name "%1$s"', $name ) );
 			}
 
-			$classname = $classprefix . $name;
+			$classname = $classprefix.$name;
 
 			if( class_exists( $classname ) === false ) {
 				throw new \Aimeos\MShop\Exception( sprintf( 'Class "%1$s" not available', $classname ) );
@@ -470,7 +470,7 @@ 
 		$config = $this->context->getConfig();
 
 		$decorators = $config->get( 'mshop/common/manager/decorators/default', [] );
-		$excludes = $config->get( 'mshop/' . $domain . '/manager/' . $managerpath . '/decorators/excludes', [] );
+		$excludes = $config->get( 'mshop/'.$domain.'/manager/'.$managerpath.'/decorators/excludes', [] );
 
 		foreach( $decorators as $key => $name )
 		{
@@ -483,12 +483,12 @@ 
 		$manager = $this->addDecorators( $this->context, $manager, $decorators, $classprefix );
 
 		$classprefix = '\\Aimeos\\MShop\\Common\\Manager\\Decorator\\';
-		$decorators = $config->get( 'mshop/' . $domain . '/manager/' . $managerpath . '/decorators/global', [] );
+		$decorators = $config->get( 'mshop/'.$domain.'/manager/'.$managerpath.'/decorators/global', [] );
 		$manager = $this->addDecorators( $this->context, $manager, $decorators, $classprefix );
 
 		$subpath = $this->createSubNames( $managerpath );
-		$classprefix = 'MShop_' . ucfirst( $domain ) . '_Manager_' . $subpath . '_Decorator_';
-		$decorators = $config->get( 'mshop/' . $domain . '/manager/' . $managerpath . '/decorators/local', [] );
+		$classprefix = 'MShop_'.ucfirst( $domain ).'_Manager_'.$subpath.'_Decorator_';
+		$decorators = $config->get( 'mshop/'.$domain.'/manager/'.$managerpath.'/decorators/local', [] );
 
 		return $this->addDecorators( $this->context, $manager, $decorators, $classprefix );
 	}
@@ -614,7 +614,7 @@ 
 	{
 		$iface = '\\Aimeos\\MW\\Criteria\\Attribute\\Iface';
 		$sep = $this->getKeySeparator();
-		$name = $prefix . $sep . 'id';
+		$name = $prefix.$sep.'id';
 
 		if( isset( $attributes[$name] ) && $attributes[$name] instanceof $iface ) {
 			return $attributes[$name]->getInternalDeps();
@@ -672,7 +672,7 @@ 
 	{
 		$config = $this->context->getConfig();
 
-		if( $config->get( 'resource/' . $name ) === null ) {
+		if( $config->get( 'resource/'.$name ) === null ) {
 			$this->resourceName = $config->get( 'resource/default', 'db' );
 		} else {
 			$this->resourceName = $name;
@@ -742,7 +742,7 @@ 
 
 		foreach( $keys as $key )
 		{
-			$name = $key . $sep . 'siteid';
+			$name = $key.$sep.'siteid';
 
 			if( isset( $attributes[$name] ) ) {
 				$cond[] = $search->compare( '==', $name, $siteIds );
@@ -830,7 +830,7 @@ 
 			$row = $results->fetch();
 			$results->finish();
 
-			$msg = get_class( $this ) . ' (' . ( ( microtime( true ) - $time ) * 1000 ) . 'ms): SQL = ' . $stmt;
+			$msg = get_class( $this ).' ('.( ( microtime( true ) - $time ) * 1000 ).'ms): SQL = '.$stmt;
 			$this->context->getLogger()->log( $msg, \Aimeos\MW\Logger\Base::DEBUG, 'core/sql' );
 
 			if( $row === false ) {
@@ -848,7 +848,7 @@ 
 		$stmt = $conn->create( $sql->str() );
 		$results = $stmt->execute();
 
-		$msg = get_class( $this ) . ' (' . ( ( microtime( true ) - $time ) * 1000 ) . 'ms): SQL = ' . $stmt;
+		$msg = get_class( $this ).' ('.( ( microtime( true ) - $time ) * 1000 ).'ms): SQL = '.$stmt;
 		$this->context->getLogger()->log( $msg, \Aimeos\MW\Logger\Base::DEBUG, 'core/sql' );
 
 		return $results;
@@ -874,7 +874,7 @@ 
 		$search->setConditions( $search->compare( '==', $name, $ids ) );
 
 		$types = array( $name => \Aimeos\MW\DB\Statement\Base::PARAM_STR );
-		$translations = array( $name => '"' . $name . '"' );
+		$translations = array( $name => '"'.$name.'"' );
 
 		$cond = $search->getConditionString( $types, $translations );
 		$sql = str_replace( ':cond', $cond, $this->getSqlConfig( $cfgpath ) );

lib/mshoplib/src/MShop/Common/Manager/Lists/Base.php

Braces +1 added lines, -2 removed lines

@@ -243,8 +243,7 @@
 				$stmt->bind( 8, $pos, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
 
 				$stmt->execute()->finish();
-			}
-			else
+			} else
 			{
 				$sql = $this->getSqlConfig( $cfgPath . 'getposmax' );
 

Spacing +29 added lines, -29 removed lines

@@ -63,7 +63,7 @@ 
 	public function aggregate( \Aimeos\MW\Criteria\Iface $search, $key )
 	{
 		$required = array( trim( $this->prefix, '.' ) );
-		return $this->aggregateBase( $search, $key, $this->getConfigPath() . 'aggregate', $required );
+		return $this->aggregateBase( $search, $key, $this->getConfigPath().'aggregate', $required );
 	}
 
 
@@ -75,7 +75,7 @@ 
 	public function createItem()
 	{
 		$values = array(
-			$this->prefix . 'siteid' => $this->getContext()->getLocale()->getSiteId()
+			$this->prefix.'siteid' => $this->getContext()->getLocale()->getSiteId()
 		);
 		return $this->createItemBase( $values );
 
@@ -112,7 +112,7 @@ 
 			}
 
 			$time = date( 'Y-m-d H:i:s' );
-			$stmt = $this->getCachedStatement( $conn, $this->getConfigPath() . $type );
+			$stmt = $this->getCachedStatement( $conn, $this->getConfigPath().$type );
 
 			$stmt->bind( 1, $item->getParentId(), \Aimeos\MW\DB\Statement\Base::PARAM_INT );
 			$stmt->bind( 2, $item->getTypeId(), \Aimeos\MW\DB\Statement\Base::PARAM_INT );
@@ -139,7 +139,7 @@ 
 			if( $fetch === true )
 			{
 				if( $id === null ) {
-					$path = $this->getConfigPath() . 'newid';
+					$path = $this->getConfigPath().'newid';
 					$item->setId( $this->newId( $conn, $path ) );
 				} else {
 					$item->setId( $id ); // modified false
@@ -163,7 +163,7 @@ 
 	 */
 	public function deleteItems( array $ids )
 	{
-		$this->deleteItemsBase( $ids, $this->getConfigPath() . 'delete' );
+		$this->deleteItemsBase( $ids, $this->getConfigPath().'delete' );
 	}
 
 
@@ -235,7 +235,7 @@ 
 			{
 				$newpos = $pos;
 
-				$sql = $this->getSqlConfig( $cfgPath . 'move' );
+				$sql = $this->getSqlConfig( $cfgPath.'move' );
 
 				$stmt = $conn->create( $sql );
 				$stmt->bind( 1, +1, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
@@ -251,7 +251,7 @@ 
 			}
 			else
 			{
-				$sql = $this->getSqlConfig( $cfgPath . 'getposmax' );
+				$sql = $this->getSqlConfig( $cfgPath.'getposmax' );
 
 				$stmt = $conn->create( $sql );
 
@@ -269,7 +269,7 @@ 
 				}
 			}
 
-			$sql = $this->getSqlConfig( $cfgPath . 'updatepos' );
+			$sql = $this->getSqlConfig( $cfgPath.'updatepos' );
 
 			$stmt = $conn->create( $sql );
 			$stmt->bind( 1, $newpos, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
@@ -286,7 +286,7 @@ 
 
 			if( $oldpos > 0 )
 			{
-				$sql = $this->getSqlConfig( $cfgPath . 'move' );
+				$sql = $this->getSqlConfig( $cfgPath.'move' );
 
 				$stmt = $conn->create( $sql );
 				$stmt->bind( 1, -1, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
@@ -336,8 +336,8 @@ 
 			}
 
 			$level = \Aimeos\MShop\Locale\Manager\Base::SITE_ALL;
-			$cfgPathSearch = $this->getConfigPath() . 'search';
-			$cfgPathCount = $this->getConfigPath() . 'count';
+			$cfgPathSearch = $this->getConfigPath().'search';
+			$cfgPathCount = $this->getConfigPath().'count';
 
 			$name = trim( $this->prefix, '.' );
 			$required = array( $name );
@@ -346,12 +346,12 @@ 
 
 			while( ( $row = $results->fetch() ) !== false )
 			{
-				if( ( $row[$this->prefix . 'config'] = json_decode( $row[$this->prefix . 'config'], true ) ) === null ) {
-					$row[$this->prefix . 'config'] = [];
+				if( ( $row[$this->prefix.'config'] = json_decode( $row[$this->prefix.'config'], true ) ) === null ) {
+					$row[$this->prefix.'config'] = [];
 				}
 
-				$map[$row[$this->prefix . 'id']] = $row;
-				$typeIds[$row[$this->prefix . 'typeid']] = null;
+				$map[$row[$this->prefix.'id']] = $row;
+				$typeIds[$row[$this->prefix.'typeid']] = null;
 			}
 
 			$dbm->release( $conn, $dbname );
@@ -366,19 +366,19 @@ 
 		{
 			$typeManager = $this->getObject()->getSubManager( 'type' );
 			$typeSearch = $typeManager->createSearch();
-			$typeSearch->setConditions( $typeSearch->compare( '==', $name . '.type.id', array_keys( $typeIds ) ) );
+			$typeSearch->setConditions( $typeSearch->compare( '==', $name.'.type.id', array_keys( $typeIds ) ) );
 			$typeSearch->setSlice( 0, $search->getSliceSize() );
 			$typeItems = $typeManager->searchItems( $typeSearch );
 
 			foreach( $map as $id => $row )
 			{
-				if( isset( $typeItems[$row[$this->prefix . 'typeid']] ) )
+				if( isset( $typeItems[$row[$this->prefix.'typeid']] ) )
 				{
-					$row[$this->prefix . 'type'] = $typeItems[$row[$this->prefix . 'typeid']]->getCode();
-					$row[$this->prefix . 'typename'] = $typeItems[$row[$this->prefix . 'typeid']]->getName();
+					$row[$this->prefix.'type'] = $typeItems[$row[$this->prefix.'typeid']]->getCode();
+					$row[$this->prefix.'typename'] = $typeItems[$row[$this->prefix.'typeid']]->getName();
 				}
 
-				$items[$row[$this->prefix . 'id']] = $this->createItemBase( $row );
+				$items[$row[$this->prefix.'id']] = $this->createItemBase( $row );
 			}
 		}
 
@@ -417,8 +417,8 @@ 
 			}
 
 			$level = \Aimeos\MShop\Locale\Manager\Base::SITE_ALL;
-			$cfgPathSearch = $this->getConfigPath() . 'search';
-			$cfgPathCount = $this->getConfigPath() . 'count';
+			$cfgPathSearch = $this->getConfigPath().'search';
+			$cfgPathCount = $this->getConfigPath().'count';
 
 			$name = trim( $this->prefix, '.' );
 			$required = array( $name );
@@ -426,7 +426,7 @@ 
 			$results = $this->searchItemsBase( $conn, $search, $cfgPathSearch, $cfgPathCount, $required, $total, $level );
 
 			while( ( $row = $results->fetch() ) !== false ) {
-				$map[$row[$this->prefix . 'domain']][] = $row[$this->prefix . 'refid'];
+				$map[$row[$this->prefix.'domain']][] = $row[$this->prefix.'refid'];
 			}
 
 			$dbm->release( $conn, $dbname );
@@ -444,7 +444,7 @@ 
 
 			$search = $manager->createSearch( true );
 			$expr = array(
-				$search->compare( '==', str_replace( '/', '.', $domain ) . '.id', $list ),
+				$search->compare( '==', str_replace( '/', '.', $domain ).'.id', $list ),
 				$search->getConditions(),
 			);
 			$search->setConditions( $search->combine( '&&', $expr ) );
@@ -476,13 +476,13 @@ 
 			$expr[] = $object->getConditions();
 
 			$exprTwo = [];
-			$exprTwo[] = $object->compare( '<=', $prefix . '.datestart', $curDate );
-			$exprTwo[] = $object->compare( '==', $prefix . '.datestart', null );
+			$exprTwo[] = $object->compare( '<=', $prefix.'.datestart', $curDate );
+			$exprTwo[] = $object->compare( '==', $prefix.'.datestart', null );
 			$expr[] = $object->combine( '||', $exprTwo );
 
 			$exprTwo = [];
-			$exprTwo[] = $object->compare( '>=', $prefix . '.dateend', $curDate );
-			$exprTwo[] = $object->compare( '==', $prefix . '.dateend', null );
+			$exprTwo[] = $object->compare( '>=', $prefix.'.dateend', $curDate );
+			$exprTwo[] = $object->compare( '==', $prefix.'.dateend', null );
 			$expr[] = $object->combine( '||', $exprTwo );
 
 			$object->setConditions( $object->combine( '&&', $expr ) );
@@ -503,7 +503,7 @@ 
 	 */
 	public function getSubManager( $manager, $name = null )
 	{
-		return $this->getSubManagerBase( 'common', 'lists/' . $manager, $name );
+		return $this->getSubManagerBase( 'common', 'lists/'.$manager, $name );
 	}
 
 

lib/mshoplib/src/MShop/Coupon/Provider/Base.php

Spacing +2 added lines, -2 removed lines

@@ -290,7 +290,7 @@ 
 
 			$taxrates[$taxrate]->addItem( $price );
 		}
-		catch( \Exception $e ) { ; } // if delivery service isn't available
+		catch( \Exception $e ) {; } // if delivery service isn't available
 
 		try
 		{
@@ -303,7 +303,7 @@ 
 
 			$taxrates[$taxrate]->addItem( $price );
 		}
-		catch( \Exception $e ) { ; } // if payment service isn't available
+		catch( \Exception $e ) {; } // if payment service isn't available
 
 		return $taxrates;
 	}

Braces +7 added lines, -4 removed lines

@@ -233,8 +233,7 @@ 
 			{
 				$value = $price->getValue() + $price->getCosts();
 				$rebate -= $value;
-			}
-			else
+			} else
 			{
 				$value = $rebate;
 				$rebate = '0.00';
@@ -290,7 +289,9 @@ 
 
 			$taxrates[$taxrate]->addItem( $price );
 		}
-		catch( \Exception $e ) { ; } // if delivery service isn't available
+		catch( \Exception $e )
+		{
+; } // if delivery service isn't available
 
 		try
 		{
@@ -303,7 +304,9 @@ 
 
 			$taxrates[$taxrate]->addItem( $price );
 		}
-		catch( \Exception $e ) { ; } // if payment service isn't available
+		catch( \Exception $e )
+		{
+; } // if payment service isn't available
 
 		return $taxrates;
 	}

lib/mshoplib/src/MShop/Coupon/Provider/FixedRebate.php

Braces +1 added lines, -2 removed lines

@@ -50,8 +50,7 @@
 			if( isset( $config['fixedrebate.rebate'][$currency] ) ) {
 				$rebate = $config['fixedrebate.rebate'][$currency];
 			}
-		}
-		else
+		} else
 		{
 			$rebate = $config['fixedrebate.rebate'];
 		}

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

Braces +3 added lines, -2 removed lines

@@ -118,10 +118,11 @@
 			) {
 				return false;
 			}
-		}
-		else if( isset( $addresses[$paymentType] ) ) // use billing address if no delivery address is available
+		} else if( isset( $addresses[$paymentType] ) ) {
+			// use billing address if no delivery address is available
 		{
 			$code = strtoupper( $addresses[$paymentType]->getCountryId() );
+		}
 
 			if( $this->checkCountryCode( $code, 'country.delivery-include' ) === false
 				|| $this->checkCountryCode( $code, 'country.delivery-exclude' ) === true

lib/mwlib/src/MW/Criteria/Attribute/Standard.php

Spacing +2 added lines, -2 removed lines

@@ -90,8 +90,8 @@
 
 		foreach( $required as $entry )
 		{
-			if ( !isset($params[$entry]) ) {
-				throw new \Aimeos\MW\Common\Exception( sprintf('Required parameter "%1$s" is missing', $entry) );
+			if( !isset( $params[$entry] ) ) {
+				throw new \Aimeos\MW\Common\Exception( sprintf( 'Required parameter "%1$s" is missing', $entry ) );
 			}
 		}