cvs: phpruntests /src/configuration rtRuntestsConfiguration.php

zoe Wed May 13 01:36:57 2009 UTC Modified files: /phpruntests/src/configuration rtRuntestsConfiguration.php Log: modification to setting nameing http://cvs.php.net/viewvc.cgi/phpruntests/src/configuration/rtRuntestsConfiguration.php?r1=1.7&r2=1.8&diff_format=u Index: phpruntests/src/configuration/rtRuntestsConfiguration.php diff -u phpruntests/src/configuration/rtRuntestsConfiguration.php:1.7 phpruntests/src/configuration/rtRuntestsConfiguration.php:1.8 --- phpruntests/src/configuration/rtRuntestsConfiguration.php:1.7 Tue May 12 09:15:19 2009 +++ phpruntests/src/configuration/rtRuntestsConfiguration.php Wed May 13 01:36:57 2009 @@ -35,14 +35,15 @@ private $commandLine; private $settingNames = array ( - 'rtCurrentDirectorySetting', - 'rtWorkingDirectorySetting', - 'rtLogFormatSetting', - 'rtPhpExecutableSetting', - 'rtPhpCgiExecutableSetting', - 'rtTestFileSetting', - 'rtTestDirectorySetting', - 'rtPhpCommandLineArgSetting', + + 'CurrentDirectory' => 'rtCurrentDirectorySetting', + 'WorkingDirectory' => 'rtWorkingDirectorySetting', + 'LogFormat' => 'rtLogFormatSetting', + 'PhpExecutable' => 'rtPhpExecutableSetting', + 'PhpCgiExecutable' => 'rtPhpCgiExecutableSetting', + 'TestFiles' => 'rtTestFileSetting', + 'TestDirectories' => 'rtTestDirectorySetting', + 'PhpCommandLineArguments' => 'rtPhpCommandLineArgSetting', ); protected function init() @@ -66,10 +67,11 @@ $options->parseAdditionalOptions($this->commandLine, $this->environmentVariables); //set configuration - foreach ($this->settingNames as $className) { + foreach ($this->settingNames as $name => $className) { $object = new $className($this); - $this->settings[$className] = $object->get(); + $this->settings[$name] = $object->get(); } + //1 var_dump($this->settings); //check configuration preconditions $preConditionList = rtPreConditionList::getInstance(); @@ -102,6 +104,8 @@ public function getSetting($settingName) { + //echo "$settingName $this->settings[$settingName] \n"; + //var_dump($this->settings); return $this->settings[$settingName]; }