Leverage str_contains/str_starts_with

derrabus · nicolas-grekas · commit bf72df15d71d · 2021-07-21T14:19:41.000+02:00
Signed-off-by: Alexander M. Turek &lt;me@derrabus.de&gt;
diff --git a/Caster/ClassStub.php b/Caster/ClassStub.php
@@ -55,7 +55,7 @@ public function __construct(string $identifier, $callable = null)
                 }
             }
 
-            if (false !== strpos($identifier, "@anonymous\0")) {
+            if (str_contains($identifier, "@anonymous\0")) {
                 $this->value = $identifier = preg_replace_callback('/[a-zA-Z_\x7f-\xff][\\\\a-zA-Z0-9_\x7f-\xff]*+@anonymous\x00.*?\.php(?:0x?|:[0-9]++\$)[0-9a-fA-F]++/', function ($m) {
                     return class_exists($m[0], false) ? (get_parent_class($m[0]) ?: key(class_implements($m[0])) ?: 'class').'@anonymous' : $m[0];
                 }, $identifier);
diff --git a/Caster/ExceptionCaster.php b/Caster/ExceptionCaster.php
@@ -149,7 +149,7 @@ public static function castTraceStub(TraceStub $trace, array $a, Stub $stub, $is
             $f = self::castFrameStub($frame, [], $frame, true);
             if (isset($f[$prefix.'src'])) {
                 foreach ($f[$prefix.'src']->value as $label => $frame) {
-                    if (0 === strpos($label, "\0~collapse=0")) {
+                    if (str_starts_with($label, "\0~collapse=0")) {
                         if ($collapse) {
                             $label = substr_replace($label, '1', 11, 1);
                         } else {
@@ -281,7 +281,7 @@ private static function filterExceptionArray(string $xClass, array $a, string $x
         }
         unset($a[$xPrefix.'string'], $a[Caster::PREFIX_DYNAMIC.'xdebug_message'], $a[Caster::PREFIX_DYNAMIC.'__destructorException']);
 
-        if (isset($a[Caster::PREFIX_PROTECTED.'message']) && false !== strpos($a[Caster::PREFIX_PROTECTED.'message'], "@anonymous\0")) {
+        if (isset($a[Caster::PREFIX_PROTECTED.'message']) && str_contains($a[Caster::PREFIX_PROTECTED.'message'], "@anonymous\0")) {
             $a[Caster::PREFIX_PROTECTED.'message'] = preg_replace_callback('/[a-zA-Z_\x7f-\xff][\\\\a-zA-Z0-9_\x7f-\xff]*+@anonymous\x00.*?\.php(?:0x?|:[0-9]++\$)[0-9a-fA-F]++/', function ($m) {
                 return class_exists($m[0], false) ? (get_parent_class($m[0]) ?: key(class_implements($m[0])) ?: 'class').'@anonymous' : $m[0];
             }, $a[Caster::PREFIX_PROTECTED.'message']);
diff --git a/Caster/LinkStub.php b/Caster/LinkStub.php
@@ -33,12 +33,12 @@ public function __construct(string $label, int $line = 0, string $href = null)
         if (!\is_string($href)) {
             return;
         }
-        if (0 === strpos($href, 'file://')) {
+        if (str_starts_with($href, 'file://')) {
             if ($href === $label) {
                 $label = substr($label, 7);
             }
             $href = substr($href, 7);
-        } elseif (false !== strpos($href, '://')) {
+        } elseif (str_contains($href, '://')) {
             $this->attr['href'] = $href;
 
             return;
@@ -69,7 +69,7 @@ private function getComposerRoot(string $file, bool &$inVendor)
             self::$vendorRoots = [];
 
             foreach (get_declared_classes() as $class) {
-                if ('C' === $class[0] && 0 === strpos($class, 'ComposerAutoloaderInit')) {
+                if ('C' === $class[0] && str_starts_with($class, 'ComposerAutoloaderInit')) {
                     $r = new \ReflectionClass($class);
                     $v = \dirname($r->getFileName(), 2);
                     if (file_exists($v.'/composer/installed.json')) {
@@ -85,7 +85,7 @@ private function getComposerRoot(string $file, bool &$inVendor)
         }
 
         foreach (self::$vendorRoots as $root) {
-            if ($inVendor = 0 === strpos($file, $root)) {
+            if ($inVendor = str_starts_with($file, $root)) {
                 return $root;
             }
         }
diff --git a/Caster/MemcachedCaster.php b/Caster/MemcachedCaster.php
@@ -71,7 +71,7 @@ private static function getOptionConstants(): array
 
         $optionConstants = [];
         foreach ($reflectedMemcached->getConstants() as $constantKey => $value) {
-            if (0 === strpos($constantKey, 'OPT_')) {
+            if (str_starts_with($constantKey, 'OPT_')) {
                 $optionConstants[$constantKey] = $value;
             }
         }
diff --git a/Caster/ReflectionCaster.php b/Caster/ReflectionCaster.php
@@ -42,7 +42,7 @@ public static function castClosure(\Closure $c, array $a, Stub $stub, $isNested,
 
         $a = static::castFunctionAbstract($c, $a, $stub, $isNested, $filter);
 
-        if (false === strpos($c->name, '{closure}')) {
+        if (!str_contains($c->name, '{closure}')) {
             $stub->class = isset($a[$prefix.'class']) ? $a[$prefix.'class']->value.'::'.$c->name : $c->name;
             unset($a[$prefix.'class']);
         }
@@ -353,7 +353,7 @@ public static function getSignature(array $a)
                 } elseif (\is_array($v)) {
                     $signature .= $v ? '[…'.\count($v).']' : '[]';
                 } elseif (\is_string($v)) {
-                    $signature .= 10 > \strlen($v) && false === strpos($v, '\\') ? "'{$v}'" : "'…".\strlen($v)."'";
+                    $signature .= 10 > \strlen($v) && !str_contains($v, '\\') ? "'{$v}'" : "'…".\strlen($v)."'";
                 } elseif (\is_bool($v)) {
                     $signature .= $v ? 'true' : 'false';
                 } else {
diff --git a/Cloner/AbstractCloner.php b/Cloner/AbstractCloner.php
@@ -300,7 +300,7 @@ protected function castObject(Stub $stub, $isNested)
         $obj = $stub->value;
         $class = $stub->class;
 
-        if (\PHP_VERSION_ID < 80000 ? "\0" === ($class[15] ?? null) : false !== strpos($class, "@anonymous\0")) {
+        if (\PHP_VERSION_ID < 80000 ? "\0" === ($class[15] ?? null) : str_contains($class, "@anonymous\0")) {
             $stub->class = get_debug_type($obj);
         }
         if (isset($this->classInfo[$class])) {
diff --git a/Dumper/CliDumper.php b/Dumper/CliDumper.php
@@ -154,7 +154,7 @@ public function dumpScalar(Cursor $cursor, $type, $value)
                     case is_nan($value):  $value = 'NAN'; break;
                     default:
                         $value = (string) $value;
-                        if (false === strpos($value, $this->decimalPoint)) {
+                        if (!str_contains($value, $this->decimalPoint)) {
                             $value .= $this->decimalPoint.'0';
                         }
                         break;
@@ -445,7 +445,7 @@ protected function style($style, $value, $attr = [])
 
         if (isset($attr['ellipsis'], $attr['ellipsis-type'])) {
             $prefix = substr($value, 0, -$attr['ellipsis']);
-            if ('cli' === \PHP_SAPI && 'path' === $attr['ellipsis-type'] && isset($_SERVER[$pwd = '\\' === \DIRECTORY_SEPARATOR ? 'CD' : 'PWD']) && 0 === strpos($prefix, $_SERVER[$pwd])) {
+            if ('cli' === \PHP_SAPI && 'path' === $attr['ellipsis-type'] && isset($_SERVER[$pwd = '\\' === \DIRECTORY_SEPARATOR ? 'CD' : 'PWD']) && str_starts_with($prefix, $_SERVER[$pwd])) {
                 $prefix = '.'.substr($prefix, \strlen($_SERVER[$pwd]));
             }
             if (!empty($attr['ellipsis-tail'])) {
diff --git a/Dumper/ContextProvider/SourceContextProvider.php b/Dumper/ContextProvider/SourceContextProvider.php
@@ -56,7 +56,7 @@ public function getContext(): ?array
                 $line = $trace[$i]['line'] ?? $line;
 
                 while (++$i < $this->limit) {
-                    if (isset($trace[$i]['function'], $trace[$i]['file']) && empty($trace[$i]['class']) && 0 !== strpos($trace[$i]['function'], 'call_user_func')) {
+                    if (isset($trace[$i]['function'], $trace[$i]['file']) && empty($trace[$i]['class']) && !str_starts_with($trace[$i]['function'], 'call_user_func')) {
                         $file = $trace[$i]['file'];
                         $line = $trace[$i]['line'];
 
@@ -98,7 +98,7 @@ public function getContext(): ?array
 
         if (null !== $this->projectDir) {
             $context['project_dir'] = $this->projectDir;
-            if (0 === strpos($file, $this->projectDir)) {
+            if (str_starts_with($file, $this->projectDir)) {
                 $context['file_relative'] = ltrim(substr($file, \strlen($this->projectDir)), \DIRECTORY_SEPARATOR);
             }
         }
diff --git a/Server/Connection.php b/Server/Connection.php
@@ -31,7 +31,7 @@ class Connection
      */
     public function __construct(string $host, array $contextProviders = [])
     {
-        if (false === strpos($host, '://')) {
+        if (!str_contains($host, '://')) {
             $host = 'tcp://'.$host;
         }
 
diff --git a/Server/DumpServer.php b/Server/DumpServer.php
@@ -30,7 +30,7 @@ class DumpServer
 
     public function __construct(string $host, LoggerInterface $logger = null)
     {
-        if (false === strpos($host, '://')) {
+        if (!str_contains($host, '://')) {
             $host = 'tcp://'.$host;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public function __construct(string $identifier, $callable = null)`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`
`58`		`- if (false !== strpos($identifier, "@anonymous\0")) {`
	`58`	`+ if (str_contains($identifier, "@anonymous\0")) {`
`59`	`59`	`$this->value = $identifier = preg_replace_callback('/[a-zA-Z_\x7f-\xff][\\\\a-zA-Z0-9_\x7f-\xff]+@anonymous\x00.?\.php(?:0x?\|:[0-9]++\$)[0-9a-fA-F]++/', function ($m) {`
`60`	`60`	`return class_exists($m[0], false) ? (get_parent_class($m[0]) ?: key(class_implements($m[0])) ?: 'class').'@anonymous' : $m[0];`
`61`	`61`	`}, $identifier);`
Original file line number	Diff line number	Diff line change
`@@ -33,12 +33,12 @@ public function __construct(string $label, int $line = 0, string $href = null)`
`33`	`33`	`if (!\is_string($href)) {`
`34`	`34`	`return;`
`35`	`35`	`}`
`36`		`- if (0 === strpos($href, 'file://')) {`
	`36`	`+ if (str_starts_with($href, 'file://')) {`
`37`	`37`	`if ($href === $label) {`
`38`	`38`	`$label = substr($label, 7);`
`39`	`39`	`}`
`40`	`40`	`$href = substr($href, 7);`
`41`		`- } elseif (false !== strpos($href, '://')) {`
	`41`	`+ } elseif (str_contains($href, '://')) {`
`42`	`42`	`$this->attr['href'] = $href;`
`43`	`43`
`44`	`44`	`return;`
`@@ -69,7 +69,7 @@ private function getComposerRoot(string $file, bool &$inVendor)`
`69`	`69`	`self::$vendorRoots = [];`
`70`	`70`
`71`	`71`	`foreach (get_declared_classes() as $class) {`
`72`		`- if ('C' === $class[0] && 0 === strpos($class, 'ComposerAutoloaderInit')) {`
	`72`	`+ if ('C' === $class[0] && str_starts_with($class, 'ComposerAutoloaderInit')) {`
`73`	`73`	`$r = new \ReflectionClass($class);`
`74`	`74`	`$v = \dirname($r->getFileName(), 2);`
`75`	`75`	`if (file_exists($v.'/composer/installed.json')) {`
`@@ -85,7 +85,7 @@ private function getComposerRoot(string $file, bool &$inVendor)`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`foreach (self::$vendorRoots as $root) {`
`88`		`- if ($inVendor = 0 === strpos($file, $root)) {`
	`88`	`+ if ($inVendor = str_starts_with($file, $root)) {`
`89`	`89`	`return $root;`
`90`	`90`	`}`
`91`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ private static function getOptionConstants(): array`
`71`	`71`
`72`	`72`	`$optionConstants = [];`
`73`	`73`	`foreach ($reflectedMemcached->getConstants() as $constantKey => $value) {`
`74`		`- if (0 === strpos($constantKey, 'OPT_')) {`
	`74`	`+ if (str_starts_with($constantKey, 'OPT_')) {`
`75`	`75`	`$optionConstants[$constantKey] = $value;`
`76`	`76`	`}`
`77`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,7 @@ protected function castObject(Stub $stub, $isNested)`
`300`	`300`	`$obj = $stub->value;`
`301`	`301`	`$class = $stub->class;`
`302`	`302`
`303`		`- if (\PHP_VERSION_ID < 80000 ? "\0" === ($class[15] ?? null) : false !== strpos($class, "@anonymous\0")) {`
	`303`	`+ if (\PHP_VERSION_ID < 80000 ? "\0" === ($class[15] ?? null) : str_contains($class, "@anonymous\0")) {`
`304`	`304`	`$stub->class = get_debug_type($obj);`
`305`	`305`	`}`
`306`	`306`	`if (isset($this->classInfo[$class])) {`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public function getContext(): ?array`
`56`	`56`	`$line = $trace[$i]['line'] ?? $line;`
`57`	`57`
`58`	`58`	`while (++$i < $this->limit) {`
`59`		`- if (isset($trace[$i]['function'], $trace[$i]['file']) && empty($trace[$i]['class']) && 0 !== strpos($trace[$i]['function'], 'call_user_func')) {`
	`59`	`+ if (isset($trace[$i]['function'], $trace[$i]['file']) && empty($trace[$i]['class']) && !str_starts_with($trace[$i]['function'], 'call_user_func')) {`
`60`	`60`	`$file = $trace[$i]['file'];`
`61`	`61`	`$line = $trace[$i]['line'];`
`62`	`62`
`@@ -98,7 +98,7 @@ public function getContext(): ?array`
`98`	`98`
`99`	`99`	`if (null !== $this->projectDir) {`
`100`	`100`	`$context['project_dir'] = $this->projectDir;`
`101`		`- if (0 === strpos($file, $this->projectDir)) {`
	`101`	`+ if (str_starts_with($file, $this->projectDir)) {`
`102`	`102`	`$context['file_relative'] = ltrim(substr($file, \strlen($this->projectDir)), \DIRECTORY_SEPARATOR);`
`103`	`103`	`}`
`104`	`104`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ class Connection`
`31`	`31`	`*/`
`32`	`32`	`public function __construct(string $host, array $contextProviders = [])`
`33`	`33`	`{`
`34`		`- if (false === strpos($host, '://')) {`
	`34`	`+ if (!str_contains($host, '://')) {`
`35`	`35`	`$host = 'tcp://'.$host;`
`36`	`36`	`}`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ class DumpServer`
`30`	`30`
`31`	`31`	`public function __construct(string $host, LoggerInterface $logger = null)`
`32`	`32`	`{`
`33`		`- if (false === strpos($host, '://')) {`
	`33`	`+ if (!str_contains($host, '://')) {`
`34`	`34`	`$host = 'tcp://'.$host;`
`35`	`35`	`}`
`36`	`36`