aimeos / aimeos-core

lib/mwlib/src/MW/Config/Base.php

Indentation +5 added lines, -5 removed lines

@@ -24,11 +24,11 @@
 
 
 	/**
-	* Includes config files using a simple caching.
-	*
-	* @param string $file Path and file name of a config file
-	* @return array Value of the requested config file
-	**/
+	 * Includes config files using a simple caching.
+	 *
+	 * @param string $file Path and file name of a config file
+	 * @return array Value of the requested config file
+	 **/
 	protected function includeFile( $file )
 	{
 		if( !isset( $this->includeCache[$file] ) ) {

lib/mwlib/src/MW/Translation/SerializedArray.php

Spacing +5 added lines, -5 removed lines

@@ -66,16 +66,16 @@ 
 		{
 			foreach( $this->getTranslations( $domain ) as $content )
 			{
-				if ( isset( $content[$string][0] ) && is_array( $content[$string] ) ) {
+				if( isset( $content[$string][0] ) && is_array( $content[$string] ) ) {
 					return $content[$string][0];
 				}
 
-				if ( isset( $content[$string] ) && is_string( $content[$string] ) ) {
+				if( isset( $content[$string] ) && is_string( $content[$string] ) ) {
 					return $content[$string];
 				}
 			}
 		}
-		catch( \Exception $e ) { ; } // no translation found
+		catch( \Exception $e ) {; } // no translation found
 
 		return (string) $string;
 	}
@@ -99,12 +99,12 @@ 
 		{
 			foreach( $this->getTranslations( $domain ) as $content )
 			{
-				if ( isset( $content[$singular][$index] ) && is_array( $content[$singular] ) ) {
+				if( isset( $content[$singular][$index] ) && is_array( $content[$singular] ) ) {
 					return $content[$singular][$index];
 				}
 			}
 		}
-		catch( \Exception $e ) { ; } // no translation found
+		catch( \Exception $e ) {; } // no translation found
 
 		if( $index > 0 ) {
 			return (string) $plural;

Braces +6 added lines, -2 removed lines

@@ -75,7 +75,9 @@ 
 				}
 			}
 		}
-		catch( \Exception $e ) { ; } // no translation found
+		catch( \Exception $e )
+		{
+; } // no translation found
 
 		return (string) $string;
 	}
@@ -104,7 +106,9 @@ 
 				}
 			}
 		}
-		catch( \Exception $e ) { ; } // no translation found
+		catch( \Exception $e )
+		{
+; } // no translation found
 
 		if( $index > 0 ) {
 			return (string) $plural;

lib/mwlib/src/MW/Tree/Manager/DBNestedSet.php

Braces +6 added lines, -12 removed lines

@@ -201,8 +201,7 @@ 
 			if( $level === \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE ) {
 				return $node;
 			}
-		}
-		else
+		} else
 		{
 			$node = $this->getNodeById( $id );
 
@@ -276,15 +275,13 @@ 
 			$node->left = $refNode->left;
 			$node->right = $refNode->left + 1;
 			$node->level = $refNode->level;
-		}
-		else if( $parentId !== null )
+		} else if( $parentId !== null )
 		{
 			$parentNode = $this->getNode( $parentId, \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE );
 			$node->left = $parentNode->right;
 			$node->right = $parentNode->right + 1;
 			$node->level = $parentNode->level + 1;
-		}
-		else
+		} else
 		{
 			$node->left = 1;
 			$node->right = 2;
@@ -375,8 +372,7 @@ 
 				$moveNodeRightBegin = $node->left + $diff + 1;
 				$moveNodeRightEnd = $node->right + $diff;
 				$movesize = $refNode->left - $node->left - $diff;
-			}
-			else
+			} else
 			{
 				$moveNodeLeftBegin = $node->left;
 				$moveNodeLeftEnd = $node->right - 1;
@@ -387,8 +383,7 @@ 
 
 			$closeNodeLeftBegin = $node->left + $diff;
 			$closeNodeRightBegin = $node->left + $diff;
-		}
-		else
+		} else
 		{
 			$refNode = $this->getNode( $newParentId, \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE );
 
@@ -414,8 +409,7 @@ 
 				$moveNodeRightBegin = $node->left + $diff + 1;
 				$moveNodeRightEnd = $node->right + $diff;
 				$movesize = $refNode->right - $node->left - $diff;
-			}
-			else
+			} else
 			{
 				$moveNodeLeftBegin = $node->left;
 				$moveNodeLeftEnd = $node->right - 1;

Spacing +6 added lines, -6 removed lines

@@ -160,7 +160,7 @@ 
 			$diff = $node->right - $node->left + 1;
 
 			$stmt = $conn->create( $this->config['move-left'] );
-			$stmt->bind( 1, -$diff, $this->searchConfig['left']['internaltype']);
+			$stmt->bind( 1, -$diff, $this->searchConfig['left']['internaltype'] );
 			$stmt->bind( 2, 0, $this->searchConfig['level']['internaltype'] );
 			$stmt->bind( 3, $node->right + 1, $this->searchConfig['left']['internaltype'] );
 			$stmt->bind( 4, 0x7FFFFFFF, $this->searchConfig['left']['internaltype'] );
@@ -223,7 +223,7 @@ 
 				$search->getConditions(),
 				$condition->getConditions()
 			);
-			$search->setConditions( $search->combine('&&', $expr) );
+			$search->setConditions( $search->combine( '&&', $expr ) );
 		}
 
 		$types = $this->getSearchTypes( $this->searchConfig );
@@ -538,14 +538,14 @@ 
 	 */
 	public function searchNodes( \Aimeos\MW\Criteria\Iface $search, $id = null )
 	{
-		$left =  1;
+		$left = 1;
 		$right = 0x7FFFFFFF;
 
 		if( $id !== null )
 		{
 			$node = $this->getNodeById( $id );
 
-			$left =  $node->left;
+			$left = $node->left;
 			$right = $node->right;
 		}
 
@@ -621,7 +621,7 @@ 
 
 		$results = $this->searchNodes( $search );
 
-		foreach ( $results as $item ) {
+		foreach( $results as $item ) {
 			$result[$item->getId()] = $item;
 		}
 
@@ -733,7 +733,7 @@ 
 	 */
 	protected function isChild( \Aimeos\MW\Tree\Node\Iface $node, \Aimeos\MW\Tree\Node\Iface $parent )
 	{
-		return $node->__get('left') > $parent->__get('left') && $node->__get('right') < $parent->__get('right');
+		return $node->__get( 'left' ) > $parent->__get( 'left' ) && $node->__get( 'right' ) < $parent->__get( 'right' );
 	}
 
 

lib/mwlib/src/MW/DB/Connection/DBAL.php

Spacing +2 added lines, -2 removed lines

@@ -42,7 +42,7 @@ 
 	 * @return \Aimeos\MW\DB\Statement\Iface \PDO statement object
 	 * @throws \Aimeos\MW\DB\Exception if type is invalid or the DBAL object throws an exception
 	 */
-	public function create( $sql, $type = \Aimeos\MW\DB\Connection\Base::TYPE_SIMPLE  )
+	public function create( $sql, $type = \Aimeos\MW\DB\Connection\Base::TYPE_SIMPLE )
 	{
 		try
 		{
@@ -56,7 +56,7 @@ 
 					throw new \Aimeos\MW\DB\Exception( sprintf( 'Invalid value "%1$d" for statement type', $type ) );
 			}
 		}
-		catch( \Exception $e)
+		catch( \Exception $e )
 		{
 			throw new \Aimeos\MW\DB\Exception( $e->getMessage(), $e->getCode() );
 		}

lib/mwlib/src/MW/DB/Connection/PDO.php

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
 					throw new \Aimeos\MW\DB\Exception( sprintf( 'Invalid value "%1$d" for statement type', $type ) );
 			}
 		} catch( \PDOException $e ) {
-			throw new \Aimeos\MW\DB\Exception($e->getMessage(), $e->getCode(), $e->errorInfo );
+			throw new \Aimeos\MW\DB\Exception( $e->getMessage(), $e->getCode(), $e->errorInfo );
 		}
 	}
 

Braces +5 added lines, -2 removed lines

@@ -45,7 +45,8 @@ 
 	 */
 	public function create( $sql, $type = \Aimeos\MW\DB\Connection\Base::TYPE_SIMPLE )
 	{
-		try {
+		try
+		{
 			switch( $type )
 			{
 				case \Aimeos\MW\DB\Connection\Base::TYPE_SIMPLE:
@@ -55,7 +56,9 @@ 
 				default:
 					throw new \Aimeos\MW\DB\Exception( sprintf( 'Invalid value "%1$d" for statement type', $type ) );
 			}
-		} catch( \PDOException $e ) {
+		}
+		catch( \PDOException $e )
+		{
 			throw new \Aimeos\MW\DB\Exception($e->getMessage(), $e->getCode(), $e->errorInfo );
 		}
 	}

lib/mwlib/src/MW/DB/Statement/Iface.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 	 * @param integer $type Type of given value defined in \Aimeos\MW\DB\Stmt\Base as constant
 	 * @return void
 	 */
-	public function bind( $position, $value, $type = \Aimeos\MW\DB\Statement\Base::PARAM_STR);
+	public function bind( $position, $value, $type = \Aimeos\MW\DB\Statement\Base::PARAM_STR );
 
 	/**
 	 * Executes the statement.

lib/mwlib/src/MW/DB/Result/PDO.php

Spacing +4 added lines, -4 removed lines

@@ -48,7 +48,7 @@ 
 	{
 		try {
 			return $this->statement->rowCount();
-		} catch ( \PDOException $e ) {
+		} catch( \PDOException $e ) {
 			throw new \Aimeos\MW\DB\Exception( $e->getMessage(), $e->getCode(), $e->errorInfo );
 		}
 	}
@@ -65,7 +65,7 @@ 
 	{
 		try {
 			return $this->statement->fetch( $this->style[$style] );
-		} catch ( \PDOException $e ) {
+		} catch( \PDOException $e ) {
 			throw new \Aimeos\MW\DB\Exception( $e->getMessage(), $e->getCode(), $e->errorInfo );
 		}
 	}
@@ -80,7 +80,7 @@ 
 	{
 		try {
 			$this->statement->closeCursor();
-		} catch ( \PDOException $e ) {
+		} catch( \PDOException $e ) {
 			throw new \Aimeos\MW\DB\Exception( $e->getMessage(), $e->getCode(), $e->errorInfo );
 		}
 	}
@@ -95,7 +95,7 @@ 
 	{
 		try {
 			return $this->statement->nextRowset();
-		} catch ( \PDOException $e ) {
+		} catch( \PDOException $e ) {
 			return false;
 		}
 	}

Braces +20 added lines, -8 removed lines

@@ -46,9 +46,12 @@ 
 	 */
 	public function affectedRows()
 	{
-		try {
+		try
+		{
 			return $this->statement->rowCount();
-		} catch ( \PDOException $e ) {
+		}
+		catch ( \PDOException $e )
+		{
 			throw new \Aimeos\MW\DB\Exception( $e->getMessage(), $e->getCode(), $e->errorInfo );
 		}
 	}
@@ -63,9 +66,12 @@ 
 	 */
 	public function fetch( $style = \Aimeos\MW\DB\Result\Base::FETCH_ASSOC )
 	{
-		try {
+		try
+		{
 			return $this->statement->fetch( $this->style[$style] );
-		} catch ( \PDOException $e ) {
+		}
+		catch ( \PDOException $e )
+		{
 			throw new \Aimeos\MW\DB\Exception( $e->getMessage(), $e->getCode(), $e->errorInfo );
 		}
 	}
@@ -78,9 +84,12 @@ 
 	 */
 	public function finish()
 	{
-		try {
+		try
+		{
 			$this->statement->closeCursor();
-		} catch ( \PDOException $e ) {
+		}
+		catch ( \PDOException $e )
+		{
 			throw new \Aimeos\MW\DB\Exception( $e->getMessage(), $e->getCode(), $e->errorInfo );
 		}
 	}
@@ -93,9 +102,12 @@ 
 	 */
 	public function nextResult()
 	{
-		try {
+		try
+		{
 			return $this->statement->nextRowset();
-		} catch ( \PDOException $e ) {
+		}
+		catch ( \PDOException $e )
+		{
 			return false;
 		}
 	}

lib/mwlib/src/MW/DB/Manager/DBAL.php

Braces +2 added lines, -1 removed lines

@@ -88,7 +88,8 @@
 			return array_pop( $this->connections[$name] );
 
 		}
-		catch( \Exception $e ) {
+		catch( \Exception $e )
+		{
 			throw new \Aimeos\MW\DB\Exception( $e->getMessage(), $e->getCode() );
 		}
 	}

lib/mwlib/src/MW/DB/Manager/PDO.php

Braces +3 added lines, -3 removed lines

@@ -88,7 +88,8 @@ 
 			return array_pop( $this->connections[$name] );
 
 		}
-		catch( \PDOException $e ) {
+		catch( \PDOException $e )
+		{
 			throw new \Aimeos\MW\DB\Exception( $e->getMessage(), $e->getCode(), $e->errorInfo );
 		}
 	}
@@ -131,8 +132,7 @@ 
 		{
 			$dsn .= isset( $host ) ? ';host=' . $host : '';
 			$dsn .= isset( $port ) ? ';port=' . $port : '';
-		}
-		else
+		} else
 		{
 			$dsn .= ';unix_socket=' . $sock;
 		}