aimeos / aimeos-core

lib/mwlib/tests/MW/DB/PDOTest.php

Spacing +22 added lines, -22 removed lines

@@ -207,7 +207,7 @@ 
 		$conn = $this->object->acquire();
 
 		$value = "(\\')";
-		$sqlinsert = str_replace( ':value', '\'' . $conn->escape( $value ) . '\'', $sqlinsert );
+		$sqlinsert = str_replace( ':value', '\''.$conn->escape( $value ).'\'', $sqlinsert );
 		$stmt = $conn->create( $sqlinsert );
 		$stmt->execute()->finish();
 
@@ -235,12 +235,12 @@ 
 
 	public function testStmtSimpleBindTwo()
 	{
-		$sqlinsert2 =  'INSERT INTO "mw_unit_test" ("id", "name") VALUES (?, ?)';
+		$sqlinsert2 = 'INSERT INTO "mw_unit_test" ("id", "name") VALUES (?, ?)';
 
 		$conn = $this->object->acquire();
 
 		$stmt2 = $conn->create( $sqlinsert2 );
-		$stmt2->bind( 1, 1, \Aimeos\MW\DB\Statement\Base::PARAM_INT);
+		$stmt2->bind( 1, 1, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
 		$stmt2->bind( 2, 0.12 );
 		$stmt2->execute()->finish();
 
@@ -252,12 +252,12 @@ 
 
 	public function testStmtSimpleBindThree()
 	{
-		$sqlinsert3 =  'INSERT INTO "mw_unit_test" ("name", "id") VALUES (\'?te?st?\', ?)';
+		$sqlinsert3 = 'INSERT INTO "mw_unit_test" ("name", "id") VALUES (\'?te?st?\', ?)';
 
 		$conn = $this->object->acquire();
 
 		$stmt2 = $conn->create( $sqlinsert3 );
-		$stmt2->bind( 1, 1, \Aimeos\MW\DB\Statement\Base::PARAM_INT);
+		$stmt2->bind( 1, 1, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
 		$stmt2->execute()->finish();
 
 		$this->object->release( $conn );
@@ -268,15 +268,15 @@ 
 
 	public function testStmtSimpleInvalidBindParamType()
 	{
-		$sqlinsert2 =  'INSERT INTO "mw_unit_test" ("id", "name") VALUES (?, ?)';
+		$sqlinsert2 = 'INSERT INTO "mw_unit_test" ("id", "name") VALUES (?, ?)';
 
 		$conn = $this->object->acquire();
 
 		try
 		{
 			$stmt2 = $conn->create( $sqlinsert2 );
-			$stmt2->bind( 1, 1, \Aimeos\MW\DB\Statement\Base::PARAM_INT);
-			$stmt2->bind( 2, 0.15, 123);
+			$stmt2->bind( 1, 1, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
+			$stmt2->bind( 2, 0.15, 123 );
 			$stmt2->execute();
 		}
 		catch( \Aimeos\MW\DB\Exception $de )
@@ -286,7 +286,7 @@ 
 		}
 
 		$this->object->release( $conn );
-		$this->fail('An expected exception has not been raised');
+		$this->fail( 'An expected exception has not been raised' );
 	}
 
 
@@ -299,13 +299,13 @@ 
 		try {
 			$stmt = $conn->create( $sqlinsert );
 			$stmt->execute();
-		} catch ( \Aimeos\MW\DB\Exception $de ) {
+		} catch( \Aimeos\MW\DB\Exception $de ) {
 			$this->object->release( $conn );
 			return;
 		}
 
 		$this->object->release( $conn );
-		$this->fail('An expected exception has not been raised');
+		$this->fail( 'An expected exception has not been raised' );
 	}
 
 
@@ -408,7 +408,7 @@ 
 
 	public function testWrongFieldType()
 	{
-		$this->setExpectedException('\\Aimeos\\MW\\DB\\Exception');
+		$this->setExpectedException( '\\Aimeos\\MW\\DB\\Exception' );
 		$sqlinsert = 'INSERT INTO "mw_unit_test" ("id", "name") VALUES (?, ?)';
 
 		$conn = $this->object->acquire();
@@ -420,7 +420,7 @@ 
 			$stmt->bind( 2, 'test', 123 );
 			$stmt->execute();
 		}
-		catch ( \Aimeos\MW\DB\Exception $e )
+		catch( \Aimeos\MW\DB\Exception $e )
 		{
 			$this->object->release( $conn );
 			throw $e;
@@ -444,13 +444,13 @@ 
 
 		$conn = $this->object->acquire();
 
-		$this->setExpectedException('\\Aimeos\\MW\\DB\\Exception');
+		$this->setExpectedException( '\\Aimeos\\MW\\DB\\Exception' );
 
 		try
 		{
 			$conn->create( $sql )->execute()->finish();
 		}
-		catch ( \Aimeos\MW\DB\Exception $e )
+		catch( \Aimeos\MW\DB\Exception $e )
 		{
 			$this->object->release( $conn );
 			throw $e;
@@ -462,13 +462,13 @@ 
 	{
 		$conn = $this->object->acquire();
 
-		$this->setExpectedException('\\Aimeos\\MW\\DB\\Exception');
+		$this->setExpectedException( '\\Aimeos\\MW\\DB\\Exception' );
 
 		try
 		{
 			$conn->create( 'SELECT *' )->execute()->finish();
 		}
-		catch ( \Aimeos\MW\DB\Exception $e )
+		catch( \Aimeos\MW\DB\Exception $e )
 		{
 			$this->object->release( $conn );
 			throw $e;
@@ -482,13 +482,13 @@ 
 
 		$conn = $this->object->acquire();
 
-		$this->setExpectedException('\\Aimeos\\MW\\DB\\Exception');
+		$this->setExpectedException( '\\Aimeos\\MW\\DB\\Exception' );
 
 		try
 		{
 			$conn->create( $sql, 123 );
 		}
-		catch (\Aimeos\MW\DB\Exception $e)
+		catch( \Aimeos\MW\DB\Exception $e )
 		{
 			$this->object->release( $conn );
 			throw $e;
@@ -500,20 +500,20 @@ 
 	{
 		$mock = $this->getMockBuilder( '\Aimeos\MW\DB\Connection\Iface' )->getMock();
 
-		$this->setExpectedException('\\Aimeos\\MW\\DB\\Exception');
+		$this->setExpectedException( '\\Aimeos\\MW\\DB\\Exception' );
 		$this->object->release( $mock );
 	}
 
 
 	public function testDBFactory()
 	{
-		$this->assertInstanceOf('\\Aimeos\\MW\\DB\\Manager\\Iface', $this->object);
+		$this->assertInstanceOf( '\\Aimeos\\MW\\DB\\Manager\\Iface', $this->object );
 	}
 
 
 	public function testFactoryFail()
 	{
-		$this->setExpectedException('\\Aimeos\\MW\\DB\\Exception');
+		$this->setExpectedException( '\\Aimeos\\MW\\DB\\Exception' );
 		\Aimeos\MW\DB\Factory::createManager( \TestHelperMw::getConfig(), 'notDefined' );
 	}
 }

lib/mshoplib/setup/MShopAddLocaleData.php

Spacing +2 added lines, -2 removed lines

@@ -174,7 +174,7 @@ 
 			$num++;
 		}
 
-		$this->status( $num > 0 ? $num . '/' . $total : 'OK' );
+		$this->status( $num > 0 ? $num.'/'.$total : 'OK' );
 	}
 
 
@@ -211,7 +211,7 @@ 
 			$num++;
 		}
 
-		$this->status( $num > 0 ? $num . '/' . $total : 'OK' );
+		$this->status( $num > 0 ? $num.'/'.$total : 'OK' );
 	}
 
 

Braces +6 added lines, -2 removed lines

@@ -240,9 +240,13 @@
 			$localeItem->setPosition( $dataset['pos'] );
 			$localeItem->setStatus( $dataset['status'] );
 
-			try {
+			try
+			{
 				$localeItemManager->saveItem( $localeItem );
-			} catch( \Exception $e ) {; } // if locale combination was already available
+			}
+			catch( \Exception $e )
+			{
+; } // if locale combination was already available
 		}
 
 		$this->status( 'done' );