From c9b965dbeec86be6cb2713185b3389c04dbd0444 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 8 Mar 2011 20:54:22 +0100 Subject: [PATCH] [Finder] moved most protected methods and properties to private --- .../Finder/Comparator/Comparator.php | 4 +-- .../Finder/Comparator/DateComparator.php | 4 +-- src/Symfony/Component/Finder/Finder.php | 26 +++++++++---------- .../Finder/Iterator/CustomFilterIterator.php | 2 +- .../Iterator/DateRangeFilterIterator.php | 2 +- .../Iterator/DepthRangeFilterIterator.php | 2 +- .../ExcludeDirectoryFilterIterator.php | 2 +- .../Iterator/FileTypeFilterIterator.php | 2 +- .../Iterator/FilenameFilterIterator.php | 6 ++--- .../Iterator/SizeRangeFilterIterator.php | 2 +- src/Symfony/Component/Finder/SplFileInfo.php | 6 ++--- 11 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/Symfony/Component/Finder/Comparator/Comparator.php b/src/Symfony/Component/Finder/Comparator/Comparator.php index 8b2ea260a2..1379fcc8c0 100644 --- a/src/Symfony/Component/Finder/Comparator/Comparator.php +++ b/src/Symfony/Component/Finder/Comparator/Comparator.php @@ -18,8 +18,8 @@ namespace Symfony\Component\Finder\Comparator; */ class Comparator { - protected $target; - protected $operator = '=='; + private $target; + private $operator = '=='; /** * Gets the target value. diff --git a/src/Symfony/Component/Finder/Comparator/DateComparator.php b/src/Symfony/Component/Finder/Comparator/DateComparator.php index 00ed6bdc89..263ec20b61 100644 --- a/src/Symfony/Component/Finder/Comparator/DateComparator.php +++ b/src/Symfony/Component/Finder/Comparator/DateComparator.php @@ -18,8 +18,8 @@ namespace Symfony\Component\Finder\Comparator; */ class DateComparator extends Comparator { - protected $target; - protected $comparison; + private $target; + private $comparison; /** * Constructor. diff --git a/src/Symfony/Component/Finder/Finder.php b/src/Symfony/Component/Finder/Finder.php index 3190243458..554db9f2e0 100644 --- a/src/Symfony/Component/Finder/Finder.php +++ b/src/Symfony/Component/Finder/Finder.php @@ -27,18 +27,18 @@ namespace Symfony\Component\Finder; */ class Finder implements \IteratorAggregate { - protected $mode = 0; - protected $names = array(); - protected $notNames = array(); - protected $exclude = array(); - protected $filters = array(); - protected $depths = array(); - protected $sizes = array(); - protected $followLinks = false; - protected $sort = false; - protected $ignoreVCS = true; - protected $dirs = array(); - protected $dates = array(); + private $mode = 0; + private $names = array(); + private $notNames = array(); + private $exclude = array(); + private $filters = array(); + private $depths = array(); + private $sizes = array(); + private $followLinks = false; + private $sort = false; + private $ignoreVCS = true; + private $dirs = array(); + private $dates = array(); /** * Restricts the matching to directories only. @@ -336,7 +336,7 @@ class Finder implements \IteratorAggregate return $iterator; } - protected function searchInDirectory($dir) + private function searchInDirectory($dir) { $flags = \RecursiveDirectoryIterator::SKIP_DOTS; diff --git a/src/Symfony/Component/Finder/Iterator/CustomFilterIterator.php b/src/Symfony/Component/Finder/Iterator/CustomFilterIterator.php index c0fb726352..cb63cb1f1d 100644 --- a/src/Symfony/Component/Finder/Iterator/CustomFilterIterator.php +++ b/src/Symfony/Component/Finder/Iterator/CustomFilterIterator.php @@ -21,7 +21,7 @@ namespace Symfony\Component\Finder\Iterator; */ class CustomFilterIterator extends \FilterIterator { - protected $filters = array(); + private $filters = array(); /** * Constructor. diff --git a/src/Symfony/Component/Finder/Iterator/DateRangeFilterIterator.php b/src/Symfony/Component/Finder/Iterator/DateRangeFilterIterator.php index c0efd407fb..8ed17b414b 100644 --- a/src/Symfony/Component/Finder/Iterator/DateRangeFilterIterator.php +++ b/src/Symfony/Component/Finder/Iterator/DateRangeFilterIterator.php @@ -18,7 +18,7 @@ namespace Symfony\Component\Finder\Iterator; */ class DateRangeFilterIterator extends \FilterIterator { - protected $comparators = array(); + private $comparators = array(); /** * Constructor. diff --git a/src/Symfony/Component/Finder/Iterator/DepthRangeFilterIterator.php b/src/Symfony/Component/Finder/Iterator/DepthRangeFilterIterator.php index 66253f7f57..7d58c38457 100644 --- a/src/Symfony/Component/Finder/Iterator/DepthRangeFilterIterator.php +++ b/src/Symfony/Component/Finder/Iterator/DepthRangeFilterIterator.php @@ -18,7 +18,7 @@ namespace Symfony\Component\Finder\Iterator; */ class DepthRangeFilterIterator extends \FilterIterator { - protected $minDepth = 0; + private $minDepth = 0; /** * Constructor. diff --git a/src/Symfony/Component/Finder/Iterator/ExcludeDirectoryFilterIterator.php b/src/Symfony/Component/Finder/Iterator/ExcludeDirectoryFilterIterator.php index 9c263bd7f1..cff773d3e7 100644 --- a/src/Symfony/Component/Finder/Iterator/ExcludeDirectoryFilterIterator.php +++ b/src/Symfony/Component/Finder/Iterator/ExcludeDirectoryFilterIterator.php @@ -18,7 +18,7 @@ namespace Symfony\Component\Finder\Iterator; */ class ExcludeDirectoryFilterIterator extends \FilterIterator { - protected $patterns; + private $patterns; /** * Constructor. diff --git a/src/Symfony/Component/Finder/Iterator/FileTypeFilterIterator.php b/src/Symfony/Component/Finder/Iterator/FileTypeFilterIterator.php index 82cd84ebff..96b6867a30 100644 --- a/src/Symfony/Component/Finder/Iterator/FileTypeFilterIterator.php +++ b/src/Symfony/Component/Finder/Iterator/FileTypeFilterIterator.php @@ -21,7 +21,7 @@ class FileTypeFilterIterator extends \FilterIterator const ONLY_FILES = 1; const ONLY_DIRECTORIES = 2; - protected $mode; + private $mode; /** * Constructor. diff --git a/src/Symfony/Component/Finder/Iterator/FilenameFilterIterator.php b/src/Symfony/Component/Finder/Iterator/FilenameFilterIterator.php index 473ee4e808..4af6f53873 100644 --- a/src/Symfony/Component/Finder/Iterator/FilenameFilterIterator.php +++ b/src/Symfony/Component/Finder/Iterator/FilenameFilterIterator.php @@ -20,8 +20,8 @@ use Symfony\Component\Finder\Glob; */ class FilenameFilterIterator extends \FilterIterator { - protected $matchRegexps; - protected $noMatchRegexps; + private $matchRegexps; + private $noMatchRegexps; /** * Constructor. @@ -81,7 +81,7 @@ class FilenameFilterIterator extends \FilterIterator return $match && !$exclude; } - protected function toRegex($str) + private function toRegex($str) { if (preg_match('/^([^a-zA-Z0-9\\\\]).+?\\1[ims]?$/', $str)) { return $str; diff --git a/src/Symfony/Component/Finder/Iterator/SizeRangeFilterIterator.php b/src/Symfony/Component/Finder/Iterator/SizeRangeFilterIterator.php index 1cfd3a5f28..0b672c1062 100644 --- a/src/Symfony/Component/Finder/Iterator/SizeRangeFilterIterator.php +++ b/src/Symfony/Component/Finder/Iterator/SizeRangeFilterIterator.php @@ -18,7 +18,7 @@ namespace Symfony\Component\Finder\Iterator; */ class SizeRangeFilterIterator extends \FilterIterator { - protected $comparators = array(); + private $comparators = array(); /** * Constructor. diff --git a/src/Symfony/Component/Finder/SplFileInfo.php b/src/Symfony/Component/Finder/SplFileInfo.php index 0de3b2f18e..b57d3e057d 100644 --- a/src/Symfony/Component/Finder/SplFileInfo.php +++ b/src/Symfony/Component/Finder/SplFileInfo.php @@ -18,8 +18,8 @@ namespace Symfony\Component\Finder; */ class SplFileInfo extends \SplFileInfo { - protected $relativePath; - protected $relativePathname; + private $relativePath; + private $relativePathname; /** * Constructor @@ -54,4 +54,4 @@ class SplFileInfo extends \SplFileInfo { return $this->relativePathname; } -} \ No newline at end of file +}