Merge branch '5.4' into 6.0

* 5.4:
  Leverage str_contains/str_starts_with
  Leverage str_ends_with

Author: nicolas-grekas

Data/Bundle/Writer/TextBundleWriter.php

@@ -194,7 +194,7 @@ private function writeTable($file, iterable $value, int $indentation, bool $fall
             fwrite($file, str_repeat('    ', $indentation + 1));
 
             // escape colons, otherwise they are interpreted as resource types
-            if (false !== strpos($key, ':') || false !== strpos($key, ' ')) {
+            if (str_contains($key, ':') || str_contains($key, ' ')) {
                 $key = '"'.$key.'"';
             }
 

Data/Generator/LanguageDataGenerator.php

@@ -135,7 +135,7 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, str
             $names = [];
             $localizedNames = [];
             foreach (self::generateLanguageNames($localeBundle) as $language => $name) {
-                if (false === strpos($language, '_')) {
+                if (!str_contains($language, '_')) {
                     $this->languageCodes[] = $language;
                     $names[$language] = $name;
                 } else {

Tests/ResourceBundleTestCase.php

@@ -778,7 +778,7 @@ protected function getRootLocales()
         if (null === self::$rootLocales) {
             self::$rootLocales = array_filter($this->getLocales(), function ($locale) {
                 // no locales for which fallback is possible (e.g "en_GB")
-                return false === strpos($locale, '_');
+                return !str_contains($locale, '_');
             });
         }
 

Tests/Util/GitRepositoryTest.php

@@ -58,14 +58,14 @@ public function testItClonesTheRepository()
         $this->assertNotEmpty($git->getLastAuthor());
         $this->assertInstanceOf(\DateTime::class, $git->getLastAuthoredDate());
         $this->assertStringMatchesFormat('v%s', $git->getLastTag());
-        $this->assertStringMatchesFormat('v3%s', $git->getLastTag(function ($tag) { return 0 === strpos($tag, 'v3'); }));
+        $this->assertStringMatchesFormat('v3%s', $git->getLastTag(function ($tag) { return str_starts_with($tag, 'v3'); }));
     }
 
     public function testItCheckoutsToTheLastTag()
     {
         $git = GitRepository::download(self::REPO_URL, $this->targetDir);
         $lastCommitHash = $git->getLastCommitHash();
-        $lastV3Tag = $git->getLastTag(function ($tag) { return 0 === strpos($tag, 'v3'); });
+        $lastV3Tag = $git->getLastTag(function ($tag) { return str_starts_with($tag, 'v3'); });
 
         $git->checkout($lastV3Tag);