aimeos / aimeos-core

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

Spacing +11 added lines, -11 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,8 +124,8 @@ 
 			'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 );
 	}
 
@@ -150,14 +150,14 @@ 
 		);
 
 		$expr = new \Aimeos\MW\Criteria\Expression\Compare\PHP( '>=', 'undefined', null );
-		$this->setExpectedException('\\Aimeos\\MW\\Common\\Exception');
+		$this->setExpectedException( '\\Aimeos\\MW\\Common\\Exception' );
 		$expr->toString( $types, $translations );
 	}
 
 	public function testToStringExcept3()
 	{
-		$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/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 );
 	}
 

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

Spacing +8 added lines, -8 removed lines

@@ -125,7 +125,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 ) );
 	}
@@ -138,7 +138,7 @@ 
 
 		$this->object->setConditions( $this->object->compare( '~=', 'str_column', null ) );
 
-		$this->setExpectedException('\\Aimeos\\MW\\Common\\Exception');
+		$this->setExpectedException( '\\Aimeos\\MW\\Common\\Exception' );
 		$this->object->getConditionString( $types );
 	}
 
@@ -148,14 +148,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 ) );
 	}
 
@@ -189,14 +189,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' ) ) );
 	}
 
@@ -205,10 +205,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 ) );
 	}
 
 

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/mshoplib/src/MAdmin/Job/Manager/Standard.php

Doc Comments +1 added lines

@@ -410,6 +410,7 @@
 	 * @param \Aimeos\MW\Criteria\Iface $search Search criteria object
 	 * @param array $ref List of domains to fetch list items and referenced items for
 	 * @param integer &$total Number of items that are available in total
+	 * @param integer $total
 	 * @return array List of service items implementing \Aimeos\MShop\Service\Item\Iface
 	 *
 	 * @throws \Aimeos\MShop\Service\Exception if creating items failed

Braces +1 added lines, -2 removed lines

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

Spacing +1 added lines, -1 removed lines

@@ -644,7 +644,7 @@
 		$statement = $conn->create( $sql );
 		$statement->bind( 1, $siteId, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
 
-		$context->getLogger()->log( __METHOD__ . ': SQL statement: ' . $statement, \Aimeos\MW\Logger\Base::DEBUG );
+		$context->getLogger()->log( __METHOD__.': SQL statement: '.$statement, \Aimeos\MW\Logger\Base::DEBUG );
 
 		return $statement->execute();
 	}

lib/mshoplib/src/MAdmin/Log/Manager/Standard.php

Doc Comments +1 added lines

@@ -410,6 +410,7 @@
 	 * @param \Aimeos\MW\Criteria\Iface $search Search criteria object
 	 * @param array $ref List of domains to fetch list items and referenced items for
 	 * @param integer &$total Number of items that are available in total
+	 * @param integer $total
 	 * @return array List of service items implementing \Aimeos\MShop\Service\Item\Iface
 	 *
 	 * @throws \Aimeos\MShop\Service\Exception if creating items failed

Spacing +1 added lines, -1 removed lines

@@ -126,7 +126,7 @@
 		 * @category User
 		 */
 		$this->loglevel = $config->get( 'madmin/log/manager/standard/loglevel', \Aimeos\MW\Logger\Base::WARN );
-		$this->requestid = md5( php_uname( 'n' ) . getmypid() . date( 'Y-m-d H:i:s' ) );
+		$this->requestid = md5( php_uname( 'n' ).getmypid().date( 'Y-m-d H:i:s' ) );
 	}
 
 

Braces +11 added lines, -6 removed lines

@@ -153,9 +153,12 @@ 
 	 */
 	public function createItem()
 	{
-		try {
+		try
+		{
 			$siteid = $this->getContext()->getLocale()->getSiteId();
-		} catch( \Exception $e ) {
+		}
+		catch( \Exception $e )
+		{
 			$siteid = null;
 		}
 
@@ -183,9 +186,12 @@ 
 
 		$context = $this->getContext();
 
-		try {
+		try
+		{
 			$siteid = $context->getLocale()->getSiteId();
-		} catch( \Exception $e ) {
+		}
+		catch( \Exception $e )
+		{
 			$siteid = null;
 		}
 
@@ -235,8 +241,7 @@ 
 				 * @see madmin/log/manager/standard/count/ansi
 				 */
 				$path = 'madmin/log/manager/standard/insert';
-			}
-			else
+			} else
 			{
 				/** madmin/log/manager/standard/update/mysql
 				 * Updates an existing log record in the database

lib/mshoplib/src/MShop/Customer/Manager/Group/Standard.php

Doc Comments +1 added lines

@@ -410,6 +410,7 @@
 	 * @param \Aimeos\MW\Criteria\Iface $search Search criteria object
 	 * @param array $ref List of domains to fetch list items and referenced items for
 	 * @param integer &$total Number of items that are available in total
+	 * @param integer $total
 	 * @return array List of service items implementing \Aimeos\MShop\Service\Item\Iface
 	 *
 	 * @throws \Aimeos\MShop\Service\Exception if creating items failed

Braces +1 added lines, -2 removed lines

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

lib/mshoplib/src/MShop/Order/Manager/Base/Coupon/Standard.php

Doc Comments +1 added lines

@@ -410,6 +410,7 @@
 	 * @param \Aimeos\MW\Criteria\Iface $search Search criteria object
 	 * @param array $ref List of domains to fetch list items and referenced items for
 	 * @param integer &$total Number of items that are available in total
+	 * @param integer $total
 	 * @return array List of service items implementing \Aimeos\MShop\Service\Item\Iface
 	 *
 	 * @throws \Aimeos\MShop\Service\Exception if creating items failed

Braces +1 added lines, -2 removed lines

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

Spacing +1 added lines, -1 removed lines

@@ -741,7 +741,7 @@
 		 * @see mshop/order/manager/base/coupon/decorators/global
 		 */
 
-		return $this->getSubManagerBase( 'order', 'base/coupon/' . $manager, $name );
+		return $this->getSubManagerBase( 'order', 'base/coupon/'.$manager, $name );
 	}
 
 

lib/mshoplib/src/MShop/Order/Manager/Base/Service/Attribute/Standard.php

Doc Comments +1 added lines

@@ -410,6 +410,7 @@
 	 * @param \Aimeos\MW\Criteria\Iface $search Search criteria object
 	 * @param array $ref List of domains to fetch list items and referenced items for
 	 * @param integer &$total Number of items that are available in total
+	 * @param integer $total
 	 * @return array List of service items implementing \Aimeos\MShop\Service\Item\Iface
 	 *
 	 * @throws \Aimeos\MShop\Service\Exception if creating items failed

Braces +1 added lines, -2 removed lines

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

Spacing +1 added lines, -1 removed lines

@@ -770,7 +770,7 @@
 		 * @see mshop/order/manager/base/service/attribute/decorators/global
 		 */
 
-		return $this->getSubManagerBase( 'order', 'base/service/attribute/' . $manager, $name );
+		return $this->getSubManagerBase( 'order', 'base/service/attribute/'.$manager, $name );
 	}