Merge branch '5.4' into 6.0

nicolas-grekas · nicolas-grekas · commit 5d42a8e2dd58 · 2021-07-21T14:48:45.000+02:00
* 5.4:
  Leverage str_contains/str_starts_with
  Leverage str_ends_with
diff --git a/Controller/ControllerResolver.php b/Controller/ControllerResolver.php
@@ -97,7 +97,7 @@ public function getController(Request $request)
      */
     protected function createController(string $controller)
     {
-        if (false === strpos($controller, '::')) {
+        if (!str_contains($controller, '::')) {
             $controller = $this->instantiateController($controller);
 
             if (!\is_callable($controller)) {
@@ -143,7 +143,7 @@ protected function instantiateController(string $class)
     private function getControllerError(mixed $callable): string
     {
         if (\is_string($callable)) {
-            if (false !== strpos($callable, '::')) {
+            if (str_contains($callable, '::')) {
                 $callable = explode('::', $callable, 2);
             } else {
                 return sprintf('Function "%s" does not exist.', $callable);
@@ -184,7 +184,7 @@ private function getControllerError(mixed $callable): string
         foreach ($collection as $item) {
             $lev = levenshtein($method, $item);
 
-            if ($lev <= \strlen($method) / 3 || false !== strpos($item, $method)) {
+            if ($lev <= \strlen($method) / 3 || str_contains($item, $method)) {
                 $alternatives[] = $item;
             }
         }
diff --git a/DataCollector/DumpDataCollector.php b/DataCollector/DumpDataCollector.php
@@ -111,11 +111,11 @@ public function collect(Request $request, Response $response, \Throwable $except
         if (!$this->requestStack
             || !$response->headers->has('X-Debug-Token')
             || $response->isRedirection()
-            || ($response->headers->has('Content-Type') && false === strpos($response->headers->get('Content-Type'), 'html'))
+            || ($response->headers->has('Content-Type') && !str_contains($response->headers->get('Content-Type'), 'html'))
             || 'html' !== $request->getRequestFormat()
             || false === strripos($response->getContent(), '</body>')
         ) {
-            if ($response->headers->has('Content-Type') && false !== strpos($response->headers->get('Content-Type'), 'html')) {
+            if ($response->headers->has('Content-Type') && str_contains($response->headers->get('Content-Type'), 'html')) {
                 $dumper = new HtmlDumper('php://output', $this->charset);
                 $dumper->setDisplayOptions(['fileLinkFormat' => $this->fileLinkFormat]);
             } else {
diff --git a/DataCollector/MemoryDataCollector.php b/DataCollector/MemoryDataCollector.php
@@ -87,9 +87,9 @@ private function convertToBytes(string $memoryLimit): int|float
 
         $memoryLimit = strtolower($memoryLimit);
         $max = strtolower(ltrim($memoryLimit, '+'));
-        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/DataCollector/RequestDataCollector.php b/DataCollector/RequestDataCollector.php
@@ -433,7 +433,7 @@ public function collectSessionUsage(): void
      */
     protected function parseController(array|object|string|null $controller)
     {
-        if (\is_string($controller) && false !== strpos($controller, '::')) {
+        if (\is_string($controller) && str_contains($controller, '::')) {
             $controller = explode('::', $controller);
         }
 
@@ -470,7 +470,7 @@ protected function parseController(array|object|string|null $controller)
                 'line' => $r->getStartLine(),
             ];
 
-            if (false !== strpos($r->name, '{closure}')) {
+            if (str_contains($r->name, '{closure}')) {
                 return $controller;
             }
             $controller['method'] = $r->name;
diff --git a/Debug/FileLinkFormatter.php b/Debug/FileLinkFormatter.php
@@ -60,7 +60,7 @@ public function format(string $file, int $line)
     {
         if ($fmt = $this->getFileLinkFormat()) {
             for ($i = 1; isset($fmt[$i]); ++$i) {
-                if (0 === strpos($file, $k = $fmt[$i++])) {
+                if (str_starts_with($file, $k = $fmt[$i++])) {
                     $file = substr_replace($file, $fmt[$i], 0, \strlen($k));
                     break;
                 }
diff --git a/DependencyInjection/AddAnnotatedClassesToCachePass.php b/DependencyInjection/AddAnnotatedClassesToCachePass.php
@@ -62,7 +62,7 @@ private function expandClasses(array $patterns, array $classes): array
 
         // Explicit classes declared in the patterns are returned directly
         foreach ($patterns as $key => $pattern) {
-            if ('\\' !== substr($pattern, -1) && false === strpos($pattern, '*')) {
+            if (!str_ends_with($pattern, '\\') && !str_contains($pattern, '*')) {
                 unset($patterns[$key]);
                 $expanded[] = ltrim($pattern, '\\');
             }
@@ -127,10 +127,10 @@ private function patternsToRegexps(array $patterns): array
 
     private function matchAnyRegexps(string $class, array $regexps): bool
     {
-        $isTest = false !== strpos($class, 'Test');
+        $isTest = str_contains($class, 'Test');
 
         foreach ($regexps as $regex) {
-            if ($isTest && false === strpos($regex, 'Test')) {
+            if ($isTest && !str_contains($regex, 'Test')) {
                 continue;
             }
 
diff --git a/EventListener/AbstractTestSessionListener.php b/EventListener/AbstractTestSessionListener.php
@@ -83,7 +83,7 @@ public function onKernelResponse(ResponseEvent $event)
         if ($session instanceof Session ? !$session->isEmpty() || (null !== $this->sessionId && $session->getId() !== $this->sessionId) : $wasStarted) {
             $params = session_get_cookie_params() + ['samesite' => null];
             foreach ($this->sessionOptions as $k => $v) {
-                if (0 === strpos($k, 'cookie_')) {
+                if (str_starts_with($k, 'cookie_')) {
                     $params[substr($k, 7)] = $v;
                 }
             }
diff --git a/Exception/ControllerDoesNotReturnResponseException.php b/Exception/ControllerDoesNotReturnResponseException.php
@@ -38,7 +38,7 @@ public function __construct(string $message, callable $controller, string $file,
 
     private function parseControllerDefinition(callable $controller): ?array
     {
-        if (\is_string($controller) && false !== strpos($controller, '::')) {
+        if (\is_string($controller) && str_contains($controller, '::')) {
             $controller = explode('::', $controller);
         }
 
diff --git a/HttpCache/AbstractSurrogate.php b/HttpCache/AbstractSurrogate.php
@@ -57,7 +57,7 @@ public function hasSurrogateCapability(Request $request)
             return false;
         }
 
-        return false !== strpos($value, sprintf('%s/1.0', strtoupper($this->getName())));
+        return str_contains($value, sprintf('%s/1.0', strtoupper($this->getName())));
     }
 
     /**
diff --git a/HttpCache/Esi.php b/HttpCache/Esi.php
@@ -37,7 +37,7 @@ public function getName()
      */
     public function addSurrogateControl(Response $response)
     {
-        if (false !== strpos($response->getContent(), '<esi:include')) {
+        if (str_contains($response->getContent(), '<esi:include')) {
             $response->headers->set('Surrogate-Control', 'content="ESI/1.0"');
         }
     }
diff --git a/HttpCache/Ssi.php b/HttpCache/Ssi.php
@@ -34,7 +34,7 @@ public function getName()
      */
     public function addSurrogateControl(Response $response)
     {
-        if (false !== strpos($response->getContent(), '<!--#include')) {
+        if (str_contains($response->getContent(), '<!--#include')) {
             $response->headers->set('Surrogate-Control', 'content="SSI/1.0"');
         }
     }
diff --git a/Kernel.php b/Kernel.php
@@ -241,13 +241,13 @@ public function locateResource(string $name)
             throw new \InvalidArgumentException(sprintf('A resource name must start with @ ("%s" given).', $name));
         }
 
-        if (false !== strpos($name, '..')) {
+        if (str_contains($name, '..')) {
             throw new \RuntimeException(sprintf('File name "%s" contains invalid characters (..).', $name));
         }
 
         $bundleName = substr($name, 1);
         $path = '';
-        if (false !== strpos($bundleName, '/')) {
+        if (str_contains($bundleName, '/')) {
             [$bundleName, $path] = explode('/', $bundleName, 2);
         }
 
@@ -408,7 +408,7 @@ protected function build(ContainerBuilder $container)
     protected function getContainerClass()
     {
         $class = static::class;
-        $class = false !== strpos($class, "@anonymous\0") ? get_parent_class($class).str_replace('.', '_', ContainerBuilder::hash($class)) : $class;
+        $class = str_contains($class, "@anonymous\0") ? get_parent_class($class).str_replace('.', '_', ContainerBuilder::hash($class)) : $class;
         $class = str_replace('\\', '_', $class).ucfirst($this->environment).($this->debug ? 'Debug' : '').'Container';
 
         if (!preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$/', $class)) {
diff --git a/Log/Logger.php b/Log/Logger.php
@@ -86,7 +86,7 @@ public function log($level, $message, array $context = []): void
 
     private function format(string $level, string $message, array $context, bool $prefixDate = true): string
     {
-        if (false !== strpos($message, '{')) {
+        if (str_contains($message, '{')) {
             $replacements = [];
             foreach ($context as $key => $val) {
                 if (null === $val || is_scalar($val) || $val instanceof \Stringable) {
diff --git a/Profiler/FileProfilerStorage.php b/Profiler/FileProfilerStorage.php
@@ -34,7 +34,7 @@ class FileProfilerStorage implements ProfilerStorageInterface
      */
     public function __construct(string $dsn)
     {
-        if (0 !== strpos($dsn, 'file:')) {
+        if (!str_starts_with($dsn, 'file:')) {
             throw new \RuntimeException(sprintf('Please check your configuration. You are trying to use FileStorage with an invalid dsn "%s". The expected format is "file:/path/to/the/storage/folder".', $dsn));
         }
         $this->folder = substr($dsn, 5);
@@ -64,7 +64,7 @@ public function find(?string $ip, ?string $url, ?int $limit, ?string $method, in
             [$csvToken, $csvIp, $csvMethod, $csvUrl, $csvTime, $csvParent, $csvStatusCode] = $values;
             $csvTime = (int) $csvTime;
 
-            if ($ip && false === strpos($csvIp, $ip) || $url && false === strpos($csvUrl, $url) || $method && false === strpos($csvMethod, $method) || $statusCode && false === strpos($csvStatusCode, $statusCode)) {
+            if ($ip && !str_contains($csvIp, $ip) || $url && !str_contains($csvUrl, $url) || $method && !str_contains($csvMethod, $method) || $statusCode && !str_contains($csvStatusCode, $statusCode)) {
                 continue;
             }
 
diff --git a/Tests/EventListener/RouterListenerTest.php b/Tests/EventListener/RouterListenerTest.php
@@ -64,7 +64,7 @@ public function testPort($defaultHttpPort, $defaultHttpsPort, $uri, $expectedHtt
 
         $this->assertEquals($expectedHttpPort, $context->getHttpPort());
         $this->assertEquals($expectedHttpsPort, $context->getHttpsPort());
-        $this->assertEquals(0 === strpos($uri, 'https') ? 'https' : 'http', $context->getScheme());
+        $this->assertEquals(str_starts_with($uri, 'https') ? 'https' : 'http', $context->getScheme());
     }
 
     public function getPortData()

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ public function getController(Request $request)`
`97`	`97`	`*/`
`98`	`98`	`protected function createController(string $controller)`
`99`	`99`	`{`
`100`		`- if (false === strpos($controller, '::')) {`
	`100`	`+ if (!str_contains($controller, '::')) {`
`101`	`101`	`$controller = $this->instantiateController($controller);`
`102`	`102`
`103`	`103`	`if (!\is_callable($controller)) {`
`@@ -143,7 +143,7 @@ protected function instantiateController(string $class)`
`143`	`143`	`private function getControllerError(mixed $callable): string`
`144`	`144`	`{`
`145`	`145`	`if (\is_string($callable)) {`
`146`		`- if (false !== strpos($callable, '::')) {`
	`146`	`+ if (str_contains($callable, '::')) {`
`147`	`147`	`$callable = explode('::', $callable, 2);`
`148`	`148`	`} else {`
`149`	`149`	`return sprintf('Function "%s" does not exist.', $callable);`
`@@ -184,7 +184,7 @@ private function getControllerError(mixed $callable): string`
`184`	`184`	`foreach ($collection as $item) {`
`185`	`185`	`$lev = levenshtein($method, $item);`
`186`	`186`
`187`		`- if ($lev <= \strlen($method) / 3 \|\| false !== strpos($item, $method)) {`
	`187`	`+ if ($lev <= \strlen($method) / 3 \|\| str_contains($item, $method)) {`
`188`	`188`	`$alternatives[] = $item;`
`189`	`189`	`}`
`190`	`190`	`}`
Original file line number	Diff line number	Diff line change
`@@ -433,7 +433,7 @@ public function collectSessionUsage(): void`
`433`	`433`	`*/`
`434`	`434`	`protected function parseController(array\|object\|string\|null $controller)`
`435`	`435`	`{`
`436`		`- if (\is_string($controller) && false !== strpos($controller, '::')) {`
	`436`	`+ if (\is_string($controller) && str_contains($controller, '::')) {`
`437`	`437`	`$controller = explode('::', $controller);`
`438`	`438`	`}`
`439`	`439`
`@@ -470,7 +470,7 @@ protected function parseController(array\|object\|string\|null $controller)`
`470`	`470`	`'line' => $r->getStartLine(),`
`471`	`471`	`];`
`472`	`472`
`473`		`- if (false !== strpos($r->name, '{closure}')) {`
	`473`	`+ if (str_contains($r->name, '{closure}')) {`
`474`	`474`	`return $controller;`
`475`	`475`	`}`
`476`	`476`	`$controller['method'] = $r->name;`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public function format(string $file, int $line)`
`60`	`60`	`{`
`61`	`61`	`if ($fmt = $this->getFileLinkFormat()) {`
`62`	`62`	`for ($i = 1; isset($fmt[$i]); ++$i) {`
`63`		`- if (0 === strpos($file, $k = $fmt[$i++])) {`
	`63`	`+ if (str_starts_with($file, $k = $fmt[$i++])) {`
`64`	`64`	`$file = substr_replace($file, $fmt[$i], 0, \strlen($k));`
`65`	`65`	`break;`
`66`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ private function expandClasses(array $patterns, array $classes): array`
`62`	`62`
`63`	`63`	`// Explicit classes declared in the patterns are returned directly`
`64`	`64`	`foreach ($patterns as $key => $pattern) {`
`65`		`- if ('\\' !== substr($pattern, -1) && false === strpos($pattern, '*')) {`
	`65`	`+ if (!str_ends_with($pattern, '\\') && !str_contains($pattern, '*')) {`
`66`	`66`	`unset($patterns[$key]);`
`67`	`67`	`$expanded[] = ltrim($pattern, '\\');`
`68`	`68`	`}`
`@@ -127,10 +127,10 @@ private function patternsToRegexps(array $patterns): array`
`127`	`127`
`128`	`128`	`private function matchAnyRegexps(string $class, array $regexps): bool`
`129`	`129`	`{`
`130`		`- $isTest = false !== strpos($class, 'Test');`
	`130`	`+ $isTest = str_contains($class, 'Test');`
`131`	`131`
`132`	`132`	`foreach ($regexps as $regex) {`
`133`		`- if ($isTest && false === strpos($regex, 'Test')) {`
	`133`	`+ if ($isTest && !str_contains($regex, 'Test')) {`
`134`	`134`	`continue;`
`135`	`135`	`}`
`136`	`136`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public function onKernelResponse(ResponseEvent $event)`
`83`	`83`	`if ($session instanceof Session ? !$session->isEmpty() \|\| (null !== $this->sessionId && $session->getId() !== $this->sessionId) : $wasStarted) {`
`84`	`84`	`$params = session_get_cookie_params() + ['samesite' => null];`
`85`	`85`	`foreach ($this->sessionOptions as $k => $v) {`
`86`		`- if (0 === strpos($k, 'cookie_')) {`
	`86`	`+ if (str_starts_with($k, 'cookie_')) {`
`87`	`87`	`$params[substr($k, 7)] = $v;`
`88`	`88`	`}`
`89`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public function __construct(string $message, callable $controller, string $file,`
`38`	`38`
`39`	`39`	`private function parseControllerDefinition(callable $controller): ?array`
`40`	`40`	`{`
`41`		`- if (\is_string($controller) && false !== strpos($controller, '::')) {`
	`41`	`+ if (\is_string($controller) && str_contains($controller, '::')) {`
`42`	`42`	`$controller = explode('::', $controller);`
`43`	`43`	`}`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public function hasSurrogateCapability(Request $request)`
`57`	`57`	`return false;`
`58`	`58`	`}`
`59`	`59`
`60`		`- return false !== strpos($value, sprintf('%s/1.0', strtoupper($this->getName())));`
	`60`	`+ return str_contains($value, sprintf('%s/1.0', strtoupper($this->getName())));`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public function getName()`
`37`	`37`	`*/`
`38`	`38`	`public function addSurrogateControl(Response $response)`
`39`	`39`	`{`
`40`		`- if (false !== strpos($response->getContent(), '<esi:include')) {`
	`40`	`+ if (str_contains($response->getContent(), '<esi:include')) {`
`41`	`41`	`$response->headers->set('Surrogate-Control', 'content="ESI/1.0"');`
`42`	`42`	`}`
`43`	`43`	`}`