Leverage str_contains/str_starts_with

Signed-off-by: Alexander M. Turek <me@derrabus.de>

Author: derrabus

DependencyInjection/MainConfiguration.php

@@ -226,7 +226,7 @@ private function addFirewallsSection(ArrayNodeDefinition $rootNode, array $facto
                         ->beforeNormalization()
                             ->ifArray()->then(function ($v) {
                                 foreach ($v as $originalName => $cookieConfig) {
-                                    if (false !== strpos($originalName, '-')) {
+                                    if (str_contains($originalName, '-')) {
                                         $normalizedName = str_replace('-', '_', $originalName);
                                         @trigger_error(sprintf('Normalization of cookie names is deprecated since Symfony 4.3. Starting from Symfony 5.0, the "%s" cookie configured in "logout.delete_cookies" will delete the "%s" cookie instead of the "%s" cookie.', $originalName, $originalName, $normalizedName), \E_USER_DEPRECATED);
 
@@ -304,7 +304,7 @@ private function addFirewallsSection(ArrayNodeDefinition $rootNode, array $facto
                             continue;
                         }
 
-                        if (false !== strpos($firewall[$k]['check_path'], '/') && !preg_match('#'.$firewall['pattern'].'#', $firewall[$k]['check_path'])) {
+                        if (str_contains($firewall[$k]['check_path'], '/') && !preg_match('#'.$firewall['pattern'].'#', $firewall[$k]['check_path'])) {
                             throw new \LogicException(sprintf('The check_path "%s" for login method "%s" is not matched by the firewall pattern "%s".', $firewall[$k]['check_path'], $k, $firewall['pattern']));
                         }
                     }

Tests/DependencyInjection/CompleteConfigurationTest.php

@@ -42,7 +42,7 @@ public function testUserProviders()
     {
         $container = $this->getContainer('container1');
 
-        $providers = array_values(array_filter($container->getServiceIds(), function ($key) { return 0 === strpos($key, 'security.user.provider.concrete'); }));
+        $providers = array_values(array_filter($container->getServiceIds(), function ($key) { return str_starts_with($key, 'security.user.provider.concrete'); }));
 
         $expectedProviders = [
             'security.user.provider.concrete.default',

composer.json

@@ -21,6 +21,7 @@
         "symfony/config": "^4.2|^5.0",
         "symfony/dependency-injection": "^4.4|^5.0",
         "symfony/http-kernel": "^4.4",
+        "symfony/polyfill-php80": "^1.16",
         "symfony/security-core": "^4.4",
         "symfony/security-csrf": "^4.2|^5.0",
         "symfony/security-guard": "^4.2|^5.0",