Leverage str_contains/str_starts_with

derrabus · nicolas-grekas · commit 882946ca2463 · 2021-07-21T14:19:41.000+02:00
Signed-off-by: Alexander M. Turek &lt;me@derrabus.de&gt;
diff --git a/Client.php b/Client.php
@@ -85,7 +85,7 @@ protected function getScript($request)
 
         $requires = '';
         foreach (get_declared_classes() as $class) {
-            if (0 === strpos($class, 'ComposerAutoloaderInit')) {
+            if (str_starts_with($class, 'ComposerAutoloaderInit')) {
                 $r = new \ReflectionClass($class);
                 $file = \dirname($r->getFileName(), 2).'/autoload.php';
                 if (file_exists($file)) {
diff --git a/Config/FileLocator.php b/Config/FileLocator.php
@@ -70,11 +70,11 @@ public function locate($file, $currentPath = null, $first = true)
             // no need to trigger deprecations when the loaded file is given as absolute path
             foreach ($this->paths as $deprecatedPath) {
                 foreach ((array) $locations as $location) {
-                    if (null !== $currentPath && 0 === strpos($location, $currentPath)) {
+                    if (null !== $currentPath && str_starts_with($location, $currentPath)) {
                         return $locations;
                     }
 
-                    if (0 === strpos($location, $deprecatedPath) && (null === $currentPath || false === strpos($location, $currentPath))) {
+                    if (str_starts_with($location, $deprecatedPath) && (null === $currentPath || !str_contains($location, $currentPath))) {
                         $deprecation = sprintf('Loading the file "%s" from the global resource directory "%s" is deprecated since Symfony 4.4 and will be removed in 5.0.', $file, $deprecatedPath);
                     }
                 }
diff --git a/Controller/ControllerResolver.php b/Controller/ControllerResolver.php
@@ -106,7 +106,7 @@ public function getController(Request $request)
      */
     protected function createController($controller)
     {
-        if (false === strpos($controller, '::')) {
+        if (!str_contains($controller, '::')) {
             $controller = $this->instantiateController($controller);
 
             if (!\is_callable($controller)) {
@@ -154,7 +154,7 @@ protected function instantiateController($class)
     private function getControllerError($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);
@@ -195,7 +195,7 @@ private function getControllerError($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
@@ -120,11 +120,11 @@ public function collect(Request $request, Response $response/*, \Throwable $exce
         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
@@ -104,9 +104,9 @@ private function convertToBytes(string $memoryLimit)
 
         $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
@@ -394,7 +394,7 @@ public function getName()
      */
     protected function parseController($controller)
     {
-        if (\is_string($controller) && false !== strpos($controller, '::')) {
+        if (\is_string($controller) && str_contains($controller, '::')) {
             $controller = explode('::', $controller);
         }
 
@@ -431,7 +431,7 @@ protected function parseController($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
@@ -50,7 +50,7 @@ public function format($file, $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 (!str_ends_with($pattern, '\\') && 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
@@ -81,7 +81,7 @@ public function onKernelResponse(FilterResponseEvent $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
@@ -255,17 +255,17 @@ public function locateResource($name/*, $dir = null, $first = true, $triggerDepr
             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);
         }
 
-        $isResource = 0 === strpos($path, 'Resources') && null !== $dir;
+        $isResource = str_starts_with($path, 'Resources') && null !== $dir;
         $overridePath = substr($path, 9);
         $bundle = $this->getBundle($bundleName);
         $files = [];
@@ -471,7 +471,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 = $this->name.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
@@ -88,7 +88,7 @@ public function log($level, $message, array $context = [])
 
     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) || (\is_object($val) && method_exists($val, '__toString'))) {
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($ip, $url, $limit, $method, $start = null, $end = null, $st
             [$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
@@ -60,7 +60,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
`@@ -70,11 +70,11 @@ public function locate($file, $currentPath = null, $first = true)`
`70`	`70`	`// no need to trigger deprecations when the loaded file is given as absolute path`
`71`	`71`	`foreach ($this->paths as $deprecatedPath) {`
`72`	`72`	`foreach ((array) $locations as $location) {`
`73`		`- if (null !== $currentPath && 0 === strpos($location, $currentPath)) {`
	`73`	`+ if (null !== $currentPath && str_starts_with($location, $currentPath)) {`
`74`	`74`	`return $locations;`
`75`	`75`	`}`
`76`	`76`
`77`		`- if (0 === strpos($location, $deprecatedPath) && (null === $currentPath \|\| false === strpos($location, $currentPath))) {`
	`77`	`+ if (str_starts_with($location, $deprecatedPath) && (null === $currentPath \|\| !str_contains($location, $currentPath))) {`
`78`	`78`	`$deprecation = sprintf('Loading the file "%s" from the global resource directory "%s" is deprecated since Symfony 4.4 and will be removed in 5.0.', $file, $deprecatedPath);`
`79`	`79`	`}`
`80`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ public function getController(Request $request)`
`106`	`106`	`*/`
`107`	`107`	`protected function createController($controller)`
`108`	`108`	`{`
`109`		`- if (false === strpos($controller, '::')) {`
	`109`	`+ if (!str_contains($controller, '::')) {`
`110`	`110`	`$controller = $this->instantiateController($controller);`
`111`	`111`
`112`	`112`	`if (!\is_callable($controller)) {`
`@@ -154,7 +154,7 @@ protected function instantiateController($class)`
`154`	`154`	`private function getControllerError($callable): string`
`155`	`155`	`{`
`156`	`156`	`if (\is_string($callable)) {`
`157`		`- if (false !== strpos($callable, '::')) {`
	`157`	`+ if (str_contains($callable, '::')) {`
`158`	`158`	`$callable = explode('::', $callable, 2);`
`159`	`159`	`} else {`
`160`	`160`	`return sprintf('Function "%s" does not exist.', $callable);`
`@@ -195,7 +195,7 @@ private function getControllerError($callable): string`
`195`	`195`	`foreach ($collection as $item) {`
`196`	`196`	`$lev = levenshtein($method, $item);`
`197`	`197`
`198`		`- if ($lev <= \strlen($method) / 3 \|\| false !== strpos($item, $method)) {`
	`198`	`+ if ($lev <= \strlen($method) / 3 \|\| str_contains($item, $method)) {`
`199`	`199`	`$alternatives[] = $item;`
`200`	`200`	`}`
`201`	`201`	`}`
Original file line number	Diff line number	Diff line change
`@@ -394,7 +394,7 @@ public function getName()`
`394`	`394`	`*/`
`395`	`395`	`protected function parseController($controller)`
`396`	`396`	`{`
`397`		`- if (\is_string($controller) && false !== strpos($controller, '::')) {`
	`397`	`+ if (\is_string($controller) && str_contains($controller, '::')) {`
`398`	`398`	`$controller = explode('::', $controller);`
`399`	`399`	`}`
`400`	`400`
`@@ -431,7 +431,7 @@ protected function parseController($controller)`
`431`	`431`	`'line' => $r->getStartLine(),`
`432`	`432`	`];`
`433`	`433`
`434`		`- if (false !== strpos($r->name, '{closure}')) {`
	`434`	`+ if (str_contains($r->name, '{closure}')) {`
`435`	`435`	`return $controller;`
`436`	`436`	`}`
`437`	`437`	`$controller['method'] = $r->name;`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public function format($file, $line)`
`50`	`50`	`{`
`51`	`51`	`if ($fmt = $this->getFileLinkFormat()) {`
`52`	`52`	`for ($i = 1; isset($fmt[$i]); ++$i) {`
`53`		`- if (0 === strpos($file, $k = $fmt[$i++])) {`
	`53`	`+ if (str_starts_with($file, $k = $fmt[$i++])) {`
`54`	`54`	`$file = substr_replace($file, $fmt[$i], 0, \strlen($k));`
`55`	`55`	`break;`
`56`	`56`	`}`
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 (!str_ends_with($pattern, '\\') && 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
`@@ -81,7 +81,7 @@ public function onKernelResponse(FilterResponseEvent $event)`
`81`	`81`	`if ($session instanceof Session ? !$session->isEmpty() \|\| (null !== $this->sessionId && $session->getId() !== $this->sessionId) : $wasStarted) {`
`82`	`82`	`$params = session_get_cookie_params() + ['samesite' => null];`
`83`	`83`	`foreach ($this->sessionOptions as $k => $v) {`
`84`		`- if (0 === strpos($k, 'cookie_')) {`
	`84`	`+ if (str_starts_with($k, 'cookie_')) {`
`85`	`85`	`$params[substr($k, 7)] = $v;`
`86`	`86`	`}`
`87`	`87`	`}`
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`