aimeos / aimeos-core

lib/mwlib/src/MW/Cache/Factory.php

Spacing +3 added lines, -3 removed lines

@@ -33,18 +33,18 @@
 	{
 		if( ctype_alnum( $name ) === false )
 		{
-			$classname = is_string( $name ) ? '\\Aimeos\\MW\\Cache\\' . $name : '<not a string>';
+			$classname = is_string( $name ) ? '\\Aimeos\\MW\\Cache\\'.$name : '<not a string>';
 			throw new \Aimeos\MW\Cache\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
 		}
 
 		$iface = '\\Aimeos\\MW\\Cache\\Iface';
-		$classname = '\\Aimeos\\MW\\Cache\\' . ucwords( $name );
+		$classname = '\\Aimeos\\MW\\Cache\\'.ucwords( $name );
 
 		if( class_exists( $classname ) === false ) {
 			throw new \Aimeos\MW\Cache\Exception( sprintf( 'Class "%1$s" not available', $classname ) );
 		}
 
-		$manager =  new $classname( $config, $resource );
+		$manager = new $classname( $config, $resource );
 
 		if( !( $manager instanceof $iface ) ) {
 			throw new \Aimeos\MW\Cache\Exception( sprintf( 'Class "%1$s" does not implement interface "%2$s"', $classname, $iface ) );

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

Spacing +17 added lines, -17 removed lines

@@ -65,7 +65,7 @@ 
 
 		foreach( $paths as $path )
 		{
-			$location = $path . DIRECTORY_SEPARATOR . $locale;
+			$location = $path.DIRECTORY_SEPARATOR.$locale;
 
 			if( file_exists( $location ) )
 			{
@@ -75,7 +75,7 @@ 
 
 			if( strlen( $locale ) > 3 )
 			{
-				$location = $path . DIRECTORY_SEPARATOR . substr( $locale, 0, -strlen( strrchr( $locale, '_' ) ) );
+				$location = $path.DIRECTORY_SEPARATOR.substr( $locale, 0, -strlen( strrchr( $locale, '_' ) ) );
 
 				if( file_exists( $location ) ) {
 					$locations[] = $location;
@@ -109,7 +109,7 @@ 
 			$locale = substr( $locale, 0, -strlen( strrchr( $locale, '_' ) ) );
 		}
 
-		switch ( $locale )
+		switch( $locale )
 		{
 			case 'af':
 			case 'az':
@@ -162,7 +162,7 @@ 
 			case 'tk':
 			case 'ur':
 			case 'zu':
-				return ($number == 1) ? 0 : 1;
+				return ( $number == 1 ) ? 0 : 1;
 
 			case 'am':
 			case 'bh':
@@ -176,7 +176,7 @@ 
 			case 'xbr':
 			case 'ti':
 			case 'wa':
-				return (($number == 0) || ($number == 1)) ? 0 : 1;
+				return ( ( $number == 0 ) || ( $number == 1 ) ) ? 0 : 1;
 
 			case 'be':
 			case 'bs':
@@ -184,41 +184,41 @@ 
 			case 'ru':
 			case 'sr':
 			case 'uk':
-				return (($number % 10 == 1) && ($number % 100 != 11)) ? 0 : ((($number % 10 >= 2) && ($number % 10 <= 4) && (($number % 100 < 10) || ($number % 100 >= 20))) ? 1 : 2);
+				return ( ( $number % 10 == 1 ) && ( $number % 100 != 11 ) ) ? 0 : ( ( ( $number % 10 >= 2 ) && ( $number % 10 <= 4 ) && ( ( $number % 100 < 10 ) || ( $number % 100 >= 20 ) ) ) ? 1 : 2 );
 
 			case 'cs':
 			case 'sk':
-				return ($number == 1) ? 0 : ((($number >= 2) && ($number <= 4)) ? 1 : 2);
+				return ( $number == 1 ) ? 0 : ( ( ( $number >= 2 ) && ( $number <= 4 ) ) ? 1 : 2 );
 
 			case 'ar':
-				return ($number == 0) ? 0 : (($number == 1) ? 1 : (($number == 2) ? 2 : ((($number >= 3) && ($number <= 10)) ? 3 : ((($number >= 11) && ($number <= 99)) ? 4 : 5))));
+				return ( $number == 0 ) ? 0 : ( ( $number == 1 ) ? 1 : ( ( $number == 2 ) ? 2 : ( ( ( $number >= 3 ) && ( $number <= 10 ) ) ? 3 : ( ( ( $number >= 11 ) && ( $number <= 99 ) ) ? 4 : 5 ) ) ) );
 
 			case 'cy':
-				return ($number == 1) ? 0 : (($number == 2) ? 1 : ((($number == 8) || ($number == 11)) ? 2 : 3));
+				return ( $number == 1 ) ? 0 : ( ( $number == 2 ) ? 1 : ( ( ( $number == 8 ) || ( $number == 11 ) ) ? 2 : 3 ) );
 
 			case 'ga':
-				return ($number == 1) ? 0 : (($number == 2) ? 1 : 2);
+				return ( $number == 1 ) ? 0 : ( ( $number == 2 ) ? 1 : 2 );
 
 			case 'lt':
-				return (($number % 10 == 1) && ($number % 100 != 11)) ? 0 : ((($number % 10 >= 2) && (($number % 100 < 10) || ($number % 100 >= 20))) ? 1 : 2);
+				return ( ( $number % 10 == 1 ) && ( $number % 100 != 11 ) ) ? 0 : ( ( ( $number % 10 >= 2 ) && ( ( $number % 100 < 10 ) || ( $number % 100 >= 20 ) ) ) ? 1 : 2 );
 
 			case 'lv':
-				return ($number == 0) ? 0 : ((($number % 10 == 1) && ($number % 100 != 11)) ? 1 : 2);
+				return ( $number == 0 ) ? 0 : ( ( ( $number % 10 == 1 ) && ( $number % 100 != 11 ) ) ? 1 : 2 );
 
 			case 'mk':
-				return ($number % 10 == 1) ? 0 : 1;
+				return ( $number % 10 == 1 ) ? 0 : 1;
 
 			case 'mt':
-				return ($number == 1) ? 0 : ((($number == 0) || (($number % 100 > 1) && ($number % 100 < 11))) ? 1 : ((($number % 100 > 10) && ($number % 100 < 20)) ? 2 : 3));
+				return ( $number == 1 ) ? 0 : ( ( ( $number == 0 ) || ( ( $number % 100 > 1 ) && ( $number % 100 < 11 ) ) ) ? 1 : ( ( ( $number % 100 > 10 ) && ( $number % 100 < 20 ) ) ? 2 : 3 ) );
 
 			case 'pl':
-				return ($number == 1) ? 0 : ((($number % 10 >= 2) && ($number % 10 <= 4) && (($number % 100 < 12) || ($number % 100 > 14))) ? 1 : 2);
+				return ( $number == 1 ) ? 0 : ( ( ( $number % 10 >= 2 ) && ( $number % 10 <= 4 ) && ( ( $number % 100 < 12 ) || ( $number % 100 > 14 ) ) ) ? 1 : 2 );
 
 			case 'ro':
-				return ($number == 1) ? 0 : ((($number == 0) || (($number % 100 > 0) && ($number % 100 < 20))) ? 1 : 2);
+				return ( $number == 1 ) ? 0 : ( ( ( $number == 0 ) || ( ( $number % 100 > 0 ) && ( $number % 100 < 20 ) ) ) ? 1 : 2 );
 
 			case 'sl':
-				return ($number % 100 == 1) ? 0 : (($number % 100 == 2) ? 1 : ((($number % 100 == 3) || ($number % 100 == 4)) ? 2 : 3));
+				return ( $number % 100 == 1 ) ? 0 : ( ( $number % 100 == 2 ) ? 1 : ( ( ( $number % 100 == 3 ) || ( $number % 100 == 4 ) ) ? 2 : 3 ) );
 
 			default:
 				return 0;

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

Spacing +6 added lines, -6 removed lines

@@ -118,7 +118,7 @@ 
 	 */
 	public function setId( $id )
 	{
-		if ( $id === null ) {
+		if( $id === null ) {
 			$this->modified = true;
 		}
 
@@ -144,7 +144,7 @@ 
 	 */
 	public function setLabel( $name )
 	{
-		if ( $name == $this->getLabel() ) { return; }
+		if( $name == $this->getLabel() ) { return; }
 
 		$this->values['label'] = (string) $name;
 		$this->modified = true;
@@ -169,7 +169,7 @@ 
 	 */
 	public function setCode( $name )
 	{
-		if ( $name == $this->getCode() ) { return; }
+		if( $name == $this->getCode() ) { return; }
 
 		$this->values['code'] = (string) $name;
 		$this->modified = true;
@@ -193,7 +193,7 @@ 
 	 */
 	public function setStatus( $status )
 	{
-		if ( $status == $this->getStatus() ) { return; }
+		if( $status == $this->getStatus() ) { return; }
 
 		$this->values['status'] = (int) $status;
 		$this->modified = true;
@@ -207,7 +207,7 @@ 
 	 * @return \Aimeos\MW\Tree\Node\Iface Selected node
 	 * @throws \Aimeos\MW\Tree\Exception If there's no child at the given position
 	 */
-	public function getChild($index)
+	public function getChild( $index )
 	{
 		if( isset( $this->children[$index] ) ) {
 			return $this->children[$index];
@@ -283,6 +283,6 @@ 
 	 */
 	public function count()
 	{
-		return count($this->children);
+		return count( $this->children );
 	}
 }

lib/mwlib/src/MW/Tree/Factory.php

Spacing +3 added lines, -3 removed lines

@@ -33,18 +33,18 @@
 	{
 		if( ctype_alnum( $name ) === false )
 		{
-			$classname = is_string( $name ) ? '\\Aimeos\\MW\\Tree\\Manager\\' . $name : '<not a string>';
+			$classname = is_string( $name ) ? '\\Aimeos\\MW\\Tree\\Manager\\'.$name : '<not a string>';
 			throw new \Aimeos\MW\Tree\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
 		}
 
 		$iface = '\\Aimeos\\MW\\Tree\\Manager\\Iface';
-		$classname = '\\Aimeos\\MW\\Tree\\Manager\\' . $name;
+		$classname = '\\Aimeos\\MW\\Tree\\Manager\\'.$name;
 
 		if( class_exists( $classname ) === false ) {
 			throw new \Aimeos\MW\Tree\Exception( sprintf( 'Class "%1$s" not available', $classname ) );
 		}
 
-		$manager =  new $classname( $config, $resource );
+		$manager = new $classname( $config, $resource );
 
 		if( !( $manager instanceof $iface ) ) {
 			throw new \Aimeos\MW\Tree\Exception( sprintf( 'Class "%1$s" does not implement interface "%2$s"', $classname, $iface ) );

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

Spacing +5 added lines, -5 removed lines

@@ -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;
 		}
 
@@ -617,7 +617,7 @@ 
 
 		$results = $this->searchNodes( $search );
 
-		foreach ( $results as $item ) {
+		foreach( $results as $item ) {
 			$result[$item->getId()] = $item;
 		}
 
@@ -729,7 +729,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' );
 	}
 
 

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;

lib/mwlib/src/MW/Communication/Curl.php

Spacing +5 added lines, -5 removed lines

@@ -33,7 +33,7 @@ 
 	{
 		$response = '';
 
-		if( ( $curl = curl_init() )=== false ) {
+		if( ( $curl = curl_init() ) === false ) {
 			throw new \Aimeos\MW\Communication\Exception( 'Could not initialize curl' );
 		}
 
@@ -44,16 +44,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\MW\Communication\Exception( sprintf( 'Sending order failed: "%1$s"', curl_error( $curl ) ) );
 			}
 
-			if ( curl_errno($curl) ) {
-				throw new \Aimeos\MW\Communication\Exception( sprintf( 'Error with nr."%1$s" - "%2$s"', curl_errno($curl), curl_error($curl) ) );
+			if( curl_errno( $curl ) ) {
+				throw new \Aimeos\MW\Communication\Exception( sprintf( 'Error with nr."%1$s" - "%2$s"', curl_errno( $curl ), curl_error( $curl ) ) );
 			}
 
 			curl_close( $curl );

lib/mwlib/src/MW/Communication/Sftp.php

Spacing +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
 				$method = NET_SFTP_STRING; break;
 		}
 
-		if ( $this->sftp->put( $target, $payload, $method ) === false )
+		if( $this->sftp->put( $target, $payload, $method ) === false )
 		{
 			$msg = sprintf( 'Could not upload payload to "%1$s:%2$s"', $this->config['host'], $target );
 			throw new \Aimeos\MW\Communication\Exception( $msg );

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() );
 		}