Merge branch '5.3' into 5.4

* 5.3:
  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 {

DateFormatter/DateFormat/FullTransformer.php

@@ -105,7 +105,7 @@ private function formatReplace(string $dateChars, \DateTime $dateTime): string
         }
 
         // handle unimplemented characters
-        if (false !== strpos($this->notImplementedChars, $dateChars[0])) {
+        if (str_contains($this->notImplementedChars, $dateChars[0])) {
             throw new NotImplementedException(sprintf('Unimplemented date character "%s" in format "%s".', $dateChars[0], $this->pattern));
         }
 

DateFormatter/IntlDateFormatter.php

@@ -531,7 +531,7 @@ public function setTimeZoneId(?string $timeZoneId)
         $timeZone = $timeZoneId;
 
         // Get an Etc/GMT time zone that is accepted for \DateTimeZone
-        if ('GMT' !== $timeZoneId && 0 === strpos($timeZoneId, 'GMT')) {
+        if ('GMT' !== $timeZoneId && str_starts_with($timeZoneId, 'GMT')) {
             try {
                 $timeZoneId = DateFormat\TimezoneTransformer::getEtcTimeZoneId($timeZoneId);
             } catch (\InvalidArgumentException $e) {

NumberFormatter/NumberFormatter.php

@@ -533,7 +533,7 @@ public function parse(string $value, int $type = self::TYPE_DOUBLE, int &$positi
             // value is not valid if grouping is used, but digits are not grouped in groups of three
             if ($error = isset($matches['grouping']) && !preg_match('/^-?(?:\d{1,3}+)?(?:(?:,\d{3})++|\d*+)(?:\.\d*+)?$/', $value)) {
                 // the position on error is 0 for positive and 1 for negative numbers
-                $position = 0 === strpos($value, '-') ? 1 : 0;
+                $position = str_starts_with($value, '-') ? 1 : 0;
             }
         } else {
             $error = true;

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

composer.json

@@ -26,7 +26,7 @@
     "require": {
         "php": ">=7.2.5",
         "symfony/deprecation-contracts": "^2.1",
-        "symfony/polyfill-php80": "^1.15"
+        "symfony/polyfill-php80": "^1.16"
     },
     "require-dev": {
         "symfony/filesystem": "^4.4|^5.0|^6.0"