aimeos / aimeos-core

lib/mshoplib/src/MShop/Service/Provider/Delivery/Standard.php

Braces +2 added lines, -4 removed lines

@@ -175,15 +175,13 @@
 					$context->getLogger()->log( 'Using weak SSL options', \Aimeos\MW\Logger\Base::NOTICE );
 					curl_setopt( $curl, CURLOPT_SSL_VERIFYPEER, false );
 					curl_setopt( $curl, CURLOPT_SSL_VERIFYHOST, true );
-				}
-				else
+				} else
 				{
 					$context->getLogger()->log( 'Using strict SSL options', \Aimeos\MW\Logger\Base::NOTICE );
 					curl_setopt( $curl, CURLOPT_SSL_VERIFYPEER, true );
 					curl_setopt( $curl, CURLOPT_SSL_VERIFYHOST, 2 ); // check CN and match host name
 				}
-			}
-			else
+			} else
 			{
 				$context->getLogger()->log( 'Using no SSL encryption', \Aimeos\MW\Logger\Base::NOTICE );
 			}

Spacing +5 added lines, -5 removed lines

@@ -82,11 +82,11 @@ 
 		$logger = $this->getContext()->getLogger();
 		$xml = $this->buildXML( $order );
 
-		$logger->log( __METHOD__ . ": XML request =\n" . $xml, \Aimeos\MW\Logger\Base::INFO );
+		$logger->log( __METHOD__.": XML request =\n".$xml, \Aimeos\MW\Logger\Base::INFO );
 
 		$response = $this->sendRequest( $xml );
 
-		$logger->log( __METHOD__ . ": XML response =\n" . trim( $response ), \Aimeos\MW\Logger\Base::INFO );
+		$logger->log( __METHOD__.": XML response =\n".trim( $response ), \Aimeos\MW\Logger\Base::INFO );
 
 		$this->checkResponse( $response, $order->getId() );
 
@@ -164,7 +164,7 @@ 
 			{
 				$context->getLogger()->log( 'Using user name and password for authentication', \Aimeos\MW\Logger\Base::NOTICE );
 				curl_setopt( $curl, CURLOPT_HTTPAUTH, CURLAUTH_ANY );
-				curl_setopt( $curl, CURLOPT_USERPWD, $config['default.username'] . ':' . $config['default.password'] );
+				curl_setopt( $curl, CURLOPT_USERPWD, $config['default.username'].':'.$config['default.password'] );
 			}
 
 			$urlinfo = parse_url( $config['default.url'] );
@@ -220,7 +220,7 @@ 
 	 */
 	protected function checkResponse( $response, $invoiceid )
 	{
-		$responseXSD = __DIR__ . DIRECTORY_SEPARATOR . 'xsd' . DIRECTORY_SEPARATOR . 'order-response_v1.xsd';
+		$responseXSD = __DIR__.DIRECTORY_SEPARATOR.'xsd'.DIRECTORY_SEPARATOR.'order-response_v1.xsd';
 
 		$dom = new \DOMDocument( '1.0', 'UTF-8' );
 		$dom->preserveWhiteSpace = false;
@@ -298,7 +298,7 @@ 
 			throw new \Aimeos\MShop\Service\Exception( sprintf( $msg, $e->getMessage() ), 0, $e );
 		}
 
-		$requestXSD = __DIR__ . DIRECTORY_SEPARATOR . 'xsd' . DIRECTORY_SEPARATOR . 'order-request_v1.xsd';
+		$requestXSD = __DIR__.DIRECTORY_SEPARATOR.'xsd'.DIRECTORY_SEPARATOR.'order-request_v1.xsd';
 
 		if( $dom->schemaValidate( $requestXSD ) !== true )
 		{

lib/mshoplib/src/MShop/Service/Provider/Payment/DirectDebit.php

Braces +3 added lines, -1 removed lines

@@ -82,7 +82,9 @@
 				$feconfig['directdebit.accountowner']['default'] = $fn . ' ' . $ln;
 			}
 		}
-		catch( \Aimeos\MShop\Order\Exception $e ) { ; } // If address isn't available
+		catch( \Aimeos\MShop\Order\Exception $e )
+		{
+; } // If address isn't available
 
 		foreach( $feconfig as $key => $config ) {
 			$list[$key] = new \Aimeos\MW\Criteria\Attribute\Standard( $config );

Spacing +3 added lines, -3 removed lines

@@ -79,10 +79,10 @@ 
 			$address = $basket->getAddress( \Aimeos\MShop\Order\Item\Base\Address\Base::TYPE_PAYMENT );
 
 			if( ( $fn = $address->getFirstname() ) !== '' && ( $ln = $address->getLastname() ) !== '' ) {
-				$feconfig['directdebit.accountowner']['default'] = $fn . ' ' . $ln;
+				$feconfig['directdebit.accountowner']['default'] = $fn.' '.$ln;
 			}
 		}
-		catch( \Aimeos\MShop\Order\Exception $e ) { ; } // If address isn't available
+		catch( \Aimeos\MShop\Order\Exception $e ) {; } // If address isn't available
 
 		foreach( $feconfig as $key => $config ) {
 			$list[$key] = new \Aimeos\MW\Criteria\Attribute\Standard( $config );
@@ -123,7 +123,7 @@ 
 			$len = strlen( $value );
 			$xstr = ( $len > 3 ? str_repeat( 'X', $len - 3 ) : '' );
 
-			$attrItem->setValue( $xstr . substr( $value, -3 ) );
+			$attrItem->setValue( $xstr.substr( $value, -3 ) );
 			$orderServiceItem->setAttributeItem( $attrItem );
 		}
 	}

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

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

Braces +3 added lines, -6 removed lines

@@ -71,8 +71,7 @@ 
 
 		if( in_array( $op, $operators['combine'] ) ) {
 			return $this->createCombineExpression( $op, (array) $value );
-		}
-		else if( in_array( $op, $operators['compare'] ) ) {
+		} else if( in_array( $op, $operators['compare'] ) ) {
 			return $this->createCompareExpression( $op, (array) $value );
 		}
 
@@ -126,11 +125,9 @@ 
 
 			if( in_array( $op, $operators['combine'] ) ) {
 				$results[] = $this->createCombineExpression( $op, (array) $entry[$op] );
-			}
-			else if( in_array( $op, $operators['compare'] ) ) {
+			} else if( in_array( $op, $operators['compare'] ) ) {
 				$results[] = $this->createCompareExpression( $op, (array) $entry[$op] );
-			}
-			else {
+			} else {
 				throw new \Aimeos\MW\Common\Exception( sprintf( 'Invalid operator "%1$s"', $op ) );
 			}
 		}

lib/mwlib/src/MW/Criteria/Expression/Base.php

Braces +1 added lines, -2 removed lines

@@ -226,8 +226,7 @@
 
 					$params[] = implode( ',', $list );
 				}
-			}
-			else
+			} else
 			{
 				$params[] = $this->escape( '==', $this->getParamType( $string ), $string );
 			}

Spacing +7 added lines, -7 removed lines

@@ -32,7 +32,7 @@ 
 	 */
 	public static function createFunction( $name, array $params )
 	{
-		return $name . '(' . self::createSignature( $params ) . ')';
+		return $name.'('.self::createSignature( $params ).')';
 	}
 
 
@@ -55,9 +55,9 @@ 
 				case 'double':
 					$list[] = $param; break;
 				case 'array':
-					$list[] = '[' . self::createSignature( $param ) . ']'; break;
+					$list[] = '['.self::createSignature( $param ).']'; break;
 				default:
-					$list[] = '"' . $param . '"';
+					$list[] = '"'.$param.'"';
 			}
 		}
 
@@ -77,7 +77,7 @@ 
 	protected function isFunction( &$name, array &$params )
 	{
 		$len = strlen( $name );
-		if( $len === 0 || $name[$len-1] !== ')' ) { return false; }
+		if( $len === 0 || $name[$len - 1] !== ')' ) { return false; }
 
 		if( ( $pos = strpos( $name, '(' ) ) === false ) {
 			throw new \Aimeos\MW\Common\Exception( 'Missing opening bracket for function syntax' );
@@ -102,7 +102,7 @@ 
 			$params = $this->extractParams( $matches[1] );
 		}
 
-		$name = $namestr . '()';
+		$name = $namestr.'()';
 		return true;
 	}
 
@@ -130,7 +130,7 @@ 
 			$count = count( $params );
 
 			for( $i = 0; $i < $count; $i++ ) {
-				$find[$i] = '$' . ( $i + 1 );
+				$find[$i] = '$'.( $i + 1 );
 			}
 
 			return str_replace( $find, $params, $transname );
@@ -168,7 +168,7 @@ 
 	 */
 	protected function setPlugins( array $plugins )
 	{
-		\Aimeos\MW\Common\Base::checkClassList('\\Aimeos\\MW\\Criteria\\Plugin\\Iface', $plugins);
+		\Aimeos\MW\Common\Base::checkClassList( '\\Aimeos\\MW\\Criteria\\Plugin\\Iface', $plugins );
 
 		$this->plugins = $plugins;
 	}

lib/mwlib/src/MW/Criteria/Expression/Compare/PHP.php

Braces +2 added lines, -4 removed lines

@@ -185,12 +185,10 @@
 			}
 
 			return 'string';
-		}
-		else if( strpos( $item, '.' ) !== false )
+		} else if( strpos( $item, '.' ) !== false )
 		{
 			return 'float';
-		}
-		else if( ctype_digit( $item ) !== false )
+		} else if( ctype_digit( $item ) !== false )
 		{
 			return 'int';
 		}

Spacing +8 added lines, -8 removed lines

@@ -62,7 +62,7 @@ 
 	protected function createTerm( $name, $type, $value )
 	{
 		$escaped = $this->escape( $this->getOperator(), $type, $value );
-		return $name . ' ' . self::$operators[$this->getOperator()] . ' ' . $escaped;
+		return $name.' '.self::$operators[$this->getOperator()].' '.$escaped;
 	}
 
 
@@ -77,9 +77,9 @@ 
 		switch( $this->getOperator() )
 		{
 			case '==':
-				return $name . ' === null';
+				return $name.' === null';
 			case '!=':
-				return $name . ' !== null';
+				return $name.' !== null';
 			default:
 				throw new \Aimeos\MW\Common\Exception( sprintf( 'null value not allowed for operator "%1$s"', $this->getOperator() ) );
 		}
@@ -103,7 +103,7 @@ 
 				foreach( (array) $this->getValue() as $value ) {
 					$list[] = $this->createTerm( $name, $type, $value );
 				}
-				return '( ' . implode( ' || ', $list ) . ' )';
+				return '( '.implode( ' || ', $list ).' )';
 
 			case '!=':
 
@@ -111,7 +111,7 @@ 
 				foreach( (array) $this->getValue() as $value ) {
 					$list[] = $this->createTerm( $name, $type, $value );
 				}
-				return '( ' . implode( ' && ', $list ) . ' )';
+				return '( '.implode( ' && ', $list ).' )';
 
 			default:
 				throw new \Aimeos\MW\Common\Exception( sprintf( 'List Term not allowed for operator "%1$s"', $this->getOperator() ) );
@@ -135,10 +135,10 @@ 
 		$string = $this->escape( $this->getOperator(), $type, $val );
 
 		while( ( $val = next( $values ) ) !== false ) {
-			$string .= ',' . $this->escape( $this->getOperator(), $type, $val );
+			$string .= ','.$this->escape( $this->getOperator(), $type, $val );
 		}
 
-		return 'array(' . $string . ')';
+		return 'array('.$string.')';
 	}
 
 
@@ -163,7 +163,7 @@ 
 			case 'float':
 				$value = (double) $value; break;
 			default:
-				$value = '\'' . addcslashes( $value, '\'' ) . '\'';
+				$value = '\''.addcslashes( $value, '\'' ).'\'';
 		}
 
 		return $value;

lib/mwlib/src/MW/Criteria/Expression/Compare/SQL.php

Braces +2 added lines, -4 removed lines

@@ -189,12 +189,10 @@
 			}
 
 			return \Aimeos\MW\DB\Statement\Base::PARAM_STR;
-		}
-		else if( strpos( $item, '.' ) !== false )
+		} else if( strpos( $item, '.' ) !== false )
 		{
 			return \Aimeos\MW\DB\Statement\Base::PARAM_FLOAT;
-		}
-		else if( ctype_digit( $item ) !== false )
+		} else if( ctype_digit( $item ) !== false )
 		{
 			return \Aimeos\MW\DB\Statement\Base::PARAM_INT;
 		}

Spacing +9 added lines, -9 removed lines

@@ -64,7 +64,7 @@ 
 	 */
 	protected function createTerm( $name, $type, $value )
 	{
-		$term = $name . ' ' . self::$operators[$this->getOperator()] . ' ' . $this->escape( $this->getOperator(), $type, $value );
+		$term = $name.' '.self::$operators[$this->getOperator()].' '.$this->escape( $this->getOperator(), $type, $value );
 
 		if( in_array( $this->getOperator(), array( '=~', '~=' ), true ) ) {
 			$term .= ' ESCAPE \'#\'';
@@ -85,9 +85,9 @@ 
 		switch( $this->getOperator() )
 		{
 			case '==':
-				return $name . ' IS NULL';
+				return $name.' IS NULL';
 			case '!=':
-				return $name . ' IS NOT NULL';
+				return $name.' IS NOT NULL';
 			default:
 				throw new \Aimeos\MW\Common\Exception( sprintf( 'NULL value not allowed for operator "%1$s"', $this->getOperator() ) );
 		}
@@ -106,9 +106,9 @@ 
 		switch( $this->getOperator() )
 		{
 			case '==':
-				return $name . ' IN ' . $this->createValueList( $type, (array) $this->getValue() );
+				return $name.' IN '.$this->createValueList( $type, (array) $this->getValue() );
 			case '!=':
-				return $name . ' NOT IN ' . $this->createValueList( $type, (array) $this->getValue() );
+				return $name.' NOT IN '.$this->createValueList( $type, (array) $this->getValue() );
 			default:
 				$terms = [];
 
@@ -116,7 +116,7 @@ 
 					$terms[] = $this->createTerm( $name, $type, $val );
 				}
 
-				return '(' . implode( ' OR ', $terms ) . ')';
+				return '('.implode( ' OR ', $terms ).')';
 		}
 	}
 
@@ -140,7 +140,7 @@ 
 			$values[$key] = $this->escape( $operator, $type, $value );
 		}
 
-		return '(' . implode(',', $values) . ')';
+		return '('.implode( ',', $values ).')';
 	}
 
 
@@ -168,10 +168,10 @@ 
 				if( in_array( $operator, array( '~=', '=~' ), true ) )
 				{
 					$value = str_replace( array( '%', '_', '[' ), array( '#%', '#_', '#[' ), $this->conn->escape( $value ) );
-					$value = '\'%' . $value . '%\''; break;
+					$value = '\'%'.$value.'%\''; break;
 				}
 			default:
-				$value = '\'' . $this->conn->escape( $value ) . '\'';
+				$value = '\''.$this->conn->escape( $value ).'\'';
 		}
 
 		return $value;

lib/mwlib/src/MW/Criteria/Expression/Sort/PHP.php

Braces +2 added lines, -4 removed lines

@@ -143,12 +143,10 @@
 			}
 
 			return '(string)';
-		}
-		else if( strpos( $item, '.' ) !== false )
+		} else if( strpos( $item, '.' ) !== false )
 		{
 			return '(float)';
-		}
-		else if( ctype_digit( $item ) !== false )
+		} else if( ctype_digit( $item ) !== false )
 		{
 			return '(int)';
 		}

Spacing +1 added lines, -1 removed lines

@@ -99,7 +99,7 @@
 			throw new \Aimeos\MW\Common\Exception( sprintf( 'Invalid name "%1$s"', $name ) );
 		}
 
-		return self::$operators[$this->operator] . '(' . $transname . ');';
+		return self::$operators[$this->operator].'('.$transname.');';
 	}
 
 

lib/mwlib/tests/MW/Criteria/Expression/Sort/PHPTest.php

Spacing +2 added lines, -2 removed lines

@@ -81,7 +81,7 @@ 
 
 	public function testException1()
 	{
-		$this->setExpectedException('\\Aimeos\\MW\\Common\\Exception');
+		$this->setExpectedException( '\\Aimeos\\MW\\Common\\Exception' );
 		new \Aimeos\MW\Criteria\Expression\Sort\PHP( '/', 'test(1,2)' );
 	}
 
@@ -98,7 +98,7 @@ 
 
 		$object = new \Aimeos\MW\Criteria\Expression\Sort\PHP( '+', 'wrongType' );
 
-		$this->setExpectedException('\\Aimeos\\MW\\Common\\Exception');
+		$this->setExpectedException( '\\Aimeos\\MW\\Common\\Exception' );
 		$object->toString( $types, $translations );
 	}