merged branch BenoitLeveque/assets-install-finder-issue (PR #7341)

fabpot · fabpot · commit 82a78ed54515 · 2013-03-14T14:30:47.000+01:00
This PR was merged into the 2.2 branch. Commits ------- 602cdee replace INF to PHP_INT_MAX inside Finder component. Discussion ---------- [2.2][Finder] fix assets:install issue I have some bundle with assets, and when i do. ``` app/console assets:install --env=prod ``` I don't have any of my file inside web/bundles, only empty first level directory like "css" bug issue introduced by 7c66dff --------------------------------------------------------------------------- by fabpot at 2013-03-13T13:34:10Z Can you base your patch on the 2.1 branch as the bug is also there? Thanks. --------------------------------------------------------------------------- by BenoitLeveque at 2013-03-13T14:29:55Z i didn't reproduce this issue on the latest commit (175cdc0) on 2.1 branch --------------------------------------------------------------------------- by taylorotwell at 2013-03-13T14:35:28Z Yeah, it appears the Finder component's recursion is basically broken on the 2.2 branch. --------------------------------------------------------------------------- by BenoitLeveque at 2013-03-14T13:24:52Z @fabpot i can't reproduce this issue on the 2.1 branch because you already fix it, see 7241be9
diff --git a/src/Symfony/Component/Finder/Adapter/AbstractAdapter.php b/src/Symfony/Component/Finder/Adapter/AbstractAdapter.php
@@ -21,7 +21,7 @@ abstract class AbstractAdapter implements AdapterInterface
     protected $followLinks = false;
     protected $mode        = 0;
     protected $minDepth    = 0;
-    protected $maxDepth    = INF;
+    protected $maxDepth    = PHP_INT_MAX;
     protected $exclude     = array();
     protected $names       = array();
     protected $notNames    = array();
@@ -76,7 +76,7 @@ public function setMode($mode)
     public function setDepths(array $depths)
     {
         $this->minDepth = 0;
-        $this->maxDepth = INF;
+        $this->maxDepth = PHP_INT_MAX;
 
         foreach ($depths as $comparator) {
             switch ($comparator->getOperator()) {
diff --git a/src/Symfony/Component/Finder/Adapter/AbstractFindAdapter.php b/src/Symfony/Component/Finder/Adapter/AbstractFindAdapter.php
@@ -60,9 +60,8 @@ public function searchInDirectory($dir)
         }
 
         $find->add('-mindepth')->add($this->minDepth + 1);
-        // warning! INF < INF => true ; INF == INF => false ; INF === INF => true
-        // https://bugs.php.net/bug.php?id=9118
-        if (INF !== $this->maxDepth) {
+
+        if (PHP_INT_MAX !== $this->maxDepth) {
             $find->add('-maxdepth')->add($this->maxDepth + 1);
         }
 
diff --git a/src/Symfony/Component/Finder/Adapter/PhpAdapter.php b/src/Symfony/Component/Finder/Adapter/PhpAdapter.php
@@ -36,7 +36,7 @@ public function searchInDirectory($dir)
             \RecursiveIteratorIterator::SELF_FIRST
         );
 
-        if ($this->minDepth > 0 || $this->maxDepth < INF) {
+        if ($this->minDepth > 0 || $this->maxDepth < PHP_INT_MAX) {
             $iterator = new Iterator\DepthRangeFilterIterator($iterator, $this->minDepth, $this->maxDepth);
         }
 
diff --git a/src/Symfony/Component/Finder/Iterator/DepthRangeFilterIterator.php b/src/Symfony/Component/Finder/Iterator/DepthRangeFilterIterator.php
@@ -27,7 +27,7 @@ class DepthRangeFilterIterator extends FilterIterator
      * @param int                        $minDepth    The min depth
      * @param int                        $maxDepth    The max depth
      */
-    public function __construct(\RecursiveIteratorIterator $iterator, $minDepth = 0, $maxDepth = INF)
+    public function __construct(\RecursiveIteratorIterator $iterator, $minDepth = 0, $maxDepth = PHP_INT_MAX)
     {
         $this->minDepth = $minDepth;
         $iterator->setMaxDepth(PHP_INT_MAX === $maxDepth ? -1 : $maxDepth);
diff --git a/src/Symfony/Component/Finder/Tests/Iterator/DepthRangeFilterIteratorTest.php b/src/Symfony/Component/Finder/Tests/Iterator/DepthRangeFilterIteratorTest.php
@@ -72,8 +72,8 @@ public function getAcceptData()
         return array(
             array(0, 0, $this->toAbsolute($lessThan1)),
             array(0, 1, $this->toAbsolute($lessThanOrEqualTo1)),
-            array(2, INF, array()),
-            array(1, INF, $this->toAbsolute($graterThanOrEqualTo1)),
+            array(2, PHP_INT_MAX, array()),
+            array(1, PHP_INT_MAX, $this->toAbsolute($graterThanOrEqualTo1)),
             array(1, 1, $this->toAbsolute($equalTo1)),
         );
     }

Original file line number	Diff line number	Diff line change
`@@ -60,9 +60,8 @@ public function searchInDirectory($dir)`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`$find->add('-mindepth')->add($this->minDepth + 1);`
`63`		`- // warning! INF < INF => true ; INF == INF => false ; INF === INF => true`
`64`		`- // https://bugs.php.net/bug.php?id=9118`
`65`		`- if (INF !== $this->maxDepth) {`
	`63`	`+`
	`64`	`+ if (PHP_INT_MAX !== $this->maxDepth) {`
`66`	`65`	`$find->add('-maxdepth')->add($this->maxDepth + 1);`
`67`	`66`	`}`
`68`	`67`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public function searchInDirectory($dir)`
`36`	`36`	`\RecursiveIteratorIterator::SELF_FIRST`
`37`	`37`	`);`
`38`	`38`
`39`		`- if ($this->minDepth > 0 \|\| $this->maxDepth < INF) {`
	`39`	`+ if ($this->minDepth > 0 \|\| $this->maxDepth < PHP_INT_MAX) {`
`40`	`40`	`$iterator = new Iterator\DepthRangeFilterIterator($iterator, $this->minDepth, $this->maxDepth);`
`41`	`41`	`}`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ class DepthRangeFilterIterator extends FilterIterator`
`27`	`27`	`* @param int $minDepth The min depth`
`28`	`28`	`* @param int $maxDepth The max depth`
`29`	`29`	`*/`
`30`		`- public function __construct(\RecursiveIteratorIterator $iterator, $minDepth = 0, $maxDepth = INF)`
	`30`	`+ public function __construct(\RecursiveIteratorIterator $iterator, $minDepth = 0, $maxDepth = PHP_INT_MAX)`
`31`	`31`	`{`
`32`	`32`	`$this->minDepth = $minDepth;`
`33`	`33`	`$iterator->setMaxDepth(PHP_INT_MAX === $maxDepth ? -1 : $maxDepth);`