Skip to content

Commit 8d1d0a0

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '5.2' into 5.3
* 5.2: Leverage str_contains/str_starts_with Leverage str_ends_with
2 parents f1a9f56 + bb07805 commit 8d1d0a0

File tree

11 files changed

+20
-20
lines changed

11 files changed

+20
-20
lines changed

‎Caster/ClassStub.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public function __construct(string $identifier, $callable = null)
5555
}
5656
}
5757

58-
if (false !== strpos($identifier, "@anonymous\0")) {
58+
if (str_contains($identifier, "@anonymous\0")) {
5959
$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) {
6060
return class_exists($m[0], false) ? (get_parent_class($m[0]) ?: key(class_implements($m[0])) ?: 'class').'@anonymous' : $m[0];
6161
}, $identifier);
@@ -65,7 +65,7 @@ public function __construct(string $identifier, $callable = null)
6565
$s = ReflectionCaster::castFunctionAbstract($r, [], new Stub(), true, Caster::EXCLUDE_VERBOSE);
6666
$s = ReflectionCaster::getSignature($s);
6767

68-
if ('()' === substr($identifier, -2)) {
68+
if (str_ends_with($identifier, '()')) {
6969
$this->value = substr_replace($identifier, $s, -2);
7070
} else {
7171
$this->value .= $s;

‎Caster/ExceptionCaster.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ public static function castTraceStub(TraceStub $trace, array $a, Stub $stub, boo
149149
$f = self::castFrameStub($frame, [], $frame, true);
150150
if (isset($f[$prefix.'src'])) {
151151
foreach ($f[$prefix.'src']->value as $label => $frame) {
152-
if (0 === strpos($label, "\0~collapse=0")) {
152+
if (str_starts_with($label, "\0~collapse=0")) {
153153
if ($collapse) {
154154
$label = substr_replace($label, '1', 11, 1);
155155
} else {
@@ -281,7 +281,7 @@ private static function filterExceptionArray(string $xClass, array $a, string $x
281281
}
282282
unset($a[$xPrefix.'string'], $a[Caster::PREFIX_DYNAMIC.'xdebug_message'], $a[Caster::PREFIX_DYNAMIC.'__destructorException']);
283283

284-
if (isset($a[Caster::PREFIX_PROTECTED.'message']) && false !== strpos($a[Caster::PREFIX_PROTECTED.'message'], "@anonymous\0")) {
284+
if (isset($a[Caster::PREFIX_PROTECTED.'message']) && str_contains($a[Caster::PREFIX_PROTECTED.'message'], "@anonymous\0")) {
285285
$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) {
286286
return class_exists($m[0], false) ? (get_parent_class($m[0]) ?: key(class_implements($m[0])) ?: 'class').'@anonymous' : $m[0];
287287
}, $a[Caster::PREFIX_PROTECTED.'message']);

‎Caster/LinkStub.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ public function __construct(string $label, int $line = 0, string $href = null)
3333
if (!\is_string($href)) {
3434
return;
3535
}
36-
if (0 === strpos($href, 'file://')) {
36+
if (str_starts_with($href, 'file://')) {
3737
if ($href === $label) {
3838
$label = substr($label, 7);
3939
}
4040
$href = substr($href, 7);
41-
} elseif (false !== strpos($href, '://')) {
41+
} elseif (str_contains($href, '://')) {
4242
$this->attr['href'] = $href;
4343

4444
return;
@@ -69,7 +69,7 @@ private function getComposerRoot(string $file, bool &$inVendor)
6969
self::$vendorRoots = [];
7070

7171
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')) {
7373
$r = new \ReflectionClass($class);
7474
$v = \dirname($r->getFileName(), 2);
7575
if (is_file($v.'/composer/installed.json')) {
@@ -85,7 +85,7 @@ private function getComposerRoot(string $file, bool &$inVendor)
8585
}
8686

8787
foreach (self::$vendorRoots as $root) {
88-
if ($inVendor = 0 === strpos($file, $root)) {
88+
if ($inVendor = str_starts_with($file, $root)) {
8989
return $root;
9090
}
9191
}

‎Caster/MemcachedCaster.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ private static function getOptionConstants(): array
7171

7272
$optionConstants = [];
7373
foreach ($reflectedMemcached->getConstants() as $constantKey => $value) {
74-
if (0 === strpos($constantKey, 'OPT_')) {
74+
if (str_starts_with($constantKey, 'OPT_')) {
7575
$optionConstants[$constantKey] = $value;
7676
}
7777
}

‎Caster/ReflectionCaster.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public static function castClosure(\Closure $c, array $a, Stub $stub, bool $isNe
4242

4343
$a = static::castFunctionAbstract($c, $a, $stub, $isNested, $filter);
4444

45-
if (false === strpos($c->name, '{closure}')) {
45+
if (!str_contains($c->name, '{closure}')) {
4646
$stub->class = isset($a[$prefix.'class']) ? $a[$prefix.'class']->value.'::'.$c->name : $c->name;
4747
unset($a[$prefix.'class']);
4848
}
@@ -381,7 +381,7 @@ public static function getSignature(array $a)
381381
} elseif (\is_array($v)) {
382382
$signature .= $v ? '[…'.\count($v).']' : '[]';
383383
} elseif (\is_string($v)) {
384-
$signature .= 10 > \strlen($v) && false === strpos($v, '\\') ? "'{$v}'" : "'…".\strlen($v)."'";
384+
$signature .= 10 > \strlen($v) && !str_contains($v, '\\') ? "'{$v}'" : "'…".\strlen($v)."'";
385385
} elseif (\is_bool($v)) {
386386
$signature .= $v ? 'true' : 'false';
387387
} else {

‎Cloner/AbstractCloner.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ protected function castObject(Stub $stub, bool $isNested)
309309
$obj = $stub->value;
310310
$class = $stub->class;
311311

312-
if (\PHP_VERSION_ID < 80000 ? "\0" === ($class[15] ?? null) : false !== strpos($class, "@anonymous\0")) {
312+
if (\PHP_VERSION_ID < 80000 ? "\0" === ($class[15] ?? null) : str_contains($class, "@anonymous\0")) {
313313
$stub->class = get_debug_type($obj);
314314
}
315315
if (isset($this->classInfo[$class])) {

‎Dumper/CliDumper.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ public function dumpScalar(Cursor $cursor, string $type, $value)
150150
case is_nan($value): $value = 'NAN'; break;
151151
default:
152152
$value = (string) $value;
153-
if (false === strpos($value, $this->decimalPoint)) {
153+
if (!str_contains($value, $this->decimalPoint)) {
154154
$value .= $this->decimalPoint.'0';
155155
}
156156
break;
@@ -441,7 +441,7 @@ protected function style(string $style, string $value, array $attr = [])
441441

442442
if (isset($attr['ellipsis'], $attr['ellipsis-type'])) {
443443
$prefix = substr($value, 0, -$attr['ellipsis']);
444-
if ('cli' === \PHP_SAPI && 'path' === $attr['ellipsis-type'] && isset($_SERVER[$pwd = '\\' === \DIRECTORY_SEPARATOR ? 'CD' : 'PWD']) && 0 === strpos($prefix, $_SERVER[$pwd])) {
444+
if ('cli' === \PHP_SAPI && 'path' === $attr['ellipsis-type'] && isset($_SERVER[$pwd = '\\' === \DIRECTORY_SEPARATOR ? 'CD' : 'PWD']) && str_starts_with($prefix, $_SERVER[$pwd])) {
445445
$prefix = '.'.substr($prefix, \strlen($_SERVER[$pwd]));
446446
}
447447
if (!empty($attr['ellipsis-tail'])) {
@@ -475,7 +475,7 @@ protected function style(string $style, string $value, array $attr = [])
475475
} else {
476476
$value = "\033[{$this->styles[$style]}m".$value;
477477
}
478-
if ($cchrCount && $endCchr === substr($value, -\strlen($endCchr))) {
478+
if ($cchrCount && str_ends_with($value, $endCchr)) {
479479
$value = substr($value, 0, -\strlen($endCchr));
480480
} else {
481481
$value .= "\033[{$this->styles['default']}m";

‎Dumper/ContextProvider/SourceContextProvider.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public function getContext(): ?array
5656
$line = $trace[$i]['line'] ?? $line;
5757

5858
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')) {
6060
$file = $trace[$i]['file'];
6161
$line = $trace[$i]['line'];
6262

@@ -98,7 +98,7 @@ public function getContext(): ?array
9898

9999
if (null !== $this->projectDir) {
100100
$context['project_dir'] = $this->projectDir;
101-
if (0 === strpos($file, $this->projectDir)) {
101+
if (str_starts_with($file, $this->projectDir)) {
102102
$context['file_relative'] = ltrim(substr($file, \strlen($this->projectDir)), \DIRECTORY_SEPARATOR);
103103
}
104104
}

‎Server/Connection.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class Connection
3131
*/
3232
public function __construct(string $host, array $contextProviders = [])
3333
{
34-
if (false === strpos($host, '://')) {
34+
if (!str_contains($host, '://')) {
3535
$host = 'tcp://'.$host;
3636
}
3737

‎Server/DumpServer.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class DumpServer
3030

3131
public function __construct(string $host, LoggerInterface $logger = null)
3232
{
33-
if (false === strpos($host, '://')) {
33+
if (!str_contains($host, '://')) {
3434
$host = 'tcp://'.$host;
3535
}
3636

0 commit comments

Comments
 (0)