Leverage str_contains/str_starts_with

derrabus · nicolas-grekas · commit d6e4f596a55d · 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
@@ -167,7 +167,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/Command/CacheClearCommand.php b/Command/CacheClearCommand.php
@@ -142,7 +142,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                     }
                     $mount = implode(' ', $mount).'/';
 
-                    if (0 === strpos($realCacheDir, $mount)) {
+                    if (str_starts_with($realCacheDir, $mount)) {
                         $io->note('For better performances, you should move the cache and log directories to a non-shared folder of the VM.');
                         $oldCacheDir = false;
                         break;
diff --git a/Command/ContainerDebugCommand.php b/Command/ContainerDebugCommand.php
@@ -270,7 +270,7 @@ private function findServiceIdsContaining(ContainerBuilder $builder, string $nam
         $serviceIds = $builder->getServiceIds();
         $foundServiceIds = $foundServiceIdsIgnoringBackslashes = [];
         foreach ($serviceIds as $serviceId) {
-            if (!$showHidden && 0 === strpos($serviceId, '.')) {
+            if (!$showHidden && str_starts_with($serviceId, '.')) {
                 continue;
             }
             if (false !== stripos(str_replace('\\', '', $serviceId), $name)) {
@@ -295,7 +295,7 @@ public function filterToServiceTypes(string $serviceId): bool
         }
 
         // if the id has a \, assume it is a class
-        if (false !== strpos($serviceId, '\\')) {
+        if (str_contains($serviceId, '\\')) {
             return true;
         }
 
diff --git a/Command/ContainerLintCommand.php b/Command/ContainerLintCommand.php
@@ -104,7 +104,7 @@ private function getContainerBuilder(): ContainerBuilder
 
             $skippedIds = [];
             foreach ($container->getServiceIds() as $serviceId) {
-                if (0 === strpos($serviceId, '.errored.')) {
+                if (str_starts_with($serviceId, '.errored.')) {
                     $skippedIds[$serviceId] = true;
                 }
             }
diff --git a/Command/DebugAutowiringCommand.php b/Command/DebugAutowiringCommand.php
@@ -80,7 +80,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         if ($search = $input->getArgument('search')) {
             $serviceIds = array_filter($serviceIds, function ($serviceId) use ($search) {
-                return false !== stripos(str_replace('\\', '', $serviceId), $search) && 0 !== strpos($serviceId, '.');
+                return false !== stripos(str_replace('\\', '', $serviceId), $search) && !str_starts_with($serviceId, '.');
             });
 
             if (empty($serviceIds)) {
@@ -104,7 +104,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         foreach ($serviceIds as $serviceId) {
             $text = [];
             $resolvedServiceId = $serviceId;
-            if (0 !== strpos($serviceId, $previousId)) {
+            if (!str_starts_with($serviceId, $previousId)) {
                 $text[] = '';
                 if ('' !== $description = Descriptor::getClassDescription($serviceId, $resolvedServiceId)) {
                     if (isset($hasAlias[$serviceId])) {
diff --git a/Command/XliffLintCommand.php b/Command/XliffLintCommand.php
@@ -37,7 +37,7 @@ public function __construct()
         };
 
         $isReadableProvider = function ($fileOrDirectory, $default) {
-            return 0 === strpos($fileOrDirectory, '@') || $default($fileOrDirectory);
+            return str_starts_with($fileOrDirectory, '@') || $default($fileOrDirectory);
         };
 
         parent::__construct(null, $directoryIteratorProvider, $isReadableProvider);
diff --git a/Command/YamlLintCommand.php b/Command/YamlLintCommand.php
@@ -36,7 +36,7 @@ public function __construct()
         };
 
         $isReadableProvider = function ($fileOrDirectory, $default) {
-            return 0 === strpos($fileOrDirectory, '@') || $default($fileOrDirectory);
+            return str_starts_with($fileOrDirectory, '@') || $default($fileOrDirectory);
         };
 
         parent::__construct(null, $directoryIteratorProvider, $isReadableProvider);
diff --git a/Console/Descriptor/JsonDescriptor.php b/Console/Descriptor/JsonDescriptor.php
@@ -286,7 +286,7 @@ private function getCallableData($callable): array
                 $data['name'] = $callable[1];
                 $data['class'] = \get_class($callable[0]);
             } else {
-                if (0 !== strpos($callable[1], 'parent::')) {
+                if (!str_starts_with($callable[1], 'parent::')) {
                     $data['name'] = $callable[1];
                     $data['class'] = $callable[0];
                     $data['static'] = true;
@@ -304,7 +304,7 @@ private function getCallableData($callable): array
         if (\is_string($callable)) {
             $data['type'] = 'function';
 
-            if (false === strpos($callable, '::')) {
+            if (!str_contains($callable, '::')) {
                 $data['name'] = $callable;
             } else {
                 $callableParts = explode('::', $callable);
@@ -321,7 +321,7 @@ private function getCallableData($callable): array
             $data['type'] = 'closure';
 
             $r = new \ReflectionFunction($callable);
-            if (false !== strpos($r->name, '{closure}')) {
+            if (str_contains($r->name, '{closure}')) {
                 return $data;
             }
             $data['name'] = $r->name;
diff --git a/Console/Descriptor/MarkdownDescriptor.php b/Console/Descriptor/MarkdownDescriptor.php
@@ -300,7 +300,7 @@ protected function describeCallable($callable, array $options = [])
                 $string .= "\n".sprintf('- Name: `%s`', $callable[1]);
                 $string .= "\n".sprintf('- Class: `%s`', \get_class($callable[0]));
             } else {
-                if (0 !== strpos($callable[1], 'parent::')) {
+                if (!str_starts_with($callable[1], 'parent::')) {
                     $string .= "\n".sprintf('- Name: `%s`', $callable[1]);
                     $string .= "\n".sprintf('- Class: `%s`', $callable[0]);
                     $string .= "\n- Static: yes";
@@ -318,7 +318,7 @@ protected function describeCallable($callable, array $options = [])
         if (\is_string($callable)) {
             $string .= "\n- Type: `function`";
 
-            if (false === strpos($callable, '::')) {
+            if (!str_contains($callable, '::')) {
                 $string .= "\n".sprintf('- Name: `%s`', $callable);
             } else {
                 $callableParts = explode('::', $callable);
@@ -335,7 +335,7 @@ protected function describeCallable($callable, array $options = [])
             $string .= "\n- Type: `closure`";
 
             $r = new \ReflectionFunction($callable);
-            if (false !== strpos($r->name, '{closure}')) {
+            if (str_contains($r->name, '{closure}')) {
                 return $this->write($string."\n");
             }
             $string .= "\n".sprintf('- Name: `%s`', $r->name);
diff --git a/Console/Descriptor/TextDescriptor.php b/Console/Descriptor/TextDescriptor.php
@@ -514,7 +514,7 @@ private function formatControllerLink($controller, string $anchorText): string
                 $r = new \ReflectionMethod($controller, '__invoke');
             } elseif (!\is_string($controller)) {
                 return $anchorText;
-            } elseif (false !== strpos($controller, '::')) {
+            } elseif (str_contains($controller, '::')) {
                 $r = new \ReflectionMethod($controller);
             } else {
                 $r = new \ReflectionFunction($controller);
@@ -547,7 +547,7 @@ private function formatCallable($callable): string
 
         if ($callable instanceof \Closure) {
             $r = new \ReflectionFunction($callable);
-            if (false !== strpos($r->name, '{closure}')) {
+            if (str_contains($r->name, '{closure}')) {
                 return 'Closure()';
             }
             if ($class = $r->getClosureScopeClass()) {
diff --git a/Console/Descriptor/XmlDescriptor.php b/Console/Descriptor/XmlDescriptor.php
@@ -469,7 +469,7 @@ private function getCallableDocument($callable): \DOMDocument
                 $callableXML->setAttribute('name', $callable[1]);
                 $callableXML->setAttribute('class', \get_class($callable[0]));
             } else {
-                if (0 !== strpos($callable[1], 'parent::')) {
+                if (!str_starts_with($callable[1], 'parent::')) {
                     $callableXML->setAttribute('name', $callable[1]);
                     $callableXML->setAttribute('class', $callable[0]);
                     $callableXML->setAttribute('static', 'true');
@@ -487,7 +487,7 @@ private function getCallableDocument($callable): \DOMDocument
         if (\is_string($callable)) {
             $callableXML->setAttribute('type', 'function');
 
-            if (false === strpos($callable, '::')) {
+            if (!str_contains($callable, '::')) {
                 $callableXML->setAttribute('name', $callable);
             } else {
                 $callableParts = explode('::', $callable);
@@ -504,7 +504,7 @@ private function getCallableDocument($callable): \DOMDocument
             $callableXML->setAttribute('type', 'closure');
 
             $r = new \ReflectionFunction($callable);
-            if (false !== strpos($r->name, '{closure}')) {
+            if (str_contains($r->name, '{closure}')) {
                 return $dom;
             }
             $callableXML->setAttribute('name', $r->name);
diff --git a/Controller/ControllerNameParser.php b/Controller/ControllerNameParser.php
@@ -107,7 +107,7 @@ public function build($controller)
         $controllerName = $match[2];
         $actionName = $match[3];
         foreach ($this->kernel->getBundles() as $name => $bundle) {
-            if (0 !== strpos($className, $bundle->getNamespace())) {
+            if (!str_starts_with($className, $bundle->getNamespace())) {
                 continue;
             }
 
@@ -130,7 +130,7 @@ private function findAlternative(string $nonExistentBundleName): ?string
         $shortest = null;
         foreach ($bundleNames as $bundleName) {
             // if there's a partial match, return it immediately
-            if (false !== strpos($bundleName, $nonExistentBundleName)) {
+            if (str_contains($bundleName, $nonExistentBundleName)) {
                 return $bundleName;
             }
 
diff --git a/Controller/ControllerResolver.php b/Controller/ControllerResolver.php
@@ -51,7 +51,7 @@ public function __construct(ContainerInterface $container, $logger = null)
      */
     protected function createController($controller)
     {
-        if ($this->parser && false === strpos($controller, '::') && 2 === substr_count($controller, ':')) {
+        if ($this->parser && !str_contains($controller, '::') && 2 === substr_count($controller, ':')) {
             // controller in the a:b:c notation then
             $deprecatedNotation = $controller;
             $controller = $this->parser->parse($deprecatedNotation, false);
diff --git a/Controller/RedirectController.php b/Controller/RedirectController.php
@@ -128,7 +128,7 @@ public function urlRedirectAction(Request $request, string $path, bool $permanen
         }
 
         if ($qs = $request->server->get('QUERY_STRING') ?: $request->getQueryString()) {
-            if (false === strpos($path, '?')) {
+            if (!str_contains($path, '?')) {
                 $qs = '?'.$qs;
             } else {
                 $qs = '&'.$qs;
diff --git a/DependencyInjection/Compiler/UnusedTagsPass.php b/DependencyInjection/Compiler/UnusedTagsPass.php
@@ -99,7 +99,7 @@ public function process(ContainerBuilder $container)
                     continue;
                 }
 
-                if (false !== strpos($definedTag, $tag) || levenshtein($tag, $definedTag) <= \strlen($tag) / 3) {
+                if (str_contains($definedTag, $tag) || levenshtein($tag, $definedTag) <= \strlen($tag) / 3) {
                     $candidates[] = $definedTag;
                 }
             }
diff --git a/DependencyInjection/FrameworkExtension.php b/DependencyInjection/FrameworkExtension.php
@@ -1266,7 +1266,7 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
                     'scanned_directories' => $scannedDirectories = array_merge($dirs, $nonExistingDirs),
                     'cache_vary' => [
                         'scanned_directories' => array_map(static function (string $dir) use ($projectDir): string {
-                            return 0 === strpos($dir, $projectDir.'/') ? substr($dir, 1 + \strlen($projectDir)) : $dir;
+                            return str_starts_with($dir, $projectDir.'/') ? substr($dir, 1 + \strlen($projectDir)) : $dir;
                         }, $scannedDirectories),
                     ],
                 ]
diff --git a/EventListener/ResolveControllerNameSubscriber.php b/EventListener/ResolveControllerNameSubscriber.php
@@ -55,7 +55,7 @@ public function __call(string $method, array $args)
         $event = $args[0];
 
         $controller = $event->getRequest()->attributes->get('_controller');
-        if (\is_string($controller) && false === strpos($controller, '::') && 2 === substr_count($controller, ':')) {
+        if (\is_string($controller) && !str_contains($controller, '::') && 2 === substr_count($controller, ':')) {
             // controller in the a:b:c notation then
             $event->getRequest()->attributes->set('_controller', $parsedNotation = $this->parser->parse($controller, false));
 
diff --git a/Routing/DelegatingLoader.php b/Routing/DelegatingLoader.php
@@ -95,7 +95,7 @@ public function load($resource, $type = null)
                 continue;
             }
 
-            if (false !== strpos($controller, '::')) {
+            if (str_contains($controller, '::')) {
                 continue;
             }
 
diff --git a/Secrets/DotenvVault.php b/Secrets/DotenvVault.php
@@ -54,7 +54,7 @@ public function reveal(string $name): ?string
     {
         $this->lastMessage = null;
         $this->validateName($name);
-        $v = \is_string($_SERVER[$name] ?? null) && 0 !== strpos($name, 'HTTP_') ? $_SERVER[$name] : ($_ENV[$name] ?? null);
+        $v = \is_string($_SERVER[$name] ?? null) && !str_starts_with($name, 'HTTP_') ? $_SERVER[$name] : ($_ENV[$name] ?? null);
 
         if (null === $v) {
             $this->lastMessage = sprintf('Secret "%s" not found in "%s".', $name, $this->getPrettyPath($this->dotenvFile));
diff --git a/Templating/Helper/CodeHelper.php b/Templating/Helper/CodeHelper.php
@@ -63,7 +63,7 @@ public function abbrClass($class)
 
     public function abbrMethod($method)
     {
-        if (false !== strpos($method, '::')) {
+        if (str_contains($method, '::')) {
             [$class, $method] = explode('::', $method, 2);
             $result = sprintf('%s::%s()', $this->abbrClass($class), $method);
         } elseif ('Closure' === $method) {
@@ -164,7 +164,7 @@ public function formatFile($file, $line, $text = null)
         if (null === $text) {
             $file = trim($file);
             $fileStr = $file;
-            if (0 === strpos($fileStr, $this->rootDir)) {
+            if (str_starts_with($fileStr, $this->rootDir)) {
                 $fileStr = str_replace(['\\', $this->rootDir], ['/', ''], $fileStr);
                 $fileStr = htmlspecialchars($fileStr, $flags, $this->charset);
                 $fileStr = sprintf('<abbr title="%s">kernel.project_dir</abbr>/%s', htmlspecialchars($this->rootDir, $flags, $this->charset), $fileStr);
diff --git a/Templating/TemplateNameParser.php b/Templating/TemplateNameParser.php
@@ -50,11 +50,11 @@ public function parse($name)
         // normalize name
         $name = preg_replace('#/{2,}#', '/', str_replace('\\', '/', $name));
 
-        if (false !== strpos($name, '..')) {
+        if (str_contains($name, '..')) {
             throw new \RuntimeException(sprintf('Template name "%s" contains invalid characters.', $name));
         }
 
-        if (!preg_match('/^(?:([^:]*):([^:]*):)?(.+)\.([^\.]+)\.([^\.]+)$/', $name, $matches) || 0 === strpos($name, '@')) {
+        if (!preg_match('/^(?:([^:]*):([^:]*):)?(.+)\.([^\.]+)\.([^\.]+)$/', $name, $matches) || str_starts_with($name, '@')) {
             return parent::parse($name);
         }
 
diff --git a/Tests/Functional/CachePoolsTest.php b/Tests/Functional/CachePoolsTest.php
@@ -35,12 +35,12 @@ public function testRedisCachePools()
         try {
             $this->doTestCachePools(['root_config' => 'redis_config.yml', 'environment' => 'redis_cache'], RedisAdapter::class);
         } catch (\PHPUnit\Framework\Error\Warning $e) {
-            if (0 !== strpos($e->getMessage(), 'unable to connect to')) {
+            if (!str_starts_with($e->getMessage(), 'unable to connect to')) {
                 throw $e;
             }
             $this->markTestSkipped($e->getMessage());
         } catch (InvalidArgumentException $e) {
-            if (0 !== strpos($e->getMessage(), 'Redis connection ')) {
+            if (!str_starts_with($e->getMessage(), 'Redis connection ')) {
                 throw $e;
             }
             $this->markTestSkipped($e->getMessage());
@@ -58,7 +58,7 @@ public function testRedisCustomCachePools()
         try {
             $this->doTestCachePools(['root_config' => 'redis_custom_config.yml', 'environment' => 'custom_redis_cache'], RedisAdapter::class);
         } catch (\PHPUnit\Framework\Error\Warning $e) {
-            if (0 !== strpos($e->getMessage(), 'unable to connect to')) {
+            if (!str_starts_with($e->getMessage(), 'unable to connect to')) {
                 throw $e;
             }
             $this->markTestSkipped($e->getMessage());

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int`
`142`	`142`	`}`
`143`	`143`	`$mount = implode(' ', $mount).'/';`
`144`	`144`
`145`		`- if (0 === strpos($realCacheDir, $mount)) {`
	`145`	`+ if (str_starts_with($realCacheDir, $mount)) {`
`146`	`146`	`$io->note('For better performances, you should move the cache and log directories to a non-shared folder of the VM.');`
`147`	`147`	`$oldCacheDir = false;`
`148`	`148`	`break;`
Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,7 @@ private function findServiceIdsContaining(ContainerBuilder $builder, string $nam`
`270`	`270`	`$serviceIds = $builder->getServiceIds();`
`271`	`271`	`$foundServiceIds = $foundServiceIdsIgnoringBackslashes = [];`
`272`	`272`	`foreach ($serviceIds as $serviceId) {`
`273`		`- if (!$showHidden && 0 === strpos($serviceId, '.')) {`
	`273`	`+ if (!$showHidden && str_starts_with($serviceId, '.')) {`
`274`	`274`	`continue;`
`275`	`275`	`}`
`276`	`276`	`if (false !== stripos(str_replace('\\', '', $serviceId), $name)) {`
`@@ -295,7 +295,7 @@ public function filterToServiceTypes(string $serviceId): bool`
`295`	`295`	`}`
`296`	`296`
`297`	`297`	`// if the id has a \, assume it is a class`
`298`		`- if (false !== strpos($serviceId, '\\')) {`
	`298`	`+ if (str_contains($serviceId, '\\')) {`
`299`	`299`	`return true;`
`300`	`300`	`}`
`301`	`301`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ private function getContainerBuilder(): ContainerBuilder`
`104`	`104`
`105`	`105`	`$skippedIds = [];`
`106`	`106`	`foreach ($container->getServiceIds() as $serviceId) {`
`107`		`- if (0 === strpos($serviceId, '.errored.')) {`
	`107`	`+ if (str_starts_with($serviceId, '.errored.')) {`
`108`	`108`	`$skippedIds[$serviceId] = true;`
`109`	`109`	`}`
`110`	`110`	`}`