adamjakab / SuiteCRM

tests/tests/include/MVC/Controller/SugarControllerTest.php

Indentation +104 added lines, -104 removed lines

@@ -4,166 +4,166 @@
 class SugarControllerTest  extends PHPUnit_Framework_TestCase
 {
 
-	public function testsetup(){
+    public function testsetup(){
 		
 		
-		$SugarController = new SugarController();
-		$default_module = $SugarController->module;
+        $SugarController = new SugarController();
+        $default_module = $SugarController->module;
 		
-		//first test with empty parameter and check for default values being used
-		$SugarController->setup('');
-		$this->assertAttributeEquals($default_module,'module', $SugarController);
-		$this->assertAttributeEquals(null,'target_module', $SugarController);
-
-		//secondly test with module name and check for correct assignment. 
-		$SugarController->setup('Users');
-		$this->assertAttributeEquals('Users','module', $SugarController);
-		$this->assertAttributeEquals(null,'target_module', $SugarController);
+        //first test with empty parameter and check for default values being used
+        $SugarController->setup('');
+        $this->assertAttributeEquals($default_module,'module', $SugarController);
+        $this->assertAttributeEquals(null,'target_module', $SugarController);
+
+        //secondly test with module name and check for correct assignment. 
+        $SugarController->setup('Users');
+        $this->assertAttributeEquals('Users','module', $SugarController);
+        $this->assertAttributeEquals(null,'target_module', $SugarController);
 	
 	
-	}
+    }
 
-	public function testsetModule(){
-		$SugarController = new SugarController();
+    public function testsetModule(){
+        $SugarController = new SugarController();
 		
-		//first test with empty parameter
-		$SugarController->setModule('');
-		$this->assertAttributeEquals('','module', $SugarController);
+        //first test with empty parameter
+        $SugarController->setModule('');
+        $this->assertAttributeEquals('','module', $SugarController);
 		
-		//secondly test with module name and check for correct assignment.
-		$SugarController->setModule('Users');
-		$this->assertAttributeEquals('Users','module', $SugarController);		
-	}
+        //secondly test with module name and check for correct assignment.
+        $SugarController->setModule('Users');
+        $this->assertAttributeEquals('Users','module', $SugarController);		
+    }
 
 
-	public function testloadBean()
-	{
-		$SugarController = new SugarController();
+    public function testloadBean()
+    {
+        $SugarController = new SugarController();
 		
-		//first test with empty parameter and check for null. Default is Home but Home has no bean
-		$SugarController->setModule('');
-		$SugarController->loadBean();
-		$this->assertEquals(null,$SugarController->bean );
+        //first test with empty parameter and check for null. Default is Home but Home has no bean
+        $SugarController->setModule('');
+        $SugarController->loadBean();
+        $this->assertEquals(null,$SugarController->bean );
 		
-		//secondly test with module name and check for correct bean class loaded.
-		$SugarController->setModule('Users');
-		$SugarController->loadBean();
-		$this->assertInstanceOf('User',$SugarController->bean);
+        //secondly test with module name and check for correct bean class loaded.
+        $SugarController->setModule('Users');
+        $SugarController->loadBean();
+        $this->assertInstanceOf('User',$SugarController->bean);
 		
-	}
+    }
 
 
-	public function testexecute()
+    public function testexecute()
     {
-    	$SugarController = new SugarController();
+        $SugarController = new SugarController();
     	
-    	//execute the method and check if it works and doesn't throws an exception
-    	try {
-    		$SugarController->execute();
-    	} catch (Exception $e) {
-    		$this->fail();
-    	}
+        //execute the method and check if it works and doesn't throws an exception
+        try {
+            $SugarController->execute();
+        } catch (Exception $e) {
+            $this->fail();
+        }
     	
-    	$this->assertTrue(TRUE);
+        $this->assertTrue(TRUE);
     	
-	}
+    }
 
 
-	public function testprocess(){
+    public function testprocess(){
 
-		$SugarController = new SugarController();
+        $SugarController = new SugarController();
 		 
-		//execute the method and check if it works and doesn't throws an exception
-		try {
-			$SugarController->process();
-		} catch (Exception $e) {
-			$this->fail();
-		}
+        //execute the method and check if it works and doesn't throws an exception
+        try {
+            $SugarController->process();
+        } catch (Exception $e) {
+            $this->fail();
+        }
 		 
-		$this->assertTrue(TRUE);		
+        $this->assertTrue(TRUE);		
 		
-	}
+    }
 
 
-	public function testpre_save(){
+    public function testpre_save(){
 
-		$SugarController = new SugarController();
-		$SugarController->setModule('Users');
-		$SugarController->loadBean();
+        $SugarController = new SugarController();
+        $SugarController->setModule('Users');
+        $SugarController->loadBean();
 	
-		//execute the method and check if it either works or throws an mysql exception.
-		//Fail if it throws any other exception.
-		try {
-			$SugarController->pre_save();
-		} catch (Exception $e) {
-			$this->assertStringStartsWith('mysqli_query()', $e->getMessage());
-		}
+        //execute the method and check if it either works or throws an mysql exception.
+        //Fail if it throws any other exception.
+        try {
+            $SugarController->pre_save();
+        } catch (Exception $e) {
+            $this->assertStringStartsWith('mysqli_query()', $e->getMessage());
+        }
 			
-		$this->assertTrue(TRUE);		
+        $this->assertTrue(TRUE);		
 		
-	}
+    }
 
 
-	public function testaction_save(){
+    public function testaction_save(){
 		
-		$SugarController = new SugarController();
-		$SugarController->setModule('Users');
-		$SugarController->loadBean();
+        $SugarController = new SugarController();
+        $SugarController->setModule('Users');
+        $SugarController->loadBean();
 		
-		//execute the method and check if it either works or throws an mysql exception.
-		//Fail if it throws any other exception.
-		try {
-			$SugarController->action_save();
-		} catch (Exception $e) {
-			$this->assertStringStartsWith('mysqli_query()', $e->getMessage());
-		}
+        //execute the method and check if it either works or throws an mysql exception.
+        //Fail if it throws any other exception.
+        try {
+            $SugarController->action_save();
+        } catch (Exception $e) {
+            $this->assertStringStartsWith('mysqli_query()', $e->getMessage());
+        }
 			
-		$this->assertTrue(TRUE);
+        $this->assertTrue(TRUE);
 		
-	}
+    }
 
 
     public function testaction_spot()
     {
-    	$SugarController = new SugarController();
+        $SugarController = new SugarController();
     	
-    	//first check with default value of attribute
-    	$this->assertAttributeEquals('classic','view', $SugarController);
+        //first check with default value of attribute
+        $this->assertAttributeEquals('classic','view', $SugarController);
     	
-    	//secondly check for attribute value change on method execution.
-    	$SugarController->action_spot();
-    	$this->assertAttributeEquals('spot','view', $SugarController);
+        //secondly check for attribute value change on method execution.
+        $SugarController->action_spot();
+        $this->assertAttributeEquals('spot','view', $SugarController);
     }
 
 
-	public function testgetActionFilename() {
+    public function testgetActionFilename() {
 
-		//first check with a invalid value
-		$action = SugarController::getActionFilename('');
-		$this->assertEquals('',$action );
+        //first check with a invalid value
+        $action = SugarController::getActionFilename('');
+        $this->assertEquals('',$action );
 		
-		//secondly check with a valid value
-		$action = SugarController::getActionFilename('editview');
-		$this->assertEquals('EditView',$action );
+        //secondly check with a valid value
+        $action = SugarController::getActionFilename('editview');
+        $this->assertEquals('EditView',$action );
 		
-	}
+    }
 
 
     public function testcheckEntryPointRequiresAuth()
     {
-    	$SugarController = new SugarController();
+        $SugarController = new SugarController();
     	
-    	//check with a invalid value
-    	$result = $SugarController->checkEntryPointRequiresAuth('');
-    	$this->assertTrue($result);
+        //check with a invalid value
+        $result = $SugarController->checkEntryPointRequiresAuth('');
+        $this->assertTrue($result);
     	
-    	//cehck with a valid True value
-    	$result = $SugarController->checkEntryPointRequiresAuth('download');
-    	$this->assertTrue($result);
+        //cehck with a valid True value
+        $result = $SugarController->checkEntryPointRequiresAuth('download');
+        $this->assertTrue($result);
 
-    	//cehck with a valid False value
-    	$result = $SugarController->checkEntryPointRequiresAuth('GeneratePassword');
-    	$this->assertFalse($result);
+        //cehck with a valid False value
+        $result = $SugarController->checkEntryPointRequiresAuth('GeneratePassword');
+        $this->assertFalse($result);
     	
     }
 

Spacing +21 added lines, -21 removed lines

@@ -4,7 +4,7 @@ 
 class SugarControllerTest  extends PHPUnit_Framework_TestCase
 {
 
-	public function testsetup(){
+	public function testsetup() {
 		
 		
 		$SugarController = new SugarController();
@@ -12,27 +12,27 @@ 
 		
 		//first test with empty parameter and check for default values being used
 		$SugarController->setup('');
-		$this->assertAttributeEquals($default_module,'module', $SugarController);
-		$this->assertAttributeEquals(null,'target_module', $SugarController);
+		$this->assertAttributeEquals($default_module, 'module', $SugarController);
+		$this->assertAttributeEquals(null, 'target_module', $SugarController);
 
 		//secondly test with module name and check for correct assignment. 
 		$SugarController->setup('Users');
-		$this->assertAttributeEquals('Users','module', $SugarController);
-		$this->assertAttributeEquals(null,'target_module', $SugarController);
+		$this->assertAttributeEquals('Users', 'module', $SugarController);
+		$this->assertAttributeEquals(null, 'target_module', $SugarController);
 	
 	
 	}
 
-	public function testsetModule(){
+	public function testsetModule() {
 		$SugarController = new SugarController();
 		
 		//first test with empty parameter
 		$SugarController->setModule('');
-		$this->assertAttributeEquals('','module', $SugarController);
+		$this->assertAttributeEquals('', 'module', $SugarController);
 		
 		//secondly test with module name and check for correct assignment.
 		$SugarController->setModule('Users');
-		$this->assertAttributeEquals('Users','module', $SugarController);		
+		$this->assertAttributeEquals('Users', 'module', $SugarController);		
 	}
 
 
@@ -43,12 +43,12 @@ 
 		//first test with empty parameter and check for null. Default is Home but Home has no bean
 		$SugarController->setModule('');
 		$SugarController->loadBean();
-		$this->assertEquals(null,$SugarController->bean );
+		$this->assertEquals(null, $SugarController->bean);
 		
 		//secondly test with module name and check for correct bean class loaded.
 		$SugarController->setModule('Users');
 		$SugarController->loadBean();
-		$this->assertInstanceOf('User',$SugarController->bean);
+		$this->assertInstanceOf('User', $SugarController->bean);
 		
 	}
 
@@ -60,7 +60,7 @@ 
     	//execute the method and check if it works and doesn't throws an exception
     	try {
     		$SugarController->execute();
-    	} catch (Exception $e) {
+    	}catch (Exception $e) {
     		$this->fail();
     	}
     	
@@ -69,14 +69,14 @@ 
 	}
 
 
-	public function testprocess(){
+	public function testprocess() {
 
 		$SugarController = new SugarController();
 		 
 		//execute the method and check if it works and doesn't throws an exception
 		try {
 			$SugarController->process();
-		} catch (Exception $e) {
+		}catch (Exception $e) {
 			$this->fail();
 		}
 		 
@@ -85,7 +85,7 @@ 
 	}
 
 
-	public function testpre_save(){
+	public function testpre_save() {
 
 		$SugarController = new SugarController();
 		$SugarController->setModule('Users');
@@ -95,7 +95,7 @@ 
 		//Fail if it throws any other exception.
 		try {
 			$SugarController->pre_save();
-		} catch (Exception $e) {
+		}catch (Exception $e) {
 			$this->assertStringStartsWith('mysqli_query()', $e->getMessage());
 		}
 			
@@ -104,7 +104,7 @@ 
 	}
 
 
-	public function testaction_save(){
+	public function testaction_save() {
 		
 		$SugarController = new SugarController();
 		$SugarController->setModule('Users');
@@ -114,7 +114,7 @@ 
 		//Fail if it throws any other exception.
 		try {
 			$SugarController->action_save();
-		} catch (Exception $e) {
+		}catch (Exception $e) {
 			$this->assertStringStartsWith('mysqli_query()', $e->getMessage());
 		}
 			
@@ -128,11 +128,11 @@ 
     	$SugarController = new SugarController();
     	
     	//first check with default value of attribute
-    	$this->assertAttributeEquals('classic','view', $SugarController);
+    	$this->assertAttributeEquals('classic', 'view', $SugarController);
     	
     	//secondly check for attribute value change on method execution.
     	$SugarController->action_spot();
-    	$this->assertAttributeEquals('spot','view', $SugarController);
+    	$this->assertAttributeEquals('spot', 'view', $SugarController);
     }
 
 
@@ -140,11 +140,11 @@ 
 
 		//first check with a invalid value
 		$action = SugarController::getActionFilename('');
-		$this->assertEquals('',$action );
+		$this->assertEquals('', $action);
 		
 		//secondly check with a valid value
 		$action = SugarController::getActionFilename('editview');
-		$this->assertEquals('EditView',$action );
+		$this->assertEquals('EditView', $action);
 		
 	}
 

tests/tests/include/utils/securityUtilsTest.php

Indentation +90 added lines, -90 removed lines

@@ -4,123 +4,123 @@
 class security_utilsTest extends PHPUnit_Framework_TestCase
 {
 	
-	public function testquery_module_access_list()
-	{
+    public function testquery_module_access_list()
+    {
 
-		//execute the method and test it it returns expected contents
+        //execute the method and test it it returns expected contents
 		
-		$user = new User('1');
-		$expected = array (
-				'Home' => 'Home',
-				'Accounts' => 'Accounts',
-				'Contacts' => 'Contacts',
-				'Opportunities' => 'Opportunities',
-				'Leads' => 'Leads',
-				'AOS_Quotes' => 'AOS_Quotes',
-				'Calendar' => 'Calendar',
-				'Documents' => 'Documents',
-				'Emails' => 'Emails',
-				'Campaigns' => 'Campaigns',
-				'Calls' => 'Calls',
-				'Meetings' => 'Meetings',
-				'Tasks' => 'Tasks',
-				'Notes' => 'Notes',
-				'AOS_Invoices' => 'AOS_Invoices',
-				'AOS_Contracts' => 'AOS_Contracts',
-				'Cases' => 'Cases',
-				'Prospects' => 'Prospects',
-				'ProspectLists' => 'ProspectLists',
-				'Project' => 'Project',
-				'AM_ProjectTemplates' => 'AM_ProjectTemplates',
-				'FP_events' => 'FP_events',
-				'FP_Event_Locations' => 'FP_Event_Locations',
-				'AOS_Products' => 'AOS_Products',
-				'AOS_Product_Categories' => 'AOS_Product_Categories',
-				'AOS_PDF_Templates' => 'AOS_PDF_Templates',
-				'jjwg_Maps' => 'jjwg_Maps',
-				'jjwg_Markers' => 'jjwg_Markers',
-				'jjwg_Areas' => 'jjwg_Areas',
-				'jjwg_Address_Cache' => 'jjwg_Address_Cache',
-				'AOR_Reports' => 'AOR_Reports',
-				'AOW_WorkFlow' => 'AOW_WorkFlow',
-				'AOK_KnowledgeBase' => 'AOK_KnowledgeBase',
-				'AOK_Knowledge_Base_Categories' => 'AOK_Knowledge_Base_Categories',
-		);		
+        $user = new User('1');
+        $expected = array (
+                'Home' => 'Home',
+                'Accounts' => 'Accounts',
+                'Contacts' => 'Contacts',
+                'Opportunities' => 'Opportunities',
+                'Leads' => 'Leads',
+                'AOS_Quotes' => 'AOS_Quotes',
+                'Calendar' => 'Calendar',
+                'Documents' => 'Documents',
+                'Emails' => 'Emails',
+                'Campaigns' => 'Campaigns',
+                'Calls' => 'Calls',
+                'Meetings' => 'Meetings',
+                'Tasks' => 'Tasks',
+                'Notes' => 'Notes',
+                'AOS_Invoices' => 'AOS_Invoices',
+                'AOS_Contracts' => 'AOS_Contracts',
+                'Cases' => 'Cases',
+                'Prospects' => 'Prospects',
+                'ProspectLists' => 'ProspectLists',
+                'Project' => 'Project',
+                'AM_ProjectTemplates' => 'AM_ProjectTemplates',
+                'FP_events' => 'FP_events',
+                'FP_Event_Locations' => 'FP_Event_Locations',
+                'AOS_Products' => 'AOS_Products',
+                'AOS_Product_Categories' => 'AOS_Product_Categories',
+                'AOS_PDF_Templates' => 'AOS_PDF_Templates',
+                'jjwg_Maps' => 'jjwg_Maps',
+                'jjwg_Markers' => 'jjwg_Markers',
+                'jjwg_Areas' => 'jjwg_Areas',
+                'jjwg_Address_Cache' => 'jjwg_Address_Cache',
+                'AOR_Reports' => 'AOR_Reports',
+                'AOW_WorkFlow' => 'AOW_WorkFlow',
+                'AOK_KnowledgeBase' => 'AOK_KnowledgeBase',
+                'AOK_Knowledge_Base_Categories' => 'AOK_Knowledge_Base_Categories',
+        );		
 		
-		$actual = query_module_access_list($user);
-		$this->assertSame($expected,$actual);
+        $actual = query_module_access_list($user);
+        $this->assertSame($expected,$actual);
 		
 				
-	}
+    }
 	
-	public function testquery_user_has_roles()
-	{
-		error_reporting(E_ERROR | E_PARSE);
+    public function testquery_user_has_roles()
+    {
+        error_reporting(E_ERROR | E_PARSE);
 		
-		//execute the method and test it it returns expected contents
+        //execute the method and test it it returns expected contents
 		
-		$expected = "0";
-		$actual = query_user_has_roles('1');
-		$this->assertSame($expected,$actual);
+        $expected = "0";
+        $actual = query_user_has_roles('1');
+        $this->assertSame($expected,$actual);
 		
-	}
+    }
 	
-	public function testget_user_allowed_modules()
-	{
-		//execute the method and test it it returns expected contents
+    public function testget_user_allowed_modules()
+    {
+        //execute the method and test it it returns expected contents
 		
-		$expected = Array();
-		$actual = get_user_allowed_modules('1');
-		$this->assertSame($expected,$actual);
+        $expected = Array();
+        $actual = get_user_allowed_modules('1');
+        $this->assertSame($expected,$actual);
 	
-	}
+    }
 	
-	public function testget_user_disallowed_modules()
-	{
-		//execute the method and test it it returns expected contents
+    public function testget_user_disallowed_modules()
+    {
+        //execute the method and test it it returns expected contents
 		
-		$expected = array (
-				'Bugs' => 'Bugs',
+        $expected = array (
+                'Bugs' => 'Bugs',
                 'Reminders' => 'Reminders',
                 'Reminders_Invitees' => 'Reminders_Invitees',
-				'AOR_Scheduled_Reports' => 'AOR_Scheduled_Reports',
-				'SecurityGroups' => 'SecurityGroups',
-		);
+                'AOR_Scheduled_Reports' => 'AOR_Scheduled_Reports',
+                'SecurityGroups' => 'SecurityGroups',
+        );
 		
-		$allowed = query_module_access_list(new User('1'));
-		$actual = get_user_disallowed_modules('1',$allowed);
+        $allowed = query_module_access_list(new User('1'));
+        $actual = get_user_disallowed_modules('1',$allowed);
 	
-		$this->assertSame($expected,$actual);
+        $this->assertSame($expected,$actual);
 		
 				
-	}
+    }
 	
-	public function testquery_client_ip()
-	{
-		//test without setting any server parameters
-		$this->assertSame(Null,query_client_ip());
+    public function testquery_client_ip()
+    {
+        //test without setting any server parameters
+        $this->assertSame(Null,query_client_ip());
 
-		//test with server params set
-		$_SERVER['REMOTE_ADDR'] = "1.1.1.3";
-		$this->assertSame("1.1.1.3",query_client_ip());
+        //test with server params set
+        $_SERVER['REMOTE_ADDR'] = "1.1.1.3";
+        $this->assertSame("1.1.1.3",query_client_ip());
 		
-		$_SERVER['HTTP_FROM'] = "1.1.1.2";
-		$this->assertSame("1.1.1.2",query_client_ip());
+        $_SERVER['HTTP_FROM'] = "1.1.1.2";
+        $this->assertSame("1.1.1.2",query_client_ip());
 		
-		$_SERVER['HTTP_CLIENT_IP'] = "1.1.1.1";
-		$this->assertSame("1.1.1.1",query_client_ip());
+        $_SERVER['HTTP_CLIENT_IP'] = "1.1.1.1";
+        $this->assertSame("1.1.1.1",query_client_ip());
 		
-	}
+    }
 	
 	
-	public function testget_val_array()
-	{
-		//execute the method and test it it returns expected contents
-		$tempArray = Array("key1"=>"val1","key2"=>"val2","key3"=>"val3");
-		$expected = Array("key1"=>"key1","key2"=>"key2","key3"=>"key3");
-		$actual = get_val_array($tempArray);
-		$this->assertSame($expected,$actual);
+    public function testget_val_array()
+    {
+        //execute the method and test it it returns expected contents
+        $tempArray = Array("key1"=>"val1","key2"=>"val2","key3"=>"val3");
+        $expected = Array("key1"=>"key1","key2"=>"key2","key3"=>"key3");
+        $actual = get_val_array($tempArray);
+        $this->assertSame($expected,$actual);
 		
-	}
+    }
 	
 }

Spacing +14 added lines, -14 removed lines

@@ -10,7 +10,7 @@ 
 		//execute the method and test it it returns expected contents
 		
 		$user = new User('1');
-		$expected = array (
+		$expected = array(
 				'Home' => 'Home',
 				'Accounts' => 'Accounts',
 				'Contacts' => 'Contacts',
@@ -48,7 +48,7 @@ 
 		);		
 		
 		$actual = query_module_access_list($user);
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 		
 				
 	}
@@ -61,7 +61,7 @@ 
 		
 		$expected = "0";
 		$actual = query_user_has_roles('1');
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 		
 	}
 	
@@ -71,7 +71,7 @@ 
 		
 		$expected = Array();
 		$actual = get_user_allowed_modules('1');
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 	
 	}
 	
@@ -79,7 +79,7 @@ 
 	{
 		//execute the method and test it it returns expected contents
 		
-		$expected = array (
+		$expected = array(
 				'Bugs' => 'Bugs',
                 'Reminders' => 'Reminders',
                 'Reminders_Invitees' => 'Reminders_Invitees',
@@ -88,9 +88,9 @@ 
 		);
 		
 		$allowed = query_module_access_list(new User('1'));
-		$actual = get_user_disallowed_modules('1',$allowed);
+		$actual = get_user_disallowed_modules('1', $allowed);
 	
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 		
 				
 	}
@@ -98,17 +98,17 @@ 
 	public function testquery_client_ip()
 	{
 		//test without setting any server parameters
-		$this->assertSame(Null,query_client_ip());
+		$this->assertSame(Null, query_client_ip());
 
 		//test with server params set
 		$_SERVER['REMOTE_ADDR'] = "1.1.1.3";
-		$this->assertSame("1.1.1.3",query_client_ip());
+		$this->assertSame("1.1.1.3", query_client_ip());
 		
 		$_SERVER['HTTP_FROM'] = "1.1.1.2";
-		$this->assertSame("1.1.1.2",query_client_ip());
+		$this->assertSame("1.1.1.2", query_client_ip());
 		
 		$_SERVER['HTTP_CLIENT_IP'] = "1.1.1.1";
-		$this->assertSame("1.1.1.1",query_client_ip());
+		$this->assertSame("1.1.1.1", query_client_ip());
 		
 	}
 	
@@ -116,10 +116,10 @@ 
 	public function testget_val_array()
 	{
 		//execute the method and test it it returns expected contents
-		$tempArray = Array("key1"=>"val1","key2"=>"val2","key3"=>"val3");
-		$expected = Array("key1"=>"key1","key2"=>"key2","key3"=>"key3");
+		$tempArray = Array("key1"=>"val1", "key2"=>"val2", "key3"=>"val3");
+		$expected = Array("key1"=>"key1", "key2"=>"key2", "key3"=>"key3");
 		$actual = get_val_array($tempArray);
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 		
 	}
 	

tests/tests/include/utils/fileUtilsTest.php

Indentation +387 added lines, -387 removed lines

@@ -15,28 +15,28 @@ 
 
 
     public function testclean_path()
-	{
-		//execute the method and test if it returns expected values
+    {
+        //execute the method and test if it returns expected values
 		
-		//invalid path
-		$expected = "";
-		$path = "";
-		$actual = clean_path($path);
-		$this->assertSame($expected,$actual);
+        //invalid path
+        $expected = "";
+        $path = "";
+        $actual = clean_path($path);
+        $this->assertSame($expected,$actual);
 		
 
-		//a simple valid path
-		$expected = "/SuiteCRM-develop/include/utils";
-		$path = '\SuiteCRM-develop\include\utils';
-		$actual = clean_path($path);
-		$this->assertSame($expected,$actual);
+        //a simple valid path
+        $expected = "/SuiteCRM-develop/include/utils";
+        $path = '\SuiteCRM-develop\include\utils';
+        $actual = clean_path($path);
+        $this->assertSame($expected,$actual);
 
 		
-		//valid network path 
-		$expected = "//SuiteCRM-develop/include/utils";
-		$path = "\\\\/SuiteCRM-develop/include/utils";
-		$actual = clean_path($path);
-		$this->assertSame($expected,$actual);
+        //valid network path 
+        $expected = "//SuiteCRM-develop/include/utils";
+        $path = "\\\\/SuiteCRM-develop/include/utils";
+        $actual = clean_path($path);
+        $this->assertSame($expected,$actual);
 
 
         $expected = "/SuiteCRM-develop/include/utils";
@@ -51,474 +51,474 @@ 
 
 
 		
-	}
+    }
 	
-	public function testcreate_cache_directory()
-	{
-		//execute the method and test if it created file/dir exists
+    public function testcreate_cache_directory()
+    {
+        //execute the method and test if it created file/dir exists
 		
-		$cache_dir = rtrim($GLOBALS['sugar_config']['cache_dir'], '/\\');
-		$file = "Test/";
+        $cache_dir = rtrim($GLOBALS['sugar_config']['cache_dir'], '/\\');
+        $file = "Test/";
 		
-		if ( $this->rootFs->hasChild($file)  == true)
-			rmdir($cache_dir . "/" . $file);
+        if ( $this->rootFs->hasChild($file)  == true)
+            rmdir($cache_dir . "/" . $file);
 		
-		$actual = create_cache_directory($file);
-		$this->assertFileExists($actual);
+        $actual = create_cache_directory($file);
+        $this->assertFileExists($actual);
 		
-		if ( $this->rootFs->hasChild($file)  == true)
-			rmdir($cache_dir . "/" . $file);
+        if ( $this->rootFs->hasChild($file)  == true)
+            rmdir($cache_dir . "/" . $file);
 		
-	}
+    }
 	
-	public function testget_module_dir_list()
-	{
-		//execute the method and test if it returns expected values
-		
-		$expected  = array (
-				'Accounts' => 'Accounts',
-				'ACL' => 'ACL',
-				'ACLActions' => 'ACLActions',
-				'ACLRoles' => 'ACLRoles',
-				'Activities' => 'Activities',
-				'Administration' => 'Administration',
-				'Alerts' => 'Alerts',
-				'AM_ProjectTemplates' => 'AM_ProjectTemplates',
-				'AM_TaskTemplates' => 'AM_TaskTemplates',
-				'AOD_Index' => 'AOD_Index',
-				'AOD_IndexEvent' => 'AOD_IndexEvent',
-				'AOK_KnowledgeBase' => 'AOK_KnowledgeBase',
-				'AOK_Knowledge_Base_Categories' => 'AOK_Knowledge_Base_Categories',
-				'AOP_Case_Events' => 'AOP_Case_Events',
-				'AOP_Case_Updates' => 'AOP_Case_Updates',
-				'AOR_Charts' => 'AOR_Charts',
-				'AOR_Conditions' => 'AOR_Conditions',
-				'AOR_Fields' => 'AOR_Fields',
-				'AOR_Reports' => 'AOR_Reports',
-				'AOR_Scheduled_Reports' => 'AOR_Scheduled_Reports',
-				'AOS_Contracts' => 'AOS_Contracts',
-				'AOS_Invoices' => 'AOS_Invoices',
-				'AOS_Line_Item_Groups' => 'AOS_Line_Item_Groups',
-				'AOS_PDF_Templates' => 'AOS_PDF_Templates',
-				'AOS_Products' => 'AOS_Products',
-				'AOS_Products_Quotes' => 'AOS_Products_Quotes',
-				'AOS_Product_Categories' => 'AOS_Product_Categories',
-				'AOS_Quotes' => 'AOS_Quotes',
-				'AOW_Actions' => 'AOW_Actions',
-				'AOW_Conditions' => 'AOW_Conditions',
-				'AOW_Processed' => 'AOW_Processed',
-				'AOW_WorkFlow' => 'AOW_WorkFlow',
-				'Audit' => 'Audit',
-				'Bugs' => 'Bugs',
-				'Calendar' => 'Calendar',
-				'Calls' => 'Calls',
-				'Calls_Reschedule' => 'Calls_Reschedule',
-				'CampaignLog' => 'CampaignLog',
-				'Campaigns' => 'Campaigns',
-				'CampaignTrackers' => 'CampaignTrackers',
-				'Cases' => 'Cases',
-				'Charts' => 'Charts',
-				'Configurator' => 'Configurator',
-				'Connectors' => 'Connectors',
-				'Contacts' => 'Contacts',
-				'Currencies' => 'Currencies',
-				'Delegates' => 'Delegates',
-				'DocumentRevisions' => 'DocumentRevisions',
-				'Documents' => 'Documents',
-				'DynamicFields' => 'DynamicFields',
-				'EAPM' => 'EAPM',
-				'EmailAddresses' => 'EmailAddresses',
-				'EmailMan' => 'EmailMan',
-				'EmailMarketing' => 'EmailMarketing',
-				'Emails' => 'Emails',
-				'EmailTemplates' => 'EmailTemplates',				
-				'EmailText' => 'EmailText',
-				'Employees' => 'Employees',
-				'Favorites' => 'Favorites',
-				'FP_events' => 'FP_events',
-				'FP_Event_Locations' => 'FP_Event_Locations',
-				'Groups' => 'Groups',
-				'Help' => 'Help',
-				'History' => 'History',
-				'Home' => 'Home',
-				'iCals' => 'iCals',
-				'Import' => 'Import',
-				'InboundEmail' => 'InboundEmail',
-				'jjwg_Address_Cache' => 'jjwg_Address_Cache',
-				'jjwg_Areas' => 'jjwg_Areas',
-				'jjwg_Maps' => 'jjwg_Maps',
-				'jjwg_Markers' => 'jjwg_Markers',
-				'LabelEditor' => 'LabelEditor',
-				'Leads' => 'Leads',
-				'MailMerge' => 'MailMerge',
-				'Meetings' => 'Meetings',
-				'MergeRecords' => 'MergeRecords',
-				'ModuleBuilder' => 'ModuleBuilder',
-				'MySettings' => 'MySettings',
-				'Notes' => 'Notes',
-				'OAuthKeys' => 'OAuthKeys',
-				'OAuthTokens' => 'OAuthTokens',
-				'Opportunities' => 'Opportunities',
-				'OptimisticLock' => 'OptimisticLock',
-				'Project' => 'Project',
-				'ProjectTask' => 'ProjectTask',
-				'ProspectLists' => 'ProspectLists',
-				'Prospects' => 'Prospects',
-				'Relationships' => 'Relationships',
+    public function testget_module_dir_list()
+    {
+        //execute the method and test if it returns expected values
+		
+        $expected  = array (
+                'Accounts' => 'Accounts',
+                'ACL' => 'ACL',
+                'ACLActions' => 'ACLActions',
+                'ACLRoles' => 'ACLRoles',
+                'Activities' => 'Activities',
+                'Administration' => 'Administration',
+                'Alerts' => 'Alerts',
+                'AM_ProjectTemplates' => 'AM_ProjectTemplates',
+                'AM_TaskTemplates' => 'AM_TaskTemplates',
+                'AOD_Index' => 'AOD_Index',
+                'AOD_IndexEvent' => 'AOD_IndexEvent',
+                'AOK_KnowledgeBase' => 'AOK_KnowledgeBase',
+                'AOK_Knowledge_Base_Categories' => 'AOK_Knowledge_Base_Categories',
+                'AOP_Case_Events' => 'AOP_Case_Events',
+                'AOP_Case_Updates' => 'AOP_Case_Updates',
+                'AOR_Charts' => 'AOR_Charts',
+                'AOR_Conditions' => 'AOR_Conditions',
+                'AOR_Fields' => 'AOR_Fields',
+                'AOR_Reports' => 'AOR_Reports',
+                'AOR_Scheduled_Reports' => 'AOR_Scheduled_Reports',
+                'AOS_Contracts' => 'AOS_Contracts',
+                'AOS_Invoices' => 'AOS_Invoices',
+                'AOS_Line_Item_Groups' => 'AOS_Line_Item_Groups',
+                'AOS_PDF_Templates' => 'AOS_PDF_Templates',
+                'AOS_Products' => 'AOS_Products',
+                'AOS_Products_Quotes' => 'AOS_Products_Quotes',
+                'AOS_Product_Categories' => 'AOS_Product_Categories',
+                'AOS_Quotes' => 'AOS_Quotes',
+                'AOW_Actions' => 'AOW_Actions',
+                'AOW_Conditions' => 'AOW_Conditions',
+                'AOW_Processed' => 'AOW_Processed',
+                'AOW_WorkFlow' => 'AOW_WorkFlow',
+                'Audit' => 'Audit',
+                'Bugs' => 'Bugs',
+                'Calendar' => 'Calendar',
+                'Calls' => 'Calls',
+                'Calls_Reschedule' => 'Calls_Reschedule',
+                'CampaignLog' => 'CampaignLog',
+                'Campaigns' => 'Campaigns',
+                'CampaignTrackers' => 'CampaignTrackers',
+                'Cases' => 'Cases',
+                'Charts' => 'Charts',
+                'Configurator' => 'Configurator',
+                'Connectors' => 'Connectors',
+                'Contacts' => 'Contacts',
+                'Currencies' => 'Currencies',
+                'Delegates' => 'Delegates',
+                'DocumentRevisions' => 'DocumentRevisions',
+                'Documents' => 'Documents',
+                'DynamicFields' => 'DynamicFields',
+                'EAPM' => 'EAPM',
+                'EmailAddresses' => 'EmailAddresses',
+                'EmailMan' => 'EmailMan',
+                'EmailMarketing' => 'EmailMarketing',
+                'Emails' => 'Emails',
+                'EmailTemplates' => 'EmailTemplates',				
+                'EmailText' => 'EmailText',
+                'Employees' => 'Employees',
+                'Favorites' => 'Favorites',
+                'FP_events' => 'FP_events',
+                'FP_Event_Locations' => 'FP_Event_Locations',
+                'Groups' => 'Groups',
+                'Help' => 'Help',
+                'History' => 'History',
+                'Home' => 'Home',
+                'iCals' => 'iCals',
+                'Import' => 'Import',
+                'InboundEmail' => 'InboundEmail',
+                'jjwg_Address_Cache' => 'jjwg_Address_Cache',
+                'jjwg_Areas' => 'jjwg_Areas',
+                'jjwg_Maps' => 'jjwg_Maps',
+                'jjwg_Markers' => 'jjwg_Markers',
+                'LabelEditor' => 'LabelEditor',
+                'Leads' => 'Leads',
+                'MailMerge' => 'MailMerge',
+                'Meetings' => 'Meetings',
+                'MergeRecords' => 'MergeRecords',
+                'ModuleBuilder' => 'ModuleBuilder',
+                'MySettings' => 'MySettings',
+                'Notes' => 'Notes',
+                'OAuthKeys' => 'OAuthKeys',
+                'OAuthTokens' => 'OAuthTokens',
+                'Opportunities' => 'Opportunities',
+                'OptimisticLock' => 'OptimisticLock',
+                'Project' => 'Project',
+                'ProjectTask' => 'ProjectTask',
+                'ProspectLists' => 'ProspectLists',
+                'Prospects' => 'Prospects',
+                'Relationships' => 'Relationships',
                 'Reminders' => 'Reminders',
                 'Reminders_Invitees' => 'Reminders_Invitees',
-				'Releases' => 'Releases',
-				'Roles' => 'Roles',
-				'SavedSearch' => 'SavedSearch',
-				'Schedulers' => 'Schedulers',
-				'SchedulersJobs' => 'SchedulersJobs',
-				'SecurityGroups' => 'SecurityGroups',
-				'Studio' => 'Studio',
-				'SugarFeed' => 'SugarFeed',
-				'Tasks' => 'Tasks',
-				'Trackers' => 'Trackers',
-				'UpgradeWizard' => 'UpgradeWizard',
-				'UserPreferences' => 'UserPreferences',
-				'Users' => 'Users',
-				'vCals' => 'vCals',
-				'Versions' => 'Versions',
-				);
-		
-		
-		$actual = get_module_dir_list();
+                'Releases' => 'Releases',
+                'Roles' => 'Roles',
+                'SavedSearch' => 'SavedSearch',
+                'Schedulers' => 'Schedulers',
+                'SchedulersJobs' => 'SchedulersJobs',
+                'SecurityGroups' => 'SecurityGroups',
+                'Studio' => 'Studio',
+                'SugarFeed' => 'SugarFeed',
+                'Tasks' => 'Tasks',
+                'Trackers' => 'Trackers',
+                'UpgradeWizard' => 'UpgradeWizard',
+                'UserPreferences' => 'UserPreferences',
+                'Users' => 'Users',
+                'vCals' => 'vCals',
+                'Versions' => 'Versions',
+                );
+		
+		
+        $actual = get_module_dir_list();
         sort($actual);
         sort($expected);
-		$this->assertSame($expected,$actual);
+        $this->assertSame($expected,$actual);
 		
-	}
+    }
 	
-	public function testmk_temp_dir(  )
-	{
-		//execute the method and test if created dir/file exists
+    public function testmk_temp_dir(  )
+    {
+        //execute the method and test if created dir/file exists
 		
-		//without prefix
-		$actual = mk_temp_dir('vfs://root', '' );
-		$this->assertFileExists($actual);
+        //without prefix
+        $actual = mk_temp_dir('vfs://root', '' );
+        $this->assertFileExists($actual);
 
-		//with prefix
-		$actual = mk_temp_dir('vfs://root', 'pfx' );
-		$this->assertFileExists($actual);
+        //with prefix
+        $actual = mk_temp_dir('vfs://root', 'pfx' );
+        $this->assertFileExists($actual);
 		
-	}
+    }
 	
-	public function testremove_file_extension(  )
-	{
-		//execute the method and test if it returns expected values
+    public function testremove_file_extension(  )
+    {
+        //execute the method and test if it returns expected values
 		
-		//no file extension
-		$expected = "";
-		$actual = remove_file_extension('fileNoExt');
-		$this->assertSame($expected,$actual);
+        //no file extension
+        $expected = "";
+        $actual = remove_file_extension('fileNoExt');
+        $this->assertSame($expected,$actual);
 		
 		
-		//simple file extension
-		$expected = "file1";
-		$actual = remove_file_extension('file1.txt');
-		$this->assertSame($expected,$actual);
+        //simple file extension
+        $expected = "file1";
+        $actual = remove_file_extension('file1.txt');
+        $this->assertSame($expected,$actual);
 		
 		
-		//complex filename
-		$expected = "file2.ext1";
-		$actual =  remove_file_extension('file2.ext1.ext2');
-		$this->assertSame($expected,$actual);
+        //complex filename
+        $expected = "file2.ext1";
+        $actual =  remove_file_extension('file2.ext1.ext2');
+        $this->assertSame($expected,$actual);
 		
-	}
+    }
 	
-	public function testwrite_array_to_file()
-	{
+    public function testwrite_array_to_file()
+    {
         $this->markTestSkipped('write_array_to_file cannot be tested with vfsStream');
-		//execute the method and test if it returns true and verify contents
+        //execute the method and test if it returns true and verify contents
 		
-		$cache_dir = "vfs://root";
-		$tempArray = Array("Key1" => Array( "Key2" => "value2" , "Key3" => "value3" ));
+        $cache_dir = "vfs://root";
+        $tempArray = Array("Key1" => Array( "Key2" => "value2" , "Key3" => "value3" ));
 		
 		
-		//without header
-		$expected = "<?php\n// created: " . date('Y-m-d H:i:s') . "\n\$tempArray = array (\n  'Key1' => \n  array (\n    'Key2' => 'value2',\n    'Key3' => 'value3',\n  ),\n);" ;
-		$actual = write_array_to_file('tempArray', $tempArray, $cache_dir . '\tempArray.txt');
-		$this->assertTrue($actual);
-		$actual_contents = file_get_contents($cache_dir . '\tempArray.txt');
-		$this->assertSame($expected,$actual_contents);
-		unlink($cache_dir . '\tempArray.txt');
+        //without header
+        $expected = "<?php\n// created: " . date('Y-m-d H:i:s') . "\n\$tempArray = array (\n  'Key1' => \n  array (\n    'Key2' => 'value2',\n    'Key3' => 'value3',\n  ),\n);" ;
+        $actual = write_array_to_file('tempArray', $tempArray, $cache_dir . '\tempArray.txt');
+        $this->assertTrue($actual);
+        $actual_contents = file_get_contents($cache_dir . '\tempArray.txt');
+        $this->assertSame($expected,$actual_contents);
+        unlink($cache_dir . '\tempArray.txt');
 		
-		//with header
-		$expected = "test header \$tempArray = array (\n  'Key1' => \n  array (\n    'Key2' => 'value2',\n    'Key3' => 'value3',\n  ),\n);" ;
-		$actual = write_array_to_file('tempArray', $tempArray, $cache_dir . '\tempArray.txt','w' ,'test header ');
-		$this->assertTrue($actual);
-		$actual_contents = file_get_contents($cache_dir . '\tempArray.txt');
-		$this->assertSame($expected,$actual_contents);
-		unlink($cache_dir . '\tempArray.txt');
+        //with header
+        $expected = "test header \$tempArray = array (\n  'Key1' => \n  array (\n    'Key2' => 'value2',\n    'Key3' => 'value3',\n  ),\n);" ;
+        $actual = write_array_to_file('tempArray', $tempArray, $cache_dir . '\tempArray.txt','w' ,'test header ');
+        $this->assertTrue($actual);
+        $actual_contents = file_get_contents($cache_dir . '\tempArray.txt');
+        $this->assertSame($expected,$actual_contents);
+        unlink($cache_dir . '\tempArray.txt');
 		
 		
-	}
+    }
 	
-	public function testwrite_encoded_file( )
-	{
-		//execute the method and test if it created file exists
+    public function testwrite_encoded_file( )
+    {
+        //execute the method and test if it created file exists
 		
-		$cache_dir = "vfs://root";
+        $cache_dir = "vfs://root";
 		
-		//without filename 
-		$tempArray = Array("filename" =>'soap_array.txt' , "md5" => "523ef67de860fc54794f27117dba4fac" , "data" => "some soap data" );
-		$actual = write_encoded_file( $tempArray, $cache_dir, "" );
-		$this->assertFileExists($actual);
-		unlink($actual);
+        //without filename 
+        $tempArray = Array("filename" =>'soap_array.txt' , "md5" => "523ef67de860fc54794f27117dba4fac" , "data" => "some soap data" );
+        $actual = write_encoded_file( $tempArray, $cache_dir, "" );
+        $this->assertFileExists($actual);
+        unlink($actual);
 		
 		
-		//with filename
-		$tempArray = Array("md5" => "523ef67de860fc54794f27117dba4fac" , "data" => "some soap data" );
-		$actual = write_encoded_file( $tempArray, $cache_dir, "soap_array.txt" );
-		$this->assertFileExists($actual);
-		unlink($actual);
+        //with filename
+        $tempArray = Array("md5" => "523ef67de860fc54794f27117dba4fac" , "data" => "some soap data" );
+        $actual = write_encoded_file( $tempArray, $cache_dir, "soap_array.txt" );
+        $this->assertFileExists($actual);
+        unlink($actual);
 		
-	}
+    }
 	
-	public function testcreate_custom_directory()
-	{
-		//execute the method and test if it created file/dir exists
+    public function testcreate_custom_directory()
+    {
+        //execute the method and test if it created file/dir exists
 		
-		$file = "Test/";
+        $file = "Test/";
 		
-		$vfs = $this->rootFs;
-		if ( $vfs->hasChild($file)  == true)
-			rmdir("custom/" . $file);
+        $vfs = $this->rootFs;
+        if ( $vfs->hasChild($file)  == true)
+            rmdir("custom/" . $file);
 		
-		$actual = create_custom_directory($file);
-		$this->assertFileExists($actual);
+        $actual = create_custom_directory($file);
+        $this->assertFileExists($actual);
 
-		if ( $vfs->hasChild($file)  == true)
-			rmdir("custom/" . $file);
+        if ( $vfs->hasChild($file)  == true)
+            rmdir("custom/" . $file);
 		
 		
-	}
+    }
 	
 	
-	public function testgenerateMD5array()
-	{
-		//execute the method and test if it returns expected values
+    public function testgenerateMD5array()
+    {
+        //execute the method and test if it returns expected values
 
-		$expected= array (
-				'data/Relationships/EmailAddressRelationship.php' => '2f04780ddd15f7b65a35c75c303ed5d7',
-				'data/Relationships/M2MRelationship.php' => 'c320909b5a17d63aafa0d7497fe3c991',
-				'data/Relationships/One2MBeanRelationship.php' => 'c09fe92826b4c8a3944694098de35027',
-				'data/Relationships/One2MRelationship.php' => '588ad87910bd9d885fe27da77ad13e30',
-				'data/Relationships/One2OneBeanRelationship.php' => '765b8785d5ca576a8530db99bdf4d411',
-				'data/Relationships/One2OneRelationship.php' => '0385f7577687a402d9603ef26984257e',
-				'data/Relationships/RelationshipFactory.php' => '3bd7cc6998beaf82a13808f54bff1c2d',
-				'data/Relationships/SugarRelationship.php' => '8d0fa8ae0f41ac34eb5d0c04f0e02825',
-		); 
-		
-		$actual = generateMD5array('data/Relationships/');
-		$this->assertSame($expected,$actual);
+        $expected= array (
+                'data/Relationships/EmailAddressRelationship.php' => '2f04780ddd15f7b65a35c75c303ed5d7',
+                'data/Relationships/M2MRelationship.php' => 'c320909b5a17d63aafa0d7497fe3c991',
+                'data/Relationships/One2MBeanRelationship.php' => 'c09fe92826b4c8a3944694098de35027',
+                'data/Relationships/One2MRelationship.php' => '588ad87910bd9d885fe27da77ad13e30',
+                'data/Relationships/One2OneBeanRelationship.php' => '765b8785d5ca576a8530db99bdf4d411',
+                'data/Relationships/One2OneRelationship.php' => '0385f7577687a402d9603ef26984257e',
+                'data/Relationships/RelationshipFactory.php' => '3bd7cc6998beaf82a13808f54bff1c2d',
+                'data/Relationships/SugarRelationship.php' => '8d0fa8ae0f41ac34eb5d0c04f0e02825',
+        ); 
+		
+        $actual = generateMD5array('data/Relationships/');
+        $this->assertSame($expected,$actual);
 			
-	}
+    }
 	
 	
-	public function testmd5DirCompare()
-	{
-		//execute the method and test if it returns expected values
+    public function testmd5DirCompare()
+    {
+        //execute the method and test if it returns expected values
 		
-		$expected= array ();
+        $expected= array ();
 		
-		$actual = md5DirCompare('include/MVC/', 'include/MVC/',array('views'));
-		$this->assertSame($expected,$actual);
+        $actual = md5DirCompare('include/MVC/', 'include/MVC/',array('views'));
+        $this->assertSame($expected,$actual);
 		
-	}
+    }
 	
 	
-	public function testgetFiles() 
-	{
-		//execute the method and test if it returns expected values
+    public function testgetFiles() 
+    {
+        //execute the method and test if it returns expected values
 		
-		//test without pattern
-		$expected = array (
+        //test without pattern
+        $expected = array (
             'include/MVC/Controller/ControllerFactory.php',
             'include/MVC/Controller/file_access_control_map.php',
             'include/MVC/Controller/action_file_map.php',
             'include/MVC/Controller/action_view_map.php',
             'include/MVC/Controller/entry_point_registry.php',
             'include/MVC/Controller/SugarController.php',
-		);
-		$actual = Array();
-		getFiles($actual, 'include/MVC/Controller');
+        );
+        $actual = Array();
+        getFiles($actual, 'include/MVC/Controller');
         sort($actual);
         sort($expected);
-		$this->assertSame($expected,$actual);
-		
-		
-		
-		
-		//test with pattern
-		$expected = array (
-				'include/MVC/Controller/action_view_map.php',
-				'include/MVC/View/views/view.ajax.php',
-				'include/MVC/View/views/view.ajaxui.php',
-				'include/MVC/View/views/view.classic.config.php',
-				'include/MVC/View/views/view.classic.php',
-				'include/MVC/View/views/view.config.php',
-				'include/MVC/View/views/view.detail.config.php',
-				'include/MVC/View/views/view.detail.php',
-				'include/MVC/View/views/view.edit.php',
-				'include/MVC/View/views/view.favorites.php',
-				'include/MVC/View/views/view.html.php',
-				'include/MVC/View/views/view.importvcard.php',
-				'include/MVC/View/views/view.importvcardsave.php',
-				'include/MVC/View/views/view.json.php',
-				'include/MVC/View/views/view.list.php',
-				'include/MVC/View/views/view.metadata.php',
-				'include/MVC/View/views/view.modulelistmenu.php',
-				'include/MVC/View/views/view.multiedit.php',
-				'include/MVC/View/views/view.noaccess.php',
-				'include/MVC/View/views/view.popup.php',
-				'include/MVC/View/views/view.quick.php',
-				'include/MVC/View/views/view.quickcreate.php',
-				'include/MVC/View/views/view.quickedit.php',
-				'include/MVC/View/views/view.serialized.php',
-				'include/MVC/View/views/view.sugarpdf.config.php',
-				'include/MVC/View/views/view.sugarpdf.php',
-				'include/MVC/View/views/view.vcard.php',
-				'include/MVC/View/views/view.xml.php',
-		);
-		$actual = Array();
-		getFiles($actual, 'include/MVC','@view@');
+        $this->assertSame($expected,$actual);
+		
+		
+		
+		
+        //test with pattern
+        $expected = array (
+                'include/MVC/Controller/action_view_map.php',
+                'include/MVC/View/views/view.ajax.php',
+                'include/MVC/View/views/view.ajaxui.php',
+                'include/MVC/View/views/view.classic.config.php',
+                'include/MVC/View/views/view.classic.php',
+                'include/MVC/View/views/view.config.php',
+                'include/MVC/View/views/view.detail.config.php',
+                'include/MVC/View/views/view.detail.php',
+                'include/MVC/View/views/view.edit.php',
+                'include/MVC/View/views/view.favorites.php',
+                'include/MVC/View/views/view.html.php',
+                'include/MVC/View/views/view.importvcard.php',
+                'include/MVC/View/views/view.importvcardsave.php',
+                'include/MVC/View/views/view.json.php',
+                'include/MVC/View/views/view.list.php',
+                'include/MVC/View/views/view.metadata.php',
+                'include/MVC/View/views/view.modulelistmenu.php',
+                'include/MVC/View/views/view.multiedit.php',
+                'include/MVC/View/views/view.noaccess.php',
+                'include/MVC/View/views/view.popup.php',
+                'include/MVC/View/views/view.quick.php',
+                'include/MVC/View/views/view.quickcreate.php',
+                'include/MVC/View/views/view.quickedit.php',
+                'include/MVC/View/views/view.serialized.php',
+                'include/MVC/View/views/view.sugarpdf.config.php',
+                'include/MVC/View/views/view.sugarpdf.php',
+                'include/MVC/View/views/view.vcard.php',
+                'include/MVC/View/views/view.xml.php',
+        );
+        $actual = Array();
+        getFiles($actual, 'include/MVC','@view@');
         sort($expected);
         sort($actual);
-		$this->assertEquals($expected,$actual);
+        $this->assertEquals($expected,$actual);
 
-	}
+    }
 	
 	
-	public function testreadfile_chunked()
-	{
-		//execute the method and test if it returns expected values
+    public function testreadfile_chunked()
+    {
+        //execute the method and test if it returns expected values
 	
-		$expected = file_get_contents('config.php');
+        $expected = file_get_contents('config.php');
 		
 		
-		//retbytes parameter false
-		ob_start();		
-		$actual = readfile_chunked('config.php',false);		
-		$renderedContent = ob_get_contents();
-		ob_end_clean();		 
+        //retbytes parameter false
+        ob_start();		
+        $actual = readfile_chunked('config.php',false);		
+        $renderedContent = ob_get_contents();
+        ob_end_clean();		 
 		
-		$this->assertTrue($actual);
-		$this->assertSame($expected,$renderedContent);
+        $this->assertTrue($actual);
+        $this->assertSame($expected,$renderedContent);
 
 		
 		
-		//retbytes parameter true/default
-		ob_start();
-		$actual = readfile_chunked('config.php');
-		$renderedContent = ob_get_contents();
-		ob_end_clean();
+        //retbytes parameter true/default
+        ob_start();
+        $actual = readfile_chunked('config.php');
+        $renderedContent = ob_get_contents();
+        ob_end_clean();
 		
-		$this->assertEquals($actual,strlen($renderedContent));
-		$this->assertSame($expected,$renderedContent);
+        $this->assertEquals($actual,strlen($renderedContent));
+        $this->assertSame($expected,$renderedContent);
 		
-	}
+    }
 	
-	public function testsugar_rename( )
-	{
-		//execute the method and test if it returns true/success
+    public function testsugar_rename( )
+    {
+        //execute the method and test if it returns true/success
 	
-		$dir = 'vfs://root';
-		$file = "test.txt";
-		$vfs = $this->rootFs;
-		if ( $vfs->hasChild($file)  != true)
-			write_array_to_file('', '', $dir . '/' . $file);
+        $dir = 'vfs://root';
+        $file = "test.txt";
+        $vfs = $this->rootFs;
+        if ( $vfs->hasChild($file)  != true)
+            write_array_to_file('', '', $dir . '/' . $file);
 		
-		//test with empty file names
-		$actual = sugar_rename('','');
-		$this->assertFalse($actual);
+        //test with empty file names
+        $actual = sugar_rename('','');
+        $this->assertFalse($actual);
 		
 		
-		//test with valid file names 
-		$actual = sugar_rename($dir . '/' . $file, $dir . '/' . 'newtest.txt');
-		$this->assertTrue($actual);
+        //test with valid file names 
+        $actual = sugar_rename($dir . '/' . $file, $dir . '/' . 'newtest.txt');
+        $this->assertTrue($actual);
 		
-		unlink($dir . '/' . 'newtest.txt');
+        unlink($dir . '/' . 'newtest.txt');
 		
-	}
+    }
 	
-	public function testfileToHash()
-	{
-		//execute the method and test if it returns expected values
-		
-		//test with empty filename string
-		$expected  = "d41d8cd98f00b204e9800998ecf8427e";
-		$hash = fileToHash("");
-		$this->assertSame($expected,$hash);
-		$this->assertSame("",$_SESSION['file2Hash'][$hash]);
-		
-		//test with valid filename
-		$expected = "9e5e2527d69c009a81b8ecd730f3957e";
-		$hash = fileToHash('config.php');
-		$this->assertSame($expected,$hash);
-		$this->assertSame('config.php', $_SESSION['file2Hash'][$hash]);
-		
-	}
+    public function testfileToHash()
+    {
+        //execute the method and test if it returns expected values
+		
+        //test with empty filename string
+        $expected  = "d41d8cd98f00b204e9800998ecf8427e";
+        $hash = fileToHash("");
+        $this->assertSame($expected,$hash);
+        $this->assertSame("",$_SESSION['file2Hash'][$hash]);
+		
+        //test with valid filename
+        $expected = "9e5e2527d69c009a81b8ecd730f3957e";
+        $hash = fileToHash('config.php');
+        $this->assertSame($expected,$hash);
+        $this->assertSame('config.php', $_SESSION['file2Hash'][$hash]);
+		
+    }
 	
-	public function testhashToFile()
-	{
-		//execute the method and test if it returns expected values
-		
-		//test with invalid hash.
-		$actual = hashToFile("");
-		$this->assertFalse($actual);
-		
-		//test with a newly generated hash
-		$hash = fileToHash('config.php');
-		$actual = hashToFile($hash);
-		$this->assertSame('config.php', $actual);
-	}
+    public function testhashToFile()
+    {
+        //execute the method and test if it returns expected values
+		
+        //test with invalid hash.
+        $actual = hashToFile("");
+        $this->assertFalse($actual);
+		
+        //test with a newly generated hash
+        $hash = fileToHash('config.php');
+        $actual = hashToFile($hash);
+        $this->assertSame('config.php', $actual);
+    }
 	
 	
-	public function testget_file_extension()
-	{
-		//execute the method and test if it returns expected values
+    public function testget_file_extension()
+    {
+        //execute the method and test if it returns expected values
 		
-		$this->assertSame('', get_file_extension(''));
-		$this->assertSame('txt', get_file_extension('test.txt'));
-		$this->assertSame('Txt', get_file_extension('test.ext.Txt',false));
-		$this->assertSame('txt', get_file_extension('test.ext.TXT',true));
+        $this->assertSame('', get_file_extension(''));
+        $this->assertSame('txt', get_file_extension('test.txt'));
+        $this->assertSame('Txt', get_file_extension('test.ext.Txt',false));
+        $this->assertSame('txt', get_file_extension('test.ext.TXT',true));
 		
-	}
+    }
 	
 	
-	public function testget_mime_content_type_from_filename()
-	{
-		//execute the method and test if it returns expected values
+    public function testget_mime_content_type_from_filename()
+    {
+        //execute the method and test if it returns expected values
 		
-		$this->assertSame('', get_mime_content_type_from_filename('') );
-		$this->assertSame('application/octet-stream', get_mime_content_type_from_filename('file.tmp') );
-		$this->assertSame('text/plain', get_mime_content_type_from_filename('file.txt') );
-		$this->assertSame('application/x-shockwave-flash', get_mime_content_type_from_filename('file.swf') );
-		$this->assertSame('video/x-flv', get_mime_content_type_from_filename('file.flv') );	
+        $this->assertSame('', get_mime_content_type_from_filename('') );
+        $this->assertSame('application/octet-stream', get_mime_content_type_from_filename('file.tmp') );
+        $this->assertSame('text/plain', get_mime_content_type_from_filename('file.txt') );
+        $this->assertSame('application/x-shockwave-flash', get_mime_content_type_from_filename('file.swf') );
+        $this->assertSame('video/x-flv', get_mime_content_type_from_filename('file.flv') );	
 		
-	}
+    }
 	
-	public function testcleanFileName()
-	{
-		//execute the method and test if it returns expected values
-		
-		$this->assertSame("file.txt", cleanFileName("file<?>.txt") );
-		$this->assertSame("file_1.txt", cleanFileName("file_1<?>.txt") );
-		$this->assertSame("file.txt", cleanFileName("file.txt") );
-	}
+    public function testcleanFileName()
+    {
+        //execute the method and test if it returns expected values
+		
+        $this->assertSame("file.txt", cleanFileName("file<?>.txt") );
+        $this->assertSame("file_1.txt", cleanFileName("file_1<?>.txt") );
+        $this->assertSame("file.txt", cleanFileName("file.txt") );
+    }
 	
-	public function testcleanDirName()
-	{
-		//execute the method and test if it returns expected values
+    public function testcleanDirName()
+    {
+        //execute the method and test if it returns expected values
 		
-		$this->assertSame("testDir", cleanDirName("./testDir") );
-		$this->assertSame("testDir", cleanDirName("..\\testDir") );
-		$this->assertSame("testDir", cleanDirName("\\test/Dir/") );
+        $this->assertSame("testDir", cleanDirName("./testDir") );
+        $this->assertSame("testDir", cleanDirName("..\\testDir") );
+        $this->assertSame("testDir", cleanDirName("\\test/Dir/") );
 		
-	}
+    }
 
 }
\ No newline at end of file

Spacing +72 added lines, -72 removed lines

@@ -22,32 +22,32 @@ 
 		$expected = "";
 		$path = "";
 		$actual = clean_path($path);
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 		
 
 		//a simple valid path
 		$expected = "/SuiteCRM-develop/include/utils";
 		$path = '\SuiteCRM-develop\include\utils';
 		$actual = clean_path($path);
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 
 		
 		//valid network path 
 		$expected = "//SuiteCRM-develop/include/utils";
 		$path = "\\\\/SuiteCRM-develop/include/utils";
 		$actual = clean_path($path);
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 
 
         $expected = "/SuiteCRM-develop/include/utils";
         $path = "/SuiteCRM-develop/./include/utils";
         $actual = clean_path($path);
-        $this->assertSame($expected,$actual);
+        $this->assertSame($expected, $actual);
 
         $expected = "/SuiteCRM-develop/include/utils";
         $path = "/SuiteCRM-develop//include/utils";
         $actual = clean_path($path);
-        $this->assertSame($expected,$actual);
+        $this->assertSame($expected, $actual);
 
 
 		
@@ -60,14 +60,14 @@ 
 		$cache_dir = rtrim($GLOBALS['sugar_config']['cache_dir'], '/\\');
 		$file = "Test/";
 		
-		if ( $this->rootFs->hasChild($file)  == true)
-			rmdir($cache_dir . "/" . $file);
+		if ($this->rootFs->hasChild($file) == true)
+			rmdir($cache_dir."/".$file);
 		
 		$actual = create_cache_directory($file);
 		$this->assertFileExists($actual);
 		
-		if ( $this->rootFs->hasChild($file)  == true)
-			rmdir($cache_dir . "/" . $file);
+		if ($this->rootFs->hasChild($file) == true)
+			rmdir($cache_dir."/".$file);
 		
 	}
 	
@@ -75,7 +75,7 @@ 
 	{
 		//execute the method and test if it returns expected values
 		
-		$expected  = array (
+		$expected = array(
 				'Accounts' => 'Accounts',
 				'ACL' => 'ACL',
 				'ACLActions' => 'ACLActions',
@@ -188,7 +188,7 @@ 
 		$actual = get_module_dir_list();
         sort($actual);
         sort($expected);
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 		
 	}
 	
@@ -197,11 +197,11 @@ 
 		//execute the method and test if created dir/file exists
 		
 		//without prefix
-		$actual = mk_temp_dir('vfs://root', '' );
+		$actual = mk_temp_dir('vfs://root', '');
 		$this->assertFileExists($actual);
 
 		//with prefix
-		$actual = mk_temp_dir('vfs://root', 'pfx' );
+		$actual = mk_temp_dir('vfs://root', 'pfx');
 		$this->assertFileExists($actual);
 		
 	}
@@ -213,19 +213,19 @@ 
 		//no file extension
 		$expected = "";
 		$actual = remove_file_extension('fileNoExt');
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 		
 		
 		//simple file extension
 		$expected = "file1";
 		$actual = remove_file_extension('file1.txt');
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 		
 		
 		//complex filename
 		$expected = "file2.ext1";
-		$actual =  remove_file_extension('file2.ext1.ext2');
-		$this->assertSame($expected,$actual);
+		$actual = remove_file_extension('file2.ext1.ext2');
+		$this->assertSame($expected, $actual);
 		
 	}
 	
@@ -235,24 +235,24 @@ 
 		//execute the method and test if it returns true and verify contents
 		
 		$cache_dir = "vfs://root";
-		$tempArray = Array("Key1" => Array( "Key2" => "value2" , "Key3" => "value3" ));
+		$tempArray = Array("Key1" => Array("Key2" => "value2", "Key3" => "value3"));
 		
 		
 		//without header
-		$expected = "<?php\n// created: " . date('Y-m-d H:i:s') . "\n\$tempArray = array (\n  'Key1' => \n  array (\n    'Key2' => 'value2',\n    'Key3' => 'value3',\n  ),\n);" ;
-		$actual = write_array_to_file('tempArray', $tempArray, $cache_dir . '\tempArray.txt');
+		$expected = "<?php\n// created: ".date('Y-m-d H:i:s')."\n\$tempArray = array (\n  'Key1' => \n  array (\n    'Key2' => 'value2',\n    'Key3' => 'value3',\n  ),\n);";
+		$actual = write_array_to_file('tempArray', $tempArray, $cache_dir.'\tempArray.txt');
 		$this->assertTrue($actual);
-		$actual_contents = file_get_contents($cache_dir . '\tempArray.txt');
-		$this->assertSame($expected,$actual_contents);
-		unlink($cache_dir . '\tempArray.txt');
+		$actual_contents = file_get_contents($cache_dir.'\tempArray.txt');
+		$this->assertSame($expected, $actual_contents);
+		unlink($cache_dir.'\tempArray.txt');
 		
 		//with header
-		$expected = "test header \$tempArray = array (\n  'Key1' => \n  array (\n    'Key2' => 'value2',\n    'Key3' => 'value3',\n  ),\n);" ;
-		$actual = write_array_to_file('tempArray', $tempArray, $cache_dir . '\tempArray.txt','w' ,'test header ');
+		$expected = "test header \$tempArray = array (\n  'Key1' => \n  array (\n    'Key2' => 'value2',\n    'Key3' => 'value3',\n  ),\n);";
+		$actual = write_array_to_file('tempArray', $tempArray, $cache_dir.'\tempArray.txt', 'w', 'test header ');
 		$this->assertTrue($actual);
-		$actual_contents = file_get_contents($cache_dir . '\tempArray.txt');
-		$this->assertSame($expected,$actual_contents);
-		unlink($cache_dir . '\tempArray.txt');
+		$actual_contents = file_get_contents($cache_dir.'\tempArray.txt');
+		$this->assertSame($expected, $actual_contents);
+		unlink($cache_dir.'\tempArray.txt');
 		
 		
 	}
@@ -264,15 +264,15 @@ 
 		$cache_dir = "vfs://root";
 		
 		//without filename 
-		$tempArray = Array("filename" =>'soap_array.txt' , "md5" => "523ef67de860fc54794f27117dba4fac" , "data" => "some soap data" );
-		$actual = write_encoded_file( $tempArray, $cache_dir, "" );
+		$tempArray = Array("filename" =>'soap_array.txt', "md5" => "523ef67de860fc54794f27117dba4fac", "data" => "some soap data");
+		$actual = write_encoded_file($tempArray, $cache_dir, "");
 		$this->assertFileExists($actual);
 		unlink($actual);
 		
 		
 		//with filename
-		$tempArray = Array("md5" => "523ef67de860fc54794f27117dba4fac" , "data" => "some soap data" );
-		$actual = write_encoded_file( $tempArray, $cache_dir, "soap_array.txt" );
+		$tempArray = Array("md5" => "523ef67de860fc54794f27117dba4fac", "data" => "some soap data");
+		$actual = write_encoded_file($tempArray, $cache_dir, "soap_array.txt");
 		$this->assertFileExists($actual);
 		unlink($actual);
 		
@@ -285,14 +285,14 @@ 
 		$file = "Test/";
 		
 		$vfs = $this->rootFs;
-		if ( $vfs->hasChild($file)  == true)
-			rmdir("custom/" . $file);
+		if ($vfs->hasChild($file) == true)
+			rmdir("custom/".$file);
 		
 		$actual = create_custom_directory($file);
 		$this->assertFileExists($actual);
 
-		if ( $vfs->hasChild($file)  == true)
-			rmdir("custom/" . $file);
+		if ($vfs->hasChild($file) == true)
+			rmdir("custom/".$file);
 		
 		
 	}
@@ -302,7 +302,7 @@ 
 	{
 		//execute the method and test if it returns expected values
 
-		$expected= array (
+		$expected = array(
 				'data/Relationships/EmailAddressRelationship.php' => '2f04780ddd15f7b65a35c75c303ed5d7',
 				'data/Relationships/M2MRelationship.php' => 'c320909b5a17d63aafa0d7497fe3c991',
 				'data/Relationships/One2MBeanRelationship.php' => 'c09fe92826b4c8a3944694098de35027',
@@ -314,7 +314,7 @@ 
 		); 
 		
 		$actual = generateMD5array('data/Relationships/');
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 			
 	}
 	
@@ -323,10 +323,10 @@ 
 	{
 		//execute the method and test if it returns expected values
 		
-		$expected= array ();
+		$expected = array();
 		
-		$actual = md5DirCompare('include/MVC/', 'include/MVC/',array('views'));
-		$this->assertSame($expected,$actual);
+		$actual = md5DirCompare('include/MVC/', 'include/MVC/', array('views'));
+		$this->assertSame($expected, $actual);
 		
 	}
 	
@@ -336,7 +336,7 @@ 
 		//execute the method and test if it returns expected values
 		
 		//test without pattern
-		$expected = array (
+		$expected = array(
             'include/MVC/Controller/ControllerFactory.php',
             'include/MVC/Controller/file_access_control_map.php',
             'include/MVC/Controller/action_file_map.php',
@@ -348,13 +348,13 @@ 
 		getFiles($actual, 'include/MVC/Controller');
         sort($actual);
         sort($expected);
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 		
 		
 		
 		
 		//test with pattern
-		$expected = array (
+		$expected = array(
 				'include/MVC/Controller/action_view_map.php',
 				'include/MVC/View/views/view.ajax.php',
 				'include/MVC/View/views/view.ajaxui.php',
@@ -385,10 +385,10 @@ 
 				'include/MVC/View/views/view.xml.php',
 		);
 		$actual = Array();
-		getFiles($actual, 'include/MVC','@view@');
+		getFiles($actual, 'include/MVC', '@view@');
         sort($expected);
         sort($actual);
-		$this->assertEquals($expected,$actual);
+		$this->assertEquals($expected, $actual);
 
 	}
 	
@@ -402,12 +402,12 @@ 
 		
 		//retbytes parameter false
 		ob_start();		
-		$actual = readfile_chunked('config.php',false);		
+		$actual = readfile_chunked('config.php', false);		
 		$renderedContent = ob_get_contents();
 		ob_end_clean();		 
 		
 		$this->assertTrue($actual);
-		$this->assertSame($expected,$renderedContent);
+		$this->assertSame($expected, $renderedContent);
 
 		
 		
@@ -417,8 +417,8 @@ 
 		$renderedContent = ob_get_contents();
 		ob_end_clean();
 		
-		$this->assertEquals($actual,strlen($renderedContent));
-		$this->assertSame($expected,$renderedContent);
+		$this->assertEquals($actual, strlen($renderedContent));
+		$this->assertSame($expected, $renderedContent);
 		
 	}
 	
@@ -429,19 +429,19 @@ 
 		$dir = 'vfs://root';
 		$file = "test.txt";
 		$vfs = $this->rootFs;
-		if ( $vfs->hasChild($file)  != true)
-			write_array_to_file('', '', $dir . '/' . $file);
+		if ($vfs->hasChild($file) != true)
+			write_array_to_file('', '', $dir.'/'.$file);
 		
 		//test with empty file names
-		$actual = sugar_rename('','');
+		$actual = sugar_rename('', '');
 		$this->assertFalse($actual);
 		
 		
 		//test with valid file names 
-		$actual = sugar_rename($dir . '/' . $file, $dir . '/' . 'newtest.txt');
+		$actual = sugar_rename($dir.'/'.$file, $dir.'/'.'newtest.txt');
 		$this->assertTrue($actual);
 		
-		unlink($dir . '/' . 'newtest.txt');
+		unlink($dir.'/'.'newtest.txt');
 		
 	}
 	
@@ -450,15 +450,15 @@ 
 		//execute the method and test if it returns expected values
 		
 		//test with empty filename string
-		$expected  = "d41d8cd98f00b204e9800998ecf8427e";
+		$expected = "d41d8cd98f00b204e9800998ecf8427e";
 		$hash = fileToHash("");
-		$this->assertSame($expected,$hash);
-		$this->assertSame("",$_SESSION['file2Hash'][$hash]);
+		$this->assertSame($expected, $hash);
+		$this->assertSame("", $_SESSION['file2Hash'][$hash]);
 		
 		//test with valid filename
 		$expected = "9e5e2527d69c009a81b8ecd730f3957e";
 		$hash = fileToHash('config.php');
-		$this->assertSame($expected,$hash);
+		$this->assertSame($expected, $hash);
 		$this->assertSame('config.php', $_SESSION['file2Hash'][$hash]);
 		
 	}
@@ -484,8 +484,8 @@ 
 		
 		$this->assertSame('', get_file_extension(''));
 		$this->assertSame('txt', get_file_extension('test.txt'));
-		$this->assertSame('Txt', get_file_extension('test.ext.Txt',false));
-		$this->assertSame('txt', get_file_extension('test.ext.TXT',true));
+		$this->assertSame('Txt', get_file_extension('test.ext.Txt', false));
+		$this->assertSame('txt', get_file_extension('test.ext.TXT', true));
 		
 	}
 	
@@ -494,11 +494,11 @@ 
 	{
 		//execute the method and test if it returns expected values
 		
-		$this->assertSame('', get_mime_content_type_from_filename('') );
-		$this->assertSame('application/octet-stream', get_mime_content_type_from_filename('file.tmp') );
-		$this->assertSame('text/plain', get_mime_content_type_from_filename('file.txt') );
-		$this->assertSame('application/x-shockwave-flash', get_mime_content_type_from_filename('file.swf') );
-		$this->assertSame('video/x-flv', get_mime_content_type_from_filename('file.flv') );	
+		$this->assertSame('', get_mime_content_type_from_filename(''));
+		$this->assertSame('application/octet-stream', get_mime_content_type_from_filename('file.tmp'));
+		$this->assertSame('text/plain', get_mime_content_type_from_filename('file.txt'));
+		$this->assertSame('application/x-shockwave-flash', get_mime_content_type_from_filename('file.swf'));
+		$this->assertSame('video/x-flv', get_mime_content_type_from_filename('file.flv'));	
 		
 	}
 	
@@ -506,18 +506,18 @@ 
 	{
 		//execute the method and test if it returns expected values
 		
-		$this->assertSame("file.txt", cleanFileName("file<?>.txt") );
-		$this->assertSame("file_1.txt", cleanFileName("file_1<?>.txt") );
-		$this->assertSame("file.txt", cleanFileName("file.txt") );
+		$this->assertSame("file.txt", cleanFileName("file<?>.txt"));
+		$this->assertSame("file_1.txt", cleanFileName("file_1<?>.txt"));
+		$this->assertSame("file.txt", cleanFileName("file.txt"));
 	}
 	
 	public function testcleanDirName()
 	{
 		//execute the method and test if it returns expected values
 		
-		$this->assertSame("testDir", cleanDirName("./testDir") );
-		$this->assertSame("testDir", cleanDirName("..\\testDir") );
-		$this->assertSame("testDir", cleanDirName("\\test/Dir/") );
+		$this->assertSame("testDir", cleanDirName("./testDir"));
+		$this->assertSame("testDir", cleanDirName("..\\testDir"));
+		$this->assertSame("testDir", cleanDirName("\\test/Dir/"));
 		
 	}
 

Braces +15 added lines, -10 removed lines

@@ -60,14 +60,16 @@ 
 		$cache_dir = rtrim($GLOBALS['sugar_config']['cache_dir'], '/\\');
 		$file = "Test/";
 		
-		if ( $this->rootFs->hasChild($file)  == true)
-			rmdir($cache_dir . "/" . $file);
+		if ( $this->rootFs->hasChild($file)  == true) {
+					rmdir($cache_dir . "/" . $file);
+		}
 		
 		$actual = create_cache_directory($file);
 		$this->assertFileExists($actual);
 		
-		if ( $this->rootFs->hasChild($file)  == true)
-			rmdir($cache_dir . "/" . $file);
+		if ( $this->rootFs->hasChild($file)  == true) {
+					rmdir($cache_dir . "/" . $file);
+		}
 		
 	}
 	
@@ -285,14 +287,16 @@ 
 		$file = "Test/";
 		
 		$vfs = $this->rootFs;
-		if ( $vfs->hasChild($file)  == true)
-			rmdir("custom/" . $file);
+		if ( $vfs->hasChild($file)  == true) {
+					rmdir("custom/" . $file);
+		}
 		
 		$actual = create_custom_directory($file);
 		$this->assertFileExists($actual);
 
-		if ( $vfs->hasChild($file)  == true)
-			rmdir("custom/" . $file);
+		if ( $vfs->hasChild($file)  == true) {
+					rmdir("custom/" . $file);
+		}
 		
 		
 	}
@@ -429,8 +433,9 @@ 
 		$dir = 'vfs://root';
 		$file = "test.txt";
 		$vfs = $this->rootFs;
-		if ( $vfs->hasChild($file)  != true)
-			write_array_to_file('', '', $dir . '/' . $file);
+		if ( $vfs->hasChild($file)  != true) {
+					write_array_to_file('', '', $dir . '/' . $file);
+		}
 		
 		//test with empty file names
 		$actual = sugar_rename('','');

tests/tests/include/utils/sugarFileUtilsTest.php

Indentation +101 added lines, -101 removed lines

@@ -10,159 +10,159 @@
         $rootFs->addChild(org\bovigo\vfs\vfsStream::newFile('test.txt')->withContent("Hello world!"));
     }
 
-	public function testsugar_mkdir()
-	{
-		//execute the method and test if it returns true and created dir exists
+    public function testsugar_mkdir()
+    {
+        //execute the method and test if it returns true and created dir exists
 		
-		$dir = "vfs://root";
+        $dir = "vfs://root";
 		
-		//non recursive
-		$result = sugar_mkdir($dir . "/mkdirTest");
-		$this->assertFileExists($dir . "/mkdirTest");
-		$this->assertTrue($result);
+        //non recursive
+        $result = sugar_mkdir($dir . "/mkdirTest");
+        $this->assertFileExists($dir . "/mkdirTest");
+        $this->assertTrue($result);
 		
-		//recursive
-		$result = sugar_mkdir($dir . "/mkdirTest/test",null,true);
-		$this->assertFileExists($dir . "/mkdirTest/test");
-		$this->assertTrue($result);
-	}
+        //recursive
+        $result = sugar_mkdir($dir . "/mkdirTest/test",null,true);
+        $this->assertFileExists($dir . "/mkdirTest/test");
+        $this->assertTrue($result);
+    }
 	
-	public function testsugar_fopen()
-	{
-		//execute the method and test if it doesn't returns false
-		$result = sugar_fopen('vfs://root/test.txt', 'r');
-		$this->assertNotFalse($result);
-	}
+    public function testsugar_fopen()
+    {
+        //execute the method and test if it doesn't returns false
+        $result = sugar_fopen('vfs://root/test.txt', 'r');
+        $this->assertNotFalse($result);
+    }
 
 	
-	public function testsugar_file_put_contents()
-	{
-		//execute the method and test if it doesn't returns false and returns the number of bytes written
+    public function testsugar_file_put_contents()
+    {
+        //execute the method and test if it doesn't returns false and returns the number of bytes written
 
         $dir = "vfs://root";
-		$result = sugar_file_put_contents( $dir . '/testfile.txt', 'some test data');
-		$this->assertNotFalse($result);
-		$this->assertEquals(14,$result);
-	}
+        $result = sugar_file_put_contents( $dir . '/testfile.txt', 'some test data');
+        $this->assertNotFalse($result);
+        $this->assertEquals(14,$result);
+    }
 
 	
 	
-	public function testsugar_file_put_contents_atomic()
-	{
+    public function testsugar_file_put_contents_atomic()
+    {
         $this->markTestSkipped('Atomic file put cannot be tested with vfsStream');
-		//execute the method and test if it returns success(true)
+        //execute the method and test if it returns success(true)
         $dir = "vfs://root";
-		$result = sugar_file_put_contents_atomic( $dir . '/atomictestfile.txt', 'some test data');
-		$this->assertTrue($result);
-	}
+        $result = sugar_file_put_contents_atomic( $dir . '/atomictestfile.txt', 'some test data');
+        $this->assertTrue($result);
+    }
 	
 	
-	public function testsugar_file_get_contents()
-	{
-		//execute the method and test if it doesn't returns false and returns the expected contents
+    public function testsugar_file_get_contents()
+    {
+        //execute the method and test if it doesn't returns false and returns the expected contents
         $dir = "vfs://root";
-		$result = file_get_contents( $dir . '/test.txt');
+        $result = file_get_contents( $dir . '/test.txt');
 		
-		$this->assertNotFalse($result);
-		$this->assertEquals('Hello world!',$result);
-	}
+        $this->assertNotFalse($result);
+        $this->assertEquals('Hello world!',$result);
+    }
 	
 
-	public function testsugar_touch() 
-	{
-		//execute the method and test if it returns success(true)
+    public function testsugar_touch() 
+    {
+        //execute the method and test if it returns success(true)
 
         $dir = "vfs://root";
-		$test_dt = time() - 3600 ; 
-		$expected = date("m d Y H:i:s",  time() - 3600 );
+        $test_dt = time() - 3600 ; 
+        $expected = date("m d Y H:i:s",  time() - 3600 );
 		
-		//test wihout modified date param
-		$result = sugar_touch( $dir . '/testfiletouch.txt');
-		$this->assertTrue($result);		
+        //test wihout modified date param
+        $result = sugar_touch( $dir . '/testfiletouch.txt');
+        $this->assertTrue($result);		
 		
-		//test wih modified date param
-		$result = sugar_touch( $dir . '/testfiletouch.txt',$test_dt,$test_dt);
-		$file_dt = date ("m d Y H:i:s", filemtime($dir . '/testfiletouch.txt')) ;
+        //test wih modified date param
+        $result = sugar_touch( $dir . '/testfiletouch.txt',$test_dt,$test_dt);
+        $file_dt = date ("m d Y H:i:s", filemtime($dir . '/testfiletouch.txt')) ;
 		
-		$this->assertTrue($result);
-		$this->assertSame($file_dt, $expected );
-	}
+        $this->assertTrue($result);
+        $this->assertSame($file_dt, $expected );
+    }
 	
 
-	public function testsugar_chmod() 
-	{
+    public function testsugar_chmod() 
+    {
         $this->markTestSkipped('Permissions cannot be tested with vfsStream');
-		//execute the method and test if it returns success(true)
+        //execute the method and test if it returns success(true)
         $dir = "vfs://test";
-		$result = sugar_chmod($dir . '/test.txt',0777);
-		$this->assertTrue($result);
-	}
+        $result = sugar_chmod($dir . '/test.txt',0777);
+        $this->assertTrue($result);
+    }
 	
 	
-	public function testsugar_chown() 
-	{
+    public function testsugar_chown() 
+    {
         $this->markTestSkipped('Permissions cannot be tested with vfsStream');
-		//execute the method and test if it returns success(true)
+        //execute the method and test if it returns success(true)
         $dir = "vfs://test";
-		$result = sugar_chown($dir . '/test.txt');
-		$this->assertFalse($result);
+        $result = sugar_chown($dir . '/test.txt');
+        $this->assertFalse($result);
 
         $result = sugar_chown($dir . '/test.txt',org\bovigo\vfs\vfsStream::getCurrentUser());
         $this->assertTrue($result);
 
-	}
+    }
 	
 	
-	public function testsugar_chgrp() 
-	{
+    public function testsugar_chgrp() 
+    {
         $this->markTestSkipped('Permissions cannot be tested with vfsStream');
-		//execute the method and test if it returns success(true)
+        //execute the method and test if it returns success(true)
         $dir = "vfs://test";
-		$result = sugar_chgrp($dir . '/test.txt');
-		$this->assertFalse($result);
+        $result = sugar_chgrp($dir . '/test.txt');
+        $this->assertFalse($result);
 
         $result = sugar_chgrp($dir . '/test.txt',org\bovigo\vfs\vfsStream::getCurrentGroup());
         $this->assertFalse($result);
-	}
+    }
 	
 
-	public function testget_mode()
-	{
-		//test with all mods defined in config
-		$this->assertSame(1528,get_mode());
-		$this->assertSame(1528,get_mode('dir_mode', 10));
-		$this->assertSame(493,get_mode('file_mode', 10));
-		$this->assertSame('',get_mode('user', 10));
-		$this->assertSame('',get_mode('group', 10));
-	}
-
-	public function testsugar_is_dir()
-	{
-		$dir = "vfs://root";
+    public function testget_mode()
+    {
+        //test with all mods defined in config
+        $this->assertSame(1528,get_mode());
+        $this->assertSame(1528,get_mode('dir_mode', 10));
+        $this->assertSame(493,get_mode('file_mode', 10));
+        $this->assertSame('',get_mode('user', 10));
+        $this->assertSame('',get_mode('group', 10));
+    }
+
+    public function testsugar_is_dir()
+    {
+        $dir = "vfs://root";
 		
-		$this->assertFalse(sugar_is_dir('')); //invalid dir
+        $this->assertFalse(sugar_is_dir('')); //invalid dir
         $this->assertFalse(sugar_is_dir($dir."/foo")); //invalid dir
-		$this->assertTrue(sugar_is_dir($dir."/testDir")); //valid dir
+        $this->assertTrue(sugar_is_dir($dir."/testDir")); //valid dir
 		
-	}
-
-	public function testsugar_is_file()
-	{
-		$this->assertFalse(sugar_is_file('')); //invalid file
-		$this->assertFalse(sugar_is_file('vfs://config')); //invalid file
-		$this->assertTrue(is_file('vfs://root/test.txt')); //valid file
-	}
+    }
+
+    public function testsugar_is_file()
+    {
+        $this->assertFalse(sugar_is_file('')); //invalid file
+        $this->assertFalse(sugar_is_file('vfs://config')); //invalid file
+        $this->assertTrue(is_file('vfs://root/test.txt')); //valid file
+    }
 	
 
-	public function testsugar_cached()
-	{
-		$cache_dir = rtrim($GLOBALS['sugar_config']['cache_dir'], '/\\');
+    public function testsugar_cached()
+    {
+        $cache_dir = rtrim($GLOBALS['sugar_config']['cache_dir'], '/\\');
 		
-		$this->assertSame($cache_dir . '/', sugar_cached('')); //invalid file
-		$this->assertSame($cache_dir . '/config', sugar_cached('config')); //valid file		
-		$this->assertSame($cache_dir . '/modules' , sugar_cached('modules')); //valid file
+        $this->assertSame($cache_dir . '/', sugar_cached('')); //invalid file
+        $this->assertSame($cache_dir . '/config', sugar_cached('config')); //valid file		
+        $this->assertSame($cache_dir . '/modules' , sugar_cached('modules')); //valid file
 		
-	}
+    }
 
 	
 }
\ No newline at end of file

Spacing +28 added lines, -28 removed lines

@@ -17,13 +17,13 @@ 
 		$dir = "vfs://root";
 		
 		//non recursive
-		$result = sugar_mkdir($dir . "/mkdirTest");
-		$this->assertFileExists($dir . "/mkdirTest");
+		$result = sugar_mkdir($dir."/mkdirTest");
+		$this->assertFileExists($dir."/mkdirTest");
 		$this->assertTrue($result);
 		
 		//recursive
-		$result = sugar_mkdir($dir . "/mkdirTest/test",null,true);
-		$this->assertFileExists($dir . "/mkdirTest/test");
+		$result = sugar_mkdir($dir."/mkdirTest/test", null, true);
+		$this->assertFileExists($dir."/mkdirTest/test");
 		$this->assertTrue($result);
 	}
 	
@@ -40,9 +40,9 @@ 
 		//execute the method and test if it doesn't returns false and returns the number of bytes written
 
         $dir = "vfs://root";
-		$result = sugar_file_put_contents( $dir . '/testfile.txt', 'some test data');
+		$result = sugar_file_put_contents($dir.'/testfile.txt', 'some test data');
 		$this->assertNotFalse($result);
-		$this->assertEquals(14,$result);
+		$this->assertEquals(14, $result);
 	}
 
 	
@@ -52,7 +52,7 @@ 
         $this->markTestSkipped('Atomic file put cannot be tested with vfsStream');
 		//execute the method and test if it returns success(true)
         $dir = "vfs://root";
-		$result = sugar_file_put_contents_atomic( $dir . '/atomictestfile.txt', 'some test data');
+		$result = sugar_file_put_contents_atomic($dir.'/atomictestfile.txt', 'some test data');
 		$this->assertTrue($result);
 	}
 	
@@ -61,10 +61,10 @@ 
 	{
 		//execute the method and test if it doesn't returns false and returns the expected contents
         $dir = "vfs://root";
-		$result = file_get_contents( $dir . '/test.txt');
+		$result = file_get_contents($dir.'/test.txt');
 		
 		$this->assertNotFalse($result);
-		$this->assertEquals('Hello world!',$result);
+		$this->assertEquals('Hello world!', $result);
 	}
 	
 
@@ -73,19 +73,19 @@ 
 		//execute the method and test if it returns success(true)
 
         $dir = "vfs://root";
-		$test_dt = time() - 3600 ; 
-		$expected = date("m d Y H:i:s",  time() - 3600 );
+		$test_dt = time() - 3600; 
+		$expected = date("m d Y H:i:s", time() - 3600);
 		
 		//test wihout modified date param
-		$result = sugar_touch( $dir . '/testfiletouch.txt');
+		$result = sugar_touch($dir.'/testfiletouch.txt');
 		$this->assertTrue($result);		
 		
 		//test wih modified date param
-		$result = sugar_touch( $dir . '/testfiletouch.txt',$test_dt,$test_dt);
-		$file_dt = date ("m d Y H:i:s", filemtime($dir . '/testfiletouch.txt')) ;
+		$result = sugar_touch($dir.'/testfiletouch.txt', $test_dt, $test_dt);
+		$file_dt = date("m d Y H:i:s", filemtime($dir.'/testfiletouch.txt'));
 		
 		$this->assertTrue($result);
-		$this->assertSame($file_dt, $expected );
+		$this->assertSame($file_dt, $expected);
 	}
 	
 
@@ -94,7 +94,7 @@ 
         $this->markTestSkipped('Permissions cannot be tested with vfsStream');
 		//execute the method and test if it returns success(true)
         $dir = "vfs://test";
-		$result = sugar_chmod($dir . '/test.txt',0777);
+		$result = sugar_chmod($dir.'/test.txt', 0777);
 		$this->assertTrue($result);
 	}
 	
@@ -104,10 +104,10 @@ 
         $this->markTestSkipped('Permissions cannot be tested with vfsStream');
 		//execute the method and test if it returns success(true)
         $dir = "vfs://test";
-		$result = sugar_chown($dir . '/test.txt');
+		$result = sugar_chown($dir.'/test.txt');
 		$this->assertFalse($result);
 
-        $result = sugar_chown($dir . '/test.txt',org\bovigo\vfs\vfsStream::getCurrentUser());
+        $result = sugar_chown($dir.'/test.txt', org\bovigo\vfs\vfsStream::getCurrentUser());
         $this->assertTrue($result);
 
 	}
@@ -118,10 +118,10 @@ 
         $this->markTestSkipped('Permissions cannot be tested with vfsStream');
 		//execute the method and test if it returns success(true)
         $dir = "vfs://test";
-		$result = sugar_chgrp($dir . '/test.txt');
+		$result = sugar_chgrp($dir.'/test.txt');
 		$this->assertFalse($result);
 
-        $result = sugar_chgrp($dir . '/test.txt',org\bovigo\vfs\vfsStream::getCurrentGroup());
+        $result = sugar_chgrp($dir.'/test.txt', org\bovigo\vfs\vfsStream::getCurrentGroup());
         $this->assertFalse($result);
 	}
 	
@@ -129,11 +129,11 @@ 
 	public function testget_mode()
 	{
 		//test with all mods defined in config
-		$this->assertSame(1528,get_mode());
-		$this->assertSame(1528,get_mode('dir_mode', 10));
-		$this->assertSame(493,get_mode('file_mode', 10));
-		$this->assertSame('',get_mode('user', 10));
-		$this->assertSame('',get_mode('group', 10));
+		$this->assertSame(1528, get_mode());
+		$this->assertSame(1528, get_mode('dir_mode', 10));
+		$this->assertSame(493, get_mode('file_mode', 10));
+		$this->assertSame('', get_mode('user', 10));
+		$this->assertSame('', get_mode('group', 10));
 	}
 
 	public function testsugar_is_dir()
@@ -158,9 +158,9 @@ 
 	{
 		$cache_dir = rtrim($GLOBALS['sugar_config']['cache_dir'], '/\\');
 		
-		$this->assertSame($cache_dir . '/', sugar_cached('')); //invalid file
-		$this->assertSame($cache_dir . '/config', sugar_cached('config')); //valid file		
-		$this->assertSame($cache_dir . '/modules' , sugar_cached('modules')); //valid file
+		$this->assertSame($cache_dir.'/', sugar_cached('')); //invalid file
+		$this->assertSame($cache_dir.'/config', sugar_cached('config')); //valid file		
+		$this->assertSame($cache_dir.'/modules', sugar_cached('modules')); //valid file
 		
 	}
 

tests/tests/include/utils/logicUtilsTest.php

Indentation +72 added lines, -72 removed lines

@@ -8,26 +8,26 @@ 
 class logic_utilsTest extends PHPUnit_Framework_TestCase
 {
 
-	public function testget_hook_array()
-	{
-		//test with a vaid module. it will return an array
-		$AccountsHooks =  get_hook_array('Accounts');
-		$this->assertTrue(is_array($AccountsHooks));
+    public function testget_hook_array()
+    {
+        //test with a vaid module. it will return an array
+        $AccountsHooks =  get_hook_array('Accounts');
+        $this->assertTrue(is_array($AccountsHooks));
 		
-		//test with an invalid array. it will throw an file include exception.
-		$BugsHooks = "";
-		try{
-			$BugsHooks =  get_hook_array('Bugs');
-		}catch(Exception $e){}
+        //test with an invalid array. it will throw an file include exception.
+        $BugsHooks = "";
+        try{
+            $BugsHooks =  get_hook_array('Bugs');
+        }catch(Exception $e){}
 		
-		$this->assertFalse(is_array($BugsHooks));
+        $this->assertFalse(is_array($BugsHooks));
 		
-	}
+    }
 	
 	
-	private function getTestHook(){
+    private function getTestHook(){
 		
-		//array containing hooks array to test
+        //array containing hooks array to test
 		
         $hook_array = Array();
         $hook_array['after_ui_footer'] = Array();
@@ -43,80 +43,80 @@ 
         $hook_array['after_restore'] = array();
         $hook_array['after_restore'][] = Array(1, 'AOD Index changes', 'modules/AOD_Index/AOD_LogicHooks.php','AOD_LogicHooks', 'saveModuleRestore');
         
-		return $hook_array;
-	}
+        return $hook_array;
+    }
 	
-	public function check_existing_elementProvider()
-	{
-		//provide test cases dataset to validate 
-		
-		$hook_array = $this->getTestHook();
-		return array(
-				array($hook_array,'after_save',array(0,'popup_select'), true),
-				array($hook_array,'after_save',array(0,'foo'), false),
-				array($hook_array,'foo',array(0,'popup_select'), false),
-		);	
-	}
+    public function check_existing_elementProvider()
+    {
+        //provide test cases dataset to validate 
+		
+        $hook_array = $this->getTestHook();
+        return array(
+                array($hook_array,'after_save',array(0,'popup_select'), true),
+                array($hook_array,'after_save',array(0,'foo'), false),
+                array($hook_array,'foo',array(0,'popup_select'), false),
+        );	
+    }
 	
-	/**
-	 * @dataProvider check_existing_elementProvider
-	 */
-	public function testcheck_existing_element($hook_array, $event, $action_array, $expected)
-	{
-		//test with dataset containing valid and invalid cases
-		$this->assertSame( check_existing_element($hook_array,$event, $action_array) , $expected);
-		
-	}
+    /**
+     * @dataProvider check_existing_elementProvider
+     */
+    public function testcheck_existing_element($hook_array, $event, $action_array, $expected)
+    {
+        //test with dataset containing valid and invalid cases
+        $this->assertSame( check_existing_element($hook_array,$event, $action_array) , $expected);
+		
+    }
 	
-	public function testreplace_or_add_logic_type()
-	{
-		//execute the method and test if it returns expected values
+    public function testreplace_or_add_logic_type()
+    {
+        //execute the method and test if it returns expected values
 		
-		$hook_array = $this->getTestHook();
-		$expected = "<?php\n// Do not store anything in this file that is not part of the array or the hook version.  This file will	\n// be automatically rebuilt in the future. \n \$hook_version = 1; \n\$hook_array = Array(); \n// position, file, function \n\$hook_array['after_ui_footer'] = Array(); \n\$hook_array['after_ui_footer'][] = Array(10, 'popup_onload', 'modules/SecurityGroups/AssignGroups.php','AssignGroups', 'popup_onload'); \n\$hook_array['after_ui_frame'] = Array(); \n\$hook_array['after_ui_frame'][] = Array(20, 'mass_assign', 'modules/SecurityGroups/AssignGroups.php','AssignGroups', 'mass_assign'); \n\$hook_array['after_ui_frame'][] = Array(1, 'Load Social JS', 'custom/include/social/hooks.php','hooks', 'load_js'); \n\$hook_array['after_save'] = Array(); \n\$hook_array['after_save'][] = Array(30, 'popup_select', 'modules/SecurityGroups/AssignGroups.php','AssignGroups', 'popup_select'); \n\$hook_array['after_save'][] = Array(1, 'AOD Index Changes', 'modules/AOD_Index/AOD_LogicHooks.php','AOD_LogicHooks', 'saveModuleChanges'); \n\$hook_array['after_delete'] = Array(); \n\$hook_array['after_delete'][] = Array(1, 'AOD Index changes', 'modules/AOD_Index/AOD_LogicHooks.php','AOD_LogicHooks', 'saveModuleDelete'); \n\$hook_array['after_restore'] = Array(); \n\$hook_array['after_restore'][] = Array(1, 'AOD Index changes', 'modules/AOD_Index/AOD_LogicHooks.php','AOD_LogicHooks', 'saveModuleRestore'); \n\n\n\n?>";
-		$this->assertEquals($expected,replace_or_add_logic_type($hook_array));
+        $hook_array = $this->getTestHook();
+        $expected = "<?php\n// Do not store anything in this file that is not part of the array or the hook version.  This file will	\n// be automatically rebuilt in the future. \n \$hook_version = 1; \n\$hook_array = Array(); \n// position, file, function \n\$hook_array['after_ui_footer'] = Array(); \n\$hook_array['after_ui_footer'][] = Array(10, 'popup_onload', 'modules/SecurityGroups/AssignGroups.php','AssignGroups', 'popup_onload'); \n\$hook_array['after_ui_frame'] = Array(); \n\$hook_array['after_ui_frame'][] = Array(20, 'mass_assign', 'modules/SecurityGroups/AssignGroups.php','AssignGroups', 'mass_assign'); \n\$hook_array['after_ui_frame'][] = Array(1, 'Load Social JS', 'custom/include/social/hooks.php','hooks', 'load_js'); \n\$hook_array['after_save'] = Array(); \n\$hook_array['after_save'][] = Array(30, 'popup_select', 'modules/SecurityGroups/AssignGroups.php','AssignGroups', 'popup_select'); \n\$hook_array['after_save'][] = Array(1, 'AOD Index Changes', 'modules/AOD_Index/AOD_LogicHooks.php','AOD_LogicHooks', 'saveModuleChanges'); \n\$hook_array['after_delete'] = Array(); \n\$hook_array['after_delete'][] = Array(1, 'AOD Index changes', 'modules/AOD_Index/AOD_LogicHooks.php','AOD_LogicHooks', 'saveModuleDelete'); \n\$hook_array['after_restore'] = Array(); \n\$hook_array['after_restore'][] = Array(1, 'AOD Index changes', 'modules/AOD_Index/AOD_LogicHooks.php','AOD_LogicHooks', 'saveModuleRestore'); \n\n\n\n?>";
+        $this->assertEquals($expected,replace_or_add_logic_type($hook_array));
 		
-	}
+    }
 	
-	public function testwrite_logic_file()
-	{
-		//execute the method and test if it returns expected values, 
-		//check if file is created and contains expected contents
+    public function testwrite_logic_file()
+    {
+        //execute the method and test if it returns expected values, 
+        //check if file is created and contains expected contents
 	
-		$vfs = vfsStream::setup('custom/modules/TEST_Test');
+        $vfs = vfsStream::setup('custom/modules/TEST_Test');
 	
-		if ( $vfs->hasChild('logic_hooks.php')  == true) {
-			unlink('custom/modules/TEST_Test/logic_hooks.php');
-			rmdir('custom/modules/TEST_Test');
-		}
+        if ( $vfs->hasChild('logic_hooks.php')  == true) {
+            unlink('custom/modules/TEST_Test/logic_hooks.php');
+            rmdir('custom/modules/TEST_Test');
+        }
 		
-		$expectedContents = "<?php\n// Do not store anything in this file that is not part of the array or the hook version.  This file will	\n// be automatically rebuilt in the future. \n \$hook_version = 1; \n\$hook_array = Array(); \n// position, file, function \n\$hook_array['after_ui_footer'] = Array(); \n\$hook_array['after_ui_footer'][] = Array(10, 'popup_onload', 'modules/SecurityGroups/AssignGroups.php','AssignGroups', 'popup_onload'); \n\$hook_array['after_ui_frame'] = Array(); \n\$hook_array['after_ui_frame'][] = Array(20, 'mass_assign', 'modules/SecurityGroups/AssignGroups.php','AssignGroups', 'mass_assign'); \n\$hook_array['after_ui_frame'][] = Array(1, 'Load Social JS', 'custom/include/social/hooks.php','hooks', 'load_js'); \n\$hook_array['after_save'] = Array(); \n\$hook_array['after_save'][] = Array(30, 'popup_select', 'modules/SecurityGroups/AssignGroups.php','AssignGroups', 'popup_select'); \n\$hook_array['after_save'][] = Array(1, 'AOD Index Changes', 'modules/AOD_Index/AOD_LogicHooks.php','AOD_LogicHooks', 'saveModuleChanges'); \n\$hook_array['after_delete'] = Array(); \n\$hook_array['after_delete'][] = Array(1, 'AOD Index changes', 'modules/AOD_Index/AOD_LogicHooks.php','AOD_LogicHooks', 'saveModuleDelete'); \n\$hook_array['after_restore'] = Array(); \n\$hook_array['after_restore'][] = Array(1, 'AOD Index changes', 'modules/AOD_Index/AOD_LogicHooks.php','AOD_LogicHooks', 'saveModuleRestore'); \n\n\n\n?>";
-		write_logic_file('TEST_Test',$expectedContents);
+        $expectedContents = "<?php\n// Do not store anything in this file that is not part of the array or the hook version.  This file will	\n// be automatically rebuilt in the future. \n \$hook_version = 1; \n\$hook_array = Array(); \n// position, file, function \n\$hook_array['after_ui_footer'] = Array(); \n\$hook_array['after_ui_footer'][] = Array(10, 'popup_onload', 'modules/SecurityGroups/AssignGroups.php','AssignGroups', 'popup_onload'); \n\$hook_array['after_ui_frame'] = Array(); \n\$hook_array['after_ui_frame'][] = Array(20, 'mass_assign', 'modules/SecurityGroups/AssignGroups.php','AssignGroups', 'mass_assign'); \n\$hook_array['after_ui_frame'][] = Array(1, 'Load Social JS', 'custom/include/social/hooks.php','hooks', 'load_js'); \n\$hook_array['after_save'] = Array(); \n\$hook_array['after_save'][] = Array(30, 'popup_select', 'modules/SecurityGroups/AssignGroups.php','AssignGroups', 'popup_select'); \n\$hook_array['after_save'][] = Array(1, 'AOD Index Changes', 'modules/AOD_Index/AOD_LogicHooks.php','AOD_LogicHooks', 'saveModuleChanges'); \n\$hook_array['after_delete'] = Array(); \n\$hook_array['after_delete'][] = Array(1, 'AOD Index changes', 'modules/AOD_Index/AOD_LogicHooks.php','AOD_LogicHooks', 'saveModuleDelete'); \n\$hook_array['after_restore'] = Array(); \n\$hook_array['after_restore'][] = Array(1, 'AOD Index changes', 'modules/AOD_Index/AOD_LogicHooks.php','AOD_LogicHooks', 'saveModuleRestore'); \n\n\n\n?>";
+        write_logic_file('TEST_Test',$expectedContents);
 		
-		//Check file created
-		$this->assertFileExists('custom/modules/TEST_Test/logic_hooks.php');
-		$actualContents = file_get_contents('custom/modules/TEST_Test/logic_hooks.php');
-		$this->assertSame($expectedContents, $actualContents);
+        //Check file created
+        $this->assertFileExists('custom/modules/TEST_Test/logic_hooks.php');
+        $actualContents = file_get_contents('custom/modules/TEST_Test/logic_hooks.php');
+        $this->assertSame($expectedContents, $actualContents);
 		
-		$expectedArray = $this->getTestHook();
+        $expectedArray = $this->getTestHook();
 		
-		$actualArray = get_hook_array('TEST_Test');
+        $actualArray = get_hook_array('TEST_Test');
 		
-		$this->assertSame($expectedArray, $actualArray);
+        $this->assertSame($expectedArray, $actualArray);
 		
-		unlink('custom/modules/TEST_Test/logic_hooks.php');
-		rmdir('custom/modules/TEST_Test');		
+        unlink('custom/modules/TEST_Test/logic_hooks.php');
+        rmdir('custom/modules/TEST_Test');		
 		
-	}
+    }
 	
-	public function testbuild_logic_file()
-	{
-		//execute the method and test if it returns expected values
-		
-		$hook_array = $this->getTestHook();
-		$expected = "// Do not store anything in this file that is not part of the array or the hook version.  This file will	\n// be automatically rebuilt in the future. \n \$hook_version = 1; \n\$hook_array = Array(); \n// position, file, function \n\$hook_array['after_ui_footer'] = Array(); \n\$hook_array['after_ui_footer'][] = Array(10, 'popup_onload', 'modules/SecurityGroups/AssignGroups.php','AssignGroups', 'popup_onload'); \n\$hook_array['after_ui_frame'] = Array(); \n\$hook_array['after_ui_frame'][] = Array(20, 'mass_assign', 'modules/SecurityGroups/AssignGroups.php','AssignGroups', 'mass_assign'); \n\$hook_array['after_ui_frame'][] = Array(1, 'Load Social JS', 'custom/include/social/hooks.php','hooks', 'load_js'); \n\$hook_array['after_save'] = Array(); \n\$hook_array['after_save'][] = Array(30, 'popup_select', 'modules/SecurityGroups/AssignGroups.php','AssignGroups', 'popup_select'); \n\$hook_array['after_save'][] = Array(1, 'AOD Index Changes', 'modules/AOD_Index/AOD_LogicHooks.php','AOD_LogicHooks', 'saveModuleChanges'); \n\$hook_array['after_delete'] = Array(); \n\$hook_array['after_delete'][] = Array(1, 'AOD Index changes', 'modules/AOD_Index/AOD_LogicHooks.php','AOD_LogicHooks', 'saveModuleDelete'); \n\$hook_array['after_restore'] = Array(); \n\$hook_array['after_restore'][] = Array(1, 'AOD Index changes', 'modules/AOD_Index/AOD_LogicHooks.php','AOD_LogicHooks', 'saveModuleRestore'); \n\n\n";
-		$this->assertEquals($expected,build_logic_file($hook_array));	
-	}
+    public function testbuild_logic_file()
+    {
+        //execute the method and test if it returns expected values
+		
+        $hook_array = $this->getTestHook();
+        $expected = "// Do not store anything in this file that is not part of the array or the hook version.  This file will	\n// be automatically rebuilt in the future. \n \$hook_version = 1; \n\$hook_array = Array(); \n// position, file, function \n\$hook_array['after_ui_footer'] = Array(); \n\$hook_array['after_ui_footer'][] = Array(10, 'popup_onload', 'modules/SecurityGroups/AssignGroups.php','AssignGroups', 'popup_onload'); \n\$hook_array['after_ui_frame'] = Array(); \n\$hook_array['after_ui_frame'][] = Array(20, 'mass_assign', 'modules/SecurityGroups/AssignGroups.php','AssignGroups', 'mass_assign'); \n\$hook_array['after_ui_frame'][] = Array(1, 'Load Social JS', 'custom/include/social/hooks.php','hooks', 'load_js'); \n\$hook_array['after_save'] = Array(); \n\$hook_array['after_save'][] = Array(30, 'popup_select', 'modules/SecurityGroups/AssignGroups.php','AssignGroups', 'popup_select'); \n\$hook_array['after_save'][] = Array(1, 'AOD Index Changes', 'modules/AOD_Index/AOD_LogicHooks.php','AOD_LogicHooks', 'saveModuleChanges'); \n\$hook_array['after_delete'] = Array(); \n\$hook_array['after_delete'][] = Array(1, 'AOD Index changes', 'modules/AOD_Index/AOD_LogicHooks.php','AOD_LogicHooks', 'saveModuleDelete'); \n\$hook_array['after_restore'] = Array(); \n\$hook_array['after_restore'][] = Array(1, 'AOD Index changes', 'modules/AOD_Index/AOD_LogicHooks.php','AOD_LogicHooks', 'saveModuleRestore'); \n\n\n";
+        $this->assertEquals($expected,build_logic_file($hook_array));	
+    }
 	
 }
 ?>

Spacing +20 added lines, -20 removed lines

@@ -11,37 +11,37 @@ 
 	public function testget_hook_array()
 	{
 		//test with a vaid module. it will return an array
-		$AccountsHooks =  get_hook_array('Accounts');
+		$AccountsHooks = get_hook_array('Accounts');
 		$this->assertTrue(is_array($AccountsHooks));
 		
 		//test with an invalid array. it will throw an file include exception.
 		$BugsHooks = "";
-		try{
-			$BugsHooks =  get_hook_array('Bugs');
-		}catch(Exception $e){}
+		try {
+			$BugsHooks = get_hook_array('Bugs');
+		}catch (Exception $e) {}
 		
 		$this->assertFalse(is_array($BugsHooks));
 		
 	}
 	
 	
-	private function getTestHook(){
+	private function getTestHook() {
 		
 		//array containing hooks array to test
 		
         $hook_array = Array();
         $hook_array['after_ui_footer'] = Array();
-        $hook_array['after_ui_footer'][] = Array(10, 'popup_onload', 'modules/SecurityGroups/AssignGroups.php','AssignGroups', 'popup_onload');
+        $hook_array['after_ui_footer'][] = Array(10, 'popup_onload', 'modules/SecurityGroups/AssignGroups.php', 'AssignGroups', 'popup_onload');
         $hook_array['after_ui_frame'] = Array();
-        $hook_array['after_ui_frame'][] = Array(20, 'mass_assign', 'modules/SecurityGroups/AssignGroups.php','AssignGroups', 'mass_assign');
-        $hook_array['after_ui_frame'][] = Array(1, 'Load Social JS', 'custom/include/social/hooks.php','hooks', 'load_js');
+        $hook_array['after_ui_frame'][] = Array(20, 'mass_assign', 'modules/SecurityGroups/AssignGroups.php', 'AssignGroups', 'mass_assign');
+        $hook_array['after_ui_frame'][] = Array(1, 'Load Social JS', 'custom/include/social/hooks.php', 'hooks', 'load_js');
         $hook_array['after_save'] = Array();
-        $hook_array['after_save'][] = Array(30, 'popup_select', 'modules/SecurityGroups/AssignGroups.php','AssignGroups', 'popup_select');
-        $hook_array['after_save'][] = Array(1, 'AOD Index Changes', 'modules/AOD_Index/AOD_LogicHooks.php','AOD_LogicHooks', 'saveModuleChanges');
+        $hook_array['after_save'][] = Array(30, 'popup_select', 'modules/SecurityGroups/AssignGroups.php', 'AssignGroups', 'popup_select');
+        $hook_array['after_save'][] = Array(1, 'AOD Index Changes', 'modules/AOD_Index/AOD_LogicHooks.php', 'AOD_LogicHooks', 'saveModuleChanges');
         $hook_array['after_delete'] = array();
-        $hook_array['after_delete'][] = Array(1, 'AOD Index changes', 'modules/AOD_Index/AOD_LogicHooks.php','AOD_LogicHooks', 'saveModuleDelete');
+        $hook_array['after_delete'][] = Array(1, 'AOD Index changes', 'modules/AOD_Index/AOD_LogicHooks.php', 'AOD_LogicHooks', 'saveModuleDelete');
         $hook_array['after_restore'] = array();
-        $hook_array['after_restore'][] = Array(1, 'AOD Index changes', 'modules/AOD_Index/AOD_LogicHooks.php','AOD_LogicHooks', 'saveModuleRestore');
+        $hook_array['after_restore'][] = Array(1, 'AOD Index changes', 'modules/AOD_Index/AOD_LogicHooks.php', 'AOD_LogicHooks', 'saveModuleRestore');
         
 		return $hook_array;
 	}
@@ -52,9 +52,9 @@ 
 		
 		$hook_array = $this->getTestHook();
 		return array(
-				array($hook_array,'after_save',array(0,'popup_select'), true),
-				array($hook_array,'after_save',array(0,'foo'), false),
-				array($hook_array,'foo',array(0,'popup_select'), false),
+				array($hook_array, 'after_save', array(0, 'popup_select'), true),
+				array($hook_array, 'after_save', array(0, 'foo'), false),
+				array($hook_array, 'foo', array(0, 'popup_select'), false),
 		);	
 	}
 	
@@ -64,7 +64,7 @@ 
 	public function testcheck_existing_element($hook_array, $event, $action_array, $expected)
 	{
 		//test with dataset containing valid and invalid cases
-		$this->assertSame( check_existing_element($hook_array,$event, $action_array) , $expected);
+		$this->assertSame(check_existing_element($hook_array, $event, $action_array), $expected);
 		
 	}
 	
@@ -74,7 +74,7 @@ 
 		
 		$hook_array = $this->getTestHook();
 		$expected = "<?php\n// Do not store anything in this file that is not part of the array or the hook version.  This file will	\n// be automatically rebuilt in the future. \n \$hook_version = 1; \n\$hook_array = Array(); \n// position, file, function \n\$hook_array['after_ui_footer'] = Array(); \n\$hook_array['after_ui_footer'][] = Array(10, 'popup_onload', 'modules/SecurityGroups/AssignGroups.php','AssignGroups', 'popup_onload'); \n\$hook_array['after_ui_frame'] = Array(); \n\$hook_array['after_ui_frame'][] = Array(20, 'mass_assign', 'modules/SecurityGroups/AssignGroups.php','AssignGroups', 'mass_assign'); \n\$hook_array['after_ui_frame'][] = Array(1, 'Load Social JS', 'custom/include/social/hooks.php','hooks', 'load_js'); \n\$hook_array['after_save'] = Array(); \n\$hook_array['after_save'][] = Array(30, 'popup_select', 'modules/SecurityGroups/AssignGroups.php','AssignGroups', 'popup_select'); \n\$hook_array['after_save'][] = Array(1, 'AOD Index Changes', 'modules/AOD_Index/AOD_LogicHooks.php','AOD_LogicHooks', 'saveModuleChanges'); \n\$hook_array['after_delete'] = Array(); \n\$hook_array['after_delete'][] = Array(1, 'AOD Index changes', 'modules/AOD_Index/AOD_LogicHooks.php','AOD_LogicHooks', 'saveModuleDelete'); \n\$hook_array['after_restore'] = Array(); \n\$hook_array['after_restore'][] = Array(1, 'AOD Index changes', 'modules/AOD_Index/AOD_LogicHooks.php','AOD_LogicHooks', 'saveModuleRestore'); \n\n\n\n?>";
-		$this->assertEquals($expected,replace_or_add_logic_type($hook_array));
+		$this->assertEquals($expected, replace_or_add_logic_type($hook_array));
 		
 	}
 	
@@ -85,13 +85,13 @@ 
 	
 		$vfs = vfsStream::setup('custom/modules/TEST_Test');
 	
-		if ( $vfs->hasChild('logic_hooks.php')  == true) {
+		if ($vfs->hasChild('logic_hooks.php') == true) {
 			unlink('custom/modules/TEST_Test/logic_hooks.php');
 			rmdir('custom/modules/TEST_Test');
 		}
 		
 		$expectedContents = "<?php\n// Do not store anything in this file that is not part of the array or the hook version.  This file will	\n// be automatically rebuilt in the future. \n \$hook_version = 1; \n\$hook_array = Array(); \n// position, file, function \n\$hook_array['after_ui_footer'] = Array(); \n\$hook_array['after_ui_footer'][] = Array(10, 'popup_onload', 'modules/SecurityGroups/AssignGroups.php','AssignGroups', 'popup_onload'); \n\$hook_array['after_ui_frame'] = Array(); \n\$hook_array['after_ui_frame'][] = Array(20, 'mass_assign', 'modules/SecurityGroups/AssignGroups.php','AssignGroups', 'mass_assign'); \n\$hook_array['after_ui_frame'][] = Array(1, 'Load Social JS', 'custom/include/social/hooks.php','hooks', 'load_js'); \n\$hook_array['after_save'] = Array(); \n\$hook_array['after_save'][] = Array(30, 'popup_select', 'modules/SecurityGroups/AssignGroups.php','AssignGroups', 'popup_select'); \n\$hook_array['after_save'][] = Array(1, 'AOD Index Changes', 'modules/AOD_Index/AOD_LogicHooks.php','AOD_LogicHooks', 'saveModuleChanges'); \n\$hook_array['after_delete'] = Array(); \n\$hook_array['after_delete'][] = Array(1, 'AOD Index changes', 'modules/AOD_Index/AOD_LogicHooks.php','AOD_LogicHooks', 'saveModuleDelete'); \n\$hook_array['after_restore'] = Array(); \n\$hook_array['after_restore'][] = Array(1, 'AOD Index changes', 'modules/AOD_Index/AOD_LogicHooks.php','AOD_LogicHooks', 'saveModuleRestore'); \n\n\n\n?>";
-		write_logic_file('TEST_Test',$expectedContents);
+		write_logic_file('TEST_Test', $expectedContents);
 		
 		//Check file created
 		$this->assertFileExists('custom/modules/TEST_Test/logic_hooks.php');
@@ -115,7 +115,7 @@ 
 		
 		$hook_array = $this->getTestHook();
 		$expected = "// Do not store anything in this file that is not part of the array or the hook version.  This file will	\n// be automatically rebuilt in the future. \n \$hook_version = 1; \n\$hook_array = Array(); \n// position, file, function \n\$hook_array['after_ui_footer'] = Array(); \n\$hook_array['after_ui_footer'][] = Array(10, 'popup_onload', 'modules/SecurityGroups/AssignGroups.php','AssignGroups', 'popup_onload'); \n\$hook_array['after_ui_frame'] = Array(); \n\$hook_array['after_ui_frame'][] = Array(20, 'mass_assign', 'modules/SecurityGroups/AssignGroups.php','AssignGroups', 'mass_assign'); \n\$hook_array['after_ui_frame'][] = Array(1, 'Load Social JS', 'custom/include/social/hooks.php','hooks', 'load_js'); \n\$hook_array['after_save'] = Array(); \n\$hook_array['after_save'][] = Array(30, 'popup_select', 'modules/SecurityGroups/AssignGroups.php','AssignGroups', 'popup_select'); \n\$hook_array['after_save'][] = Array(1, 'AOD Index Changes', 'modules/AOD_Index/AOD_LogicHooks.php','AOD_LogicHooks', 'saveModuleChanges'); \n\$hook_array['after_delete'] = Array(); \n\$hook_array['after_delete'][] = Array(1, 'AOD Index changes', 'modules/AOD_Index/AOD_LogicHooks.php','AOD_LogicHooks', 'saveModuleDelete'); \n\$hook_array['after_restore'] = Array(); \n\$hook_array['after_restore'][] = Array(1, 'AOD Index changes', 'modules/AOD_Index/AOD_LogicHooks.php','AOD_LogicHooks', 'saveModuleRestore'); \n\n\n";
-		$this->assertEquals($expected,build_logic_file($hook_array));	
+		$this->assertEquals($expected, build_logic_file($hook_array));	
 	}
 	
 }

Braces +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 		$BugsHooks = "";
 		try{
 			$BugsHooks =  get_hook_array('Bugs');
-		}catch(Exception $e){}
+		} catch(Exception $e){}
 		
 		$this->assertFalse(is_array($BugsHooks));
 		

tests/tests/include/utils/dbUtilsTest.php

Indentation +96 added lines, -96 removed lines

@@ -6,130 +6,130 @@
 
 	
 	
-	public function db_convertProvider()
-	{
-		//array containing all possible types supported by db_convert
-		return array(
-				array(gmdate('Y-m-d H:i:s'),'today',array(),'CURDATE()'),
-				array('text','left',array(2),'LEFT(text,2)'),
-				array('2015-11-16 19:10:52','date_format',array(),'DATE_FORMAT(2015-11-16 19:10:52,\'%Y-%m-%d\')'),
-				array('2015-11-16 19:10:52','time_format',array(), '2015-11-16 19:10:52' ),
-				array('2015-11-16','date',array(), '2015-11-16' ),
-				array('19:10:52','time',array(), '19:10:52' ),
-				array('2015-11-16 19:10:52','datetime',array(), '2015-11-16 19:10:52'),
-				array(Null,'ifnull',array(0), 'IFNULL(0)' ),
-				array('value1 ','concat',array('value2'), 'CONCAT(value1 ,value2)' ), 
-				array('2015-11-16 19:10:52','quarter',array(), 'QUARTER(2015-11-16 19:10:52)' ),
-				array('value1','length',array(), 'LENGTH(value1)' ),
-				array('2015-11-16 19:32:29', 'month',array(), 'MONTH(2015-11-16 19:32:29)' ),
-				array('2015-11-16','add_date',array('1','DAY'), 'DATE_ADD(2015-11-16, INTERVAL 1 DAY)' ),
-				array('19:10:52','add_time',array('1', 'HOUR'), 'DATE_ADD(19:10:52, INTERVAL + CONCAT(1, \':\', HOUR) HOUR_MINUTE)' ),
-				array('col','avg',array(2), 'avg(col)' ),
-				array('2015-11-16 19:32:29','add_tz_offset',array(), '2015-11-16 19:32:29 + INTERVAL 0 MINUTE' ),
+    public function db_convertProvider()
+    {
+        //array containing all possible types supported by db_convert
+        return array(
+                array(gmdate('Y-m-d H:i:s'),'today',array(),'CURDATE()'),
+                array('text','left',array(2),'LEFT(text,2)'),
+                array('2015-11-16 19:10:52','date_format',array(),'DATE_FORMAT(2015-11-16 19:10:52,\'%Y-%m-%d\')'),
+                array('2015-11-16 19:10:52','time_format',array(), '2015-11-16 19:10:52' ),
+                array('2015-11-16','date',array(), '2015-11-16' ),
+                array('19:10:52','time',array(), '19:10:52' ),
+                array('2015-11-16 19:10:52','datetime',array(), '2015-11-16 19:10:52'),
+                array(Null,'ifnull',array(0), 'IFNULL(0)' ),
+                array('value1 ','concat',array('value2'), 'CONCAT(value1 ,value2)' ), 
+                array('2015-11-16 19:10:52','quarter',array(), 'QUARTER(2015-11-16 19:10:52)' ),
+                array('value1','length',array(), 'LENGTH(value1)' ),
+                array('2015-11-16 19:32:29', 'month',array(), 'MONTH(2015-11-16 19:32:29)' ),
+                array('2015-11-16','add_date',array('1','DAY'), 'DATE_ADD(2015-11-16, INTERVAL 1 DAY)' ),
+                array('19:10:52','add_time',array('1', 'HOUR'), 'DATE_ADD(19:10:52, INTERVAL + CONCAT(1, \':\', HOUR) HOUR_MINUTE)' ),
+                array('col','avg',array(2), 'avg(col)' ),
+                array('2015-11-16 19:32:29','add_tz_offset',array(), '2015-11-16 19:32:29 + INTERVAL 0 MINUTE' ),
 				
-		);
-	}
-	
-	/**
-	 * @dataProvider db_convertProvider
-	 */	
-	public function testdb_convert($string, $type, $params, $expected)
-	{
-		//execute the method and test if it returns expected values for all types
-		$actual = db_convert($string, $type,$params);
-		$this->assertSame($expected,$actual);
-	}
-	
-	
-	public function testdb_concat()
-	{
-		error_reporting(E_ERROR | E_PARSE);
+        );
+    }
+	
+    /**
+     * @dataProvider db_convertProvider
+     */	
+    public function testdb_convert($string, $type, $params, $expected)
+    {
+        //execute the method and test if it returns expected values for all types
+        $actual = db_convert($string, $type,$params);
+        $this->assertSame($expected,$actual);
+    }
+	
+	
+    public function testdb_concat()
+    {
+        error_reporting(E_ERROR | E_PARSE);
 		
-		//execute the method and test if it returns expected values
+        //execute the method and test if it returns expected values
 		
-		$table = "Table1"; 
-		$fields = Array('Col1','Col2','Col3');
-		$expected = "LTRIM(RTRIM(CONCAT(IFNULL(Table1.Col1,''),'',IFNULL(Table1.Col2,''),'',IFNULL(Table1.Col3,''))))";
-		$actual = db_concat($table, $fields);
-		$this->assertSame($expected,$actual);
-	}
+        $table = "Table1"; 
+        $fields = Array('Col1','Col2','Col3');
+        $expected = "LTRIM(RTRIM(CONCAT(IFNULL(Table1.Col1,''),'',IFNULL(Table1.Col2,''),'',IFNULL(Table1.Col3,''))))";
+        $actual = db_concat($table, $fields);
+        $this->assertSame($expected,$actual);
+    }
 	
 	
-	public function testfrom_db_convert()
-	{
-		//execute the method and test if it returns expected values
+    public function testfrom_db_convert()
+    {
+        //execute the method and test if it returns expected values
 		
-		$this->assertSame("2015-11-16 19:32:29", from_db_convert("2015-11-16 19:32:29","date")); 
-		$this->assertSame("19:32:29",from_db_convert("19:32:29","time"));
-		$this->assertSame("2015-11-16 19:32:29",from_db_convert("2015-11-16 19:32:29","datetime"));
-		$this->assertSame("2015-11-16 19:32:29",from_db_convert("2015-11-16 19:32:29","datetimecombo"));
-		$this->assertSame("2015-11-16 19:32:29",from_db_convert("2015-11-16 19:32:29","timestamp"));
+        $this->assertSame("2015-11-16 19:32:29", from_db_convert("2015-11-16 19:32:29","date")); 
+        $this->assertSame("19:32:29",from_db_convert("19:32:29","time"));
+        $this->assertSame("2015-11-16 19:32:29",from_db_convert("2015-11-16 19:32:29","datetime"));
+        $this->assertSame("2015-11-16 19:32:29",from_db_convert("2015-11-16 19:32:29","datetimecombo"));
+        $this->assertSame("2015-11-16 19:32:29",from_db_convert("2015-11-16 19:32:29","timestamp"));
 		
-	}
+    }
 	
 	
-	public function testto_html()
-	{
-		//execute the method and test if it returns expected values
+    public function testto_html()
+    {
+        //execute the method and test if it returns expected values
 		
-		$string = "";
-		$expected = "";
-		$actual = to_html($string);
-		$this->assertSame($expected,$actual);
+        $string = "";
+        $expected = "";
+        $actual = to_html($string);
+        $this->assertSame($expected,$actual);
 		
-		$string = "'test'&trial<\">";
-		$expected = "&#039;test&#039;&trial&lt;&quot;&gt;";
-		$actual = to_html($string);
-		$this->assertSame($expected,$actual);
+        $string = "'test'&trial<\">";
+        $expected = "&#039;test&#039;&trial&lt;&quot;&gt;";
+        $actual = to_html($string);
+        $this->assertSame($expected,$actual);
 		
-	}
+    }
 	
 	
 	
-	public function testfrom_html() 
-	{
+    public function testfrom_html() 
+    {
 	
-		$string = "";
-		$expected = "";
-		$actual = from_html($string);
-		$this->assertSame($expected,$actual);
+        $string = "";
+        $expected = "";
+        $actual = from_html($string);
+        $this->assertSame($expected,$actual);
 		
-		$string = "&#039;test&#039;&trial&lt;&quot;&gt;";
-		$expected = "'test'&trial<\">"; 
-		$actual = from_html($string);
-		$this->assertSame($expected,$actual);
+        $string = "&#039;test&#039;&trial&lt;&quot;&gt;";
+        $expected = "'test'&trial<\">"; 
+        $actual = from_html($string);
+        $this->assertSame($expected,$actual);
 		
-	}
+    }
 	
 	
-	public function testgetValidDBName()
-	{
-		$expected ="";
-		$actual = getValidDBName("");
-		$this->assertSame($expected,$actual);
+    public function testgetValidDBName()
+    {
+        $expected ="";
+        $actual = getValidDBName("");
+        $this->assertSame($expected,$actual);
 		
 		
-		$expected = "col";
-		$actual = getValidDBName("Col");
-		$this->assertSame($expected,$actual);
+        $expected = "col";
+        $actual = getValidDBName("Col");
+        $this->assertSame($expected,$actual);
 		
-	}
+    }
 	
 	
-	public function testisValidDBName()
-	{
-		//valid value
-		$expected = true;
-		$actual = isValidDBName("suitecrmtest","mysql");
-		$this->assertSame($expected,$actual);
+    public function testisValidDBName()
+    {
+        //valid value
+        $expected = true;
+        $actual = isValidDBName("suitecrmtest","mysql");
+        $this->assertSame($expected,$actual);
 
-		//invalid value
-		$expected = false;
-		$actual = isValidDBName("suite/crm.test","mysql");
-		$this->assertSame($expected,$actual);
+        //invalid value
+        $expected = false;
+        $actual = isValidDBName("suite/crm.test","mysql");
+        $this->assertSame($expected,$actual);
 		
 		
-	}
+    }
 
 	
 }

Spacing +36 added lines, -36 removed lines

@@ -10,22 +10,22 @@ 
 	{
 		//array containing all possible types supported by db_convert
 		return array(
-				array(gmdate('Y-m-d H:i:s'),'today',array(),'CURDATE()'),
-				array('text','left',array(2),'LEFT(text,2)'),
-				array('2015-11-16 19:10:52','date_format',array(),'DATE_FORMAT(2015-11-16 19:10:52,\'%Y-%m-%d\')'),
-				array('2015-11-16 19:10:52','time_format',array(), '2015-11-16 19:10:52' ),
-				array('2015-11-16','date',array(), '2015-11-16' ),
-				array('19:10:52','time',array(), '19:10:52' ),
-				array('2015-11-16 19:10:52','datetime',array(), '2015-11-16 19:10:52'),
-				array(Null,'ifnull',array(0), 'IFNULL(0)' ),
-				array('value1 ','concat',array('value2'), 'CONCAT(value1 ,value2)' ), 
-				array('2015-11-16 19:10:52','quarter',array(), 'QUARTER(2015-11-16 19:10:52)' ),
-				array('value1','length',array(), 'LENGTH(value1)' ),
-				array('2015-11-16 19:32:29', 'month',array(), 'MONTH(2015-11-16 19:32:29)' ),
-				array('2015-11-16','add_date',array('1','DAY'), 'DATE_ADD(2015-11-16, INTERVAL 1 DAY)' ),
-				array('19:10:52','add_time',array('1', 'HOUR'), 'DATE_ADD(19:10:52, INTERVAL + CONCAT(1, \':\', HOUR) HOUR_MINUTE)' ),
-				array('col','avg',array(2), 'avg(col)' ),
-				array('2015-11-16 19:32:29','add_tz_offset',array(), '2015-11-16 19:32:29 + INTERVAL 0 MINUTE' ),
+				array(gmdate('Y-m-d H:i:s'), 'today', array(), 'CURDATE()'),
+				array('text', 'left', array(2), 'LEFT(text,2)'),
+				array('2015-11-16 19:10:52', 'date_format', array(), 'DATE_FORMAT(2015-11-16 19:10:52,\'%Y-%m-%d\')'),
+				array('2015-11-16 19:10:52', 'time_format', array(), '2015-11-16 19:10:52'),
+				array('2015-11-16', 'date', array(), '2015-11-16'),
+				array('19:10:52', 'time', array(), '19:10:52'),
+				array('2015-11-16 19:10:52', 'datetime', array(), '2015-11-16 19:10:52'),
+				array(Null, 'ifnull', array(0), 'IFNULL(0)'),
+				array('value1 ', 'concat', array('value2'), 'CONCAT(value1 ,value2)'), 
+				array('2015-11-16 19:10:52', 'quarter', array(), 'QUARTER(2015-11-16 19:10:52)'),
+				array('value1', 'length', array(), 'LENGTH(value1)'),
+				array('2015-11-16 19:32:29', 'month', array(), 'MONTH(2015-11-16 19:32:29)'),
+				array('2015-11-16', 'add_date', array('1', 'DAY'), 'DATE_ADD(2015-11-16, INTERVAL 1 DAY)'),
+				array('19:10:52', 'add_time', array('1', 'HOUR'), 'DATE_ADD(19:10:52, INTERVAL + CONCAT(1, \':\', HOUR) HOUR_MINUTE)'),
+				array('col', 'avg', array(2), 'avg(col)'),
+				array('2015-11-16 19:32:29', 'add_tz_offset', array(), '2015-11-16 19:32:29 + INTERVAL 0 MINUTE'),
 				
 		);
 	}
@@ -36,8 +36,8 @@ 
 	public function testdb_convert($string, $type, $params, $expected)
 	{
 		//execute the method and test if it returns expected values for all types
-		$actual = db_convert($string, $type,$params);
-		$this->assertSame($expected,$actual);
+		$actual = db_convert($string, $type, $params);
+		$this->assertSame($expected, $actual);
 	}
 	
 	
@@ -48,10 +48,10 @@ 
 		//execute the method and test if it returns expected values
 		
 		$table = "Table1"; 
-		$fields = Array('Col1','Col2','Col3');
+		$fields = Array('Col1', 'Col2', 'Col3');
 		$expected = "LTRIM(RTRIM(CONCAT(IFNULL(Table1.Col1,''),'',IFNULL(Table1.Col2,''),'',IFNULL(Table1.Col3,''))))";
 		$actual = db_concat($table, $fields);
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 	}
 	
 	
@@ -59,11 +59,11 @@ 
 	{
 		//execute the method and test if it returns expected values
 		
-		$this->assertSame("2015-11-16 19:32:29", from_db_convert("2015-11-16 19:32:29","date")); 
-		$this->assertSame("19:32:29",from_db_convert("19:32:29","time"));
-		$this->assertSame("2015-11-16 19:32:29",from_db_convert("2015-11-16 19:32:29","datetime"));
-		$this->assertSame("2015-11-16 19:32:29",from_db_convert("2015-11-16 19:32:29","datetimecombo"));
-		$this->assertSame("2015-11-16 19:32:29",from_db_convert("2015-11-16 19:32:29","timestamp"));
+		$this->assertSame("2015-11-16 19:32:29", from_db_convert("2015-11-16 19:32:29", "date")); 
+		$this->assertSame("19:32:29", from_db_convert("19:32:29", "time"));
+		$this->assertSame("2015-11-16 19:32:29", from_db_convert("2015-11-16 19:32:29", "datetime"));
+		$this->assertSame("2015-11-16 19:32:29", from_db_convert("2015-11-16 19:32:29", "datetimecombo"));
+		$this->assertSame("2015-11-16 19:32:29", from_db_convert("2015-11-16 19:32:29", "timestamp"));
 		
 	}
 	
@@ -75,12 +75,12 @@ 
 		$string = "";
 		$expected = "";
 		$actual = to_html($string);
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 		
 		$string = "'test'&trial<\">";
 		$expected = "&#039;test&#039;&trial&lt;&quot;&gt;";
 		$actual = to_html($string);
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 		
 	}
 	
@@ -92,26 +92,26 @@ 
 		$string = "";
 		$expected = "";
 		$actual = from_html($string);
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 		
 		$string = "&#039;test&#039;&trial&lt;&quot;&gt;";
 		$expected = "'test'&trial<\">"; 
 		$actual = from_html($string);
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 		
 	}
 	
 	
 	public function testgetValidDBName()
 	{
-		$expected ="";
+		$expected = "";
 		$actual = getValidDBName("");
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 		
 		
 		$expected = "col";
 		$actual = getValidDBName("Col");
-		$this->assertSame($expected,$actual);
+		$this->assertSame($expected, $actual);
 		
 	}
 	
@@ -120,13 +120,13 @@ 
 	{
 		//valid value
 		$expected = true;
-		$actual = isValidDBName("suitecrmtest","mysql");
-		$this->assertSame($expected,$actual);
+		$actual = isValidDBName("suitecrmtest", "mysql");
+		$this->assertSame($expected, $actual);
 
 		//invalid value
 		$expected = false;
-		$actual = isValidDBName("suite/crm.test","mysql");
-		$this->assertSame($expected,$actual);
+		$actual = isValidDBName("suite/crm.test", "mysql");
+		$this->assertSame($expected, $actual);
 		
 		
 	}

tests/tests/include/utils/layoutUtilsTest.php

Indentation +80 added lines, -80 removed lines

@@ -6,113 +6,113 @@
 {
 	
 
-	public function testget_form_header()
-	{
-		error_reporting(E_ERROR | E_PARSE);
+    public function testget_form_header()
+    {
+        error_reporting(E_ERROR | E_PARSE);
 		
-		//execute the method and test if it returns html and contains the values provided in parameters
+        //execute the method and test if it returns html and contains the values provided in parameters
 		
-		//help param true
-		$html1 = get_form_header("test Header", "test subheader", true);
-		$this->assertGreaterThan(0,strlen($html1));
-		$this->assertNotFalse(strpos($html1,"test Header"));
-		$this->assertNotFalse(strpos($html1,"test subheader"));
+        //help param true
+        $html1 = get_form_header("test Header", "test subheader", true);
+        $this->assertGreaterThan(0,strlen($html1));
+        $this->assertNotFalse(strpos($html1,"test Header"));
+        $this->assertNotFalse(strpos($html1,"test subheader"));
 		
 		
-		// help param false
-		$html2 = get_form_header("new test Header", "new test subheader", false);
-		$this->assertGreaterThan(0,strlen($html2));
-		$this->assertNotFalse(strpos($html2,"new test Header"));
-		$this->assertNotFalse(strpos($html2,"new test subheader"));
+        // help param false
+        $html2 = get_form_header("new test Header", "new test subheader", false);
+        $this->assertGreaterThan(0,strlen($html2));
+        $this->assertNotFalse(strpos($html2,"new test Header"));
+        $this->assertNotFalse(strpos($html2,"new test subheader"));
 		
 		
-		$this->assertGreaterThan(strlen($html2),strlen($html1));
+        $this->assertGreaterThan(strlen($html2),strlen($html1));
 		
-	}
+    }
 	
 	
-	public function testget_module_title( )
-	{
-		//execute the method and test if it returns html and contains the values provided in parameters
-		
-		//with show_create true, generates more html
-		$html1 = get_module_title("Users", "Users Home", true );
-		$this->assertGreaterThan(0,strlen($html1));
-		$this->assertNotFalse(strpos($html1,"Users"));
-		$this->assertNotFalse(strpos($html1,"Users Home"));
-		
-		//with show_create false, generates less html
-		$html2 = get_module_title("Users", "Users Home", false );
-		$this->assertGreaterThan(0,strlen($html2));
-		$this->assertNotFalse(strpos($html2,"Users"));
-		$this->assertNotFalse(strpos($html2,"Users Home"));
-		$this->assertGreaterThan(strlen($html2),strlen($html1));
+    public function testget_module_title( )
+    {
+        //execute the method and test if it returns html and contains the values provided in parameters
+		
+        //with show_create true, generates more html
+        $html1 = get_module_title("Users", "Users Home", true );
+        $this->assertGreaterThan(0,strlen($html1));
+        $this->assertNotFalse(strpos($html1,"Users"));
+        $this->assertNotFalse(strpos($html1,"Users Home"));
+		
+        //with show_create false, generates less html
+        $html2 = get_module_title("Users", "Users Home", false );
+        $this->assertGreaterThan(0,strlen($html2));
+        $this->assertNotFalse(strpos($html2,"Users"));
+        $this->assertNotFalse(strpos($html2,"Users Home"));
+        $this->assertGreaterThan(strlen($html2),strlen($html1));
 
-		//with show_create flase and count > 1, generates more html compared to count =0
-		$html3 = get_module_title("Users", "Users Home", false, 2 );
-		$this->assertGreaterThan(0,strlen($html3));
-		$this->assertNotFalse(strpos($html3,"Users"));
-		$this->assertNotFalse(strpos($html3,"Users Home"));
-		$this->assertGreaterThan(strlen($html2),strlen($html3));
-		$this->assertGreaterThan(strlen($html3),strlen($html1));
-		
-	}
+        //with show_create flase and count > 1, generates more html compared to count =0
+        $html3 = get_module_title("Users", "Users Home", false, 2 );
+        $this->assertGreaterThan(0,strlen($html3));
+        $this->assertNotFalse(strpos($html3,"Users"));
+        $this->assertNotFalse(strpos($html3,"Users Home"));
+        $this->assertGreaterThan(strlen($html2),strlen($html3));
+        $this->assertGreaterThan(strlen($html3),strlen($html1));
+		
+    }
 	
 	
-	public function testgetClassicModuleTitle()
-	{
-		//execute the method and test if it returns html and contains the values provided in parameters
+    public function testgetClassicModuleTitle()
+    {
+        //execute the method and test if it returns html and contains the values provided in parameters
 		
-		//with show_create false, generates less html
-		$html1 = getClassicModuleTitle("users", Array('Users Home'));
-		$this->assertGreaterThan(0,strlen($html1));
-		$this->assertNotFalse(strpos($html1,"Users Home"));
+        //with show_create false, generates less html
+        $html1 = getClassicModuleTitle("users", Array('Users Home'));
+        $this->assertGreaterThan(0,strlen($html1));
+        $this->assertNotFalse(strpos($html1,"Users Home"));
 		
 
-		//with show_create true, generates more html
-		$html2 = getClassicModuleTitle("users", Array('Users Home'),true);
-		$this->assertGreaterThan(0,strlen($html2));
-		$this->assertNotFalse(strpos($html2,"Users Home"));
-		$this->assertGreaterThan(strlen($html1),strlen($html2));
+        //with show_create true, generates more html
+        $html2 = getClassicModuleTitle("users", Array('Users Home'),true);
+        $this->assertGreaterThan(0,strlen($html2));
+        $this->assertNotFalse(strpos($html2,"Users Home"));
+        $this->assertGreaterThan(strlen($html1),strlen($html2));
 		
-	}
+    }
 	
 	
-	public function testinsert_popup_header()
-	{
-		//execute the method and test if it returns html/JS
+    public function testinsert_popup_header()
+    {
+        //execute the method and test if it returns html/JS
 		
-		//with includeJS true, generates more html		
-		ob_start();
-		insert_popup_header();
-		$renderedContent1 = ob_get_contents();
-		ob_end_clean();
-		$this->assertGreaterThan(0,strlen($renderedContent1));
+        //with includeJS true, generates more html		
+        ob_start();
+        insert_popup_header();
+        $renderedContent1 = ob_get_contents();
+        ob_end_clean();
+        $this->assertGreaterThan(0,strlen($renderedContent1));
 		
 		
-		//with includeJS false, generates less html
-		ob_start();
-		insert_popup_header('',false);
-		$renderedContent2 = ob_get_contents();
-		ob_end_clean();
-		$this->assertGreaterThan(0,strlen($renderedContent2));		
+        //with includeJS false, generates less html
+        ob_start();
+        insert_popup_header('',false);
+        $renderedContent2 = ob_get_contents();
+        ob_end_clean();
+        $this->assertGreaterThan(0,strlen($renderedContent2));		
 		
-		$this->assertGreaterThan(strlen($renderedContent2),strlen($renderedContent1));
+        $this->assertGreaterThan(strlen($renderedContent2),strlen($renderedContent1));
 		
-	}
+    }
 	
 	
-	public function testinsert_popup_footer()
-	{
-		//execute the method and test if it returns html 
+    public function testinsert_popup_footer()
+    {
+        //execute the method and test if it returns html 
 		
-		ob_start();
-		insert_popup_footer();
-		$renderedContent = ob_get_contents();
-		ob_end_clean();
-		$this->assertGreaterThan(0,strlen($renderedContent));
+        ob_start();
+        insert_popup_footer();
+        $renderedContent = ob_get_contents();
+        ob_end_clean();
+        $this->assertGreaterThan(0,strlen($renderedContent));
 		
-	}
+    }
 
 }
 ?>

Spacing +33 added lines, -33 removed lines

@@ -14,19 +14,19 @@ 
 		
 		//help param true
 		$html1 = get_form_header("test Header", "test subheader", true);
-		$this->assertGreaterThan(0,strlen($html1));
-		$this->assertNotFalse(strpos($html1,"test Header"));
-		$this->assertNotFalse(strpos($html1,"test subheader"));
+		$this->assertGreaterThan(0, strlen($html1));
+		$this->assertNotFalse(strpos($html1, "test Header"));
+		$this->assertNotFalse(strpos($html1, "test subheader"));
 		
 		
 		// help param false
 		$html2 = get_form_header("new test Header", "new test subheader", false);
-		$this->assertGreaterThan(0,strlen($html2));
-		$this->assertNotFalse(strpos($html2,"new test Header"));
-		$this->assertNotFalse(strpos($html2,"new test subheader"));
+		$this->assertGreaterThan(0, strlen($html2));
+		$this->assertNotFalse(strpos($html2, "new test Header"));
+		$this->assertNotFalse(strpos($html2, "new test subheader"));
 		
 		
-		$this->assertGreaterThan(strlen($html2),strlen($html1));
+		$this->assertGreaterThan(strlen($html2), strlen($html1));
 		
 	}
 	
@@ -36,25 +36,25 @@ 
 		//execute the method and test if it returns html and contains the values provided in parameters
 		
 		//with show_create true, generates more html
-		$html1 = get_module_title("Users", "Users Home", true );
-		$this->assertGreaterThan(0,strlen($html1));
-		$this->assertNotFalse(strpos($html1,"Users"));
-		$this->assertNotFalse(strpos($html1,"Users Home"));
+		$html1 = get_module_title("Users", "Users Home", true);
+		$this->assertGreaterThan(0, strlen($html1));
+		$this->assertNotFalse(strpos($html1, "Users"));
+		$this->assertNotFalse(strpos($html1, "Users Home"));
 		
 		//with show_create false, generates less html
-		$html2 = get_module_title("Users", "Users Home", false );
-		$this->assertGreaterThan(0,strlen($html2));
-		$this->assertNotFalse(strpos($html2,"Users"));
-		$this->assertNotFalse(strpos($html2,"Users Home"));
-		$this->assertGreaterThan(strlen($html2),strlen($html1));
+		$html2 = get_module_title("Users", "Users Home", false);
+		$this->assertGreaterThan(0, strlen($html2));
+		$this->assertNotFalse(strpos($html2, "Users"));
+		$this->assertNotFalse(strpos($html2, "Users Home"));
+		$this->assertGreaterThan(strlen($html2), strlen($html1));
 
 		//with show_create flase and count > 1, generates more html compared to count =0
-		$html3 = get_module_title("Users", "Users Home", false, 2 );
-		$this->assertGreaterThan(0,strlen($html3));
-		$this->assertNotFalse(strpos($html3,"Users"));
-		$this->assertNotFalse(strpos($html3,"Users Home"));
-		$this->assertGreaterThan(strlen($html2),strlen($html3));
-		$this->assertGreaterThan(strlen($html3),strlen($html1));
+		$html3 = get_module_title("Users", "Users Home", false, 2);
+		$this->assertGreaterThan(0, strlen($html3));
+		$this->assertNotFalse(strpos($html3, "Users"));
+		$this->assertNotFalse(strpos($html3, "Users Home"));
+		$this->assertGreaterThan(strlen($html2), strlen($html3));
+		$this->assertGreaterThan(strlen($html3), strlen($html1));
 		
 	}
 	
@@ -65,15 +65,15 @@ 
 		
 		//with show_create false, generates less html
 		$html1 = getClassicModuleTitle("users", Array('Users Home'));
-		$this->assertGreaterThan(0,strlen($html1));
-		$this->assertNotFalse(strpos($html1,"Users Home"));
+		$this->assertGreaterThan(0, strlen($html1));
+		$this->assertNotFalse(strpos($html1, "Users Home"));
 		
 
 		//with show_create true, generates more html
-		$html2 = getClassicModuleTitle("users", Array('Users Home'),true);
-		$this->assertGreaterThan(0,strlen($html2));
-		$this->assertNotFalse(strpos($html2,"Users Home"));
-		$this->assertGreaterThan(strlen($html1),strlen($html2));
+		$html2 = getClassicModuleTitle("users", Array('Users Home'), true);
+		$this->assertGreaterThan(0, strlen($html2));
+		$this->assertNotFalse(strpos($html2, "Users Home"));
+		$this->assertGreaterThan(strlen($html1), strlen($html2));
 		
 	}
 	
@@ -87,17 +87,17 @@ 
 		insert_popup_header();
 		$renderedContent1 = ob_get_contents();
 		ob_end_clean();
-		$this->assertGreaterThan(0,strlen($renderedContent1));
+		$this->assertGreaterThan(0, strlen($renderedContent1));
 		
 		
 		//with includeJS false, generates less html
 		ob_start();
-		insert_popup_header('',false);
+		insert_popup_header('', false);
 		$renderedContent2 = ob_get_contents();
 		ob_end_clean();
-		$this->assertGreaterThan(0,strlen($renderedContent2));		
+		$this->assertGreaterThan(0, strlen($renderedContent2));		
 		
-		$this->assertGreaterThan(strlen($renderedContent2),strlen($renderedContent1));
+		$this->assertGreaterThan(strlen($renderedContent2), strlen($renderedContent1));
 		
 	}
 	
@@ -110,7 +110,7 @@ 
 		insert_popup_footer();
 		$renderedContent = ob_get_contents();
 		ob_end_clean();
-		$this->assertGreaterThan(0,strlen($renderedContent));
+		$this->assertGreaterThan(0, strlen($renderedContent));
 		
 	}
 

tests/tests/include/utils/autoloaderTest.php

Indentation +22 added lines, -22 removed lines

@@ -6,36 +6,36 @@
 
 
     public function testautoload()
-	{
-		//execute the method and test if it returns expected values
+    {
+        //execute the method and test if it returns expected values
 		
-		//test with a invalid class .
-		$result = SugarAutoLoader::autoload('foo');
-		$this->assertFalse($result);
+        //test with a invalid class .
+        $result = SugarAutoLoader::autoload('foo');
+        $this->assertFalse($result);
 		
-		//test with a valid class out of autoload mappings.
-		$result = SugarAutoLoader::autoload('SugarArray');
-		$this->assertFalse($result);
+        //test with a valid class out of autoload mappings.
+        $result = SugarAutoLoader::autoload('SugarArray');
+        $this->assertFalse($result);
 		
-		//test with a valid class registered in autoload mappings
-		$result = SugarAutoLoader::autoload('User');
-		$this->assertTrue($result);
+        //test with a valid class registered in autoload mappings
+        $result = SugarAutoLoader::autoload('User');
+        $this->assertTrue($result);
 		
-	}
+    }
 
 
-	public function testloadAll(){
+    public function testloadAll(){
 		
-		//execute the method and check if it works and doesn't throws an exception
-		//this method only includes file so there is no output to test.
-		try {
-			SugarAutoLoader::loadAll();
-			$this->assertTrue(TRUE);
-		} catch (Exception $e) {
-			$this->fail();
-		}
+        //execute the method and check if it works and doesn't throws an exception
+        //this method only includes file so there is no output to test.
+        try {
+            SugarAutoLoader::loadAll();
+            $this->assertTrue(TRUE);
+        } catch (Exception $e) {
+            $this->fail();
+        }
 		 
-	}
+    }
 	
 }
 ?>

Spacing +3 added lines, -3 removed lines

@@ -2,7 +2,7 @@ 
 
 
 
-class SugarAutoLoaderTest extends PHPUnit_Framework_TestCase{
+class SugarAutoLoaderTest extends PHPUnit_Framework_TestCase {
 
 
     public function testautoload()
@@ -24,14 +24,14 @@ 
 	}
 
 
-	public function testloadAll(){
+	public function testloadAll() {
 		
 		//execute the method and check if it works and doesn't throws an exception
 		//this method only includes file so there is no output to test.
 		try {
 			SugarAutoLoader::loadAll();
 			$this->assertTrue(TRUE);
-		} catch (Exception $e) {
+		}catch (Exception $e) {
 			$this->fail();
 		}
 		 

tests/tests/include/utils/zipUtilsTest.php

Indentation +13 added lines, -13 removed lines

@@ -5,22 +5,22 @@
 {
 
 	
-	public function testunzip(){
-		$this->markTestIncomplete('Can Not be implemented');
-	}
+    public function testunzip(){
+        $this->markTestIncomplete('Can Not be implemented');
+    }
 	
-	public function testunzip_file(){
-		$this->markTestIncomplete('Can Not be implemented');
-	}
+    public function testunzip_file(){
+        $this->markTestIncomplete('Can Not be implemented');
+    }
 	
-	public function testzip_dir(){
-		$this->markTestIncomplete('Can Not be implemented');
-	}
+    public function testzip_dir(){
+        $this->markTestIncomplete('Can Not be implemented');
+    }
 	
 	
-	public function testzip_files_list()
-	{
-		$this->markTestIncomplete('Can Not be implemented');
-	}
+    public function testzip_files_list()
+    {
+        $this->markTestIncomplete('Can Not be implemented');
+    }
 
 }

Spacing +3 added lines, -3 removed lines

@@ -5,15 +5,15 @@
 {
 
 	
-	public function testunzip(){
+	public function testunzip() {
 		$this->markTestIncomplete('Can Not be implemented');
 	}
 	
-	public function testunzip_file(){
+	public function testunzip_file() {
 		$this->markTestIncomplete('Can Not be implemented');
 	}
 	
-	public function testzip_dir(){
+	public function testzip_dir() {
 		$this->markTestIncomplete('Can Not be implemented');
 	}