pradosoft / prado

tests/unit/Web/TAssetManagerTest.php

Braces +23 added lines, -11 removed lines

@@ -31,13 +31,16 @@ 
 			self::$app=new TApplication(dirname(__FILE__).'/app');
 		}
 
-		if (self::$assetDir===null) self::$assetDir= dirname(__FILE__).'/assets';
+		if (self::$assetDir===null) {
+			self::$assetDir= dirname(__FILE__).'/assets';
+		}
 		// Make asset directory if not exists
 	    if (!file_exists (self::$assetDir)) {
-    		if (is_writable(dirname(self::$assetDir)))
-    		  mkdir (self::$assetDir) ;
-    		else
-    		  throw new Exception ('Directory '.dirname(self::$assetDir).' is not writable');
+    		if (is_writable(dirname(self::$assetDir))) {
+    		    		  mkdir (self::$assetDir) ;
+    		} else {
+    		    		  throw new Exception ('Directory '.dirname(self::$assetDir).' is not writable');
+    		}
 	    } elseif (!is_dir (self::$assetDir)) {
 	       throw new Exception (self::$assetDir.' exists and is not a directory');
 	    }
@@ -51,12 +54,19 @@ 
 	  clearstatcache();
 	  if (is_dir($dir)) {
 	    foreach (scandir($dir) as $content) {
-	      if ($content==='.' or $content==='..') continue; // skip . and ..
+	      if ($content==='.' or $content==='..') {
+	      	continue;
+	      }
+	      // skip . and ..
 	      $content=$dir.'/'.$content;
-	      if (is_dir($content))
-	        $this->removeDirectory ($content); // Recursivly remove directories
-	      else
-	        unlink ($content); // Remove file
+	      if (is_dir($content)) {
+	      	        $this->removeDirectory ($content);
+	      }
+	      // Recursivly remove directories
+	      else {
+	      	        unlink ($content);
+	      }
+	      // Remove file
 	    }
 	    // Now, directory should be empty, remove it
 	    rmdir ($dir);
@@ -78,7 +88,9 @@ 
 		self::assertEquals($manager, self::$app->getAssetManager());
 
 		// No, remove asset directory, and catch the exception
-		if (is_dir(self::$assetDir)) $this->removeDirectory (self::$assetDir);
+		if (is_dir(self::$assetDir)) {
+			$this->removeDirectory (self::$assetDir);
+		}
 		try {
 			$manager->init (null);
 			self::fail ('Expected TConfigurationException not thrown');

tests/unit/Web/THttpResponseTest.php

Braces +3 added lines, -1 removed lines

@@ -11,7 +11,9 @@
   public static $app=null;
 
   public function setUp () {
-    if (self::$app===null) self::$app=new TApplication(dirname(__FILE__).'/app');
+    if (self::$app===null) {
+    	self::$app=new TApplication(dirname(__FILE__).'/app');
+    }
     ob_start();
   }
 

tests/unit/Web/TCacheHttpSessionTest.php

Braces +4 added lines, -8 removed lines

@@ -17,8 +17,7 @@ 
 		if(!extension_loaded('memcache'))
 		{
 			self::markTestSkipped('The memcache extension is not available');
-		}
-		else
+		} else
 		{
 			$basePath = dirname(__FILE__).'/app';
 			$runtimePath = $basePath.'/runtime';
@@ -48,8 +47,7 @@ 
         {
             $session->init(null);
             $this->fail("Expected TConfigurationException is not raised");
-        }
-        catch(TConfigurationException $e)
+        } catch(TConfigurationException $e)
         {
         }
         unset($session);
@@ -61,8 +59,7 @@ 
             $session->init(null);
             $this->fail("Expected TConfigurationException is not raised");
             $session->open();
-        }
-        catch(TConfigurationException $e)
+        } catch(TConfigurationException $e)
         {
         }
         unset($session);
@@ -72,8 +69,7 @@ 
         {
             self::$session->setCacheModuleID('MyCache');
             self::$session->init(null);
-        }
-        catch(TConfigurationException $e)
+        } catch(TConfigurationException $e)
         {
             $this->fail('TConfigurationException is not expected');
             self::markTestSkipped('Cannot continue this test');

tests/unit/Web/UI/THtmlWriterTest.php

Braces +3 added lines, -1 removed lines

@@ -47,7 +47,9 @@
 
 	public function setUp () {
 		// We need an output writer, use a TestWriter for this
-		if (self::$output===null) self::$output=new TestWriter();
+		if (self::$output===null) {
+			self::$output=new TestWriter();
+		}
 	}
 
 	public function testConstruct() {

tests/unit/Xml/TXmlDocumentTest.php

Braces +6 added lines, -2 removed lines

@@ -66,7 +66,9 @@ 
 
 	public function testSaveToFile() {
 		$file=dirname(__FILE__).'/data/tmp.xml';
-		if (!is_writable(dirname($file))) self::markTestSkipped(dirname($file).' must be writable for this test');
+		if (!is_writable(dirname($file))) {
+			self::markTestSkipped(dirname($file).' must be writable for this test');
+		}
 		$xmldoc=new TXmlDocument('1.0','utf-8');
 		$xmldoc->setTagName('root');
 		$node=new TXmlElement('node');
@@ -74,6 +76,8 @@ 
 		$xmldoc->getElements()->add($node);
 		$xmldoc->saveToFile($file);
 		self::assertTrue(is_file($file));
-		if (is_file($file)) unlink ($file);
+		if (is_file($file)) {
+			unlink ($file);
+		}
 	}
 }

tests/unit/Data/TDbTransactionTest.php

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

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

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/TDbCommandTest.php

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