aimeos / aimeos-core

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/Catalog/Manager/Standard.php

Braces +12 added lines, -8 removed lines

@@ -567,9 +567,12 @@ 
 
 		foreach( $sitePath as $siteId )
 		{
-			try {
+			try
+			{
 				$path = $this->createTreeManager( $siteId )->getPath( $id );
-			} catch( \Exception $e ) {
+			}
+			catch( \Exception $e )
+			{
 				continue;
 			}
 
@@ -604,9 +607,12 @@ 
 
 		foreach( $sitePath as $siteId )
 		{
-			try {
+			try
+			{
 				$node = $this->createTreeManager( $siteId )->getNode( $id, $level, $criteria );
-			} catch( \Exception $e ) {
+			}
+			catch( \Exception $e )
+			{
 				continue;
 			}
 
@@ -1243,8 +1249,7 @@ 
 				 * @see mshop/catalog/manager/standard/insert-usage
 				 */
 				$path = 'mshop/catalog/manager/standard/update-usage';
-			}
-			else
+			} else
 			{
 				/** mshop/catalog/manager/standard/insert-usage
 				 * Updates the config, editor, ctime and mtime value of an inserted record
@@ -1293,8 +1298,7 @@ 
 			{
 				$stmt->bind( 4, $siteid, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
 				$stmt->bind( 5, $id, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
-			}
-			else
+			} else
 			{
 				$stmt->bind( 4, $date ); // ctime
 				$stmt->bind( 5, $siteid, \Aimeos\MW\DB\Statement\Base::PARAM_INT );

Doc Comments +2 added lines, -1 removed lines

@@ -234,7 +234,7 @@ 
 	/**
 	 * Removes multiple items specified by ids in the array.
 	 *
-	 * @param array $ids List of IDs
+	 * @param integer[] $ids List of IDs
 	 */
 	public function deleteItems( array $ids )
 	{
@@ -411,6 +411,7 @@ 
 	 * @param \Aimeos\MW\Criteria\Iface $search Search criteria object
 	 * @param string[] $ref List of domains to fetch list items and referenced items for
 	 * @param integer|null &$total Number of items that are available in total
+	 * @param integer $total
 	 * @return array List of items implementing \Aimeos\MShop\Common\Item\Iface
 	 */
 	public function searchItems( \Aimeos\MW\Criteria\Iface $search, array $ref = array(), &$total = 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

@@ -221,7 +221,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 );
 
@@ -309,9 +309,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 ) );
 	}
 
 
@@ -327,7 +327,7 @@ 
 	{
 		$domain = strtolower( $domain );
 		$manager = strtolower( $manager );
-		$key = $domain . $manager . $name;
+		$key = $domain.$manager.$name;
 
 		if( !isset( $this->subManagers[$key] ) )
 		{
@@ -340,7 +340,7 @@ 
 			}
 
 			if( $name === null ) {
-				$path = 'mshop/' . $domain . '/manager/' . $manager . '/name';
+				$path = 'mshop/'.$domain.'/manager/'.$manager.'/name';
 				$name = $this->context->getConfig()->get( $path, 'Standard' );
 			}
 
@@ -351,8 +351,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 ) );
@@ -391,7 +391,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 ) );
@@ -420,7 +420,7 @@ 
 		$config = $this->context->getConfig();
 
 		$decorators = $config->get( 'mshop/common/manager/decorators/default', array() );
-		$excludes = $config->get( 'mshop/' . $domain . '/manager/' . $managerpath . '/decorators/excludes', array() );
+		$excludes = $config->get( 'mshop/'.$domain.'/manager/'.$managerpath.'/decorators/excludes', array() );
 
 		foreach( $decorators as $key => $name )
 		{
@@ -433,12 +433,12 @@ 
 		$manager = $this->addDecorators( $this->context, $manager, $decorators, $classprefix );
 
 		$classprefix = '\\Aimeos\\MShop\\Common\\Manager\\Decorator\\';
-		$decorators = $config->get( 'mshop/' . $domain . '/manager/' . $managerpath . '/decorators/global', array() );
+		$decorators = $config->get( 'mshop/'.$domain.'/manager/'.$managerpath.'/decorators/global', array() );
 		$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', array() );
+		$classprefix = 'MShop_'.ucfirst( $domain ).'_Manager_'.$subpath.'_Decorator_';
+		$decorators = $config->get( 'mshop/'.$domain.'/manager/'.$managerpath.'/decorators/local', array() );
 
 		return $this->addDecorators( $this->context, $manager, $decorators, $classprefix );
 	}
@@ -533,7 +533,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();
@@ -591,7 +591,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;
@@ -639,7 +639,7 @@ 
 
 		foreach( $keys as $key )
 		{
-			$name = $key . $sep . 'siteid';
+			$name = $key.$sep.'siteid';
 
 			if( isset( $attributes[$name] ) ) {
 				$cond[] = $search->compare( '==', $name, $siteIds );
@@ -726,7 +726,7 @@ 
 			$results = $stmt->execute();
 			$row = $results->fetch();
 			$results->finish();
-			$this->context->getLogger()->log( __METHOD__ . '(' . ( ( microtime( true ) - $time ) * 1000 ) . 'ms): SQL statement: ' . $stmt, \Aimeos\MW\Logger\Base::DEBUG );
+			$this->context->getLogger()->log( __METHOD__.'('.( ( microtime( true ) - $time ) * 1000 ).'ms): SQL statement: '.$stmt, \Aimeos\MW\Logger\Base::DEBUG );
 
 			if( $row === false ) {
 				throw new \Aimeos\MShop\Exception( sprintf( 'Total results value not found' ) );
@@ -742,7 +742,7 @@ 
 		$time = microtime( true );
 		$stmt = $conn->create( $sql->str() );
 		$results = $stmt->execute();
-		$this->context->getLogger()->log( __METHOD__ . '(' . ( ( microtime( true ) - $time ) * 1000 ) . 'ms): SQL statement: ' . $stmt, \Aimeos\MW\Logger\Base::DEBUG );
+		$this->context->getLogger()->log( __METHOD__.'('.( ( microtime( true ) - $time ) * 1000 ).'ms): SQL statement: '.$stmt, \Aimeos\MW\Logger\Base::DEBUG );
 
 		return $results;
 	}
@@ -767,7 +767,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/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/Locale/Item/Language/Standard.php

Braces +1 added lines, -2 removed lines

@@ -67,8 +67,7 @@
 			$this->setCode( $key );
 			$this->values['id'] = $this->values['code'];
 			$this->modified = false;
-		}
-		else
+		} else
 		{
 			$this->values['id'] = null;
 			$this->modified = true;

lib/mshoplib/src/MShop/Locale/Manager/Language/Standard.php

Braces +6 added lines, -4 removed lines

@@ -104,9 +104,12 @@ 
 	 */
 	public function createItem()
 	{
-		try {
+		try
+		{
 			$values = array( 'siteid' => $this->getContext()->getLocale()->getSiteId() );
-		} catch( \Exception $ex ) {
+		}
+		catch( \Exception $ex )
+		{
 			$values = array( 'siteid' => null );
 		}
 
@@ -167,8 +170,7 @@ 
 				 * @see mshop/locale/manager/language/standard/count
 				 */
 				$path = 'mshop/locale/manager/language/standard/insert';
-			}
-			else
+			} else
 			{
 				/** mshop/locale/manager/language/standard/update
 				 * Updates an existing language record in the database

Spacing +3 added lines, -3 removed lines

@@ -454,7 +454,7 @@ 
 		 * @see mshop/locale/manager/language/decorators/global
 		 */
 
-		return $this->getSubManagerBase( 'locale', 'language/' . $manager, $name );
+		return $this->getSubManagerBase( 'locale', 'language/'.$manager, $name );
 	}
 
 
@@ -486,7 +486,7 @@ 
 			$replace = array(
 				$search->getConditionString( $types, $translations ),
 				$search->getSortationString( $types, $translations ),
-				( $columns ? ', ' . $columns : '' ),
+				( $columns ? ', '.$columns : '' ),
 				$search->getSliceStart(),
 				$search->getSliceSize(),
 			);
@@ -606,7 +606,7 @@ 
 	protected function getSearchResults( \Aimeos\MW\DB\Connection\Iface $conn, $sql )
 	{
 		$statement = $conn->create( $sql );
-		$this->getContext()->getLogger()->log( __METHOD__ . ': SQL statement: ' . $statement, \Aimeos\MW\Logger\Base::DEBUG );
+		$this->getContext()->getLogger()->log( __METHOD__.': SQL statement: '.$statement, \Aimeos\MW\Logger\Base::DEBUG );
 
 		$results = $statement->execute();
 

Doc Comments +2 added lines, -2 removed lines

@@ -865,7 +865,7 @@ 
 	 * Returns the search results for the given SQL statement.
 	 *
 	 * @param \Aimeos\MW\DB\Connection\Iface $conn Database connection
-	 * @param $sql SQL statement
+	 * @param string $sql SQL statement
 	 * @return \Aimeos\MW\DB\Result\Iface Search result object
 	 */
 	protected function getSearchResults( \Aimeos\MW\DB\Connection\Iface $conn, $sql )
@@ -906,7 +906,7 @@ 
 	 * Returns the total number of items found for the conditions
 	 *
 	 * @param \Aimeos\MW\DB\Connection\Iface $conn Database connection
-	 * @param array $find List of markers that should be replaced in the SQL statement
+	 * @param string[] $find List of markers that should be replaced in the SQL statement
 	 * @param array $replace List of replacements for the markers in the SQL statement
 	 * @throws \Aimeos\MShop\Locale\Exception If no total value was found
 	 * @return integer Total number of found items

lib/mshoplib/src/MShop/Locale/Manager/Standard.php

Braces +6 added lines, -4 removed lines

@@ -139,9 +139,12 @@ 
 	 */
 	public function createItem()
 	{
-		try {
+		try
+		{
 			return $this->createItemBase( array( 'siteid' => $this->getContext()->getLocale()->getSiteId() ) );
-		} catch( \Exception $e ) {
+		}
+		catch( \Exception $e )
+		{
 			return $this->createItemBase();
 		}
 	}
@@ -301,8 +304,7 @@ 
 				 * @see mshop/locale/manager/standard/count
 				 */
 				$path = 'mshop/locale/manager/standard/insert';
-			}
-			else
+			} else
 			{
 				/** mshop/locale/manager/standard/update
 				 * Updates an existing locale record in the database

Spacing +2 added lines, -2 removed lines

@@ -684,7 +684,7 @@ 
 	{
 		$stmt = $conn->create( $sql );
 
-		$this->getContext()->getLogger()->log( __METHOD__ . ': SQL statement: ' . $stmt, \Aimeos\MW\Logger\Base::DEBUG );
+		$this->getContext()->getLogger()->log( __METHOD__.': SQL statement: '.$stmt, \Aimeos\MW\Logger\Base::DEBUG );
 
 		return $stmt->execute();
 	}
@@ -719,7 +719,7 @@ 
 			$replace = array(
 					$search->getConditionString( $types, $translations ),
 					$search->getSortationString( $types, $translations ),
-					( $columns ? ', ' . $columns : '' ),
+					( $columns ? ', '.$columns : '' ),
 					$search->getSliceStart(),
 					$search->getSliceSize(),
 			);

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

Braces +1 added lines, -2 removed lines

@@ -78,8 +78,7 @@
 				{
 					$couponProvider = $couponManager->getProvider( $couponItem, $code );
 					$couponProvider->updateCoupon( $order );
-				}
-				else
+				} else
 				{
 					$notAvailable[$code] = 'coupon.gone';
 				}

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