diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replace INF to PHP_INT_MAX inside Finder component.

Browse Source 
bug issue introduced by 7c66dffa6b
This commit is contained in:
Benoit Leveque 2013-03-12 12:39:20 +01:00
parent 02da7da5a6
commit 602cdeeaed
5 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Component/Finder/Adapter/AbstractAdapter.php
View File

@ -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 @@ abstract class AbstractAdapter implements AdapterInterface
public function setDepths(array $depths)
{
$this->minDepth = 0;
$this->maxDepth = INF;
$this->maxDepth = PHP_INT_MAX;
foreach ($depths as $comparator) {
switch ($comparator->getOperator()) {

5
src/Symfony/Component/Finder/Adapter/AbstractFindAdapter.php
View File

@ -60,9 +60,8 @@ abstract class AbstractFindAdapter extends AbstractAdapter
}
$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);
}

2
src/Symfony/Component/Finder/Adapter/PhpAdapter.php
View File

@ -36,7 +36,7 @@ class PhpAdapter extends AbstractAdapter
\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);
}

2
src/Symfony/Component/Finder/Iterator/DepthRangeFilterIterator.php
View File

@ -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);

4
src/Symfony/Component/Finder/Tests/Iterator/DepthRangeFilterIteratorTest.php
View File

@ -72,8 +72,8 @@ class DepthRangeFilterIteratorTest extends RealIteratorTestCase
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)),
);
}