Use str_ends_with() and str_starts_with()

alexislefebvre · GromNaN · commit 28d4d6ba7807 · 2021-12-08T00:54:12.000+01:00
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Csp/ContentSecurityPolicyHandler.php b/src/Symfony/Bundle/WebProfilerBundle/Csp/ContentSecurityPolicyHandler.php
@@ -224,7 +224,7 @@ private function hasHashOrNonce(array $directives): bool
             if (!str_ends_with($directive, '\'')) {
                 continue;
             }
-            if ('\'nonce-' === substr($directive, 0, 7)) {
+            if (str_starts_with($directive, '\'nonce-')) {
                 return true;
             }
             if (\in_array(substr($directive, 0, 8), ['\'sha256-', '\'sha384-', '\'sha512-'], true)) {
diff --git a/src/Symfony/Component/Console/Formatter/OutputFormatter.php b/src/Symfony/Component/Console/Formatter/OutputFormatter.php
@@ -254,7 +254,7 @@ private function applyCurrentStyle(string $text, string $current, int $width, in
         $text = $prefix.preg_replace('~([^\\n]{'.$width.'})\\ *~', "\$1\n", $text);
         $text = rtrim($text, "\n").($matches[1] ?? '');
 
-        if (!$currentLineLength && '' !== $current && "\n" !== substr($current, -1)) {
+        if (!$currentLineLength && '' !== $current && !str_ends_with($current, "\n")) {
             $text = "\n".$text;
         }
 
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/AddAnnotatedClassesToCachePass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/AddAnnotatedClassesToCachePass.php
@@ -117,7 +117,7 @@ private function patternsToRegexps(array $patterns): array
             $regex = strtr($regex, ['\\*\\*' => '.*?', '\\*' => '[^\\\\]*?']);
 
             // If this class does not end by a slash, anchor the end
-            if ('\\' !== substr($regex, -1)) {
+            if (!str_ends_with($regex, '\\')) {
                 $regex .= '$';
             }
 
diff --git a/src/Symfony/Component/Mime/Tests/Encoder/Rfc2231EncoderTest.php b/src/Symfony/Component/Mime/Tests/Encoder/Rfc2231EncoderTest.php
@@ -102,15 +102,15 @@ public function testEncodingAndDecodingSamples()
         $dir = realpath(__DIR__.'/../Fixtures/samples/charsets');
         $sampleFp = opendir($dir);
         while (false !== $encoding = readdir($sampleFp)) {
-            if ('.' == substr($encoding, 0, 1)) {
+            if (str_starts_with($encoding, '.')) {
                 continue;
             }
 
             $encoder = new Rfc2231Encoder();
             if (is_dir($dir.'/'.$encoding)) {
                 $fileFp = opendir($dir.'/'.$encoding);
                 while (false !== $sampleFile = readdir($fileFp)) {
-                    if ('.' == substr($sampleFile, 0, 1)) {
+                    if (str_starts_with($sampleFile, '.')) {
                         continue;
                     }
 
diff --git a/src/Symfony/Component/Routing/Loader/AnnotationDirectoryLoader.php b/src/Symfony/Component/Routing/Loader/AnnotationDirectoryLoader.php
@@ -37,7 +37,7 @@ public function load(mixed $path, string $type = null): RouteCollection
             new \RecursiveCallbackFilterIterator(
                 new \RecursiveDirectoryIterator($dir, \FilesystemIterator::SKIP_DOTS | \FilesystemIterator::FOLLOW_SYMLINKS),
                 function (\SplFileInfo $current) {
-                    return '.' !== substr($current->getBasename(), 0, 1);
+                    return !str_starts_with($current->getBasename(), '.');
                 }
             ),
             \RecursiveIteratorIterator::LEAVES_ONLY
diff --git a/src/Symfony/Component/Translation/Loader/CsvFileLoader.php b/src/Symfony/Component/Translation/Loader/CsvFileLoader.php
@@ -45,7 +45,7 @@ protected function loadResource(string $resource): array
                 continue;
             }
 
-            if ('#' !== substr($data[0], 0, 1) && isset($data[1]) && 2 === \count($data)) {
+            if (!str_starts_with($data[0], '#') && isset($data[1]) && 2 === \count($data)) {
                 $messages[$data[0]] = $data[1];
             }
         }
diff --git a/src/Symfony/Component/Workflow/Dumper/PlantUmlDumper.php b/src/Symfony/Component/Workflow/Dumper/PlantUmlDumper.php
@@ -237,7 +237,7 @@ private function getTransitionEscapedWithStyle(MetadataStoreInterface $workflowM
     private function getTransitionColor(string $color): string
     {
         // PUML format requires that color in transition have to be prefixed with “#”.
-        if ('#' !== substr($color, 0, 1)) {
+        if (!str_starts_with($color, '#')) {
             $color = '#'.$color;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ private function hasHashOrNonce(array $directives): bool`
`224`	`224`	`if (!str_ends_with($directive, '\'')) {`
`225`	`225`	`continue;`
`226`	`226`	`}`
`227`		`- if ('\'nonce-' === substr($directive, 0, 7)) {`
	`227`	`+ if (str_starts_with($directive, '\'nonce-')) {`
`228`	`228`	`return true;`
`229`	`229`	`}`
`230`	`230`	`if (\in_array(substr($directive, 0, 8), ['\'sha256-', '\'sha384-', '\'sha512-'], true)) {`
Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,7 @@ private function applyCurrentStyle(string $text, string $current, int $width, in`
`254`	`254`	`$text = $prefix.preg_replace('~([^\\n]{'.$width.'})\\ *~', "\$1\n", $text);`
`255`	`255`	`$text = rtrim($text, "\n").($matches[1] ?? '');`
`256`	`256`
`257`		`- if (!$currentLineLength && '' !== $current && "\n" !== substr($current, -1)) {`
	`257`	`+ if (!$currentLineLength && '' !== $current && !str_ends_with($current, "\n")) {`
`258`	`258`	`$text = "\n".$text;`
`259`	`259`	`}`
`260`	`260`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ private function patternsToRegexps(array $patterns): array`
`117`	`117`	`$regex = strtr($regex, ['\\\\' => '.?', '\\' => '[^\\\\]*?']);`
`118`	`118`
`119`	`119`	`// If this class does not end by a slash, anchor the end`
`120`		`- if ('\\' !== substr($regex, -1)) {`
	`120`	`+ if (!str_ends_with($regex, '\\')) {`
`121`	`121`	`$regex .= '$';`
`122`	`122`	`}`
`123`	`123`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public function load(mixed $path, string $type = null): RouteCollection`
`37`	`37`	`new \RecursiveCallbackFilterIterator(`
`38`	`38`	`new \RecursiveDirectoryIterator($dir, \FilesystemIterator::SKIP_DOTS \| \FilesystemIterator::FOLLOW_SYMLINKS),`
`39`	`39`	`function (\SplFileInfo $current) {`
`40`		`- return '.' !== substr($current->getBasename(), 0, 1);`
	`40`	`+ return !str_starts_with($current->getBasename(), '.');`
`41`	`41`	`}`
`42`	`42`	`),`
`43`	`43`	`\RecursiveIteratorIterator::LEAVES_ONLY`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ protected function loadResource(string $resource): array`
`45`	`45`	`continue;`
`46`	`46`	`}`
`47`	`47`
`48`		`- if ('#' !== substr($data[0], 0, 1) && isset($data[1]) && 2 === \count($data)) {`
	`48`	`+ if (!str_starts_with($data[0], '#') && isset($data[1]) && 2 === \count($data)) {`
`49`	`49`	`$messages[$data[0]] = $data[1];`
`50`	`50`	`}`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,7 @@ private function getTransitionEscapedWithStyle(MetadataStoreInterface $workflowM`
`237`	`237`	`private function getTransitionColor(string $color): string`
`238`	`238`	`{`
`239`	`239`	`// PUML format requires that color in transition have to be prefixed with “#”.`
`240`		`- if ('#' !== substr($color, 0, 1)) {`
	`240`	`+ if (!str_starts_with($color, '#')) {`
`241`	`241`	`$color = '#'.$color;`
`242`	`242`	`}`
`243`	`243`