protected -> private

Author: sebastianbergmann

PHP/CodeCoverage.php

@@ -59,66 +59,66 @@ class PHP_CodeCoverage
     /**
      * @var PHP_CodeCoverage_Driver
      */
-    protected $driver;
+    private $driver;
 
     /**
      * @var PHP_CodeCoverage_Filter
      */
-    protected $filter;
+    private $filter;
 
     /**
      * @var boolean
      */
-    protected $cacheTokens = FALSE;
+    private $cacheTokens = FALSE;
 
     /**
      * @var boolean
      */
-    protected $checkForUnintentionallyCoveredCode = FALSE;
+    private $checkForUnintentionallyCoveredCode = FALSE;
 
     /**
      * @var boolean
      */
-    protected $forceCoversAnnotation = FALSE;
+    private $forceCoversAnnotation = FALSE;
 
     /**
      * @var boolean
      */
-    protected $mapTestClassNameToCoveredClassName = FALSE;
+    private $mapTestClassNameToCoveredClassName = FALSE;
 
     /**
      * @var boolean
      */
-    protected $addUncoveredFilesFromWhitelist = TRUE;
+    private $addUncoveredFilesFromWhitelist = TRUE;
 
     /**
      * @var boolean
      */
-    protected $processUncoveredFilesFromWhitelist = FALSE;
+    private $processUncoveredFilesFromWhitelist = FALSE;
 
     /**
      * @var mixed
      */
-    protected $currentId;
+    private $currentId;
 
     /**
      * Code coverage data.
      *
      * @var array
      */
-    protected $data = array();
+    private $data = array();
 
     /**
      * @var array
      */
-    protected $ignoredLines = array();
+    private $ignoredLines = array();
 
     /**
      * Test data.
      *
      * @var array
      */
-    protected $tests = array();
+    private $tests = array();
 
     /**
      * Constructor.
@@ -487,7 +487,7 @@ public function setProcessUncoveredFilesFromWhitelist($flag)
      * @param  array $linesToBeUsed
      * @throws PHP_CodeCoverage_Exception_UnintentionallyCoveredCode
      */
-    protected function applyCoversAnnotationFilter(array &$data, $linesToBeCovered, array $linesToBeUsed)
+    private function applyCoversAnnotationFilter(array &$data, $linesToBeCovered, array $linesToBeUsed)
     {
         if ($linesToBeCovered === FALSE ||
             ($this->forceCoversAnnotation && empty($linesToBeCovered))) {
@@ -521,7 +521,7 @@ protected function applyCoversAnnotationFilter(array &$data, $linesToBeCovered,
      *
      * @param array $data
      */
-    protected function applyListsFilter(array &$data)
+    private function applyListsFilter(array &$data)
     {
         foreach (array_keys($data) as $filename) {
             if ($this->filter->isFiltered($filename)) {
@@ -535,7 +535,7 @@ protected function applyListsFilter(array &$data)
      *
      * @param array $data
      */
-    protected function applyIgnoredLinesFilter(array &$data)
+    private function applyIgnoredLinesFilter(array &$data)
     {
         foreach (array_keys($data) as $filename) {
             if (!$this->filter->isFile($filename)) {
@@ -556,7 +556,7 @@ protected function applyIgnoredLinesFilter(array &$data)
      * @param array $data
      * @since Method available since Release 1.1.0
      */
-    protected function initializeFilesThatAreSeenTheFirstTime(array $data)
+    private function initializeFilesThatAreSeenTheFirstTime(array $data)
     {
         foreach ($data as $file => $lines) {
             if ($this->filter->isFile($file) && !isset($this->data[$file])) {
@@ -572,7 +572,7 @@ protected function initializeFilesThatAreSeenTheFirstTime(array $data)
     /**
      * Processes whitelisted files that are not covered.
      */
-    protected function addUncoveredFilesFromWhitelist()
+    private function addUncoveredFilesFromWhitelist()
     {
         $data           = array();
         $uncoveredFiles = array_diff(
@@ -607,7 +607,7 @@ protected function addUncoveredFilesFromWhitelist()
      * @param array  $data
      * @param array  $uncoveredFiles
      */
-    protected function processUncoveredFileFromWhitelist($uncoveredFile, array &$data, array $uncoveredFiles)
+    private function processUncoveredFileFromWhitelist($uncoveredFile, array &$data, array $uncoveredFiles)
     {
         $this->driver->start();
         include_once $uncoveredFile;
@@ -635,7 +635,7 @@ protected function processUncoveredFileFromWhitelist($uncoveredFile, array &$dat
      * @throws PHP_CodeCoverage_Exception
      * @since  Method available since Release 1.3.0
      */
-    protected function getLinesToBeIgnored($filename)
+    private function getLinesToBeIgnored($filename)
     {
         if (!is_string($filename)) {
             throw PHP_CodeCoverage_Util_InvalidArgumentHelper::factory(
@@ -807,7 +807,7 @@ protected function getLinesToBeIgnored($filename)
      * @throws PHP_CodeCoverage_Exception_UnintentionallyCoveredCode
      * @since Method available since Release 1.3.0
      */
-    protected function performUnintentionallyCoveredCodeCheck(array &$data, array $linesToBeCovered, array $linesToBeUsed)
+    private function performUnintentionallyCoveredCodeCheck(array &$data, array $linesToBeCovered, array $linesToBeUsed)
     {
         $allowedLines = $this->getAllowedLines(
           $linesToBeCovered, $linesToBeUsed
@@ -842,7 +842,7 @@ protected function performUnintentionallyCoveredCodeCheck(array &$data, array $l
      * @return array
      * @since Method available since Release 1.3.0
      */
-    protected function getAllowedLines(array $linesToBeCovered, array $linesToBeUsed)
+    private function getAllowedLines(array $linesToBeCovered, array $linesToBeUsed)
     {
         $allowedLines = array();
 

PHP/CodeCoverage/Filter.php

@@ -61,19 +61,19 @@ class PHP_CodeCoverage_Filter
      *
      * @var array
      */
-    protected $blacklistedFiles = array();
+    private $blacklistedFiles = array();
 
     /**
      * Source files that are whitelisted.
      *
      * @var array
      */
-    protected $whitelistedFiles = array();
+    private $whitelistedFiles = array();
 
     /**
      * @var boolean
      */
-    protected $blacklistPrefilled = FALSE;
+    private $blacklistPrefilled = FALSE;
 
     /**
      * Adds a directory to the blacklist (recursively).
@@ -302,7 +302,7 @@ public function hasWhitelist()
     /**
      * @since Method available since Release 1.2.3
      */
-    protected function prefillBlacklist()
+    private function prefillBlacklist()
     {
         if (defined('__PHPUNIT_PHAR__')) {
             $this->addFileToBlacklist(__PHPUNIT_PHAR__);
@@ -332,7 +332,7 @@ protected function prefillBlacklist()
      * @param integer $parent
      * @since Method available since Release 1.2.3
      */
-    protected function addDirectoryContainingClassToBlacklist($className, $parent = 1)
+    private function addDirectoryContainingClassToBlacklist($className, $parent = 1)
     {
         if (!class_exists($className)) {
             return;

PHP/CodeCoverage/Report/Factory.php

@@ -83,7 +83,7 @@ public function create(PHP_CodeCoverage $coverage)
      * @param array                                  $tests
      * @param boolean                                $cacheTokens
      */
-    protected function addItems(PHP_CodeCoverage_Report_Node_Directory $root, array $items, array $tests, $cacheTokens)
+    private function addItems(PHP_CodeCoverage_Report_Node_Directory $root, array $items, array $tests, $cacheTokens)
     {
         foreach ($items as $key => $value) {
             if (substr($key, -2) == '/f') {
@@ -142,7 +142,7 @@ protected function addItems(PHP_CodeCoverage_Report_Node_Directory $root, array
      * @param  array $files
      * @return array
      */
-    protected function buildDirectoryStructure($files)
+    private function buildDirectoryStructure($files)
     {
         $result = array();
 
@@ -207,7 +207,7 @@ protected function buildDirectoryStructure($files)
      * @param  array $files
      * @return string
      */
-    protected function reducePaths(&$files)
+    private function reducePaths(&$files)
     {
         if (empty($files)) {
             return '.';

PHP/CodeCoverage/Report/HTML.php

@@ -59,32 +59,32 @@ class PHP_CodeCoverage_Report_HTML
     /**
      * @var string
      */
-    protected $templatePath;
+    private $templatePath;
 
     /**
      * @var string
      */
-    protected $charset;
+    private $charset;
 
     /**
      * @var string
      */
-    protected $generator;
+    private $generator;
 
     /**
      * @var integer
      */
-    protected $lowUpperBound;
+    private $lowUpperBound;
 
     /**
      * @var integer
      */
-    protected $highLowerBound;
+    private $highLowerBound;
 
     /**
      * @var boolean
      */
-    protected $highlight;
+    private $highlight;
 
     /**
      * Constructor.
@@ -184,7 +184,7 @@ public function process(PHP_CodeCoverage $coverage, $target)
     /**
      * @param string $target
      */
-    protected function copyFiles($target)
+    private function copyFiles($target)
     {
         $dir = $this->getDirectory($target . 'css');
         copy($this->templatePath . 'css/bootstrap.min.css', $dir . 'bootstrap.min.css');
@@ -213,7 +213,7 @@ protected function copyFiles($target)
      * @throws PHP_CodeCoverage_Exception
      * @since  Method available since Release 1.2.0
      */
-    protected function getDirectory($directory)
+    private function getDirectory($directory)
     {
         if (substr($directory, -1, 1) != DIRECTORY_SEPARATOR) {
             $directory .= DIRECTORY_SEPARATOR;