zoe Thu, 06 Aug 2009 11:48:12 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=286881
Log:
change to use protected rather than private
Changed paths:
U
php/phpruntests/trunk/src/configuration/preconditions/rtIsPhpVersionCorrect.php
U php/phpruntests/trunk/src/configuration/rtEnvironmentVariables.php
U php/phpruntests/trunk/src/configuration/rtRuntestsConfiguration.php
U
php/phpruntests/trunk/src/configuration/settings/rtCurrentDirectorySetting.php
U php/phpruntests/trunk/src/configuration/settings/rtLogFormatSetting.php
U
php/phpruntests/trunk/src/configuration/settings/rtPhpCgiExecutableSetting.php
U
php/phpruntests/trunk/src/configuration/settings/rtPhpCommandLineArgSetting.php
U
php/phpruntests/trunk/src/configuration/settings/rtPhpExecutableSetting.php
U
php/phpruntests/trunk/src/configuration/settings/rtTestDirectorySetting.php
U php/phpruntests/trunk/src/configuration/settings/rtTestFileSetting.php
U
php/phpruntests/trunk/src/configuration/settings/rtWorkingDirectorySetting.php
U php/phpruntests/trunk/src/taskScheduler/rtTaskSchedulerFile.php
U php/phpruntests/trunk/src/taskScheduler/rtTaskSchedulerMsgQ.php
U php/phpruntests/trunk/src/taskScheduler/rtTaskTestGroup.php
U php/phpruntests/trunk/src/testcase/output/rtTestOutputWriterHTML.php
U php/phpruntests/trunk/src/testcase/output/rtTestOutputWriterXML.php
U
php/phpruntests/trunk/src/testcase/preconditions/rtHasNoEmptySections.php
U
php/phpruntests/trunk/src/testcase/preconditions/rtIsSectionImplemented.php
U
php/phpruntests/trunk/src/testcase/preconditions/rtIsValidSectionName.php
U php/phpruntests/trunk/src/testcase/rtPhpRunner.php
U php/phpruntests/trunk/src/testcase/rtPhpTest.php
U php/phpruntests/trunk/src/testcase/rtPhpTestFile.php
U php/phpruntests/trunk/src/testcase/rtTestConfiguration.php
U php/phpruntests/trunk/src/testcase/rtTestDifference.php
U php/phpruntests/trunk/src/testcase/rtTestResults.php
U php/phpruntests/trunk/src/testcase/rtTestStatus.php
U
php/phpruntests/trunk/src/testcase/sections/configurationsections/rtArgsSection.php
U
php/phpruntests/trunk/src/testcase/sections/configurationsections/rtCookieSection.php
U
php/phpruntests/trunk/src/testcase/sections/configurationsections/rtDeflatePostSection.php
U
php/phpruntests/trunk/src/testcase/sections/configurationsections/rtEnvSection.php
U
php/phpruntests/trunk/src/testcase/sections/configurationsections/rtGetSection.php
U
php/phpruntests/trunk/src/testcase/sections/configurationsections/rtGzipPostSection.php
U
php/phpruntests/trunk/src/testcase/sections/configurationsections/rtIniSection.php
U
php/phpruntests/trunk/src/testcase/sections/configurationsections/rtPostRawSection.php
U
php/phpruntests/trunk/src/testcase/sections/configurationsections/rtPostSection.php
U
php/phpruntests/trunk/src/testcase/sections/configurationsections/rtStdinSection.php
U
php/phpruntests/trunk/src/testcase/sections/executablesections/rtFileExternalSection.php
U
php/phpruntests/trunk/src/testcase/sections/executablesections/rtFileSection.php
U
php/phpruntests/trunk/src/testcase/sections/outputsections/rtExpectFSection.php
U php/phpruntests/trunk/src/testcase/sections/rtSection.php
U php/phpruntests/trunk/src/testgroup/rtPhpTestGroup.php
U php/phpruntests/trunk/src/testrun/rtPhpTestRun.php
Modified: php/phpruntests/trunk/src/configuration/preconditions/rtIsPhpVersionCorrect.php
===================================================================
--- php/phpruntests/trunk/src/configuration/preconditions/rtIsPhpVersionCorrect.php 2009-08-06 11:11:15 UTC (rev 286880)
+++ php/phpruntests/trunk/src/configuration/preconditions/rtIsPhpVersionCorrect.php 2009-08-06 11:48:12 UTC (rev 286881)
@@ -19,12 +19,12 @@
/**
* @var int
*/
- private $requiredMajorVersion = 5;
+ protected $requiredMajorVersion = 5;
/**
* @var int
*/
- private $requiredMinorVersion = 3;
+ protected $requiredMinorVersion = 3;
/**
* Return the message associated with an invalid php-version
Modified: php/phpruntests/trunk/src/configuration/rtEnvironmentVariables.php
===================================================================
--- php/phpruntests/trunk/src/configuration/rtEnvironmentVariables.php 2009-08-06 11:11:15 UTC (rev 286880)
+++ php/phpruntests/trunk/src/configuration/rtEnvironmentVariables.php 2009-08-06 11:48:12 UTC (rev 286881)
@@ -31,7 +31,7 @@
'NO_PHPTEST_SUMMARY',
);
- private $environmentVariables = array();
+ protected $environmentVariables = array();
public function __construct()
{
Modified: php/phpruntests/trunk/src/configuration/rtRuntestsConfiguration.php
===================================================================
--- php/phpruntests/trunk/src/configuration/rtRuntestsConfiguration.php 2009-08-06 11:11:15 UTC (rev 286880)
+++ php/phpruntests/trunk/src/configuration/rtRuntestsConfiguration.php 2009-08-06 11:48:12 UTC (rev 286881)
@@ -19,13 +19,13 @@
{
protected $commandLineArgs;
- private $settings;
- private $environmentVariables;
- private $commandLine;
+ protected $settings;
+ protected $environmentVariables;
+ protected $commandLine;
- private $memoryTool = null;
+ protected $memoryTool = null;
- private $settingNames = array (
+ protected $settingNames = array (
'CurrentDirectory' => 'rtCurrentDirectorySetting',
'WorkingDirectory' => 'rtWorkingDirectorySetting',
Modified: php/phpruntests/trunk/src/configuration/settings/rtCurrentDirectorySetting.php
===================================================================
--- php/phpruntests/trunk/src/configuration/settings/rtCurrentDirectorySetting.php 2009-08-06 11:11:15 UTC (rev 286880)
+++ php/phpruntests/trunk/src/configuration/settings/rtCurrentDirectorySetting.php 2009-08-06 11:48:12 UTC (rev 286881)
@@ -15,7 +15,7 @@
*/
class rtCurrentDirectorySetting extends rtSetting
{
- private $currentDirectory;
+ protected $currentDirectory;
/**
* Set the current directory
Modified: php/phpruntests/trunk/src/configuration/settings/rtLogFormatSetting.php
===================================================================
--- php/phpruntests/trunk/src/configuration/settings/rtLogFormatSetting.php 2009-08-06 11:11:15 UTC (rev 286880)
+++ php/phpruntests/trunk/src/configuration/settings/rtLogFormatSetting.php 2009-08-06 11:48:12 UTC (rev 286881)
@@ -19,7 +19,7 @@
*/
class rtLogFormatSetting extends rtSetting
{
- private $logFormat;
+ protected $logFormat;
/**
* Sets log format to that specifiled by TEST_PHP_LOG_FORMAT or LEOD
Modified: php/phpruntests/trunk/src/configuration/settings/rtPhpCgiExecutableSetting.php
===================================================================
--- php/phpruntests/trunk/src/configuration/settings/rtPhpCgiExecutableSetting.php 2009-08-06 11:11:15 UTC (rev 286880)
+++ php/phpruntests/trunk/src/configuration/settings/rtPhpCgiExecutableSetting.php 2009-08-06 11:48:12 UTC (rev 286881)
@@ -17,9 +17,9 @@
{
const SAPI_CGI = "/sapi/cgi/php-cgi";
- private $phpCgiExecutable;
+ protected $phpCgiExecutable;
- private $configuration;
+ protected $configuration;
/**
* Sets the PHP CGI executable. Note the dependency on having a working directory setting
Modified: php/phpruntests/trunk/src/configuration/settings/rtPhpCommandLineArgSetting.php
===================================================================
--- php/phpruntests/trunk/src/configuration/settings/rtPhpCommandLineArgSetting.php 2009-08-06 11:11:15 UTC (rev 286880)
+++ php/phpruntests/trunk/src/configuration/settings/rtPhpCommandLineArgSetting.php 2009-08-06 11:48:12 UTC (rev 286881)
@@ -16,7 +16,7 @@
*/
class rtPhpCommandLineArgSetting extends rtSetting
{
- private $phpCommandLineArguments;
+ protected $phpCommandLineArguments;
/**
* Sets the command line arguments for
Modified: php/phpruntests/trunk/src/configuration/settings/rtPhpExecutableSetting.php
===================================================================
--- php/phpruntests/trunk/src/configuration/settings/rtPhpExecutableSetting.php 2009-08-06 11:11:15 UTC (rev 286880)
+++ php/phpruntests/trunk/src/configuration/settings/rtPhpExecutableSetting.php 2009-08-06 11:48:12 UTC (rev 286881)
@@ -17,7 +17,7 @@
{
const SAPI_CLI = "/sapi/cli/php";
- private $phpExecutable;
+ protected $phpExecutable;
/**
* Sets the PHP executable, note the dependency on working directory
Modified: php/phpruntests/trunk/src/configuration/settings/rtTestDirectorySetting.php
===================================================================
--- php/phpruntests/trunk/src/configuration/settings/rtTestDirectorySetting.php 2009-08-06 11:11:15 UTC (rev 286880)
+++ php/phpruntests/trunk/src/configuration/settings/rtTestDirectorySetting.php 2009-08-06 11:48:12 UTC (rev 286881)
@@ -17,7 +17,7 @@
*/
class rtTestDirectorySetting extends rtSetting
{
- private $testDir = null;
+ protected $testDir = null;
/**
* Check each option - if it's a directory add it to the list.
Modified: php/phpruntests/trunk/src/configuration/settings/rtTestFileSetting.php
===================================================================
--- php/phpruntests/trunk/src/configuration/settings/rtTestFileSetting.php 2009-08-06 11:11:15 UTC (rev 286880)
+++ php/phpruntests/trunk/src/configuration/settings/rtTestFileSetting.php 2009-08-06 11:48:12 UTC (rev 286881)
@@ -17,7 +17,7 @@
*/
class rtTestFileSetting extends rtSetting
{
- private $testFiles;
+ protected $testFiles;
/**
* Check each filename - if it's not a directory and the name ends .phpt
Modified: php/phpruntests/trunk/src/configuration/settings/rtWorkingDirectorySetting.php
===================================================================
--- php/phpruntests/trunk/src/configuration/settings/rtWorkingDirectorySetting.php 2009-08-06 11:11:15 UTC (rev 286880)
+++ php/phpruntests/trunk/src/configuration/settings/rtWorkingDirectorySetting.php 2009-08-06 11:48:12 UTC (rev 286881)
@@ -16,7 +16,7 @@
*/
class rtWorkingDirectorySetting extends rtSetting
{
- private $workingDirectory;
+ protected $workingDirectory;
/**
* Sets the working directory
Modified: php/phpruntests/trunk/src/taskScheduler/rtTaskSchedulerFile.php
===================================================================
--- php/phpruntests/trunk/src/taskScheduler/rtTaskSchedulerFile.php 2009-08-06 11:11:15 UTC (rev 286880)
+++ php/phpruntests/trunk/src/taskScheduler/rtTaskSchedulerFile.php 2009-08-06 11:48:12 UTC (rev 286881)
@@ -17,8 +17,8 @@
{
const TMP_FILE = 'taskFile';
- private $pidStore = array(); // stores the pids of all child-processes
- private $groupTasks = false; // are the tasks stored in groups?
+ protected $pidStore = array(); // stores the pids of all child-processes
+ protected $groupTasks = false; // are the tasks stored in groups?
/**
@@ -140,7 +140,7 @@
* creates a temporary file for each child which stores serialized task-objects
*
*/
- private function distributeTasks() {
+ protected function distributeTasks() {
if ($this->groupTasks == true) {
@@ -170,7 +170,7 @@
*
* @return void
*/
- private function receiver()
+ protected function receiver()
{
for ($cid=0; $cid<$this->processCount; $cid++) {
@@ -202,7 +202,7 @@
* @param int $cid the child-id
* @return void
*/
- private function child($cid)
+ protected function child($cid)
{
$taskList = file_get_contents(self::TMP_FILE.$cid);
$taskList = explode('[END]', $taskList);
Modified: php/phpruntests/trunk/src/taskScheduler/rtTaskSchedulerMsgQ.php
===================================================================
--- php/phpruntests/trunk/src/taskScheduler/rtTaskSchedulerMsgQ.php 2009-08-06 11:11:15 UTC (rev 286880)
+++ php/phpruntests/trunk/src/taskScheduler/rtTaskSchedulerMsgQ.php 2009-08-06 11:48:12 UTC (rev 286881)
@@ -21,9 +21,9 @@
const MSG_QUEUE_SIZE = 1024; // max-size of a single message
const KILL_CHILD = 'killBill'; // kill-signal to terminate a child
- private $inputQueue = NULL; // the input-queue (only used by the sender)
- private $pidStore = array(); // stores the pids of all child-processes
- private $groupTasks = false; // are the tasks stored in groups?
+ protected $inputQueue = NULL; // the input-queue (only used by the sender)
+ protected $pidStore = array(); // stores the pids of all child-processes
+ protected $groupTasks = false; // are the tasks stored in groups?
@@ -70,7 +70,7 @@
/**
* removes the used message-queues.
*/
- private static function cleanUp()
+ protected static function cleanUp()
{
@msg_remove_queue(msg_get_queue(self::MSG_QUEUE_KEY));
@msg_remove_queue(msg_get_queue(self::MSG_QUEUE_KEY+1));
@@ -174,7 +174,7 @@
*
* @return void
*/
- private function receiver()
+ protected function receiver()
{
$resultQueue = msg_get_queue(self::MSG_QUEUE_KEY+1);
@@ -241,7 +241,7 @@
*
* @return void
*/
- private function sender()
+ protected function sender()
{
$this->inputQueue = msg_get_queue(self::MSG_QUEUE_KEY);
@@ -273,7 +273,7 @@
* @param int $type the message-type (default=1)
* @return void
*/
- private function sendTask(task $task, $index, $type=1)
+ protected function sendTask(task $task, $index, $type=1)
{
$task->setIndex($index);
@@ -297,7 +297,7 @@
* @param int $cid the child-id (default=NULL)
* @return void
*/
- private function child($cid=NULL)
+ protected function child($cid=NULL)
{
if (is_null($cid)) {
$cid = 0;
Modified: php/phpruntests/trunk/src/taskScheduler/rtTaskTestGroup.php
===================================================================
--- php/phpruntests/trunk/src/taskScheduler/rtTaskTestGroup.php 2009-08-06 11:11:15 UTC (rev 286880)
+++ php/phpruntests/trunk/src/taskScheduler/rtTaskTestGroup.php 2009-08-06 11:48:12 UTC (rev 286881)
@@ -13,8 +13,8 @@
*/
class rtTaskTestGroup extends rtTask implements rtTaskInterface
{
- private $runConfiguration;
- private $subDirectory;
+ protected $runConfiguration;
+ protected $subDirectory;
public function __construct($runConfiguration, $subDirectory)
Modified: php/phpruntests/trunk/src/testcase/output/rtTestOutputWriterHTML.php
===================================================================
--- php/phpruntests/trunk/src/testcase/output/rtTestOutputWriterHTML.php 2009-08-06 11:11:15 UTC (rev 286880)
+++ php/phpruntests/trunk/src/testcase/output/rtTestOutputWriterHTML.php 2009-08-06 11:48:12 UTC (rev 286881)
@@ -16,8 +16,8 @@
*/
class rtTestOutputWriterHTML extends rtTestOutputWriter
{
- private $dom = null;
- private $stage = null; // base-node which holds the content
+ protected $dom = null;
+ protected $stage = null; // base-node which holds the content
public function __construct()
Modified: php/phpruntests/trunk/src/testcase/output/rtTestOutputWriterXML.php
===================================================================
--- php/phpruntests/trunk/src/testcase/output/rtTestOutputWriterXML.php 2009-08-06 11:11:15 UTC (rev 286880)
+++ php/phpruntests/trunk/src/testcase/output/rtTestOutputWriterXML.php 2009-08-06 11:48:12 UTC (rev 286881)
@@ -16,8 +16,8 @@
*/
class rtTestOutputWriterXML extends rtTestOutputWriter
{
- private $dom = null;
- private $rootNode = null;
+ protected $dom = null;
+ protected $rootNode = null;
public function __construct()
Modified: php/phpruntests/trunk/src/testcase/preconditions/rtHasNoEmptySections.php
===================================================================
--- php/phpruntests/trunk/src/testcase/preconditions/rtHasNoEmptySections.php 2009-08-06 11:11:15 UTC (rev 286880)
+++ php/phpruntests/trunk/src/testcase/preconditions/rtHasNoEmptySections.php 2009-08-06 11:48:12 UTC (rev 286881)
@@ -15,7 +15,7 @@
*/
class rtHasNoEmptySections implements rtTestPreCondition
{
- private function isSectionHeading($string) {
+ protected function isSectionHeading($string) {
return preg_match("/^--[A-Z]+(_[A-Z]+|)--/", $string);
}
Modified: php/phpruntests/trunk/src/testcase/preconditions/rtIsSectionImplemented.php
===================================================================
--- php/phpruntests/trunk/src/testcase/preconditions/rtIsSectionImplemented.php 2009-08-06 11:11:15 UTC (rev 286880)
+++ php/phpruntests/trunk/src/testcase/preconditions/rtIsSectionImplemented.php 2009-08-06 11:48:12 UTC (rev 286881)
@@ -15,7 +15,7 @@
*/
class rtIsSectionImplemented implements rtTestPreCondition
{
- private $sectionMap = array(
+ protected $sectionMap = array(
'TEST' => 'rtTestHeaderSection',
'DESCRIPTION' => 'rtDescriptionSection',
'SKIPIF' => 'rtSkipIfSection',
Modified: php/phpruntests/trunk/src/testcase/preconditions/rtIsValidSectionName.php
===================================================================
--- php/phpruntests/trunk/src/testcase/preconditions/rtIsValidSectionName.php 2009-08-06 11:11:15 UTC (rev 286880)
+++ php/phpruntests/trunk/src/testcase/preconditions/rtIsValidSectionName.php 2009-08-06 11:48:12 UTC (rev 286881)
@@ -15,7 +15,7 @@
*/
class rtIsValidSectionName implements rtTestPreCondition
{
- private $validSectionNames = array(
+ protected $validSectionNames = array(
'TEST',
'DESCRIPTION',
'SKIPIF',
Modified: php/phpruntests/trunk/src/testcase/rtPhpRunner.php
===================================================================
--- php/phpruntests/trunk/src/testcase/rtPhpRunner.php 2009-08-06 11:11:15 UTC (rev 286880)
+++ php/phpruntests/trunk/src/testcase/rtPhpRunner.php 2009-08-06 11:48:12 UTC (rev 286881)
@@ -15,11 +15,11 @@
*/
class rtPhpRunner
{
- private $phpCommand;
- private $environmentVariables;
- private $currentWorkingDirectory;
- private $stdin;
- private $timeOut;
+ protected $phpCommand;
+ protected $environmentVariables;
+ protected $currentWorkingDirectory;
+ protected $stdin;
+ protected $timeOut;
public function __construct($phpCommand, $environmentVariables=null, $currentWorkingDirectory=null, $stdin = null, $timeOut = 60)
{
Modified: php/phpruntests/trunk/src/testcase/rtPhpTest.php
===================================================================
--- php/phpruntests/trunk/src/testcase/rtPhpTest.php 2009-08-06 11:11:15 UTC (rev 286880)
+++ php/phpruntests/trunk/src/testcase/rtPhpTest.php 2009-08-06 11:48:12 UTC (rev 286881)
@@ -16,14 +16,14 @@
{
public $testConfiguration;
- private $testName;
- private $contents;
- private $testStatus;
- private $output;
- private $sections;
- private $fileSection;
- private $expectSection;
- private $sectionHeadings;
+ protected $testName;
+ protected $contents;
+ protected $testStatus;
+ protected $output;
+ protected $sections;
+ protected $fileSection;
+ protected $expectSection;
+ protected $sectionHeadings;
public function __construct(array $contents, $testName, $sectionHeadings, $runConfiguration, $testStatus)
{
@@ -164,7 +164,7 @@
* Identify a FILE section
*
*/
- private function isFileSection($key)
+ protected function isFileSection($key)
{
if (strpos($key, "FILE") !== false) {
return true;
@@ -176,7 +176,7 @@
/*
* Strip the lines after ===DONE=== from the file section of a test
*/
- private function removeDone($array) {
+ protected function removeDone($array) {
$result = array();
foreach($array as $line) {
$result[] = $line;
@@ -192,7 +192,7 @@
/**
* Set the test's file section
*/
- private function setFileSection()
+ protected function setFileSection()
{
if (array_key_exists('FILE', $this->sections)) {
return $this->sections['FILE'];
@@ -211,7 +211,7 @@
/**
* Sets the test's expect section
*/
- private function setExpectSection()
+ protected function setExpectSection()
{
if (array_key_exists('EXPECT', $this->sections)) {
return $this->sections['EXPECT'];
Modified: php/phpruntests/trunk/src/testcase/rtPhpTestFile.php
===================================================================
--- php/phpruntests/trunk/src/testcase/rtPhpTestFile.php 2009-08-06 11:11:15 UTC (rev 286880)
+++ php/phpruntests/trunk/src/testcase/rtPhpTestFile.php 2009-08-06 11:48:12 UTC (rev 286881)
@@ -14,16 +14,16 @@
*/
class rtPhpTestFile
{
- private $fileName;
- private $testName;
- private $testContents;
- private $testExitMessage;
- private $sectionHeadings = array();
+ protected $fileName;
+ protected $testName;
+ protected $testContents;
+ protected $testExitMessage;
+ protected $sectionHeadings = array();
- private $carriageReturn = "\r";
- private $newLine = "\n";
+ protected $carriageReturn = "\r";
+ protected $newLine = "\n";
- private $preConditions = array (
+ protected $preConditions = array (
'rtHasMandatorySections',
'rtHasNoDuplicateSections',
'rtIsValidSectionName',
@@ -31,16 +31,16 @@
'rtHasNoEmptySections',
);
- private function isSectionHeading($string) {
+ protected function isSectionHeading($string) {
return preg_match("/^\s*--[A-Z]+(_[A-Z]+|)--/", $string);
}
- private function getUntrimmedSectionHeading($string) {
+ protected function getUntrimmedSectionHeading($string) {
preg_match("/^\s*(--[A-Z]+(_[A-Z]+|)--)/", $string, $matches);
return $matches[1];
}
- private function getSectionHeading($string) {
+ protected function getSectionHeading($string) {
preg_match("/^\s*--([A-Z]+(_[A-Z]+|))--/", $string, $matches);
return $matches[1];
}
Modified: php/phpruntests/trunk/src/testcase/rtTestConfiguration.php
===================================================================
--- php/phpruntests/trunk/src/testcase/rtTestConfiguration.php 2009-08-06 11:11:15 UTC (rev 286880)
+++ php/phpruntests/trunk/src/testcase/rtTestConfiguration.php 2009-08-06 11:48:12 UTC (rev 286881)
@@ -15,14 +15,14 @@
*/
class rtTestConfiguration
{
- private $environmentVariables;
- private $phpCommandLineArguments;
- private $testCommandLineArguments;
- private $phpExecutable;
- private $inputFileString;
- private $stdin = null;
- private $cgiTest = false;
- private $cgiSections = array(
+ protected $environmentVariables;
+ protected $phpCommandLineArguments;
+ protected $testCommandLineArguments;
+ protected $phpExecutable;
+ protected $inputFileString;
+ protected $stdin = null;
+ protected $cgiTest = false;
+ protected $cgiSections = array(
'GET',
'POST',
'POST_RAW',
@@ -37,7 +37,7 @@
$this->init($runConfiguration, $sections, $sectionHeadings, $fileSection);
}
- private function init(rtRuntestsConfiguration $runConfiguration, $sections, $sectionHeadings, $fileSection)
+ protected function init(rtRuntestsConfiguration $runConfiguration, $sections, $sectionHeadings, $fileSection)
{
$this->setCgiTest($sectionHeadings);
@@ -50,7 +50,7 @@
}
- private function setEnvironmentVariables(rtRuntestsConfiguration $runConfiguration, $sections, $fileSection)
+ protected function setEnvironmentVariables(rtRuntestsConfiguration $runConfiguration, $sections, $fileSection)
{
$this->environmentVariables = $runConfiguration->getEnvironmentVariables();
@@ -88,7 +88,7 @@
}
- private function setPhpCommandLineArguments(rtRuntestsConfiguration $runConfiguration, $sections, $fileSection)
+ protected function setPhpCommandLineArguments(rtRuntestsConfiguration $runConfiguration, $sections, $fileSection)
{
$this->phpCommandLineArguments = $runConfiguration->getSetting('PhpCommandLineArguments');
if (array_key_exists('INI', $sections)) {
@@ -99,7 +99,7 @@
}
}
- private function setTestCommandLineArguments($sections)
+ protected function setTestCommandLineArguments($sections)
{
$this->testCommandLineArguments = '';
@@ -108,7 +108,7 @@
}
}
- private function setPhpExecutable($runConfiguration, $sectionHeadings)
+ protected function setPhpExecutable($runConfiguration, $sectionHeadings)
{
if ($this->cgiTest) {
if($runConfiguration->getSetting('PhpCgiExecutable') != null) {
@@ -121,7 +121,7 @@
}
}
- private function setInputFileString($runConfiguration, $sections, $sectionHeadings)
+ protected function setInputFileString($runConfiguration, $sections, $sectionHeadings)
{
$this->inputFileString = '';
if(in_array('POST', $sectionHeadings)) {
@@ -138,7 +138,7 @@
}
}
- private function setCgiTest($sectionHeadings)
+ protected function setCgiTest($sectionHeadings)
{
$tempArray = array_diff($this->cgiSections, $sectionHeadings);
if (count($tempArray) < count($this->cgiSections)) {
@@ -146,7 +146,7 @@
}
}
- private function setStdin($sections, $sectionHeadings) {
+ protected function setStdin($sections, $sectionHeadings) {
if(in_array('STDIN', $sectionHeadings)) {
$this->stdin = $sections['STDIN']->getInputString();
}
Modified: php/phpruntests/trunk/src/testcase/rtTestDifference.php
===================================================================
--- php/phpruntests/trunk/src/testcase/rtTestDifference.php 2009-08-06 11:11:15 UTC (rev 286880)
+++ php/phpruntests/trunk/src/testcase/rtTestDifference.php 2009-08-06 11:48:12 UTC (rev 286881)
@@ -15,10 +15,10 @@
*/
class rtTestDifference
{
- private $difference;
- private $expectedOutput;
- private $output;
- private $expectedRegularExpression;
+ protected $difference;
+ protected $expectedOutput;
+ protected $output;
+ protected $expectedRegularExpression;
public function __construct(rtOutputSection $expectedOutput, $output)
{
Modified: php/phpruntests/trunk/src/testcase/rtTestResults.php
===================================================================
--- php/phpruntests/trunk/src/testcase/rtTestResults.php 2009-08-06 11:11:15 UTC (rev 286880)
+++ php/phpruntests/trunk/src/testcase/rtTestResults.php 2009-08-06 11:48:12 UTC (rev 286881)
@@ -19,11 +19,11 @@
*/
class rtTestResults
{
- private $testStatus;
- private $testName = '';
- private $savedFileNames = array();
- private $title = '';
- private $time = 0;
+ protected $testStatus;
+ protected $testName = '';
+ protected $savedFileNames = array();
+ protected $title = '';
+ protected $time = 0;
public function __construct(rtPhpTest $testCase = null, rtTestStatus $testStatus = null)
{
@@ -76,7 +76,7 @@
/**
* Actions if a test passes
*/
- private function onPass(rtPhpTest $testCase, rtRuntestsConfiguration $runConfiguration)
+ protected function onPass(rtPhpTest $testCase, rtRuntestsConfiguration $runConfiguration)
{
if (!$runConfiguration->hasCommandLineOption('keep-all') && !$runConfiguration->hasCommandLineOption('keep-php')) {
$testCase->getFileSection()->deleteFile();
@@ -115,7 +115,7 @@
}
- private function onFail(rtPhpTest $testCase)
+ protected function onFail(rtPhpTest $testCase)
{
$testDifference = new rtTestDifference($testCase->getExpectSection(), $testCase->getOutput());
$difference = implode(b"\n",$testDifference->getDifference());
@@ -148,7 +148,7 @@
}
}
- private function onSkip(rtPhpTest $testCase, rtRuntestsConfiguration $runConfiguration)
+ protected function onSkip(rtPhpTest $testCase, rtRuntestsConfiguration $runConfiguration)
{
if ($runConfiguration->hasCommandLineOption('keep-all') || $runConfiguration->hasCommandLineOption('keep-skip')) {
$this->savedFileNames['skipif'] = $this->testName. 'skipif.php';
Modified: php/phpruntests/trunk/src/testcase/rtTestStatus.php
===================================================================
--- php/phpruntests/trunk/src/testcase/rtTestStatus.php 2009-08-06 11:11:15 UTC (rev 286880)
+++ php/phpruntests/trunk/src/testcase/rtTestStatus.php 2009-08-06 11:48:12 UTC (rev 286881)
@@ -14,10 +14,10 @@
*/
class rtTestStatus {
- private $testName;
- private $states = array();
- private $messages = array();
- private $testStateNames = array ('skip',
+ protected $testName;
+ protected $states = array();
+ protected $messages = array();
+ protected $testStateNames = array ('skip',
'bork',
'warn',
'xfail',
@@ -35,7 +35,7 @@
$this->init();
}
- private function init()
+ protected function init()
{
foreach ($this->testStateNames as $name) {
$this->states[$name] = false;
Modified: php/phpruntests/trunk/src/testcase/sections/configurationsections/rtArgsSection.php
===================================================================
--- php/phpruntests/trunk/src/testcase/sections/configurationsections/rtArgsSection.php 2009-08-06 11:11:15 UTC (rev 286880)
+++ php/phpruntests/trunk/src/testcase/sections/configurationsections/rtArgsSection.php 2009-08-06 11:48:12 UTC (rev 286881)
@@ -15,7 +15,7 @@
*/
class rtArgsSection extends rtConfigurationSection
{
- private $testCommandLineArguments;
+ protected $testCommandLineArguments;
protected function init()
{
Modified: php/phpruntests/trunk/src/testcase/sections/configurationsections/rtCookieSection.php
===================================================================
--- php/phpruntests/trunk/src/testcase/sections/configurationsections/rtCookieSection.php 2009-08-06 11:11:15 UTC (rev 286880)
+++ php/phpruntests/trunk/src/testcase/sections/configurationsections/rtCookieSection.php 2009-08-06 11:48:12 UTC (rev 286881)
@@ -14,7 +14,7 @@
*/
class rtCookieSection extends rtConfigurationSection
{
- private $cookieVariables = array();
+ protected $cookieVariables = array();
protected function init()
{
Modified: php/phpruntests/trunk/src/testcase/sections/configurationsections/rtDeflatePostSection.php
===================================================================
--- php/phpruntests/trunk/src/testcase/sections/configurationsections/rtDeflatePostSection.php 2009-08-06 11:11:15 UTC (rev 286880)
+++ php/phpruntests/trunk/src/testcase/sections/configurationsections/rtDeflatePostSection.php 2009-08-06 11:48:12 UTC (rev 286881)
@@ -14,8 +14,8 @@
*/
class rtDeflatePostSection extends rtConfigurationSection
{
- private $postVariables = array();
- private $postFileName;
+ protected $postVariables = array();
+ protected $postFileName;
protected function init()
{
Modified: php/phpruntests/trunk/src/testcase/sections/configurationsections/rtEnvSection.php
===================================================================
--- php/phpruntests/trunk/src/testcase/sections/configurationsections/rtEnvSection.php 2009-08-06 11:11:15 UTC (rev 286880)
+++ php/phpruntests/trunk/src/testcase/sections/configurationsections/rtEnvSection.php 2009-08-06 11:48:12 UTC (rev 286881)
@@ -15,7 +15,7 @@
*/
class rtEnvSection extends rtConfigurationSection
{
- private $testEnvironmentVariables = array();
+ protected $testEnvironmentVariables = array();
protected function init()
{
Modified: php/phpruntests/trunk/src/testcase/sections/configurationsections/rtGetSection.php
===================================================================
--- php/phpruntests/trunk/src/testcase/sections/configurationsections/rtGetSection.php 2009-08-06 11:11:15 UTC (rev 286880)
+++ php/phpruntests/trunk/src/testcase/sections/configurationsections/rtGetSection.php 2009-08-06 11:48:12 UTC (rev 286881)
@@ -14,7 +14,7 @@
*/
class rtGetSection extends rtConfigurationSection
{
- private $getVariables = array();
+ protected $getVariables = array();
protected function init()
{
Modified: php/phpruntests/trunk/src/testcase/sections/configurationsections/rtGzipPostSection.php
===================================================================
--- php/phpruntests/trunk/src/testcase/sections/configurationsections/rtGzipPostSection.php 2009-08-06 11:11:15 UTC (rev 286880)
+++ php/phpruntests/trunk/src/testcase/sections/configurationsections/rtGzipPostSection.php 2009-08-06 11:48:12 UTC (rev 286881)
@@ -14,8 +14,8 @@
*/
class rtGzipPostSection extends rtConfigurationSection
{
- private $postVariables = array();
- private $postFileName;
+ protected $postVariables = array();
+ protected $postFileName;
protected function init()
{
Modified: php/phpruntests/trunk/src/testcase/sections/configurationsections/rtIniSection.php
===================================================================
--- php/phpruntests/trunk/src/testcase/sections/configurationsections/rtIniSection.php 2009-08-06 11:11:15 UTC (rev 286880)
+++ php/phpruntests/trunk/src/testcase/sections/configurationsections/rtIniSection.php 2009-08-06 11:48:12 UTC (rev 286881)
@@ -15,7 +15,7 @@
*/
class rtIniSection extends rtConfigurationSection
{
- private $commandLineArguments = array();
+ protected $commandLineArguments = array();
public function init()
{
Modified: php/phpruntests/trunk/src/testcase/sections/configurationsections/rtPostRawSection.php
===================================================================
--- php/phpruntests/trunk/src/testcase/sections/configurationsections/rtPostRawSection.php 2009-08-06 11:11:15 UTC (rev 286880)
+++ php/phpruntests/trunk/src/testcase/sections/configurationsections/rtPostRawSection.php 2009-08-06 11:48:12 UTC (rev 286881)
@@ -14,8 +14,8 @@
*/
class rtPostRawSection extends rtConfigurationSection
{
- private $postVariables = array();
- private $postFileName;
+ protected $postVariables = array();
+ protected $postFileName;
protected function init()
{
Modified: php/phpruntests/trunk/src/testcase/sections/configurationsections/rtPostSection.php
===================================================================
--- php/phpruntests/trunk/src/testcase/sections/configurationsections/rtPostSection.php 2009-08-06 11:11:15 UTC (rev 286880)
+++ php/phpruntests/trunk/src/testcase/sections/configurationsections/rtPostSection.php 2009-08-06 11:48:12 UTC (rev 286881)
@@ -14,8 +14,8 @@
*/
class rtPostSection extends rtConfigurationSection
{
- private $postVariables = array();
- private $postFileName;
+ protected $postVariables = array();
+ protected $postFileName;
protected function init()
{
Modified: php/phpruntests/trunk/src/testcase/sections/configurationsections/rtStdinSection.php
===================================================================
--- php/phpruntests/trunk/src/testcase/sections/configurationsections/rtStdinSection.php 2009-08-06 11:11:15 UTC (rev 286880)
+++ php/phpruntests/trunk/src/testcase/sections/configurationsections/rtStdinSection.php 2009-08-06 11:48:12 UTC (rev 286881)
@@ -15,7 +15,7 @@
*/
class rtStdinSection extends rtConfigurationSection
{
- private $inputString;
+ protected $inputString;
protected function init()
{
Modified: php/phpruntests/trunk/src/testcase/sections/executablesections/rtFileExternalSection.php
===================================================================
--- php/phpruntests/trunk/src/testcase/sections/executablesections/rtFileExternalSection.php 2009-08-06 11:11:15 UTC (rev 286880)
+++ php/phpruntests/trunk/src/testcase/sections/executablesections/rtFileExternalSection.php 2009-08-06 11:48:12 UTC (rev 286881)
@@ -31,7 +31,7 @@
/**
* @return boolean
*/
- private function copyExternalFileContent($testStatus)
+ protected function copyExternalFileContent($testStatus)
{
if (sizeof($this->sectionContents) != 1) {
$testStatus->setTrue('fail');
Modified: php/phpruntests/trunk/src/testcase/sections/executablesections/rtFileSection.php
===================================================================
--- php/phpruntests/trunk/src/testcase/sections/executablesections/rtFileSection.php 2009-08-06 11:11:15 UTC (rev 286880)
+++ php/phpruntests/trunk/src/testcase/sections/executablesections/rtFileSection.php 2009-08-06 11:48:12 UTC (rev 286881)
@@ -14,9 +14,9 @@
*/
class rtFileSection extends rtExecutableSection
{
- private $twoBlankLines = '\r?\n\r?\n';
- private $headers;
- private $memFileName;
+ protected $twoBlankLines = '\r?\n\r?\n';
+ protected $headers;
+ protected $memFileName;
public function setExecutableFileName($testName)
{
Modified: php/phpruntests/trunk/src/testcase/sections/outputsections/rtExpectFSection.php
===================================================================
--- php/phpruntests/trunk/src/testcase/sections/outputsections/rtExpectFSection.php 2009-08-06 11:11:15 UTC (rev 286880)
+++ php/phpruntests/trunk/src/testcase/sections/outputsections/rtExpectFSection.php 2009-08-06 11:48:12 UTC (rev 286881)
@@ -37,7 +37,7 @@
* @param string
* @return string
*/
- private function expectfUnicodeSubstitutions($string)
+ protected function expectfUnicodeSubstitutions($string)
{
$string = str_replace(
array('%unicode_string_optional%'),
@@ -72,7 +72,7 @@
* @param string
* @return string
*/
- private function expectfRegexSubstitutions($string)
+ protected function expectfRegexSubstitutions($string)
{
$string = str_replace('%e', '\\' . DIRECTORY_SEPARATOR, $string);
$string = str_replace('%s', '[^\r\n]+', $string);
@@ -94,7 +94,7 @@
* @param string
* @return string
*/
- private function expectfEmbeddedRegex($string) {
+ protected function expectfEmbeddedRegex($string) {
$temp = "";
$r = "%r";
$startOffset = 0;
Modified: php/phpruntests/trunk/src/testcase/sections/rtSection.php
===================================================================
--- php/phpruntests/trunk/src/testcase/sections/rtSection.php 2009-08-06 11:11:15 UTC (rev 286880)
+++ php/phpruntests/trunk/src/testcase/sections/rtSection.php 2009-08-06 11:48:12 UTC (rev 286881)
@@ -15,7 +15,7 @@
*/
abstract class rtSection
{
- private static $sectionMap = array (
+ protected static $sectionMap = array (
'TEST' => 'rtTestHeaderSection',
'DESCRIPTION' => 'rtDescriptionSection',
'SKIPIF' => 'rtSkipIfSection',
Modified: php/phpruntests/trunk/src/testgroup/rtPhpTestGroup.php
===================================================================
--- php/phpruntests/trunk/src/testgroup/rtPhpTestGroup.php 2009-08-06 11:11:15 UTC (rev 286880)
+++ php/phpruntests/trunk/src/testgroup/rtPhpTestGroup.php 2009-08-06 11:48:12 UTC (rev 286881)
@@ -14,9 +14,9 @@
*/
class rtPhpTestGroup
{
- private $testDirectory;
- private $testCases;
- private $results;
+ protected $testDirectory;
+ protected $testCases;
+ protected $results;
public function __construct(rtRuntestsConfiguration $runConfiguration, $directory)
{
Modified: php/phpruntests/trunk/src/testrun/rtPhpTestRun.php
===================================================================
--- php/phpruntests/trunk/src/testrun/rtPhpTestRun.php 2009-08-06 11:11:15 UTC (rev 286880)
+++ php/phpruntests/trunk/src/testrun/rtPhpTestRun.php 2009-08-06 11:48:12 UTC (rev 286881)
@@ -15,7 +15,7 @@
*/
class rtPhpTestRun
{
- private $commandLineArguments;
+ protected $commandLineArguments;
public function __construct($argv)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
