aimeos / aimeos-core

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

setup.php

Braces +2 added lines, -4 removed lines

@@ -65,15 +65,13 @@
 				{
 					$options[$name] = (array) $options[$name];
 					$options[$name][] = substr( $option, $pos + 1 );
-				}
-				else
+				} else
 				{
 					$options[$name] = substr( $option, $pos + 1 );
 				}
 
 				unset( $params[$key] );
-			}
-			else
+			} else
 			{
 				printf( "Invalid option \"%1\$s\"\n", $option );
 				usage();

Spacing +2 added lines, -2 removed lines

@@ -148,7 +148,7 @@ 
 		if( strncmp( $rname, 'db', 2 ) !== 0 ) {
 			unset( $dbconfig[$rname] );
 		} else {
-			$conf->set( 'resource/' . $rname . '/limit', 2 );
+			$conf->set( 'resource/'.$rname.'/limit', 2 );
 		}
 	}
 
@@ -186,7 +186,7 @@ 
 	}
 
 
-	require 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
+	require 'vendor'.DIRECTORY_SEPARATOR.'autoload.php';
 
 	$aimeos = new \Aimeos\Bootstrap( ( isset( $options['extdir'] ) ? (array) $options['extdir'] : array() ) );
 	$taskPaths = $aimeos->getSetupPaths( $tplsite );

lib/mwlib/tests/MW/Criteria/Attribute/StandardTest.php

Spacing +11 added lines, -11 removed lines

@@ -38,7 +38,7 @@ 
 			'required' => false,
 		);
 
-		$this->object = new \Aimeos\MW\Criteria\Attribute\Standard($values);
+		$this->object = new \Aimeos\MW\Criteria\Attribute\Standard( $values );
 	}
 
 	/**
@@ -54,48 +54,48 @@ 
 
 	public function testGetType()
 	{
-		$this->assertEquals('attribute_type', $this->object->getType());
+		$this->assertEquals( 'attribute_type', $this->object->getType() );
 	}
 
 
 	public function testGetInternalType()
 	{
-		$this->assertEquals('internaltype', $this->object->getInternalType());
+		$this->assertEquals( 'internaltype', $this->object->getInternalType() );
 	}
 
 	public function testGetCode()
 	{
-		$this->assertEquals('attribute_code', $this->object->getCode());
+		$this->assertEquals( 'attribute_code', $this->object->getCode() );
 	}
 
 	public function testGetInternalCode()
 	{
-		$this->assertEquals('internalcode', $this->object->getInternalCode());
+		$this->assertEquals( 'internalcode', $this->object->getInternalCode() );
 	}
 
 	public function testGetInternalDeps()
 	{
-		$this->assertEquals(array( 'test' ), $this->object->getInternalDeps());
+		$this->assertEquals( array( 'test' ), $this->object->getInternalDeps() );
 	}
 
 	public function testGetLabel()
 	{
-		$this->assertEquals('labelname', $this->object->getLabel());
+		$this->assertEquals( 'labelname', $this->object->getLabel() );
 	}
 
 	public function testGetDefault()
 	{
-		$this->assertEquals('default value', $this->object->getDefault());
+		$this->assertEquals( 'default value', $this->object->getDefault() );
 	}
 
 	public function testIsPublic()
 	{
-		$this->assertEquals(false, $this->object->isPublic());
+		$this->assertEquals( false, $this->object->isPublic() );
 	}
 
 	public function testIsRequired()
 	{
-		$this->assertEquals(false, $this->object->isRequired());
+		$this->assertEquals( false, $this->object->isRequired() );
 	}
 
 	public function testToArray()
@@ -109,6 +109,6 @@ 
 			'required' => false,
 		);
 
-		$this->assertEquals($expected, $this->object->toArray());
+		$this->assertEquals( $expected, $this->object->toArray() );
 	}
 }

lib/mwlib/tests/MW/Criteria/Expression/Compare/SQLTest.php

Spacing +7 added lines, -7 removed lines

@@ -97,10 +97,10 @@ 
 			'bool' => 't.bool',
 		);
 
-		$expr = new \Aimeos\MW\Criteria\Expression\Compare\SQL( $this->conn, '==', 'list', array('a', 'b', 'c') );
+		$expr = new \Aimeos\MW\Criteria\Expression\Compare\SQL( $this->conn, '==', 'list', array( 'a', 'b', 'c' ) );
 		$this->assertEquals( "t.list IN ('a','b','c')", $expr->toString( $types, $translations ) );
 
-		$expr = new \Aimeos\MW\Criteria\Expression\Compare\SQL( $this->conn, '!=', 'list', array('a', 'b', 'c') );
+		$expr = new \Aimeos\MW\Criteria\Expression\Compare\SQL( $this->conn, '!=', 'list', array( 'a', 'b', 'c' ) );
 		$this->assertEquals( "t.list NOT IN ('a','b','c')", $expr->toString( $types, $translations ) );
 
 		$expr = new \Aimeos\MW\Criteria\Expression\Compare\SQL( $this->conn, '~=', 'string', 'value' );
@@ -109,19 +109,19 @@ 
 		$expr = new \Aimeos\MW\Criteria\Expression\Compare\SQL( $this->conn, '<', 'float', 0.1 );
 		$this->assertEquals( "t.float < 0.1", $expr->toString( $types, $translations ) );
 
-		$expr= new \Aimeos\MW\Criteria\Expression\Compare\SQL( $this->conn, '>', 'int', 10 );
+		$expr = new \Aimeos\MW\Criteria\Expression\Compare\SQL( $this->conn, '>', 'int', 10 );
 		$this->assertEquals( "t.int > 10", $expr->toString( $types, $translations ) );
 
-		$expr= new \Aimeos\MW\Criteria\Expression\Compare\SQL( $this->conn, '!=', 'undefined', null );
+		$expr = new \Aimeos\MW\Criteria\Expression\Compare\SQL( $this->conn, '!=', 'undefined', null );
 		$this->assertEquals( "t.undefined IS NOT NULL", $expr->toString( $types, $translations ) );
 
-		$expr= new \Aimeos\MW\Criteria\Expression\Compare\SQL( $this->conn, '==', 'bool', true );
+		$expr = new \Aimeos\MW\Criteria\Expression\Compare\SQL( $this->conn, '==', 'bool', true );
 		$this->assertEquals( "t.bool = 1", $expr->toString( $types, $translations ) );
 
-		$expr= new \Aimeos\MW\Criteria\Expression\Compare\SQL( $this->conn, '&', 'int', 0x2 );
+		$expr = new \Aimeos\MW\Criteria\Expression\Compare\SQL( $this->conn, '&', 'int', 0x2 );
 		$this->assertEquals( "t.int & 2", $expr->toString( $types, $translations ) );
 
-		$expr= new \Aimeos\MW\Criteria\Expression\Compare\SQL( $this->conn, '|', 'int', 0x4 );
+		$expr = new \Aimeos\MW\Criteria\Expression\Compare\SQL( $this->conn, '|', 'int', 0x4 );
 		$this->assertEquals( "t.int | 4", $expr->toString( $types, $translations ) );
 	}