From 030c59dc3056b1754f39bd208a671bf93a14be00 Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Mon, 7 Jun 2021 01:15:42 +0200
Subject: [PATCH] Leverage str_contains/str_starts_with

Signed-off-by: Alexander M. Turek <me@derrabus.de>
---
 Iterator/ExcludeDirectoryFilterIterator.php | 2 +-
 Tests/FinderTest.php                        | 2 +-
 Tests/Iterator/CustomFilterIteratorTest.php | 2 +-
 Tests/Iterator/MockSplFileInfo.php          | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Iterator/ExcludeDirectoryFilterIterator.php b/Iterator/ExcludeDirectoryFilterIterator.php
index 6a1b291a..f3743143 100644
--- 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
index dbc66cbc..4fb1cb4d 100644
--- 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
index 4d55b112..7c3c65ce 100644
--- 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
index bc80ed2e..028e3584 100644
--- 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;