Skip to content

Commit 2c3ba7a

Browse files
Merge branch '4.4' into 5.1
* 4.4: Enable "native_constant_invocation" CS rule Make AbstractPhpFileCacheWarmer public
2 parents 2b765f0 + 5ef0f6c commit 2c3ba7a

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

Finder.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ public function in($dirs)
582582
foreach ((array) $dirs as $dir) {
583583
if (is_dir($dir)) {
584584
$resolvedDirs[] = $this->normalizeDir($dir);
585-
} elseif ($glob = glob($dir, (\defined('GLOB_BRACE') ? GLOB_BRACE : 0) | GLOB_ONLYDIR | GLOB_NOSORT)) {
585+
} elseif ($glob = glob($dir, (\defined('GLOB_BRACE') ? \GLOB_BRACE : 0) | \GLOB_ONLYDIR | \GLOB_NOSORT)) {
586586
sort($glob);
587587
$resolvedDirs = array_merge($resolvedDirs, array_map([$this, 'normalizeDir'], $glob));
588588
} else {
@@ -700,7 +700,7 @@ private function searchInDirectory(string $dir): \Iterator
700700
}
701701

702702
$minDepth = 0;
703-
$maxDepth = PHP_INT_MAX;
703+
$maxDepth = \PHP_INT_MAX;
704704

705705
foreach ($this->depths as $comparator) {
706706
switch ($comparator->getOperator()) {
@@ -735,7 +735,7 @@ private function searchInDirectory(string $dir): \Iterator
735735

736736
$iterator = new \RecursiveIteratorIterator($iterator, \RecursiveIteratorIterator::SELF_FIRST);
737737

738-
if ($minDepth > 0 || $maxDepth < PHP_INT_MAX) {
738+
if ($minDepth > 0 || $maxDepth < \PHP_INT_MAX) {
739739
$iterator = new Iterator\DepthRangeFilterIterator($iterator, $minDepth, $maxDepth);
740740
}
741741

Iterator/DepthRangeFilterIterator.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ class DepthRangeFilterIterator extends \FilterIterator
2525
* @param int $minDepth The min depth
2626
* @param int $maxDepth The max depth
2727
*/
28-
public function __construct(\RecursiveIteratorIterator $iterator, int $minDepth = 0, int $maxDepth = PHP_INT_MAX)
28+
public function __construct(\RecursiveIteratorIterator $iterator, int $minDepth = 0, int $maxDepth = \PHP_INT_MAX)
2929
{
3030
$this->minDepth = $minDepth;
31-
$iterator->setMaxDepth(PHP_INT_MAX === $maxDepth ? -1 : $maxDepth);
31+
$iterator->setMaxDepth(\PHP_INT_MAX === $maxDepth ? -1 : $maxDepth);
3232

3333
parent::__construct($iterator);
3434
}

SplFileInfo.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public function getFilenameWithoutExtension(): string
6161
{
6262
$filename = $this->getFilename();
6363

64-
return pathinfo($filename, PATHINFO_FILENAME);
64+
return pathinfo($filename, \PATHINFO_FILENAME);
6565
}
6666

6767
/**

Tests/Iterator/DepthRangeFilterIteratorTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ public function getAcceptData()
9797
return [
9898
[0, 0, $this->toAbsolute($lessThan1)],
9999
[0, 1, $this->toAbsolute($lessThanOrEqualTo1)],
100-
[2, PHP_INT_MAX, []],
101-
[1, PHP_INT_MAX, $this->toAbsolute($graterThanOrEqualTo1)],
100+
[2, \PHP_INT_MAX, []],
101+
[1, \PHP_INT_MAX, $this->toAbsolute($graterThanOrEqualTo1)],
102102
[1, 1, $this->toAbsolute($equalTo1)],
103103
];
104104
}

0 commit comments

Comments
 (0)