Merge branch '4.4' into 5.2

* 4.4: Leverage str_contains/str_starts_with Leverage str_ends_with
symfony · Jul 21, 2021 · abc5571 · abc5571
2 parents f1b7140 + 030c59d
commit abc5571
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/Gitignore.php b/Gitignore.php
@@ -78,6 +78,6 @@ private static function lineToRegex(string $gitignoreLine): string
 
         return ($isAbsolute ? '' : '(?:[^/]+/)*')
             .$regex
-            .('/' !== substr($gitignoreLine, -1) ? '(?:$|/)' : '');
+            .(!str_ends_with($gitignoreLine, '/') ? '(?:$|/)' : '');
     }
 }
diff --git a/Iterator/ExcludeDirectoryFilterIterator.php b/Iterator/ExcludeDirectoryFilterIterator.php
@@ -34,7 +34,7 @@ public function __construct(\Iterator $iterator, array $directories)
         $patterns = [];
         foreach ($directories as $directory) {
             $directory = rtrim($directory, '/');
-            if (!$this->isRecursive || false !== strpos($directory, '/')) {
+            if (!$this->isRecursive || str_contains($directory, '/')) {
                 $patterns[] = preg_quote($directory, '#');
             } else {
                 $this->excludedDirs[$directory] = true;

diff --git a/Tests/FinderTest.php b/Tests/FinderTest.php
@@ -869,7 +869,7 @@ public function testSortAcrossDirectories()
     public function testFilter()
     {
         $finder = $this->buildFinder();
-        $this->assertSame($finder, $finder->filter(function (\SplFileInfo $f) { return false !== strpos($f, 'test'); }));
+        $this->assertSame($finder, $finder->filter(function (\SplFileInfo $f) { return str_contains($f, 'test'); }));
         $this->assertIterator($this->toAbsolute(['test.php', 'test.py']), $finder->in(self::$tmpDir)->getIterator());
     }
 

diff --git a/Tests/Iterator/CustomFilterIteratorTest.php b/Tests/Iterator/CustomFilterIteratorTest.php
@@ -37,7 +37,7 @@ public function getAcceptData()
     {
         return [
             [[function (\SplFileInfo $fileinfo) { return false; }], []],
-            [[function (\SplFileInfo $fileinfo) { return 0 === strpos($fileinfo, 'test'); }], ['test.php', 'test.py']],
+            [[function (\SplFileInfo $fileinfo) { return str_starts_with($fileinfo, 'test'); }], ['test.php', 'test.py']],
             [['is_dir'], []],
         ];
     }

diff --git a/Tests/Iterator/MockSplFileInfo.php b/Tests/Iterator/MockSplFileInfo.php
@@ -51,7 +51,7 @@ public function __construct($param)
     public function isFile(): bool
     {
         if (null === $this->type) {
-            return false !== strpos($this->getFilename(), 'file');
+            return str_contains($this->getFilename(), 'file');
         }
 
         return self::TYPE_FILE === $this->type;
@@ -60,7 +60,7 @@ public function isFile(): bool
     public function isDir(): bool
     {
         if (null === $this->type) {
-            return false !== strpos($this->getFilename(), 'directory');
+            return str_contains($this->getFilename(), 'directory');
         }
 
         return self::TYPE_DIRECTORY === $this->type;

diff --git a/composer.json b/composer.json
@@ -16,7 +16,8 @@
         }
     ],
     "require": {
-        "php": ">=7.2.5"
+        "php": ">=7.2.5",
+        "symfony/polyfill-php80": "^1.16"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Finder\\": "" },