change to use protected rather than private

src/configuration/preconditions/rtIsPhpVersionCorrect.php

@@ -19,12 +19,12 @@ class rtIsPhpVersionCorrect extends rtPreCondition
     /**
      * @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

src/configuration/rtEnvironmentVariables.php

@@ -31,7 +31,7 @@ class rtEnvironmentVariables
         'NO_PHPTEST_SUMMARY',
     );
 
-    private $environmentVariables = array();
+    protected $environmentVariables = array();
 
     public function __construct()
     {

src/configuration/rtRuntestsConfiguration.php

@@ -19,13 +19,13 @@ abstract class rtRuntestsConfiguration
 {
     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',

src/configuration/settings/rtCurrentDirectorySetting.php

@@ -15,7 +15,7 @@
  */
 class rtCurrentDirectorySetting extends rtSetting
 {
-    private $currentDirectory;
+    protected $currentDirectory;
 
     /**
      * Set the current directory

src/configuration/settings/rtLogFormatSetting.php

@@ -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

src/configuration/settings/rtPhpCgiExecutableSetting.php

@@ -17,9 +17,9 @@ class rtPhpCgiExecutableSetting extends rtSetting
 {
     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

src/configuration/settings/rtPhpCommandLineArgSetting.php

@@ -16,7 +16,7 @@
  */
 class rtPhpCommandLineArgSetting extends rtSetting
 {
-    private $phpCommandLineArguments;
+    protected $phpCommandLineArguments;
 
     /**
      * Sets the command line arguments for

src/configuration/settings/rtPhpExecutableSetting.php

@@ -17,7 +17,7 @@ class rtPhpExecutableSetting extends rtSetting
 {
     const SAPI_CLI =  "/sapi/cli/php";
 
-    private $phpExecutable;
+    protected $phpExecutable;
 
     /**
      * Sets the PHP executable, note the dependency on working directory

src/configuration/settings/rtTestDirectorySetting.php

@@ -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.

src/configuration/settings/rtTestFileSetting.php

@@ -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

src/configuration/settings/rtWorkingDirectorySetting.php

@@ -16,7 +16,7 @@
  */
 class rtWorkingDirectorySetting extends rtSetting
 {
-    private $workingDirectory;
+    protected $workingDirectory;
 
     /**
      * Sets the working directory

src/taskScheduler/rtTaskSchedulerFile.php

@@ -17,8 +17,8 @@ class rtTaskSchedulerFile extends rtTaskScheduler
 {
 	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 @@ public function run()
 	 * 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 @@ private function distributeTasks() {
 	 * 
 	 * @return void
 	 */
-	private function receiver()
+	protected function receiver()
 	{
 		for ($cid=0; $cid<$this->processCount; $cid++) {
 
@@ -202,7 +202,7 @@ private function receiver()
 	 * @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);

src/taskScheduler/rtTaskSchedulerMsgQ.php

@@ -21,9 +21,9 @@ class rtTaskSchedulerMsgQ extends rtTaskScheduler
 	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 @@ public function setProcessCount($processCount)
 	/**
 	 * 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 @@ public function run()
 	 * 
 	 * @return void
 	 */
-	private function receiver()
+	protected function receiver()
 	{
 		$resultQueue = msg_get_queue(self::MSG_QUEUE_KEY+1);
 
@@ -241,7 +241,7 @@ private function receiver()
 	 * 
 	 * @return void
 	 */
-	private function sender()
+	protected function sender()
 	{
 		$this->inputQueue = msg_get_queue(self::MSG_QUEUE_KEY);
 
@@ -273,7 +273,7 @@ private function sender()
 	 * @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 @@ private function sendTask(task $task, $index, $type=1)
 	 * @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;

src/taskScheduler/rtTaskTestGroup.php

@@ -13,8 +13,8 @@
  */
 class rtTaskTestGroup extends rtTask implements rtTaskInterface
 {
-	private $runConfiguration;
-	private $subDirectory;
+	protected $runConfiguration;
+	protected $subDirectory;
 
 
 	public function __construct($runConfiguration, $subDirectory)

src/testcase/output/rtTestOutputWriterHTML.php

@@ -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()

src/testcase/output/rtTestOutputWriterXML.php

@@ -16,8 +16,8 @@
  */
 class rtTestOutputWriterXML extends rtTestOutputWriter
 {
-    private $dom = null;
-	private $rootNode = null;
+    protected $dom = null;
+	protected $rootNode = null;
 
 
 	public function __construct()

src/testcase/preconditions/rtHasNoEmptySections.php

@@ -15,7 +15,7 @@
  */
 class rtHasNoEmptySections implements rtTestPreCondition
 {
-    private function isSectionHeading($string) {
+    protected function isSectionHeading($string) {
         return preg_match("/^--[A-Z]+(_[A-Z]+|)--/", $string);
     }
 

src/testcase/preconditions/rtIsSectionImplemented.php

@@ -15,7 +15,7 @@
  */
 class rtIsSectionImplemented implements rtTestPreCondition
 {
-    private $sectionMap = array(
+    protected $sectionMap = array(
         'TEST'        => 'rtTestHeaderSection',
         'DESCRIPTION' => 'rtDescriptionSection',
         'SKIPIF'      => 'rtSkipIfSection',

src/testcase/preconditions/rtIsValidSectionName.php

@@ -15,7 +15,7 @@
  */
 class rtIsValidSectionName implements rtTestPreCondition
 {
-    private $validSectionNames = array(
+    protected $validSectionNames = array(
         'TEST',
         'DESCRIPTION',
         'SKIPIF',

src/testcase/rtPhpRunner.php

@@ -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)
     {

src/testcase/rtPhpTest.php

@@ -16,14 +16,14 @@ class rtPhpTest
 {
     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 @@ public function compareHeaders()
      * Identify a FILE section
      *
      */
-    private function isFileSection($key)
+    protected function isFileSection($key)
     {
         if (strpos($key, "FILE") !== false) {
             return true;
@@ -176,7 +176,7 @@ private function isFileSection($key)
     /*
      * 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 @@ private function removeDone($array) {
     /**
      * 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 @@ private function setFileSection()
     /**
      * Sets the test's expect section
      */
-    private function setExpectSection()
+    protected function setExpectSection()
     {
         if (array_key_exists('EXPECT', $this->sections)) {
             return $this->sections['EXPECT'];

src/testcase/rtPhpTestFile.php

@@ -14,33 +14,33 @@
  */
 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',
         'rtIsSectionImplemented',
         '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];
         }