pradosoft / prado

tests/unit/IO/AllTests.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if(!defined('PHPUnit_MAIN_METHOD')) {
+if (!defined('PHPUnit_MAIN_METHOD')) {
 	define('PHPUnit_MAIN_METHOD', 'IO_AllTests::main');
 }
 
@@ -22,6 +22,6 @@ 
 	}
 }
 
-if(PHPUnit_MAIN_METHOD == 'IO_AllTests::main') {
+if (PHPUnit_MAIN_METHOD == 'IO_AllTests::main') {
 	IO_AllTests::main();
 }

tests/unit/Data/TDbTransactionTest.php

Spacing +16 added lines, -16 removed lines

@@ -2,8 +2,8 @@ 
 
 Prado::using('System.Data.*');
 
-if(!defined('TEST_DB_FILE'))
-	define('TEST_DB_FILE',dirname(__FILE__).'/db/test.db');
+if (!defined('TEST_DB_FILE'))
+	define('TEST_DB_FILE', dirname(__FILE__) . '/db/test.db');
 
 /**
  * @package System.Data.PDO
@@ -17,22 +17,22 @@ 
 		@unlink(TEST_DB_FILE);
 
 		// create application just to provide application mode
-		new TApplication(__DIR__, false ,TApplication::CONFIG_TYPE_PHP);
+		new TApplication(__DIR__, false, TApplication::CONFIG_TYPE_PHP);
 
-		$this->_connection=new TDbConnection('sqlite:'.TEST_DB_FILE);
-		$this->_connection->Active=true;
+		$this->_connection = new TDbConnection('sqlite:' . TEST_DB_FILE);
+		$this->_connection->Active = true;
 		$this->_connection->createCommand('CREATE TABLE foo (id INTEGER NOT NULL PRIMARY KEY, name VARCHAR(8))')->execute();
 	}
 
 	public function tearDown()
 	{
-		$this->_connection=null;
+		$this->_connection = null;
 	}
 
 	public function testRollBack()
 	{
-		$sql='INSERT INTO foo(id,name) VALUES (1,\'my name\')';
-		$transaction=$this->_connection->beginTransaction();
+		$sql = 'INSERT INTO foo(id,name) VALUES (1,\'my name\')';
+		$transaction = $this->_connection->beginTransaction();
 		try
 		{
 			$this->_connection->createCommand($sql)->execute();
@@ -40,21 +40,21 @@ 
 			$this->fail('Expected exception not raised');
 			$transaction->commit();
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			$this->assertTrue($transaction->Active);
 			$transaction->rollBack();
 			$this->assertFalse($transaction->Active);
-			$reader=$this->_connection->createCommand('SELECT * FROM foo')->query();
+			$reader = $this->_connection->createCommand('SELECT * FROM foo')->query();
 			$this->assertFalse($reader->read());
 		}
 	}
 
 	public function testCommit()
 	{
-		$sql1='INSERT INTO foo(id,name) VALUES (1,\'my name\')';
-		$sql2='INSERT INTO foo(id,name) VALUES (2,\'my name\')';
-		$transaction=$this->_connection->beginTransaction();
+		$sql1 = 'INSERT INTO foo(id,name) VALUES (1,\'my name\')';
+		$sql2 = 'INSERT INTO foo(id,name) VALUES (2,\'my name\')';
+		$transaction = $this->_connection->beginTransaction();
 		try
 		{
 			$this->_connection->createCommand($sql1)->execute();
@@ -63,12 +63,12 @@ 
 			$transaction->commit();
 			$this->assertFalse($transaction->Active);
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			$transaction->rollBack();
 			$this->fail('Unexpected exception');
 		}
-		$result=$this->_connection->createCommand('SELECT * FROM foo')->query()->readAll();
-		$this->assertEquals(count($result),2);
+		$result = $this->_connection->createCommand('SELECT * FROM foo')->query()->readAll();
+		$this->assertEquals(count($result), 2);
 	}
 }

Braces +4 added lines, -5 removed lines

@@ -2,8 +2,9 @@ 
 
 Prado::using('System.Data.*');
 
-if(!defined('TEST_DB_FILE'))
+if(!defined('TEST_DB_FILE')) {
 	define('TEST_DB_FILE',dirname(__FILE__).'/db/test.db');
+}
 
 /**
  * @package System.Data.PDO
@@ -39,8 +40,7 @@ 
 			$this->_connection->createCommand($sql)->execute();
 			$this->fail('Expected exception not raised');
 			$transaction->commit();
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			$this->assertTrue($transaction->Active);
 			$transaction->rollBack();
@@ -62,8 +62,7 @@ 
 			$this->assertTrue($transaction->Active);
 			$transaction->commit();
 			$this->assertFalse($transaction->Active);
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			$transaction->rollBack();
 			$this->fail('Unexpected exception');

tests/unit/Data/TDbConnectionTest.php

Indentation +11 added lines, -11 removed lines

@@ -37,21 +37,21 @@
 
 	public function testActive()
 	{
-	    $this->assertFalse($this->_connection2->Active);
+		$this->assertFalse($this->_connection2->Active);
 
-	    $this->_connection2->Active=true;
-	    $this->assertTrue($this->_connection2->Active);
-	    $pdo=$this->_connection2->PdoInstance;
-	    $this->assertTrue($pdo instanceof PDO);
-	    // test setting Active repeatedly doesn't re-connect DB
-	    $this->_connection2->Active=true;
-	    $this->assertTrue($pdo===$this->_connection2->PdoInstance);
+		$this->_connection2->Active=true;
+		$this->assertTrue($this->_connection2->Active);
+		$pdo=$this->_connection2->PdoInstance;
+		$this->assertTrue($pdo instanceof PDO);
+		// test setting Active repeatedly doesn't re-connect DB
+		$this->_connection2->Active=true;
+		$this->assertTrue($pdo===$this->_connection2->PdoInstance);
 
 		$this->_connection2->Active=false;
-	    $this->assertFalse($this->_connection2->Active);
+		$this->assertFalse($this->_connection2->Active);
 
-	    try
-	    {
+		try
+		{
    			$connection=new TDbConnection('unknown:'.TEST_DB_FILE);
    			$connection->Active=true;
    			$this->fail('Expected exception is not raised');

Spacing +37 added lines, -37 removed lines

@@ -2,10 +2,10 @@ 
 
 Prado::using('System.Data.*');
 
-if(!defined('TEST_DB_FILE'))
-	define('TEST_DB_FILE',dirname(__FILE__).'/db/test.db');
-if(!defined('TEST_DB_FILE2'))
-	define('TEST_DB_FILE2',dirname(__FILE__).'/db/test2.db');
+if (!defined('TEST_DB_FILE'))
+	define('TEST_DB_FILE', dirname(__FILE__) . '/db/test.db');
+if (!defined('TEST_DB_FILE2'))
+	define('TEST_DB_FILE2', dirname(__FILE__) . '/db/test2.db');
 
 /**
  * @package System.Data.PDO
@@ -21,66 +21,66 @@ 
 		@unlink(TEST_DB_FILE2);
 
 		// create application just to provide application mode
-		new TApplication(__DIR__, false ,TApplication::CONFIG_TYPE_PHP);
+		new TApplication(__DIR__, false, TApplication::CONFIG_TYPE_PHP);
 
-		$this->_connection1=new TDbConnection('sqlite:'.TEST_DB_FILE);
-		$this->_connection1->Active=true;
+		$this->_connection1 = new TDbConnection('sqlite:' . TEST_DB_FILE);
+		$this->_connection1->Active = true;
 		$this->_connection1->createCommand('CREATE TABLE foo (id INTEGER NOT NULL PRIMARY KEY, name VARCHAR(8))')->execute();
-		$this->_connection2=new TDbConnection('sqlite:'.TEST_DB_FILE2);
+		$this->_connection2 = new TDbConnection('sqlite:' . TEST_DB_FILE2);
 	}
 
 	public function tearDown()
 	{
-		$this->_connection1=null;
-		$this->_connection2=null;
+		$this->_connection1 = null;
+		$this->_connection2 = null;
 	}
 
 	public function testActive()
 	{
 	    $this->assertFalse($this->_connection2->Active);
 
-	    $this->_connection2->Active=true;
+	    $this->_connection2->Active = true;
 	    $this->assertTrue($this->_connection2->Active);
-	    $pdo=$this->_connection2->PdoInstance;
+	    $pdo = $this->_connection2->PdoInstance;
 	    $this->assertTrue($pdo instanceof PDO);
 	    // test setting Active repeatedly doesn't re-connect DB
-	    $this->_connection2->Active=true;
-	    $this->assertTrue($pdo===$this->_connection2->PdoInstance);
+	    $this->_connection2->Active = true;
+	    $this->assertTrue($pdo === $this->_connection2->PdoInstance);
 
-		$this->_connection2->Active=false;
+		$this->_connection2->Active = false;
 	    $this->assertFalse($this->_connection2->Active);
 
 	    try
 	    {
-   			$connection=new TDbConnection('unknown:'.TEST_DB_FILE);
-   			$connection->Active=true;
+   			$connection = new TDbConnection('unknown:' . TEST_DB_FILE);
+   			$connection->Active = true;
    			$this->fail('Expected exception is not raised');
 		}
-		catch(TDbException $e)
+		catch (TDbException $e)
 		{
 		}
 	}
 
 	public function testCreateCommand()
 	{
-		$sql='CREATE TABLE foo (id INTEGER NOT NULL PRIMARY KEY, name VARCHAR(8))';
+		$sql = 'CREATE TABLE foo (id INTEGER NOT NULL PRIMARY KEY, name VARCHAR(8))';
 		try
 		{
 			$this->_connection2->createCommand($sql);
 			$this->fail('Expected exception is not raised');
 		}
-		catch(TDbException $e)
+		catch (TDbException $e)
 		{
 		}
 
-		$command=$this->_connection1->createCommand($sql);
+		$command = $this->_connection1->createCommand($sql);
 		$this->assertTrue($command instanceof TDbCommand);
 	}
 
 	public function testBeginTransaction()
 	{
-		$sql='INSERT INTO foo(id,name) VALUES (1,\'my name\')';
-		$transaction=$this->_connection1->beginTransaction();
+		$sql = 'INSERT INTO foo(id,name) VALUES (1,\'my name\')';
+		$transaction = $this->_connection1->beginTransaction();
 		try
 		{
 			$this->_connection1->createCommand($sql)->execute();
@@ -88,40 +88,40 @@ 
 			$this->fail('Expected exception not raised');
 			$transaction->commit();
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			$transaction->rollBack();
-			$reader=$this->_connection1->createCommand('SELECT * FROM foo')->query();
+			$reader = $this->_connection1->createCommand('SELECT * FROM foo')->query();
 			$this->assertFalse($reader->read());
 		}
 	}
 
 	public function testLastInsertID()
 	{
-		$sql='INSERT INTO foo(name) VALUES (\'my name\')';
+		$sql = 'INSERT INTO foo(name) VALUES (\'my name\')';
 		$this->_connection1->createCommand($sql)->execute();
-		$value=$this->_connection1->LastInsertID;
-		$this->assertEquals($this->_connection1->LastInsertID,'1');
+		$value = $this->_connection1->LastInsertID;
+		$this->assertEquals($this->_connection1->LastInsertID, '1');
 	}
 
 	public function testQuoteString()
 	{
-		$str="this is 'my' name";
-		$expectedStr="'this is ''my'' name'";
-		$this->assertEquals($expectedStr,$this->_connection1->quoteString($str));
+		$str = "this is 'my' name";
+		$expectedStr = "'this is ''my'' name'";
+		$this->assertEquals($expectedStr, $this->_connection1->quoteString($str));
 	}
 
 	public function testColumnNameCase()
 	{
-		$this->assertEquals(TDbColumnCaseMode::Preserved,$this->_connection1->ColumnCase);
-		$this->_connection1->ColumnCase=TDbColumnCaseMode::LowerCase;
-		$this->assertEquals(TDbColumnCaseMode::LowerCase,$this->_connection1->ColumnCase);
+		$this->assertEquals(TDbColumnCaseMode::Preserved, $this->_connection1->ColumnCase);
+		$this->_connection1->ColumnCase = TDbColumnCaseMode::LowerCase;
+		$this->assertEquals(TDbColumnCaseMode::LowerCase, $this->_connection1->ColumnCase);
 	}
 
 	public function testNullConversion()
 	{
-		$this->assertEquals(TDbNullConversionMode::Preserved,$this->_connection1->NullConversion);
-		$this->_connection1->NullConversion=TDbNullConversionMode::NullToEmptyString;
-		$this->assertEquals(TDbNullConversionMode::NullToEmptyString,$this->_connection1->NullConversion);
+		$this->assertEquals(TDbNullConversionMode::Preserved, $this->_connection1->NullConversion);
+		$this->_connection1->NullConversion = TDbNullConversionMode::NullToEmptyString;
+		$this->assertEquals(TDbNullConversionMode::NullToEmptyString, $this->_connection1->NullConversion);
 	}
 }

Braces +7 added lines, -8 removed lines

@@ -2,10 +2,12 @@ 
 
 Prado::using('System.Data.*');
 
-if(!defined('TEST_DB_FILE'))
+if(!defined('TEST_DB_FILE')) {
 	define('TEST_DB_FILE',dirname(__FILE__).'/db/test.db');
-if(!defined('TEST_DB_FILE2'))
+}
+if(!defined('TEST_DB_FILE2')) {
 	define('TEST_DB_FILE2',dirname(__FILE__).'/db/test2.db');
+}
 
 /**
  * @package System.Data.PDO
@@ -55,8 +57,7 @@ 
    			$connection=new TDbConnection('unknown:'.TEST_DB_FILE);
    			$connection->Active=true;
    			$this->fail('Expected exception is not raised');
-		}
-		catch(TDbException $e)
+		} catch(TDbException $e)
 		{
 		}
 	}
@@ -68,8 +69,7 @@ 
 		{
 			$this->_connection2->createCommand($sql);
 			$this->fail('Expected exception is not raised');
-		}
-		catch(TDbException $e)
+		} catch(TDbException $e)
 		{
 		}
 
@@ -87,8 +87,7 @@ 
 			$this->_connection1->createCommand($sql)->execute();
 			$this->fail('Expected exception not raised');
 			$transaction->commit();
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 			$transaction->rollBack();
 			$reader=$this->_connection1->createCommand('SELECT * FROM foo')->query();

tests/unit/Data/TDbDataReaderTest.php

Spacing +63 added lines, -63 removed lines

@@ -2,8 +2,8 @@ 
 
 Prado::using('System.Data.*');
 
-if(!defined('TEST_DB_FILE'))
-	define('TEST_DB_FILE',dirname(__FILE__).'/db/test.db');
+if (!defined('TEST_DB_FILE'))
+	define('TEST_DB_FILE', dirname(__FILE__) . '/db/test.db');
 
 class FooRecord extends TComponent
 {
@@ -13,7 +13,7 @@ 
 
 	public function __construct($param)
 	{
-		$this->param=$param;
+		$this->param = $param;
 	}
 
 	public function getName()
@@ -23,7 +23,7 @@ 
 
 	public function setName($value)
 	{
-		$this->_name=$value;
+		$this->_name = $value;
 	}
 }
 
@@ -39,10 +39,10 @@ 
 		@unlink(TEST_DB_FILE);
 
 		// create application just to provide application mode
-		new TApplication(__DIR__, false ,TApplication::CONFIG_TYPE_PHP);
+		new TApplication(__DIR__, false, TApplication::CONFIG_TYPE_PHP);
 
-		$this->_connection=new TDbConnection('sqlite:'.TEST_DB_FILE);
-		$this->_connection->Active=true;
+		$this->_connection = new TDbConnection('sqlite:' . TEST_DB_FILE);
+		$this->_connection->Active = true;
 		$this->_connection->createCommand('CREATE TABLE foo (id INTEGER NOT NULL PRIMARY KEY, name VARCHAR(8))')->execute();
 		$this->_connection->createCommand('INSERT INTO foo (name) VALUES (\'my name\')')->execute();
 		$this->_connection->createCommand('INSERT INTO foo (name) VALUES (\'my name 2\')')->execute();
@@ -50,56 +50,56 @@ 
 
 	public function tearDown()
 	{
-		$this->_connection=null;
+		$this->_connection = null;
 	}
 
 	public function testRead()
 	{
-		$reader=$this->_connection->createCommand('SELECT * FROM foo')->query();
-		$row=$reader->read();
-		$this->assertTrue($row['id']==='1' && $row['name']==='my name');
-		$row=$reader->read();
-		$this->assertTrue($row['id']==='2' && $row['name']==='my name 2');
-		$row=$reader->read();
+		$reader = $this->_connection->createCommand('SELECT * FROM foo')->query();
+		$row = $reader->read();
+		$this->assertTrue($row['id'] === '1' && $row['name'] === 'my name');
+		$row = $reader->read();
+		$this->assertTrue($row['id'] === '2' && $row['name'] === 'my name 2');
+		$row = $reader->read();
 		$this->assertFalse($row);
 	}
 
 	public function testReadColumn()
 	{
-		$reader=$this->_connection->createCommand('SELECT * FROM foo')->query();
-		$this->assertEquals($reader->readColumn(0),'1');
-		$this->assertEquals($reader->readColumn(1),'my name 2');
+		$reader = $this->_connection->createCommand('SELECT * FROM foo')->query();
+		$this->assertEquals($reader->readColumn(0), '1');
+		$this->assertEquals($reader->readColumn(1), 'my name 2');
 		$this->assertFalse($reader->readColumn(0));
 	}
 
 	public function testReadObject()
 	{
-		$reader=$this->_connection->createCommand('SELECT * FROM foo')->query();
-		$object=$reader->readObject('FooRecord',array('object'));
-		$this->assertEquals($object->id,'1');
-		$this->assertEquals($object->Name,'my name');
-		$this->assertEquals($object->param,'object');
+		$reader = $this->_connection->createCommand('SELECT * FROM foo')->query();
+		$object = $reader->readObject('FooRecord', array('object'));
+		$this->assertEquals($object->id, '1');
+		$this->assertEquals($object->Name, 'my name');
+		$this->assertEquals($object->param, 'object');
 	}
 
 	public function testReadAll()
 	{
-		$reader=$this->_connection->createCommand('SELECT * FROM foo')->query();
-		$rows=$reader->readAll();
-		$this->assertEquals(count($rows),2);
-		$row=$rows[0];
-		$this->assertTrue($row['id']==='1' && $row['name']==='my name');
-		$row=$rows[1];
-		$this->assertTrue($row['id']==='2' && $row['name']==='my name 2');
-
-		$reader=$this->_connection->createCommand('SELECT * FROM foo WHERE id=3')->query();
-		$rows=$reader->readAll();
-		$this->assertEquals($rows,array());
+		$reader = $this->_connection->createCommand('SELECT * FROM foo')->query();
+		$rows = $reader->readAll();
+		$this->assertEquals(count($rows), 2);
+		$row = $rows[0];
+		$this->assertTrue($row['id'] === '1' && $row['name'] === 'my name');
+		$row = $rows[1];
+		$this->assertTrue($row['id'] === '2' && $row['name'] === 'my name 2');
+
+		$reader = $this->_connection->createCommand('SELECT * FROM foo WHERE id=3')->query();
+		$rows = $reader->readAll();
+		$this->assertEquals($rows, array());
 	}
 
 	public function testClose()
 	{
-		$reader=$this->_connection->createCommand('SELECT * FROM foo')->query();
-		$row=$reader->read();
+		$reader = $this->_connection->createCommand('SELECT * FROM foo')->query();
+		$row = $reader->read();
 		$this->assertFalse($reader->IsClosed);
 		$reader->close();
 		$this->assertTrue($reader->IsClosed);
@@ -108,7 +108,7 @@ 
 			$reader->read();
 			$this->fail('Expected exception is not raised');
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 		}
 	}
@@ -120,61 +120,61 @@ 
 
 	public function testColumnCount()
 	{
-		$reader=$this->_connection->createCommand('SELECT * FROM foo')->query();
-		$this->assertEquals($reader->ColumnCount,2);
+		$reader = $this->_connection->createCommand('SELECT * FROM foo')->query();
+		$this->assertEquals($reader->ColumnCount, 2);
 
-		$reader=$this->_connection->createCommand('SELECT * FROM foo WHERE id=11')->query();
-		$this->assertEquals($reader->ColumnCount,2);
+		$reader = $this->_connection->createCommand('SELECT * FROM foo WHERE id=11')->query();
+		$this->assertEquals($reader->ColumnCount, 2);
 	}
 
 	public function testForeach()
 	{
-		$ids=array();
-		$reader=$this->_connection->createCommand('SELECT * FROM foo')->query();
-		foreach($reader as $row)
-			$ids[]=$row['id'];
-		$this->assertEquals(count($ids),2);
-		$this->assertTrue($ids[0]==='1' && $ids[1]==='2');
+		$ids = array();
+		$reader = $this->_connection->createCommand('SELECT * FROM foo')->query();
+		foreach ($reader as $row)
+			$ids[] = $row['id'];
+		$this->assertEquals(count($ids), 2);
+		$this->assertTrue($ids[0] === '1' && $ids[1] === '2');
 
 		try
 		{
-			foreach($reader as $row)
-				$ids[]=$row['id'];
+			foreach ($reader as $row)
+				$ids[] = $row['id'];
 			$this->fail('Expected exception is not raised');
 		}
-		catch(TDbException $e)
+		catch (TDbException $e)
 		{
 		}
 	}
 
 	public function testFetchMode()
 	{
-		$reader=$this->_connection->createCommand('SELECT * FROM foo')->query();
+		$reader = $this->_connection->createCommand('SELECT * FROM foo')->query();
 
-		$reader->FetchMode=PDO::FETCH_NUM;
-		$row=$reader->read();
+		$reader->FetchMode = PDO::FETCH_NUM;
+		$row = $reader->read();
 		$this->assertFalse(isset($row['id']));
 		$this->assertTrue(isset($row[0]));
 
-		$reader->FetchMode=PDO::FETCH_ASSOC;
-		$row=$reader->read();
+		$reader->FetchMode = PDO::FETCH_ASSOC;
+		$row = $reader->read();
 		$this->assertTrue(isset($row['id']));
 		$this->assertFalse(isset($row[0]));
 	}
 
 	public function testBindColumn()
 	{
-		$reader=$this->_connection->createCommand('SELECT * FROM foo')->query();
-		$reader->bindColumn(1,$id);
-		$reader->bindColumn(2,$name);
+		$reader = $this->_connection->createCommand('SELECT * FROM foo')->query();
+		$reader->bindColumn(1, $id);
+		$reader->bindColumn(2, $name);
 		$reader->read();
-		$this->assertEquals($id,'1');
-		$this->assertEquals($name,'my name');
+		$this->assertEquals($id, '1');
+		$this->assertEquals($name, 'my name');
 		$reader->read();
-		$this->assertEquals($id,'2');
-		$this->assertEquals($name,'my name 2');
+		$this->assertEquals($id, '2');
+		$this->assertEquals($name, 'my name 2');
 		$reader->read();
-		$this->assertEquals($id,'2');
-		$this->assertEquals($name,'my name 2');
+		$this->assertEquals($id, '2');
+		$this->assertEquals($name, 'my name 2');
 	}
 }

Braces +10 added lines, -9 removed lines

@@ -2,8 +2,9 @@ 
 
 Prado::using('System.Data.*');
 
-if(!defined('TEST_DB_FILE'))
+if(!defined('TEST_DB_FILE')) {
 	define('TEST_DB_FILE',dirname(__FILE__).'/db/test.db');
+}
 
 class FooRecord extends TComponent
 {
@@ -107,8 +108,7 @@ 
 		{
 			$reader->read();
 			$this->fail('Expected exception is not raised');
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 		}
 	}
@@ -131,18 +131,19 @@ 
 	{
 		$ids=array();
 		$reader=$this->_connection->createCommand('SELECT * FROM foo')->query();
-		foreach($reader as $row)
-			$ids[]=$row['id'];
+		foreach($reader as $row) {
+					$ids[]=$row['id'];
+		}
 		$this->assertEquals(count($ids),2);
 		$this->assertTrue($ids[0]==='1' && $ids[1]==='2');
 
 		try
 		{
-			foreach($reader as $row)
-				$ids[]=$row['id'];
+			foreach($reader as $row) {
+							$ids[]=$row['id'];
+			}
 			$this->fail('Expected exception is not raised');
-		}
-		catch(TDbException $e)
+		} catch(TDbException $e)
 		{
 		}
 	}

tests/unit/Data/DataGateway/AllTests.php

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 
-if(!defined('PHPUnit_MAIN_METHOD')) {
+if (!defined('PHPUnit_MAIN_METHOD')) {
 	define('PHPUnit_MAIN_METHOD', 'Data_DataGateway_AllTests::main');
 }
 
@@ -22,6 +22,6 @@ 
 	}
 }
 
-if(PHPUnit_MAIN_METHOD == 'Data_DataGateway_AllTests::main') {
+if (PHPUnit_MAIN_METHOD == 'Data_DataGateway_AllTests::main') {
 	Data_DataGateway_AllTests::main();
 }

tests/unit/Data/TDbCommandTest.php

Spacing +76 added lines, -76 removed lines

@@ -2,8 +2,8 @@ 
 
 Prado::using('System.Data.*');
 
-if(!defined('TEST_DB_FILE'))
-	define('TEST_DB_FILE',dirname(__FILE__).'/db/test.db');
+if (!defined('TEST_DB_FILE'))
+	define('TEST_DB_FILE', dirname(__FILE__) . '/db/test.db');
 
 /**
  * @package System.Data.PDO
@@ -17,10 +17,10 @@ 
 		@unlink(TEST_DB_FILE);
     
 		// create application just to provide application mode
-		new TApplication(__DIR__, false ,TApplication::CONFIG_TYPE_PHP);
+		new TApplication(__DIR__, false, TApplication::CONFIG_TYPE_PHP);
 
-		$this->_connection=new TDbConnection('sqlite:'.TEST_DB_FILE);
-		$this->_connection->Active=true;
+		$this->_connection = new TDbConnection('sqlite:' . TEST_DB_FILE);
+		$this->_connection->Active = true;
 		$this->_connection->createCommand('CREATE TABLE foo (id INTEGER NOT NULL PRIMARY KEY, name VARCHAR(8))')->execute();
 		$this->_connection->createCommand('INSERT INTO foo (name) VALUES (\'my name\')')->execute();
 		$this->_connection->createCommand('INSERT INTO foo (name) VALUES (\'my name 2\')')->execute();
@@ -28,116 +28,116 @@ 
 
 	public function tearDown()
 	{
-		$this->_connection=null;
+		$this->_connection = null;
 	}
 
 	public function testGetText()
 	{
-		$sql='SELECT * FROM foo';
-		$command=$this->_connection->createCommand($sql);
-		$this->assertEquals($command->Text,$sql);
+		$sql = 'SELECT * FROM foo';
+		$command = $this->_connection->createCommand($sql);
+		$this->assertEquals($command->Text, $sql);
 	}
 
 	public function testSetText()
 	{
-		$sql='SELECT name FROM foo';
-		$command=$this->_connection->createCommand($sql);
-		$row=$command->query()->read();
-		$this->assertEquals($row['name'],'my name');
+		$sql = 'SELECT name FROM foo';
+		$command = $this->_connection->createCommand($sql);
+		$row = $command->query()->read();
+		$this->assertEquals($row['name'], 'my name');
 
-		$newSql='SELECT id FROM foo';
-		$command->Text=$newSql;
-		$this->assertEquals($command->Text,$newSql);
-		$row=$command->query()->read();
+		$newSql = 'SELECT id FROM foo';
+		$command->Text = $newSql;
+		$this->assertEquals($command->Text, $newSql);
+		$row = $command->query()->read();
 
-		$this->assertEquals($row['id'],'1');
+		$this->assertEquals($row['id'], '1');
 	}
 
 	public function testConnection()
 	{
-		$sql='SELECT name FROM foo';
-		$command=$this->_connection->createCommand($sql);
+		$sql = 'SELECT name FROM foo';
+		$command = $this->_connection->createCommand($sql);
 		$this->assertTrue($command->Connection instanceof TDbConnection);
 	}
 
 	public function testPrepare()
 	{
-		$sql='SELECT name FROM foo';
-		$command=$this->_connection->createCommand($sql);
-		$this->assertTrue($command->PdoStatement===null);
+		$sql = 'SELECT name FROM foo';
+		$command = $this->_connection->createCommand($sql);
+		$this->assertTrue($command->PdoStatement === null);
 		$command->prepare();
 		$this->assertTrue($command->PdoStatement instanceof PDOStatement);
 
 		try
 		{
-			$command->Text='Bad SQL';
+			$command->Text = 'Bad SQL';
 			$command->prepare();
 			$this->fail('Expected exception is not raised');
 		}
-		catch(TDbException $e)
+		catch (TDbException $e)
 		{
 		}
 	}
 
 	public function testCancel()
 	{
-		$sql='SELECT name FROM foo';
-		$command=$this->_connection->createCommand($sql);
+		$sql = 'SELECT name FROM foo';
+		$command = $this->_connection->createCommand($sql);
 		$command->prepare();
 		$this->assertTrue($command->PdoStatement instanceof PDOStatement);
 		$command->cancel();
-		$this->assertEquals($command->PdoStatement,null);
+		$this->assertEquals($command->PdoStatement, null);
 	}
 
 	public function testBindParameter()
 	{
-		$sql='INSERT INTO foo (id,name) VALUES (3,:name)';
-		$command=$this->_connection->createCommand($sql);
-		$name='new name';
-		$command->bindParameter(':name',$name);
+		$sql = 'INSERT INTO foo (id,name) VALUES (3,:name)';
+		$command = $this->_connection->createCommand($sql);
+		$name = 'new name';
+		$command->bindParameter(':name', $name);
 		$command->execute();
-		$insertedName=$this->_connection->createCommand('SELECT name FROM foo WHERE id=3')->queryScalar();
-		$this->assertEquals($name,$insertedName);
+		$insertedName = $this->_connection->createCommand('SELECT name FROM foo WHERE id=3')->queryScalar();
+		$this->assertEquals($name, $insertedName);
 	}
 
 	public function testBindValue()
 	{
-		$sql='INSERT INTO foo (id,name) VALUES (3,:name)';
-		$command=$this->_connection->createCommand($sql);
-		$command->bindValue(':name','new name');
+		$sql = 'INSERT INTO foo (id,name) VALUES (3,:name)';
+		$command = $this->_connection->createCommand($sql);
+		$command->bindValue(':name', 'new name');
 		$command->execute();
-		$insertedName=$this->_connection->createCommand('SELECT name FROM foo WHERE id=3')->queryScalar();
-		$this->assertEquals('new name',$insertedName);
+		$insertedName = $this->_connection->createCommand('SELECT name FROM foo WHERE id=3')->queryScalar();
+		$this->assertEquals('new name', $insertedName);
 	}
 
 	public function testExecute()
 	{
 		// test unprepared SQL execution
-		$sql='INSERT INTO foo (name) VALUES (\'new name\')';
-		$command=$this->_connection->createCommand($sql);
-		$n=$command->execute();
-		$this->assertEquals($n,1);
+		$sql = 'INSERT INTO foo (name) VALUES (\'new name\')';
+		$command = $this->_connection->createCommand($sql);
+		$n = $command->execute();
+		$this->assertEquals($n, 1);
 		$command->execute();
-		$count=$this->_connection->createCommand('SELECT COUNT(id) AS id_count FROM foo')->queryScalar();
-		$this->assertEquals('4',$count);
+		$count = $this->_connection->createCommand('SELECT COUNT(id) AS id_count FROM foo')->queryScalar();
+		$this->assertEquals('4', $count);
 
 		// test prepared SQL execution
-		$sql='INSERT INTO foo (name) VALUES (\'new name\')';
-		$command=$this->_connection->createCommand($sql);
+		$sql = 'INSERT INTO foo (name) VALUES (\'new name\')';
+		$command = $this->_connection->createCommand($sql);
 		$command->prepare();
 		$command->execute();
 		$command->execute();
-		$count=$this->_connection->createCommand('SELECT COUNT(id) AS id_count FROM foo')->queryScalar();
-		$this->assertEquals('6',$count);
+		$count = $this->_connection->createCommand('SELECT COUNT(id) AS id_count FROM foo')->queryScalar();
+		$this->assertEquals('6', $count);
 
 		// test exception raising
 		try
 		{
-			$command=$this->_connection->createCommand('bad SQL');
+			$command = $this->_connection->createCommand('bad SQL');
 			$command->execute();
 			$this->fail('Expected exception is not raised');
 		}
-		catch(TDbException $e)
+		catch (TDbException $e)
 		{
 		}
 	}
@@ -145,25 +145,25 @@ 
 	public function testQuery()
 	{
 		// test unprepared SQL query
-		$sql='SELECT * FROM foo';
-		$reader=$this->_connection->createCommand($sql)->query();
+		$sql = 'SELECT * FROM foo';
+		$reader = $this->_connection->createCommand($sql)->query();
 		$this->assertTrue($reader instanceof TDbDataReader);
 
 		// test unprepared SQL query
-		$sql='SELECT * FROM foo';
-		$command=$this->_connection->createCommand($sql);
+		$sql = 'SELECT * FROM foo';
+		$command = $this->_connection->createCommand($sql);
 		$command->prepare();
-		$reader=$command->query();
+		$reader = $command->query();
 		$this->assertTrue($reader instanceof TDbDataReader);
 
 		// test exception raising
 		try
 		{
-			$command=$this->_connection->createCommand('bad SQL');
+			$command = $this->_connection->createCommand('bad SQL');
 			$command->query();
 			$this->fail('Expected exception is not raised');
 		}
-		catch(TDbException $e)
+		catch (TDbException $e)
 		{
 		}
 	}
@@ -171,25 +171,25 @@ 
 	public function testQueryRow()
 	{
 		// test unprepared SQL query
-		$sql='SELECT * FROM foo';
-		$row=$this->_connection->createCommand($sql)->queryRow();
-		$this->assertTrue($row['id']==='1' && $row['name']==='my name');
+		$sql = 'SELECT * FROM foo';
+		$row = $this->_connection->createCommand($sql)->queryRow();
+		$this->assertTrue($row['id'] === '1' && $row['name'] === 'my name');
 
 		// test unprepared SQL query
-		$sql='SELECT * FROM foo';
-		$command=$this->_connection->createCommand($sql);
+		$sql = 'SELECT * FROM foo';
+		$command = $this->_connection->createCommand($sql);
 		$command->prepare();
-		$row=$command->queryRow();
-		$this->assertTrue($row['id']==='1' && $row['name']==='my name');
+		$row = $command->queryRow();
+		$this->assertTrue($row['id'] === '1' && $row['name'] === 'my name');
 
 		// test exception raising
 		try
 		{
-			$command=$this->_connection->createCommand('bad SQL');
+			$command = $this->_connection->createCommand('bad SQL');
 			$command->queryRow();
 			$this->fail('Expected exception is not raised');
 		}
-		catch(TDbException $e)
+		catch (TDbException $e)
 		{
 		}
 	}
@@ -197,25 +197,25 @@ 
 	public function testQueryScalar()
 	{
 		// test unprepared SQL query
-		$sql='SELECT * FROM foo';
-		$id=$this->_connection->createCommand($sql)->queryScalar();
-		$this->assertTrue($id==='1');
+		$sql = 'SELECT * FROM foo';
+		$id = $this->_connection->createCommand($sql)->queryScalar();
+		$this->assertTrue($id === '1');
 
 		// test unprepared SQL query
-		$sql='SELECT * FROM foo';
-		$command=$this->_connection->createCommand($sql);
+		$sql = 'SELECT * FROM foo';
+		$command = $this->_connection->createCommand($sql);
 		$command->prepare();
-		$row=$command->queryScalar();
-		$this->assertTrue($id==='1');
+		$row = $command->queryScalar();
+		$this->assertTrue($id === '1');
 
 		// test exception raising
 		try
 		{
-			$command=$this->_connection->createCommand('bad SQL');
+			$command = $this->_connection->createCommand('bad SQL');
 			$command->queryScalar();
 			$this->fail('Expected exception is not raised');
 		}
-		catch(TDbException $e)
+		catch (TDbException $e)
 		{
 		}
 	}

Braces +7 added lines, -11 removed lines

@@ -2,8 +2,9 @@ 
 
 Prado::using('System.Data.*');
 
-if(!defined('TEST_DB_FILE'))
+if(!defined('TEST_DB_FILE')) {
 	define('TEST_DB_FILE',dirname(__FILE__).'/db/test.db');
+}
 
 /**
  * @package System.Data.PDO
@@ -73,8 +74,7 @@ 
 			$command->Text='Bad SQL';
 			$command->prepare();
 			$this->fail('Expected exception is not raised');
-		}
-		catch(TDbException $e)
+		} catch(TDbException $e)
 		{
 		}
 	}
@@ -136,8 +136,7 @@ 
 			$command=$this->_connection->createCommand('bad SQL');
 			$command->execute();
 			$this->fail('Expected exception is not raised');
-		}
-		catch(TDbException $e)
+		} catch(TDbException $e)
 		{
 		}
 	}
@@ -162,8 +161,7 @@ 
 			$command=$this->_connection->createCommand('bad SQL');
 			$command->query();
 			$this->fail('Expected exception is not raised');
-		}
-		catch(TDbException $e)
+		} catch(TDbException $e)
 		{
 		}
 	}
@@ -188,8 +186,7 @@ 
 			$command=$this->_connection->createCommand('bad SQL');
 			$command->queryRow();
 			$this->fail('Expected exception is not raised');
-		}
-		catch(TDbException $e)
+		} catch(TDbException $e)
 		{
 		}
 	}
@@ -214,8 +211,7 @@ 
 			$command=$this->_connection->createCommand('bad SQL');
 			$command->queryScalar();
 			$this->fail('Expected exception is not raised');
-		}
-		catch(TDbException $e)
+		} catch(TDbException $e)
 		{
 		}
 	}

tests/unit/Data/SqlMap/DynamicParameterTest.php

Spacing +5 added lines, -5 removed lines

@@ -15,18 +15,18 @@
 		static $conn;
 		static $sqlMapManager;
 
-		if(Prado::getApplication() === null)
-			Prado::setApplication(new TApplication(dirname(__FILE__).'/app'));
+		if (Prado::getApplication() === null)
+			Prado::setApplication(new TApplication(dirname(__FILE__) . '/app'));
 
-		if($conn === null)
+		if ($conn === null)
 			$conn = new TDbConnection('mysql:host=localhost;dbname=prado_system_data_sqlmap', 'prado_unitest', 'prado_system_data_sqlmap_unitest');
 
 		$conn->setActive(true);
 
-		if($sqlMapManager === null)
+		if ($sqlMapManager === null)
 		{
 			$sqlMapManager = new TSqlMapManager($conn);
-			$sqlMapManager->configureXml( dirname(__FILE__) . '/DynamicParameterTestMap.xml');
+			$sqlMapManager->configureXml(dirname(__FILE__) . '/DynamicParameterTestMap.xml');
 		}
 
 		return $sqlMapManager;

Braces +6 added lines, -4 removed lines

@@ -15,11 +15,13 @@
 		static $conn;
 		static $sqlMapManager;
 
-		if(Prado::getApplication() === null)
-			Prado::setApplication(new TApplication(dirname(__FILE__).'/app'));
+		if(Prado::getApplication() === null) {
+					Prado::setApplication(new TApplication(dirname(__FILE__).'/app'));
+		}
 
-		if($conn === null)
-			$conn = new TDbConnection('mysql:host=localhost;dbname=prado_system_data_sqlmap', 'prado_unitest', 'prado_system_data_sqlmap_unitest');
+		if($conn === null) {
+					$conn = new TDbConnection('mysql:host=localhost;dbname=prado_system_data_sqlmap', 'prado_unitest', 'prado_system_data_sqlmap_unitest');
+		}
 
 		$conn->setActive(true);
 

tests/unit/Data/SqlMap/AllTests.php

Spacing +3 added lines, -3 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 
-if(!defined('PHPUnit_MAIN_METHOD')) {
+if (!defined('PHPUnit_MAIN_METHOD')) {
 	define('PHPUnit_MAIN_METHOD', 'Data_SqlMap_AllTests::main');
 }
 
@@ -18,12 +18,12 @@ 
 		$suite = new PHPUnit_Framework_TestSuite('System.Data.SqlMap');
 
 		$suite->addTestSuite('DynamicParameterTest');
-		$suite -> addTest( Data_SqlMap_DataMapper_AllTests::suite() );
+		$suite -> addTest(Data_SqlMap_DataMapper_AllTests::suite());
 
 		return $suite;
 	}
 }
 
-if(PHPUnit_MAIN_METHOD == 'Data_SqlMap_AllTests::main') {
+if (PHPUnit_MAIN_METHOD == 'Data_SqlMap_AllTests::main') {
 	Data_SqlMap_AllTests::main();
 }

tests/unit/Data/SqlMap/DataMapper/TPropertyAccessTest.php

Spacing +2 added lines, -2 removed lines

@@ -238,7 +238,7 @@ 
 
 	public function __set($name, $value)
 	{
-		switch(strToLower($name))
+		switch (strToLower($name))
 		{
 			case 'a':
 				$this -> _a = $value;
@@ -251,7 +251,7 @@ 
 
 	public function __get($name)
 	{
-		switch(strToLower($name))
+		switch (strToLower($name))
 		{
 			case 'a':
 				return $this -> _a;