Merge branch '5.2' into 5.3

* 5.2:
  Leverage str_contains/str_starts_with
  Leverage str_ends_with

Author: nicolas-grekas

Store/StoreFactory.php

@@ -63,46 +63,46 @@ public static function createStore($connection)
             case 'flock' === $connection:
                 return new FlockStore();
 
-            case 0 === strpos($connection, 'flock://'):
+            case str_starts_with($connection, 'flock://'):
                 return new FlockStore(substr($connection, 8));
 
             case 'semaphore' === $connection:
                 return new SemaphoreStore();
 
-            case 0 === strpos($connection, 'redis:'):
-            case 0 === strpos($connection, 'rediss:'):
-            case 0 === strpos($connection, 'memcached:'):
+            case str_starts_with($connection, 'redis:'):
+            case str_starts_with($connection, 'rediss:'):
+            case str_starts_with($connection, 'memcached:'):
                 if (!class_exists(AbstractAdapter::class)) {
                     throw new InvalidArgumentException(sprintf('Unsupported DSN "%s". Try running "composer require symfony/cache".', $connection));
                 }
-                $storeClass = 0 === strpos($connection, 'memcached:') ? MemcachedStore::class : RedisStore::class;
+                $storeClass = str_starts_with($connection, 'memcached:') ? MemcachedStore::class : RedisStore::class;
                 $connection = AbstractAdapter::createConnection($connection, ['lazy' => true]);
 
                 return new $storeClass($connection);
 
-            case 0 === strpos($connection, 'mongodb'):
+            case str_starts_with($connection, 'mongodb'):
                 return new MongoDbStore($connection);
 
-            case 0 === strpos($connection, 'mssql://'):
-            case 0 === strpos($connection, 'mysql:'):
-            case 0 === strpos($connection, 'mysql2://'):
-            case 0 === strpos($connection, 'oci:'):
-            case 0 === strpos($connection, 'oci8://'):
-            case 0 === strpos($connection, 'pdo_oci://'):
-            case 0 === strpos($connection, 'pgsql:'):
-            case 0 === strpos($connection, 'postgres://'):
-            case 0 === strpos($connection, 'postgresql://'):
-            case 0 === strpos($connection, 'sqlsrv:'):
-            case 0 === strpos($connection, 'sqlite:'):
-            case 0 === strpos($connection, 'sqlite3://'):
+            case str_starts_with($connection, 'mssql://'):
+            case str_starts_with($connection, 'mysql:'):
+            case str_starts_with($connection, 'mysql2://'):
+            case str_starts_with($connection, 'oci:'):
+            case str_starts_with($connection, 'oci8://'):
+            case str_starts_with($connection, 'pdo_oci://'):
+            case str_starts_with($connection, 'pgsql:'):
+            case str_starts_with($connection, 'postgres://'):
+            case str_starts_with($connection, 'postgresql://'):
+            case str_starts_with($connection, 'sqlsrv:'):
+            case str_starts_with($connection, 'sqlite:'):
+            case str_starts_with($connection, 'sqlite3://'):
                 return new PdoStore($connection);
 
-            case 0 === strpos($connection, 'pgsql+advisory:'):
-            case 0 === strpos($connection, 'postgres+advisory://'):
-            case 0 === strpos($connection, 'postgresql+advisory://'):
+            case str_starts_with($connection, 'pgsql+advisory:'):
+            case str_starts_with($connection, 'postgres+advisory://'):
+            case str_starts_with($connection, 'postgresql+advisory://'):
                 return new PostgreSqlStore(preg_replace('/^([^:+]+)\+advisory/', '$1', $connection));
 
-            case 0 === strpos($connection, 'zookeeper://'):
+            case str_starts_with($connection, 'zookeeper://'):
                 return new ZookeeperStore(ZookeeperStore::createConnection($connection));
 
             case 'in-memory' === $connection:

Store/ZookeeperStore.php

@@ -36,7 +36,7 @@ public function __construct(\Zookeeper $zookeeper)
 
     public static function createConnection(string $dsn): \Zookeeper
     {
-        if (0 !== strpos($dsn, 'zookeeper:')) {
+        if (!str_starts_with($dsn, 'zookeeper:')) {
             throw new InvalidArgumentException(sprintf('Unsupported DSN: "%s".', $dsn));
         }
 
@@ -142,7 +142,7 @@ private function getKeyResource(Key $key): string
         // For example: foo/bar will become /foo-bar and /foo/bar will become /-foo-bar
         $resource = (string) $key;
 
-        if (false !== strpos($resource, '/')) {
+        if (str_contains($resource, '/')) {
             $resource = strtr($resource, ['/' => '-']).'-'.sha1($resource);
         }
 

composer.json

@@ -19,7 +19,7 @@
         "php": ">=7.2.5",
         "psr/log": "^1|^2|^3",
         "symfony/deprecation-contracts": "^2.1",
-        "symfony/polyfill-php80": "^1.15"
+        "symfony/polyfill-php80": "^1.16"
     },
     "require-dev": {
         "doctrine/dbal": "^2.10|^3.0",