Revert fix for sebastianbergmann#30

Author: sebastianbergmann

Diff for: ChangeLog.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.4.5] - 2017-11-27
+
+### Fixed
+
+* Fixed [#37](https://github.com/sebastianbergmann/php-file-iterator/issues/37): Regression caused by fix for [#30](https://github.com/sebastianbergmann/php-file-iterator/issues/30)
+
 ## [1.4.4] - 2017-11-27
 
 ### Fixed
@@ -28,6 +34,7 @@ No changes
 
 * [Added support for wildcards (glob) in exclude](https://github.com/sebastianbergmann/php-file-iterator/pull/23)
 
+[1.4.5]: https://github.com/sebastianbergmann/php-file-iterator/compare/1.4.4...1.4.5
 [1.4.4]: https://github.com/sebastianbergmann/php-file-iterator/compare/1.4.3...1.4.4
 [1.4.3]: https://github.com/sebastianbergmann/php-file-iterator/compare/1.4.2...1.4.3
 [1.4.2]: https://github.com/sebastianbergmann/php-file-iterator/compare/1.4.1...1.4.2

Diff for: src/Iterator.php

@@ -39,11 +39,6 @@ class File_Iterator extends FilterIterator
      */
     protected $basepath;
 
-    /**
-     * @var bool
-     */
-    private $excludeAll = FALSE;
-
     /**
      * @param Iterator $iterator
      * @param array    $suffixes
@@ -63,11 +58,6 @@ public function __construct(Iterator $iterator, array $suffixes = array(), array
             $basepath = NULL;
         } else {
             foreach ($exclude as &$_exclude) {
-                if (self::isExcludeParentOrSame($_exclude, $basepath)) {
-                    $this->excludeAll = TRUE;
-                    continue;
-                }
-
                 $_exclude = str_replace($basepath, '', $_exclude);
             }
         }
@@ -110,10 +100,6 @@ public function accept()
      */
     protected function acceptPath($path)
     {
-        if ($this->excludeAll) {
-            return FALSE;
-        }
-
         foreach ($this->exclude as $exclude) {
             if (strpos($path, $exclude) === 0) {
                 return FALSE;
@@ -169,19 +155,4 @@ protected function acceptSubString($filename, array $subStrings, $type)
 
         return $matched;
     }
-
-    private static function isExcludeParentOrSame($exclude, $basepath)
-    {
-        if ($exclude === $basepath) {
-            return TRUE;
-        }
-
-        $excludeWithSeparator = $exclude . DIRECTORY_SEPARATOR;
-        $prefixLength = strlen($excludeWithSeparator);
-        if ($excludeWithSeparator === substr($basepath, 0, $prefixLength)) {
-            return TRUE;
-        }
-
-        return FALSE;
-    }
 }