[PHP-CVS] cvs: phpruntests /src/testcase rtTestConfiguration.php

[Zoe Slattery]

zoe             Tue Apr 28 20:23:15 2009 UTC

  Modified files:              
    /phpruntests/src/testcase   rtTestConfiguration.php 
  Log:
  change names
  
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/rtTestConfiguration.php?r1=1.7&r2=1.8&diff_format=u
Index: phpruntests/src/testcase/rtTestConfiguration.php
diff -u phpruntests/src/testcase/rtTestConfiguration.php:1.7 
phpruntests/src/testcase/rtTestConfiguration.php:1.8
--- phpruntests/src/testcase/rtTestConfiguration.php:1.7        Mon Apr 27 
21:04:32 2009
+++ phpruntests/src/testcase/rtTestConfiguration.php    Tue Apr 28 20:23:14 2009
@@ -22,7 +22,7 @@
     private $testCommandLineArguments;
     private $phpExecutable;
     private $inputFileString;
-    private $isCgiTest = false;
+    private $cgiTest = false;
     private $cgiSections = array(
                             'GET',
                             'POST',
@@ -40,15 +40,15 @@
 
     private function init(rtRuntestsConfiguration $runConfiguration, 
$sections, $sectionHeadings, $fileSection)
     {
-        $this->queryCgiTest($sectionHeadings);
+        $this->isCgiTest($sectionHeadings);
 
         $this->setEnvironmentVariables($runConfiguration, $sections, 
$fileSection);
         $this->setPhpCommandLineArguments($runConfiguration, $sections);
         $this->setTestCommandLineArguments($sections);
         $this->setPhpExecutable($runConfiguration, $sectionHeadings);
         $this->setInputFileString($runConfiguration, $sections, 
$sectionHeadings);
-        
-        if($this->isCgiTest) {
+
+        if($this->cgiTest) {
             $this->environmentVariables['SCRIPT_FILENAME'] = 
$fileSection->getFileName();
             $this->environmentVariables['PATH_TRANSLATED'] = 
$fileSection->getFileName();
             //Required by when the cgi has been compiled with 
force-cgi-redirect.
@@ -90,7 +90,7 @@
 
     private function setPhpExecutable($runConfiguration, $sectionHeadings)
     {
-        if ($this->isCgiTest) {
+        if ($this->cgiTest) {
             $this->phpExecutable =  
$runConfiguration->getSetting('PhpCgiExecutable'). " -C";
         } else {
             $this->phpExecutable = 
$runConfiguration->getSetting('PhpExecutable');
@@ -105,11 +105,11 @@
         }
     }
 
-    private function queryCgiTest($sectionHeadings)
+    private function isCgiTest($sectionHeadings)
     {
         $tempArray = array_diff($this->cgiSections, $sectionHeadings);
         if (count($tempArray) < count($this->cgiSections)) {
-            $this->isCgiTest = true;
+            $this->cgiTest = true;
         }
     }
 
@@ -133,5 +133,10 @@
     {
         return $this->testCommandLineArguments;
     }
+
+    public function getInputFileString()
+    {
+        return $this->inputFileString;
+    }
 }
 ?>



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php