1 files changed, 82 insertions, 85 deletions

diff --git a/test/TestBitSmartyFilter.php b/test/TestBitSmartyFilter.php
index e2402a0..6ac0555 100644
--- a/test/TestBitSmartyFilter.php
+++ b/test/TestBitSmartyFilter.php
@@ -6,129 +6,126 @@ class InputOutputTester {
 
 }
 
-
 class TestBitSmartyFilter extends UnitTestCase {
 
   var $filterTestDir;
   var $smartyDir;
-    
 
   function TestBitSmartyFilter ()
   {
-    // directory that contains test directories
-    $this->filterTestDir = KERNEL_PKG_PATH . '/test/smarty_filter_tests';
-    $this->smartyDir = KERNEL_PKG_PATH . 'smarty_bit';
+	// directory that contains test directories
+	$this->filterTestDir = KERNEL_PKG_PATH . '/test/smarty_filter_tests';
+	$this->smartyDir = KERNEL_PKG_PATH . 'smarty_bit';
   }
 
   function testPrePostFilters ()
   {
-    global $gBitLanguage;
-    $gBitLanguage->mLanguage = 'sv';
-	
-    $this->assertTrue (is_dir("$this->filterTestDir"), // Quite fatal
-		       "$this->filterTestDir is not a directory");
-	
-    // echo "$this->filterTestDir<br />";
-	
-    $filterTestDirHandle = opendir($this->filterTestDir);
-    while (false !== ($filterTestCase = readdir($filterTestDirHandle))) {
-      $filterTestCaseDir = $this->filterTestDir . '/' . $filterTestCase;
-      $this->assertTrue(is_dir ($filterTestCaseDir),
-			"$filterTestCaseDir is not a directory");
-	    
-      // echo "$filterTestCaseDir<br />";
-      if (preg_match('/(.+)filter\.(.+)/', $filterTestCase, $matches)) {
+	global $gBitLanguage;
+	$gBitLanguage->mLanguage = 'sv';
+
+	$this->assertTrue (is_dir("$this->filterTestDir"), // Quite fatal
+			   "$this->filterTestDir is not a directory", );
+
+	// echo "$this->filterTestDir<br />";
+
+	$filterTestDirHandle = opendir($this->filterTestDir);
+	while (false !== ($filterTestCase = readdir($filterTestDirHandle))) {
+	  $filterTestCaseDir = $this->filterTestDir . '/' . $filterTestCase;
+	  $this->assertTrue(is_dir ($filterTestCaseDir),
+			"$filterTestCaseDir is not a directory", );
+
+	  // echo "$filterTestCaseDir<br />";
+	  if (preg_match('/(.+)filter\.(.+)/', $filterTestCase, $matches)) {
 	// echo "$matches[0]<br />";
-		
+
 	$filterType = $matches[1];
 	$filterBase = $matches[2];
-		
-	$smartyFile = 
+
+	$smartyFile =
 	  $this->smartyDir . '/' . $filterType .'filter.' . $filterBase . '.php';
 	$filterName = 'smarty_' . $filterType . 'filter_' .$filterBase;
-		
+
 	// echo "$smartyFile<br />";
 	// echo "$filterName<br />";
-		
+
 	$this->assertTrue(file_exists ($smartyFile),
-			  "Smarty filter $smartyFile is missing");
+			  "Smarty filter $smartyFile is missing", );
 	include_once($smartyFile);
-		
+
 	// echo "$filterTestCaseDir<br />";
 	$filterTestCaseDirHandle = opendir("$filterTestCaseDir");
 	while (false != ($inputFile = readdir($filterTestCaseDirHandle))) {
 	  if (preg_match('/^(.+)\.input$/', $inputFile, $matches)) {
-	    $baseName = $matches[1];
-	    $outputFile = $filterTestCaseDir . '/' . $baseName . '.output';
-	    $errorFile  = $filterTestCaseDir . '/' . $baseName . '.error';
-	    $inputFile  = $filterTestCaseDir . '/' . $inputFile;
-			
-			
-	    // echo "$inputFile<br />";
-	    // echo "$outputFile<br />";
-	    // echo "$errorFile<br />";
-			
-	    $this->assertTrue(file_exists ($inputFile),
-			      (file_exists ($inputFile) ?
-			       "" :
-			       "Input file <strong>$inputFile</strong> " .
-			       "is missing"));
-			
-	    // remove error file if there is no error
-			
-	    if (file_exists($errorFile)) {
-	      @unlink ($errorFile); 
-	    }
-			
-	    $input = file_get_contents($inputFile);
-	    // $filterOutput = call_user_func ($filterName, $input, &$smarty);
-	    $filterOutput = call_user_func_array ($filterName, 
-						  array($input, &$gBitSmarty));
-			
-	    if (!file_exists($outputFile)) {
-	      // Output file does not exist - Create error file
-	      // echo "OUTPUT does not Exists<br />";
-	      $this->assertTrue(file_exists ($outputFile),
+		$baseName = $matches[1];
+		$outputFile = $filterTestCaseDir . '/' . $baseName . '.output';
+		$errorFile  = $filterTestCaseDir . '/' . $baseName . '.error';
+		$inputFile  = $filterTestCaseDir . '/' . $inputFile;
+
+		// echo "$inputFile<br />";
+		// echo "$outputFile<br />";
+		// echo "$errorFile<br />";
+
+		$this->assertTrue(file_exists ($inputFile),
+				  (file_exists ($inputFile) ?
+				   "" :
+				   "Input file <strong>$inputFile</strong> " .
+				   "is missing"), );
+
+		// remove error file if there is no error
+
+		if (file_exists($errorFile)) {
+		  @unlink ($errorFile);
+		}
+
+		$input = file_get_contents($inputFile);
+		// $filterOutput = call_user_func ($filterName, $input, &$smarty);
+		$filterOutput = call_user_func_array ($filterName,
+						  [$input, &$gBitSmarty], );
+
+		if (!file_exists($outputFile)) {
+		  // Output file does not exist - Create error file
+		  // echo "OUTPUT does not Exists<br />";
+		  $this->assertTrue(file_exists ($outputFile),
 				(file_exists ($outputFile) ?
 				 "" :
-				 "Output file <strong>$outputFile</strong> " . 
+				 "Output file <strong>$outputFile</strong> " .
 				 "is missing, " .
-				 "<strong>$errorFile</strong> created."));
+				 "<strong>$errorFile</strong> created."), );
+
+		  // Error handling missing when writing to file,
+		  // final code should be encapsulated in a function.
+		  $outHandle = fopen ($errorFile, 'wb');
+		  fwrite ($outHandle, $filterOutput, strlen ($filterOutput));
+		  fclose($outHandle);
+		  // echo "END OUTPUT does not Exists<br />";
+		  // break;
+		}
 
-	      // Error handling missing when writing to file,
-	      // final code should be encapsulated in a function.
-	      $outHandle = fopen ($errorFile, 'wb');
-	      fwrite ($outHandle, $filterOutput, strlen ($filterOutput));
-	      fclose($outHandle);
-	      // echo "END OUTPUT does not Exists<br />";
-	      // break;
-	    }
-	    
-	    else {
-	      // echo "OUTPUT Exists<br />";
-	      $output = file_get_contents($outputFile);
-	      $compareResult = strcmp ($output, $filterOutput);
-	      // print "$output <br />\n";
-	      // print "$filterOutput <br />\n";
-	      // print "$compareResult <br \>\n";
+		else {
+		  // echo "OUTPUT Exists<br />";
+		  $output = file_get_contents($outputFile);
+		  $compareResult = strcmp ($output, $filterOutput);
+		  // print "$output <br />\n";
+		  // print "$filterOutput <br />\n";
+		  // print "$compareResult <br \>\n";
 
-	      $this->assertTrue (0 == $compareResult,
+		  $this->assertTrue (0 == $compareResult,
 				 (0 == $compareResult ?
 				  "" :
 				  "<strong>$inputFile</strong> did not match " .
 				  "output, incorrect data stored in " .
-				  "<strong>$errorFile</strong>"));
-	      if (0 != $compareResult) {
+				  "<strong>$errorFile</strong>"), );
+		  if (0 != $compareResult) {
 		$outHandle = fopen ($errorFile, 'wb');
 		fwrite ($outHandle, $filterOutput, strlen ($filterOutput));
 		fclose($outHandle);
-	      }
-	      // echo "END OUTPUT Exists<br />";
-	    }
+		  }
+		  // echo "END OUTPUT Exists<br />";
+		}
+	  }
+	}
 	  }
 	}
-      }
-    }
   }
 }