aimeos / aimeos-core

controller/common/src/Controller/Common/Order/Standard.php

Spacing +1 added lines, -1 removed lines

@@ -165,7 +165,7 @@
 		foreach( $bundleItems as $bundleItem )
 		{
 			foreach( $bundleItem->getRefItems( 'product', null, 'default' ) as $item ) {
-				$bundleMap[ $item->getCode() ][] = $bundleItem->getCode();
+				$bundleMap[$item->getCode()][] = $bundleItem->getCode();
 			}
 		}
 

Braces +2 added lines, -1 removed lines

@@ -333,7 +333,8 @@
 				{
 					$stockManager->increase( $item->getProductCode(), $item->getStockType(), $how * $item->getQuantity() );
 
-					switch( $item->getType() ) {
+					switch( $item->getType() )
+					{
 						case 'default':
 							$this->updateStockBundle( $item->getProductId(), $item->getStockType() ); break;
 						case 'select':

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

Spacing +7 added lines, -7 removed lines

@@ -120,7 +120,7 @@ 
 		$this->object->setConditions( $this->object->combine( '&&', $expr ) );
 		$this->assertEquals( "( int_col = 1 AND ( str_col = 'test' ) )", $this->object->getConditionString( $types, $translations ) );
 
-		$types = array( 'column' => \Aimeos\MW\DB\Statement\Base::PARAM_BOOL);
+		$types = array( 'column' => \Aimeos\MW\DB\Statement\Base::PARAM_BOOL );
 		$this->object->setConditions( $this->object->compare( '==', 'column', 1 ) );
 		$this->assertEquals( "column = 1", $this->object->getConditionString( $types ) );
 	}
@@ -131,14 +131,14 @@ 
 		$types = array( 'int_column' => \Aimeos\MW\DB\Statement\Base::PARAM_INT );
 
 		$this->object->setConditions( $this->object->compare( '==', 'icol', 10 ) );
-		$this->setExpectedException('\\Aimeos\\MW\\Common\\Exception');
+		$this->setExpectedException( '\\Aimeos\\MW\\Common\\Exception' );
 		$this->object->getConditionString( $types );
 	}
 
 
 	public function testGetConditionStringInvalidOperator()
 	{
-		$this->setExpectedException('\\Aimeos\\MW\\Common\\Exception');
+		$this->setExpectedException( '\\Aimeos\\MW\\Common\\Exception' );
 		$this->object->setConditions( $this->object->compare( '?', 'int_column', 10 ) );
 	}
 
@@ -172,14 +172,14 @@ 
 		$translations = array( 'asc_column' => 'asc_int_col' );
 
 		$this->object->setSortations( array( $this->object->sort( '+', 'asc_col' ) ) );
-		$this->setExpectedException('\\Aimeos\\MW\\Common\\Exception');
+		$this->setExpectedException( '\\Aimeos\\MW\\Common\\Exception' );
 		$this->object->getSortationString( $types, $translations );
 	}
 
 
 	public function testGetSortationStringInvalidDirection()
 	{
-		$this->setExpectedException('\\Aimeos\\MW\\Common\\Exception');
+		$this->setExpectedException( '\\Aimeos\\MW\\Common\\Exception' );
 		$this->object->setSortations( array( $this->object->sort( '/', 'asc_column' ) ) );
 	}
 
@@ -188,10 +188,10 @@ 
 	{
 		$types = array( 'asc_column' => \Aimeos\MW\DB\Statement\Base::PARAM_INT, 'desc_column' => \Aimeos\MW\DB\Statement\Base::PARAM_STR );
 
-		$this->assertEquals('asc_column ASC', $this->object->getSortationString( $types ) );
+		$this->assertEquals( 'asc_column ASC', $this->object->getSortationString( $types ) );
 
 		$translations = array( 'asc_column' => 'asc_int_col', 'desc_column' => 'desc_str_col' );
-		$this->assertEquals('asc_int_col ASC', $this->object->getSortationString( $types, $translations ));
+		$this->assertEquals( 'asc_int_col ASC', $this->object->getSortationString( $types, $translations ) );
 	}
 
 

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

Spacing +12 added lines, -12 removed lines

@@ -78,44 +78,44 @@ 
 
 		$result = $this->object->getConditionString( $types, $translations );
 		$this->assertEquals( "1 == 1", $result );
-		$this->assertEquals( true, eval( 'return ' . $result . ';' ) );
+		$this->assertEquals( true, eval( 'return '.$result.';' ) );
 
 		$expr = array( $this->object->compare( '==', 'int_value', 'a' ), $this->object->compare( '==', 'str_value', 'test' ) );
 		$this->object->setConditions( $this->object->combine( '&&', $expr ) );
 		$result = $this->object->getConditionString( $types, $translations, $plugins );
 		$this->assertEquals( "( \$intval == 10 && \$strval == 'test' )", $result );
-		$this->assertEquals( false, eval( 'return ' . $result . ';' ) );
+		$this->assertEquals( false, eval( 'return '.$result.';' ) );
 
 		$expr = array( $this->object->compare( '==', 'int_value', array( 1, 2, 4, 8 ) ), $this->object->compare( '==', 'str_value', 'test' ) );
 		$this->object->setConditions( $this->object->combine( '&&', $expr ) );
 		$result = $this->object->getConditionString( $types, $translations );
 		$this->assertEquals( "( ( \$intval == 1 || \$intval == 2 || \$intval == 4 || \$intval == 8 ) && \$strval == 'test' )", $result );
-		$this->assertEquals( true, eval( 'return ' . $result . ';' ) );
+		$this->assertEquals( true, eval( 'return '.$result.';' ) );
 
 		$expr = array( $this->object->compare( '==', 'int_value', 1 ), $this->object->compare( '!=', 'int_value', 2 ) );
 		$this->object->setConditions( $this->object->combine( '!', array( $this->object->combine( '&&', $expr ) ) ) );
 		$result = $this->object->getConditionString( $types, $translations );
 		$this->assertEquals( " ! ( \$intval == 1 && \$intval != 2 )", $result );
-		$this->assertEquals( false, eval( 'return ' . $result . ';' ) );
+		$this->assertEquals( false, eval( 'return '.$result.';' ) );
 
 		$expr = array( $this->object->compare( '==', 'int_value', null ), $this->object->compare( '!=', 'str_value', null ) );
 		$this->object->setConditions( $this->object->combine( '&&', $expr ) );
 		$result = $this->object->getConditionString( $types, $translations );
 		$this->assertEquals( "( \$intval === null && \$strval !== null )", $result );
-		$this->assertEquals( false, eval( 'return ' . $result . ';' ) );
+		$this->assertEquals( false, eval( 'return '.$result.';' ) );
 
 		$expr = array( $this->object->compare( '==', 'int_value', 1 ) );
 		$this->object->setConditions( $this->object->combine( '&&', $expr ) );
 		$result = $this->object->getConditionString( $types, $translations );
 		$this->assertEquals( "( \$intval == 1 )", $result );
-		$this->assertEquals( true, eval( 'return ' . $result . ';' ) );
+		$this->assertEquals( true, eval( 'return '.$result.';' ) );
 
 		$expr = array( $this->object->compare( '==', 'str_value', 'test' ) );
 		$expr = array( $this->object->compare( '==', 'int_value', 1 ), $this->object->combine( '&&', $expr ) );
 		$this->object->setConditions( $this->object->combine( '&&', $expr ) );
 		$result = $this->object->getConditionString( $types, $translations );
 		$this->assertEquals( "( \$intval == 1 && ( \$strval == 'test' ) )", $result );
-		$this->assertEquals( true, eval( 'return ' . $result . ';' ) );
+		$this->assertEquals( true, eval( 'return '.$result.';' ) );
 
 		$types = array( 'column' => 'bool' );
 		$this->object->setConditions( $this->object->compare( '==', 'column', 1 ) );
@@ -128,14 +128,14 @@ 
 		$types = array( 'int_value' => \Aimeos\MW\DB\Statement\Base::PARAM_INT );
 
 		$this->object->setConditions( $this->object->compare( '==', 'ival', 10 ) );
-		$this->setExpectedException('\\Aimeos\\MW\\Common\\Exception');
+		$this->setExpectedException( '\\Aimeos\\MW\\Common\\Exception' );
 		$this->object->getConditionString( $types );
 	}
 
 
 	public function testGetConditionStringInvalidOperator()
 	{
-		$this->setExpectedException('\\Aimeos\\MW\\Common\\Exception');
+		$this->setExpectedException( '\\Aimeos\\MW\\Common\\Exception' );
 		$this->object->setConditions( $this->object->compare( '?', 'int_value', 10 ) );
 	}
 
@@ -176,14 +176,14 @@ 
 		$translations = array( 'asc_array' => 'asc_int_list' );
 
 		$this->object->setSortations( array( $this->object->sort( '+', 'asc_col' ) ) );
-		$this->setExpectedException('\\Aimeos\\MW\\Common\\Exception');
+		$this->setExpectedException( '\\Aimeos\\MW\\Common\\Exception' );
 		$this->object->getSortationString( $types, $translations );
 	}
 
 
 	public function testGetSortationStringInvalidDirection()
 	{
-		$this->setExpectedException('\\Aimeos\\MW\\Common\\Exception');
+		$this->setExpectedException( '\\Aimeos\\MW\\Common\\Exception' );
 		$this->object->setSortations( array( $this->object->sort( '/', 'asc_array' ) ) );
 	}
 
@@ -196,7 +196,7 @@ 
 		$translations = array( 'asc_array' => '$ascIntList', 'desc_array' => '$descStrList' );
 
 		$result = $this->object->getSortationString( $types, $translations );
-		$this->assertEquals('asort($ascIntList);', $result);
+		$this->assertEquals( 'asort($ascIntList);', $result );
 		$this->assertEquals( array( 0 => 1, 2 => 5, 1 => 9 ), $ascIntList );
 	}
 

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

Spacing +10 added lines, -10 removed lines

@@ -77,10 +77,10 @@ 
 			'undefined' => '$undefined',
 		);
 
-		$expr = new \Aimeos\MW\Criteria\Expression\Compare\PHP( '==', 'listitem', array('a', 'b', 'c') );
+		$expr = new \Aimeos\MW\Criteria\Expression\Compare\PHP( '==', 'listitem', array( 'a', 'b', 'c' ) );
 		$this->assertEquals( "( \$listitem == 'a' || \$listitem == 'b' || \$listitem == 'c' )", $expr->toString( $types, $translations ) );
 
-		$expr = new \Aimeos\MW\Criteria\Expression\Compare\PHP( '!=', 'listitem', array('a', 'b') );
+		$expr = new \Aimeos\MW\Criteria\Expression\Compare\PHP( '!=', 'listitem', array( 'a', 'b' ) );
 		$this->assertEquals( "( \$listitem != 'a' && \$listitem != 'b' )", $expr->toString( $types, $translations ) );
 
 		$expr = new \Aimeos\MW\Criteria\Expression\Compare\PHP( '==', 'stringvar', 'value' );
@@ -89,16 +89,16 @@ 
 		$expr = new \Aimeos\MW\Criteria\Expression\Compare\PHP( '<', 'floatvar', 0.1 );
 		$this->assertEquals( '$floatvar < 0.1', $expr->toString( $types, $translations ) );
 
-		$expr= new \Aimeos\MW\Criteria\Expression\Compare\PHP( '>', 'intvar', 10 );
+		$expr = new \Aimeos\MW\Criteria\Expression\Compare\PHP( '>', 'intvar', 10 );
 		$this->assertEquals( '$intvar > 10', $expr->toString( $types, $translations ) );
 
-		$expr= new \Aimeos\MW\Criteria\Expression\Compare\PHP( '==', 'boolvar', true );
+		$expr = new \Aimeos\MW\Criteria\Expression\Compare\PHP( '==', 'boolvar', true );
 		$this->assertEquals( '$boolvar == 1', $expr->toString( $types, $translations ) );
 
-		$expr= new \Aimeos\MW\Criteria\Expression\Compare\PHP( '!=', 'undefined', null );
+		$expr = new \Aimeos\MW\Criteria\Expression\Compare\PHP( '!=', 'undefined', null );
 		$this->assertEquals( '$undefined !== null', $expr->toString( $types, $translations ) );
 
-		$expr= new \Aimeos\MW\Criteria\Expression\Compare\PHP( '==', 'undefined', null );
+		$expr = new \Aimeos\MW\Criteria\Expression\Compare\PHP( '==', 'undefined', null );
 		$this->assertEquals( '$undefined === null', $expr->toString( $types, $translations ) );
 
 
@@ -124,15 +124,15 @@ 
 			'undefined' => '$undefined',
 		);
 
-		$expr = new \Aimeos\MW\Criteria\Expression\Compare\PHP( '>=', 'listitem', array('a', 'b') );
-		$this->setExpectedException('\\Aimeos\\MW\\Common\\Exception');
+		$expr = new \Aimeos\MW\Criteria\Expression\Compare\PHP( '>=', 'listitem', array( 'a', 'b' ) );
+		$this->setExpectedException( '\\Aimeos\\MW\\Common\\Exception' );
 		$expr->toString( $types, $translations );
 	}
 
 	public function testToStringExcept2()
 	{
-		$this->setExpectedException('\\Aimeos\\MW\\Common\\Exception');
-		new \Aimeos\MW\Criteria\Expression\Compare\PHP('=', 'undefined', null);
+		$this->setExpectedException( '\\Aimeos\\MW\\Common\\Exception' );
+		new \Aimeos\MW\Criteria\Expression\Compare\PHP( '=', 'undefined', null );
 	}
 
 	public function testToStringFunction()

lib/mshoplib/setup/OrderMigrateFlag.php

Braces +2 added lines, -4 removed lines

@@ -78,8 +78,7 @@ 
 			{
 				$this->execute( $stmts['index'] );
 				$this->status( 'dropped' );
-			}
-			else
+			} else
 			{
 				$this->status( 'OK' );
 			}
@@ -125,8 +124,7 @@ 
 				} else {
 					$this->status( 'OK' );
 				}
-			}
-			else
+			} else
 			{
 				$this->status( 'OK' );
 			}

lib/mshoplib/tests/MShop/Service/Provider/Decorator/BaseTest.php

Spacing +2 added lines, -2 removed lines

@@ -19,8 +19,8 @@
 
 		$servManager = \Aimeos\MShop\Service\Manager\Factory::createManager( $this->context );
 		$search = $servManager->createSearch();
-		$search->setConditions($search->compare('==', 'service.provider', 'Standard'));
-		$result = $servManager->searchItems($search, array('price'));
+		$search->setConditions( $search->compare( '==', 'service.provider', 'Standard' ) );
+		$result = $servManager->searchItems( $search, array( 'price' ) );
 
 		if( ( $item = reset( $result ) ) === false ) {
 			throw new \RuntimeException( 'No order base item found' );

lib/mshoplib/src/MShop/Catalog/Manager/Base.php

Doc Comments +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
 	 * Creates the catalog item objects.
 	 *
 	 * @param array $itemMap Associative list of catalog ID / tree node pairs
-	 * @param array $domains List of domains (e.g. text, media) whose items should be attached to the catalog items
+	 * @param string[] $domains List of domains (e.g. text, media) whose items should be attached to the catalog items
 	 * @param string $prefix Domain prefix
 	 * @param array $local Associative list of IDs as keys and the associative array of items as values
 	 * @return array List of items implementing \Aimeos\MShop\Catalog\Item\Iface

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

Spacing +2 added lines, -2 removed lines

@@ -132,9 +132,9 @@
 					&& ( $count += substr_count( $pr, '\'' ) ) % 2 !== 0 )
 				{
 					if( ( $part = next( $parts ) ) === false ) {
-						throw new \Aimeos\MW\DB\Exception( 'Number of apostrophes don\'t match: ' . $sql );
+						throw new \Aimeos\MW\DB\Exception( 'Number of apostrophes don\'t match: '.$sql );
 					}
-					$temp .= '?' . $part;
+					$temp .= '?'.$part;
 				}
 				$result[] = $temp;
 			}

Doc Comments +1 added lines, -1 removed lines

@@ -174,7 +174,7 @@
 	 * Reconnects to the database server if not in a transaction
 	 *
 	 * @param \Exception $e Exception to throw if a transaction is running
-	 * @return \Aimeos\MW\DB\Statement\Iface Object for method chaining
+	 * @return Base Object for method chaining
 	 * @throws \Exception If a transaction is running
 	 */
 	protected function reconnect( \Exception $e )

lib/mshoplib/tests/MShop/Order/Manager/Base/StandardTest.php

Spacing +1 added lines, -1 removed lines

@@ -335,7 +335,7 @@
 
 	public function testSearchItemsDefault()
 	{
-		$search = $this->object->createSearch(  true );
+		$search = $this->object->createSearch( true );
 		$items = $this->object->searchItems( $search );
 
 		$this->assertEquals( 0, count( $items ) );