symfony · fabpot · Oct 30, 2012 · Jul 4, 2012 · Oct 29, 2012 · Oct 29, 2012
diff --git a/src/Symfony/Component/Finder/Adapter/AbstractAdapter.php b/src/Symfony/Component/Finder/Adapter/AbstractAdapter.php
@@ -31,6 +31,8 @@ abstract class AbstractAdapter implements AdapterInterface
     protected $dates       = array();
     protected $filters     = array();
     protected $sort        = false;
+    protected $paths       = array();
+    protected $notPaths    = array();
 
     /**
      * {@inheritdoc}
@@ -40,7 +42,7 @@ public function setFollowLinks($followLinks)
         $this->followLinks = $followLinks;
 
         return $this;
-     }
+    }
 
     /**
      * {@inheritdoc}
@@ -50,7 +52,7 @@ public function setMode($mode)
         $this->mode = $mode;
 
         return $this;
-     }
+    }
 
     /**
      * {@inheritdoc}
@@ -80,7 +82,7 @@ public function setDepths(array $depths)
         }
 
         return $this;
-     }
+    }
 
     /**
      * {@inheritdoc}
@@ -90,7 +92,7 @@ public function setExclude(array $exclude)
         $this->exclude = $exclude;
 
         return $this;
-     }
+    }
 
     /**
      * {@inheritdoc}
@@ -100,7 +102,7 @@ public function setNames(array $names)
         $this->names = $names;
 
         return $this;
-     }
+    }
 
     /**
      * {@inheritdoc}
@@ -110,7 +112,7 @@ public function setNotNames(array $notNames)
         $this->notNames = $notNames;
 
         return $this;
-     }
+    }
 
     /**
      * {@inheritdoc}
@@ -120,7 +122,7 @@ public function setContains(array $contains)
         $this->contains = $contains;
 
         return $this;
-     }
+    }
 
     /**
      * {@inheritdoc}
@@ -130,7 +132,7 @@ public function setNotContains(array $notContains)
         $this->notContains = $notContains;
 
         return $this;
-     }
+    }
 
     /**
      * {@inheritdoc}
@@ -140,7 +142,7 @@ public function setSizes(array $sizes)
         $this->sizes = $sizes;
 
         return $this;
-     }
+    }
 
     /**
      * {@inheritdoc}
@@ -150,7 +152,7 @@ public function setDates(array $dates)
         $this->dates = $dates;
 
         return $this;
-     }
+    }
 
     /**
      * {@inheritdoc}
@@ -160,7 +162,7 @@ public function setFilters(array $filters)
         $this->filters = $filters;
 
         return $this;
-     }
+    }
 
     /**
      * {@inheritdoc}
@@ -170,5 +172,25 @@ public function setSort($sort)
         $this->sort = $sort;
 
         return $this;
-     }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setPath(array $paths)
+    {
+        $this->paths = $paths;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setNotPath(array $notPaths)
+    {
+        $this->notPaths = $notPaths;
+
+        return $this;
+    }
 }
diff --git a/src/Symfony/Component/Finder/Adapter/AdapterInterface.php b/src/Symfony/Component/Finder/Adapter/AdapterInterface.php
@@ -21,103 +21,117 @@ interface AdapterInterface
      *
      * @return AdapterInterface Current instance
      */
-    function setFollowLinks($followLinks);
+    public function setFollowLinks($followLinks);
 
     /**
      * @param int $mode
      *
      * @return AdapterInterface Current instance
      */
-    function setMode($mode);
+    public function setMode($mode);
 
     /**
      * @param array $exclude
      *
      * @return AdapterInterface Current instance
      */
-    function setExclude(array $exclude);
+    public function setExclude(array $exclude);
 
     /**
      * @param array $depths
      *
      * @return AdapterInterface Current instance
      */
-    function setDepths(array $depths);
+    public function setDepths(array $depths);
 
     /**
      * @param array $names
      *
      * @return AdapterInterface Current instance
      */
-    function setNames(array $names);
+    public function setNames(array $names);
 
     /**
      * @param array $notNames
      *
      * @return AdapterInterface Current instance
      */
-    function setNotNames(array $notNames);
+    public function setNotNames(array $notNames);
 
     /**
      * @param array $contains
      *
      * @return AdapterInterface Current instance
      */
-    function setContains(array $contains);
+    public function setContains(array $contains);
 
     /**
      * @param array $notContains
      *
      * @return AdapterInterface Current instance
      */
-    function setNotContains(array $notContains);
+    public function setNotContains(array $notContains);
 
     /**
      * @param array $sizes
      *
      * @return AdapterInterface Current instance
      */
-    function setSizes(array $sizes);
+    public function setSizes(array $sizes);
 
     /**
      * @param array $dates
      *
      * @return AdapterInterface Current instance
      */
-    function setDates(array $dates);
+    public function setDates(array $dates);
 
     /**
      * @param array $filters
      *
      * @return AdapterInterface Current instance
      */
-    function setFilters(array $filters);
+    public function setFilters(array $filters);
 
     /**
      * @param \Closure|int $sort
      *
      * @return AdapterInterface Current instance
      */
-    function setSort($sort);
+    public function setSort($sort);
+
+    /**
+     * @param array $path
+     *
+     * @return AdapterInterface Current instance
+     */
+    public function setPath(array $paths);
+
+    /**
+     * @param array $notPaths
+     *
+     * @return AdapterInterface Current instance
+     */
+    public function setNotPath(array $notPaths);
 
     /**
      * @param string $dir
      *
      * @return \Iterator Result iterator
      */
-    function searchInDirectory($dir);
+    public function searchInDirectory($dir);
 
     /**
      * Tests adapter support for current platform.
      *
      * @return bool
      */
-    function isSupported();
+    public function isSupported();
 
     /**
      * Returns adapter name.
      *
      * @return string
      */
-    function getName();
+    public function getName();
 }
diff --git a/src/Symfony/Component/Finder/Adapter/GnuFindAdapter.php b/src/Symfony/Component/Finder/Adapter/GnuFindAdapter.php
@@ -80,6 +80,8 @@ public function searchInDirectory($dir)
 
         $this->buildNamesFiltering($find, $this->names);
         $this->buildNamesFiltering($find, $this->notNames, true);
+        $this->buildPathsFiltering($find, $dir, $this->paths);
+        $this->buildPathsFiltering($find, $dir, $this->notPaths, true);
         $this->buildSizesFiltering($find, $this->sizes);
         $this->buildDatesFiltering($find, $this->dates);
 
@@ -151,7 +153,7 @@ private function buildNamesFiltering(Command $command, array $names, $not = fals
         foreach ($names as $i => $name) {
             $expr = Expression::create($name);
 
-            // Fixes 'not search' and 'fuls path matching' regex problems.
+            // Fixes 'not search' and 'full path matching' regex problems.
             // - Jokers '.' are replaced by [^/].
             // - We add '[^/]*' before and after regex (if no ^|$ flags are present).
             if ($expr->isRegex()) {
@@ -177,6 +179,44 @@ private function buildNamesFiltering(Command $command, array $names, $not = fals
         $command->cmd(')');
     }
 
+    /**
+     * @param Command  $command
+     * @param string   $dir
+     * @param string[] $paths
+     * @param bool     $not
+     * @return void
+     */
+    private function buildPathsFiltering(Command $command, $dir, array $paths, $not = false)
+    {
+        if (0 === count($paths)) {
+            return;
+        }
+
+        $command->add($not ? '-not' : null)->cmd('(');
+
+        foreach ($paths as $i => $path) {
+            $expr = Expression::create($path);
+
+            // Fixes 'not search' regex problems.
+            if ($expr->isRegex()) {
+                $regex = $expr->getRegex();
+                $regex->prepend($regex->hasStartFlag() ? '' : '.*')->setEndJoker(!$regex->hasEndFlag());
+            } else {
+                $expr->prepend('*')->append('*');
+            }
+
+            $command
+                ->add($i > 0 ? '-or' : null)
+                ->add($expr->isRegex()
+                    ? ($expr->isCaseSensitive() ? '-regex' : '-iregex')
+                    : ($expr->isCaseSensitive() ? '-path' : '-ipath')
+                )
+                ->arg($expr->prepend($dir.DIRECTORY_SEPARATOR)->renderPattern());
+        }
+
+        $command->cmd(')');
+    }
+
     /**
      * @param Command            $command
      * @param NumberComparator[] $sizes

diff --git a/src/Symfony/Component/Finder/Adapter/PhpAdapter.php b/src/Symfony/Component/Finder/Adapter/PhpAdapter.php
@@ -73,6 +73,10 @@ public function searchInDirectory($dir)
             $iterator = $iteratorAggregate->getIterator();
         }
 
+        if ($this->paths || $this->notPaths) {
+            $iterator = new Iterator\PathFilterIterator($iterator, $this->paths, $this->notPaths);
+        }
+
         return $iterator;
     }
 

diff --git a/src/Symfony/Component/Finder/Expression/Expression.php b/src/Symfony/Component/Finder/Expression/Expression.php
@@ -86,6 +86,26 @@ public function getType()
         return $this->value->getType();
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function prepend($expr)
+    {
+        $this->value->prepend($expr);
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function append($expr)
+    {
+        $this->value->append($expr);
+
+        return $this;
+    }
+
     /**
      * @return bool
      */

diff --git a/src/Symfony/Component/Finder/Expression/Glob.php b/src/Symfony/Component/Finder/Expression/Glob.php
@@ -61,6 +61,26 @@ public function isCaseSensitive()
         return true;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function prepend($expr)
+    {
+        $this->pattern = $expr.$this->pattern;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function append($expr)
+    {
+        $this->pattern .= $expr;
+
+        return $this;
+    }
+
     /**
      * @param bool $strictLeadingDot
      * @param bool $strictWildcardSlash