Merge branch '5.2' into 5.3

nicolas-grekas · nicolas-grekas · commit 710a8abb9c5d · 2021-07-21T14:40:44.000+02:00
* 5.2:
  Leverage str_contains/str_starts_with
  Leverage str_ends_with
diff --git a/BinaryFileResponse.php b/BinaryFileResponse.php
@@ -160,7 +160,7 @@ public function setContentDisposition(string $disposition, string $filename = ''
             $filename = $this->file->getFilename();
         }
 
-        if ('' === $filenameFallback && (!preg_match('/^[\x20-\x7e]*$/', $filename) || false !== strpos($filename, '%'))) {
+        if ('' === $filenameFallback && (!preg_match('/^[\x20-\x7e]*$/', $filename) || str_contains($filename, '%'))) {
             $encoding = mb_detect_encoding($filename, null, true) ?: '8bit';
 
             for ($i = 0, $filenameLength = mb_strlen($filename, $encoding); $i < $filenameLength; ++$i) {
@@ -240,7 +240,7 @@ public function prepare(Request $request)
             if (!$request->headers->has('If-Range') || $this->hasValidIfRangeHeader($request->headers->get('If-Range'))) {
                 $range = $request->headers->get('Range');
 
-                if (0 === strpos($range, 'bytes=')) {
+                if (str_starts_with($range, 'bytes=')) {
                     [$start, $end] = explode('-', substr($range, 6), 2) + [0];
 
                     $end = ('' === $end) ? $fileSize - 1 : (int) $end;
diff --git a/File/UploadedFile.php b/File/UploadedFile.php
@@ -240,9 +240,9 @@ private static function parseFilesize(string $size)
         $size = strtolower($size);
 
         $max = ltrim($size, '+');
-        if (0 === strpos($max, '0x')) {
+        if (str_starts_with($max, '0x')) {
             $max = \intval($max, 16);
-        } elseif (0 === strpos($max, '0')) {
+        } elseif (str_starts_with($max, '0')) {
             $max = \intval($max, 8);
         } else {
             $max = (int) $max;
diff --git a/HeaderUtils.php b/HeaderUtils.php
@@ -176,12 +176,12 @@ public static function makeDisposition(string $disposition, string $filename, st
         }
 
         // percent characters aren't safe in fallback.
-        if (false !== strpos($filenameFallback, '%')) {
+        if (str_contains($filenameFallback, '%')) {
             throw new \InvalidArgumentException('The filename fallback cannot contain the "%" character.');
         }
 
         // path separators aren't allowed in either.
-        if (false !== strpos($filename, '/') || false !== strpos($filename, '\\') || false !== strpos($filenameFallback, '/') || false !== strpos($filenameFallback, '\\')) {
+        if (str_contains($filename, '/') || str_contains($filename, '\\') || str_contains($filenameFallback, '/') || str_contains($filenameFallback, '\\')) {
             throw new \InvalidArgumentException('The filename and the fallback cannot contain the "/" and "\\" characters.');
         }
 
diff --git a/IpUtils.php b/IpUtils.php
@@ -70,7 +70,7 @@ public static function checkIp4(?string $requestIp, string $ip)
             return self::$checkedIps[$cacheKey] = false;
         }
 
-        if (false !== strpos($ip, '/')) {
+        if (str_contains($ip, '/')) {
             [$address, $netmask] = explode('/', $ip, 2);
 
             if ('0' === $netmask) {
@@ -117,7 +117,7 @@ public static function checkIp6(?string $requestIp, string $ip)
             throw new \RuntimeException('Unable to check Ipv6. Check that PHP was not compiled with option "disable-ipv6".');
         }
 
-        if (false !== strpos($ip, '/')) {
+        if (str_contains($ip, '/')) {
             [$address, $netmask] = explode('/', $ip, 2);
 
             if ('0' === $netmask) {
diff --git a/JsonResponse.php b/JsonResponse.php
@@ -157,7 +157,7 @@ public function setData($data = [])
         try {
             $data = json_encode($data, $this->encodingOptions);
         } catch (\Exception $e) {
-            if ('Exception' === \get_class($e) && 0 === strpos($e->getMessage(), 'Failed calling ')) {
+            if ('Exception' === \get_class($e) && str_starts_with($e->getMessage(), 'Failed calling ')) {
                 throw $e->getPrevious() ?: $e;
             }
             throw $e;
diff --git a/Request.php b/Request.php
@@ -305,7 +305,7 @@ public static function createFromGlobals()
     {
         $request = self::createRequestFromFactory($_GET, $_POST, [], $_COOKIE, $_FILES, $_SERVER);
 
-        if (0 === strpos($request->headers->get('CONTENT_TYPE', ''), 'application/x-www-form-urlencoded')
+        if (str_starts_with($request->headers->get('CONTENT_TYPE', ''), 'application/x-www-form-urlencoded')
             && \in_array(strtoupper($request->server->get('REQUEST_METHOD', 'GET')), ['PUT', 'DELETE', 'PATCH'])
         ) {
             parse_str($request->getContent(), $data);
@@ -1682,7 +1682,7 @@ public function getLanguages()
         $languages = AcceptHeader::fromString($this->headers->get('Accept-Language'))->all();
         $this->languages = [];
         foreach ($languages as $lang => $acceptHeaderItem) {
-            if (false !== strpos($lang, '-')) {
+            if (str_contains($lang, '-')) {
                 $codes = explode('-', $lang);
                 if ('i' === $codes[0]) {
                     // Language not listed in ISO 639 that are not variants
@@ -2007,7 +2007,7 @@ private function setPhpDefaultLocale(string $locale): void
      */
     private function getUrlencodedPrefix(string $string, string $prefix): ?string
     {
-        if (0 !== strpos(rawurldecode($string), $prefix)) {
+        if (!str_starts_with(rawurldecode($string), $prefix)) {
             return null;
         }
 
@@ -2069,7 +2069,7 @@ private function getTrustedValues(int $type, string $ip = null): array
                     continue;
                 }
                 if (self::HEADER_X_FORWARDED_PORT === $type) {
-                    if (']' === substr($v, -1) || false === $v = strrchr($v, ':')) {
+                    if (str_ends_with($v, ']') || false === $v = strrchr($v, ':')) {
                         $v = $this->isSecure() ? ':443' : ':80';
                     }
                     $v = '0.0.0.0'.$v;
@@ -2115,7 +2115,7 @@ private function normalizeAndFilterClientIps(array $clientIps, string $ip): arra
                 if ($i) {
                     $clientIps[$key] = $clientIp = substr($clientIp, 0, $i);
                 }
-            } elseif (0 === strpos($clientIp, '[')) {
+            } elseif (str_starts_with($clientIp, '[')) {
                 // Strip brackets and :port from IPv6 addresses.
                 $i = strpos($clientIp, ']', 1);
                 $clientIps[$key] = $clientIp = substr($clientIp, 1, $i - 1);
diff --git a/Response.php b/Response.php
@@ -324,7 +324,7 @@ public function prepare(Request $request)
         }
 
         // Check if we need to send extra expire info headers
-        if ('1.0' == $this->getProtocolVersion() && false !== strpos($headers->get('Cache-Control'), 'no-cache')) {
+        if ('1.0' == $this->getProtocolVersion() && str_contains($headers->get('Cache-Control'), 'no-cache')) {
             $headers->set('pragma', 'no-cache');
             $headers->set('expires', -1);
         }
@@ -926,7 +926,7 @@ public function setEtag(string $etag = null, bool $weak = false): object
         if (null === $etag) {
             $this->headers->remove('Etag');
         } else {
-            if (0 !== strpos($etag, '"')) {
+            if (!str_starts_with($etag, '"')) {
                 $etag = '"'.$etag.'"';
             }
 
diff --git a/ServerBag.php b/ServerBag.php
@@ -29,7 +29,7 @@ public function getHeaders()
     {
         $headers = [];
         foreach ($this->parameters as $key => $value) {
-            if (0 === strpos($key, 'HTTP_')) {
+            if (str_starts_with($key, 'HTTP_')) {
                 $headers[substr($key, 5)] = $value;
             } elseif (\in_array($key, ['CONTENT_TYPE', 'CONTENT_LENGTH', 'CONTENT_MD5'], true)) {
                 $headers[$key] = $value;
diff --git a/Session/Attribute/NamespacedAttributeBag.php b/Session/Attribute/NamespacedAttributeBag.php
@@ -106,7 +106,7 @@ public function remove(string $name)
     protected function &resolveAttributePath(string $name, bool $writeContext = false)
     {
         $array = &$this->attributes;
-        $name = (0 === strpos($name, $this->namespaceCharacter)) ? substr($name, 1) : $name;
+        $name = (str_starts_with($name, $this->namespaceCharacter)) ? substr($name, 1) : $name;
 
         // Check if there is anything to do, else return
         if (!$name) {
diff --git a/Session/Storage/Handler/PdoSessionHandler.php b/Session/Storage/Handler/PdoSessionHandler.php
@@ -179,7 +179,7 @@ public function __construct($pdoOrDsn = null, array $options = [])
 
             $this->pdo = $pdoOrDsn;
             $this->driver = $this->pdo->getAttribute(\PDO::ATTR_DRIVER_NAME);
-        } elseif (\is_string($pdoOrDsn) && false !== strpos($pdoOrDsn, '://')) {
+        } elseif (\is_string($pdoOrDsn) && str_contains($pdoOrDsn, '://')) {
             $this->dsn = $this->buildDsnFromUrl($pdoOrDsn);
         } else {
             $this->dsn = $pdoOrDsn;
@@ -353,7 +353,7 @@ protected function doWrite(string $sessionId, string $data)
                     $insertStmt->execute();
                 } catch (\PDOException $e) {
                     // Handle integrity violation SQLSTATE 23000 (or a subclass like 23505 in Postgres) for duplicate keys
-                    if (0 === strpos($e->getCode(), '23')) {
+                    if (str_starts_with($e->getCode(), '23')) {
                         $updateStmt->execute();
                     } else {
                         throw $e;
@@ -487,7 +487,7 @@ private function buildDsnFromUrl(string $dsnOrUrl): string
         $driver = $driverAliasMap[$params['scheme']] ?? $params['scheme'];
 
         // Doctrine DBAL supports passing its internal pdo_* driver names directly too (allowing both dashes and underscores). This allows supporting the same here.
-        if (0 === strpos($driver, 'pdo_') || 0 === strpos($driver, 'pdo-')) {
+        if (str_starts_with($driver, 'pdo_') || str_starts_with($driver, 'pdo-')) {
             $driver = substr($driver, 4);
         }
 
@@ -681,7 +681,7 @@ protected function doRead(string $sessionId)
                 } catch (\PDOException $e) {
                     // Catch duplicate key error because other connection created the session already.
                     // It would only not be the case when the other connection destroyed the session.
-                    if (0 === strpos($e->getCode(), '23')) {
+                    if (str_starts_with($e->getCode(), '23')) {
                         // Retrieve finished session data written by concurrent connection by restarting the loop.
                         // We have to start a new transaction as a failed query will mark the current transaction as
                         // aborted in PostgreSQL and disallow further queries within it.
diff --git a/Session/Storage/Handler/SessionHandlerFactory.php b/Session/Storage/Handler/SessionHandlerFactory.php
@@ -47,38 +47,38 @@ public static function createHandler($connection): AbstractSessionHandler
 
             case !\is_string($connection):
                 throw new \InvalidArgumentException(sprintf('Unsupported Connection: "%s".', get_debug_type($connection)));
-            case 0 === strpos($connection, 'file://'):
+            case str_starts_with($connection, 'file://'):
                 $savePath = substr($connection, 7);
 
                 return new StrictSessionHandler(new NativeFileSessionHandler('' === $savePath ? null : $savePath));
 
-            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));
                 }
-                $handlerClass = 0 === strpos($connection, 'memcached:') ? MemcachedSessionHandler::class : RedisSessionHandler::class;
+                $handlerClass = str_starts_with($connection, 'memcached:') ? MemcachedSessionHandler::class : RedisSessionHandler::class;
                 $connection = AbstractAdapter::createConnection($connection, ['lazy' => true]);
 
                 return new $handlerClass($connection);
 
-            case 0 === strpos($connection, 'pdo_oci://'):
+            case str_starts_with($connection, 'pdo_oci://'):
                 if (!class_exists(DriverManager::class)) {
                     throw new \InvalidArgumentException(sprintf('Unsupported DSN "%s". Try running "composer require doctrine/dbal".', $connection));
                 }
                 $connection = DriverManager::getConnection(['url' => $connection])->getWrappedConnection();
                 // no break;
 
-            case 0 === strpos($connection, 'mssql://'):
-            case 0 === strpos($connection, 'mysql://'):
-            case 0 === strpos($connection, 'mysql2://'):
-            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, '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 PdoSessionHandler($connection);
         }
 
diff --git a/Session/Storage/NativeSessionStorage.php b/Session/Storage/NativeSessionStorage.php
@@ -256,7 +256,7 @@ public function save()
 
         // Register error handler to add information about the current save handler
         $previousHandler = set_error_handler(function ($type, $msg, $file, $line) use (&$previousHandler) {
-            if (\E_WARNING === $type && 0 === strpos($msg, 'session_write_close():')) {
+            if (\E_WARNING === $type && str_starts_with($msg, 'session_write_close():')) {
                 $handler = $this->saveHandler instanceof SessionHandlerProxy ? $this->saveHandler->getHandler() : $this->saveHandler;
                 $msg = sprintf('session_write_close(): Failed to write session data with "%s" handler', \get_class($handler));
             }
diff --git a/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php b/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
@@ -156,7 +156,7 @@ public function testReadLockedConvertsStreamToString()
         $insertStmt = $this->createMock(\PDOStatement::class);
 
         $pdo->prepareResult = function ($statement) use ($selectStmt, $insertStmt) {
-            return 0 === strpos($statement, 'INSERT') ? $insertStmt : $selectStmt;
+            return str_starts_with($statement, 'INSERT') ? $insertStmt : $selectStmt;
         };
 
         $content = 'foobar';
diff --git a/UrlHelper.php b/UrlHelper.php
@@ -31,7 +31,7 @@ public function __construct(RequestStack $requestStack, RequestContext $requestC
 
     public function getAbsoluteUrl(string $path): string
     {
-        if (false !== strpos($path, '://') || '//' === substr($path, 0, 2)) {
+        if (str_contains($path, '://') || '//' === substr($path, 0, 2)) {
             return $path;
         }
 
@@ -60,7 +60,7 @@ public function getAbsoluteUrl(string $path): string
 
     public function getRelativePath(string $path): string
     {
-        if (false !== strpos($path, '://') || '//' === substr($path, 0, 2)) {
+        if (str_contains($path, '://') || '//' === substr($path, 0, 2)) {
             return $path;
         }
 
diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
         "php": ">=7.2.5",
         "symfony/deprecation-contracts": "^2.1",
         "symfony/polyfill-mbstring": "~1.1",
-        "symfony/polyfill-php80": "^1.15"
+        "symfony/polyfill-php80": "^1.16"
     },
     "require-dev": {
         "predis/predis": "~1.0",

Original file line number	Diff line number	Diff line change
`@@ -176,12 +176,12 @@ public static function makeDisposition(string $disposition, string $filename, st`
`176`	`176`	`}`
`177`	`177`
`178`	`178`	`// percent characters aren't safe in fallback.`
`179`		`- if (false !== strpos($filenameFallback, '%')) {`
	`179`	`+ if (str_contains($filenameFallback, '%')) {`
`180`	`180`	`throw new \InvalidArgumentException('The filename fallback cannot contain the "%" character.');`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`// path separators aren't allowed in either.`
`184`		`- if (false !== strpos($filename, '/') \|\| false !== strpos($filename, '\\') \|\| false !== strpos($filenameFallback, '/') \|\| false !== strpos($filenameFallback, '\\')) {`
	`184`	`+ if (str_contains($filename, '/') \|\| str_contains($filename, '\\') \|\| str_contains($filenameFallback, '/') \|\| str_contains($filenameFallback, '\\')) {`
`185`	`185`	`throw new \InvalidArgumentException('The filename and the fallback cannot contain the "/" and "\\" characters.');`
`186`	`186`	`}`
`187`	`187`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public static function checkIp4(?string $requestIp, string $ip)`
`70`	`70`	`return self::$checkedIps[$cacheKey] = false;`
`71`	`71`	`}`
`72`	`72`
`73`		`- if (false !== strpos($ip, '/')) {`
	`73`	`+ if (str_contains($ip, '/')) {`
`74`	`74`	`[$address, $netmask] = explode('/', $ip, 2);`
`75`	`75`
`76`	`76`	`if ('0' === $netmask) {`
`@@ -117,7 +117,7 @@ public static function checkIp6(?string $requestIp, string $ip)`
`117`	`117`	`throw new \RuntimeException('Unable to check Ipv6. Check that PHP was not compiled with option "disable-ipv6".');`
`118`	`118`	`}`
`119`	`119`
`120`		`- if (false !== strpos($ip, '/')) {`
	`120`	`+ if (str_contains($ip, '/')) {`
`121`	`121`	`[$address, $netmask] = explode('/', $ip, 2);`
`122`	`122`
`123`	`123`	`if ('0' === $netmask) {`
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ public function setData($data = [])`
`157`	`157`	`try {`
`158`	`158`	`$data = json_encode($data, $this->encodingOptions);`
`159`	`159`	`} catch (\Exception $e) {`
`160`		`- if ('Exception' === \get_class($e) && 0 === strpos($e->getMessage(), 'Failed calling ')) {`
	`160`	`+ if ('Exception' === \get_class($e) && str_starts_with($e->getMessage(), 'Failed calling ')) {`
`161`	`161`	`throw $e->getPrevious() ?: $e;`
`162`	`162`	`}`
`163`	`163`	`throw $e;`
Original file line number	Diff line number	Diff line change
`@@ -324,7 +324,7 @@ public function prepare(Request $request)`
`324`	`324`	`}`
`325`	`325`
`326`	`326`	`// Check if we need to send extra expire info headers`
`327`		`- if ('1.0' == $this->getProtocolVersion() && false !== strpos($headers->get('Cache-Control'), 'no-cache')) {`
	`327`	`+ if ('1.0' == $this->getProtocolVersion() && str_contains($headers->get('Cache-Control'), 'no-cache')) {`
`328`	`328`	`$headers->set('pragma', 'no-cache');`
`329`	`329`	`$headers->set('expires', -1);`
`330`	`330`	`}`
`@@ -926,7 +926,7 @@ public function setEtag(string $etag = null, bool $weak = false): object`
`926`	`926`	`if (null === $etag) {`
`927`	`927`	`$this->headers->remove('Etag');`
`928`	`928`	`} else {`
`929`		`- if (0 !== strpos($etag, '"')) {`
	`929`	`+ if (!str_starts_with($etag, '"')) {`
`930`	`930`	`$etag = '"'.$etag.'"';`
`931`	`931`	`}`
`932`	`932`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public function getHeaders()`
`29`	`29`	`{`
`30`	`30`	`$headers = [];`
`31`	`31`	`foreach ($this->parameters as $key => $value) {`
`32`		`- if (0 === strpos($key, 'HTTP_')) {`
	`32`	`+ if (str_starts_with($key, 'HTTP_')) {`
`33`	`33`	`$headers[substr($key, 5)] = $value;`
`34`	`34`	`} elseif (\in_array($key, ['CONTENT_TYPE', 'CONTENT_LENGTH', 'CONTENT_MD5'], true)) {`
`35`	`35`	`$headers[$key] = $value;`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ public function remove(string $name)`
`106`	`106`	`protected function &resolveAttributePath(string $name, bool $writeContext = false)`
`107`	`107`	`{`
`108`	`108`	`$array = &$this->attributes;`
`109`		`- $name = (0 === strpos($name, $this->namespaceCharacter)) ? substr($name, 1) : $name;`
	`109`	`+ $name = (str_starts_with($name, $this->namespaceCharacter)) ? substr($name, 1) : $name;`
`110`	`110`
`111`	`111`	`// Check if there is anything to do, else return`
`112`	`112`	`if (!$name) {`