瀏覽代碼

[Finder] moved most protected methods and properties to private

Fabien Potencier 14 年之前
父節點
當前提交
c9b965dbee

+ 2 - 2
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.

+ 2 - 2
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.

+ 13 - 13
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;
 

+ 1 - 1
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.

+ 1 - 1
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.

+ 1 - 1
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.

+ 1 - 1
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.

+ 1 - 1
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.

+ 3 - 3
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;

+ 1 - 1
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.

+ 3 - 3
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;
     }
-}
+}