Leverage str_contains/str_starts_with

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

Author: derrabus

Core/Authorization/Voter/RoleVoter.php

@@ -41,7 +41,7 @@ public function vote(TokenInterface $token, $subject, array $attributes)
                 $attribute = $attribute->getRole();
             }
 
-            if (!\is_string($attribute) || 0 !== strpos($attribute, $this->prefix)) {
+            if (!\is_string($attribute) || !str_starts_with($attribute, $this->prefix)) {
                 continue;
             }
 

Core/Encoder/Argon2iPasswordEncoder.php

@@ -83,7 +83,7 @@ public function isPasswordValid($encoded, $raw, $salt)
     {
         // If $encoded was created via "sodium_crypto_pwhash_str()", the hashing algorithm may be "argon2id" instead of "argon2i".
         // In this case, "password_verify()" cannot be used.
-        if (\PHP_VERSION_ID >= 70200 && \defined('PASSWORD_ARGON2I') && (false === strpos($encoded, '$argon2id$'))) {
+        if (\PHP_VERSION_ID >= 70200 && \defined('PASSWORD_ARGON2I') && (!str_contains($encoded, '$argon2id$'))) {
             return !$this->isPasswordTooLong($raw) && password_verify($raw, $encoded);
         }
         if (\function_exists('sodium_crypto_pwhash_str_verify')) {

Core/Encoder/MessageDigestPasswordEncoder.php

@@ -73,7 +73,7 @@ public function encodePassword($raw, $salt)
      */
     public function isPasswordValid($encoded, $raw, $salt)
     {
-        if (\strlen($encoded) !== $this->encodedLength || false !== strpos($encoded, '$')) {
+        if (\strlen($encoded) !== $this->encodedLength || str_contains($encoded, '$')) {
             return false;
         }
 

Core/Encoder/NativePasswordEncoder.php

@@ -97,9 +97,9 @@ public function isPasswordValid($encoded, $raw, $salt): bool
             return false;
         }
 
-        if (0 !== strpos($encoded, '$argon')) {
+        if (!str_starts_with($encoded, '$argon')) {
             // BCrypt encodes only the first 72 chars
-            return (72 >= \strlen($raw) || 0 !== strpos($encoded, '$2')) && password_verify($raw, $encoded);
+            return (72 >= \strlen($raw) || !str_starts_with($encoded, '$2')) && password_verify($raw, $encoded);
         }
 
         if (\extension_loaded('sodium') && version_compare(\SODIUM_LIBRARY_VERSION, '1.0.14', '>=')) {

Core/Encoder/Pbkdf2PasswordEncoder.php

@@ -80,7 +80,7 @@ public function encodePassword($raw, $salt)
      */
     public function isPasswordValid($encoded, $raw, $salt)
     {
-        if (\strlen($encoded) !== $this->encodedLength || false !== strpos($encoded, '$')) {
+        if (\strlen($encoded) !== $this->encodedLength || str_contains($encoded, '$')) {
             return false;
         }
 

Core/Encoder/SodiumPasswordEncoder.php

@@ -84,9 +84,9 @@ public function isPasswordValid($encoded, $raw, $salt): bool
             return false;
         }
 
-        if (0 !== strpos($encoded, '$argon')) {
+        if (!str_starts_with($encoded, '$argon')) {
             // Accept validating non-argon passwords for seamless migrations
-            return (72 >= \strlen($raw) || 0 !== strpos($encoded, '$2')) && password_verify($raw, $encoded);
+            return (72 >= \strlen($raw) || !str_starts_with($encoded, '$2')) && password_verify($raw, $encoded);
         }
 
         if (\function_exists('sodium_crypto_pwhash_str_verify')) {

Core/composer.json

@@ -18,6 +18,7 @@
     "require": {
         "php": ">=7.1.3",
         "symfony/event-dispatcher-contracts": "^1.1|^2",
+        "symfony/polyfill-php80": "^1.16",
         "symfony/service-contracts": "^1.1.6|^2"
     },
     "require-dev": {

Csrf/TokenStorage/SessionTokenStorage.php

@@ -98,7 +98,7 @@ public function removeToken($tokenId)
     public function clear()
     {
         foreach (array_keys($this->session->all()) as $key) {
-            if (0 === strpos($key, $this->namespace.'/')) {
+            if (str_starts_with($key, $this->namespace.'/')) {
                 $this->session->remove($key);
             }
         }

Csrf/composer.json

@@ -17,6 +17,7 @@
     ],
     "require": {
         "php": ">=7.1.3",
+        "symfony/polyfill-php80": "^1.16",
         "symfony/security-core": "^3.4|^4.0|^5.0"
     },
     "require-dev": {

Http/Firewall/ChannelListener.php

@@ -51,7 +51,7 @@ public function supports(Request $request): ?bool
             if (null !== $this->logger) {
                 if ('https' === $request->headers->get('X-Forwarded-Proto')) {
                     $this->logger->info('Redirecting to HTTPS. ("X-Forwarded-Proto" header is set to "https" - did you set "trusted_proxies" correctly?)');
-                } elseif (false !== strpos($request->headers->get('Forwarded'), 'proto=https')) {
+                } elseif (str_contains($request->headers->get('Forwarded'), 'proto=https')) {
                     $this->logger->info('Redirecting to HTTPS. ("Forwarded" header is set to "proto=https" - did you set "trusted_proxies" correctly?)');
                 } else {
                     $this->logger->info('Redirecting to HTTPS.');