used native PHP 8 functions

dg · dg · commit d508398e07e9 · 2021-08-31T11:40:35.000+02:00
diff --git a/src/DI/Autowiring.php b/src/DI/Autowiring.php
@@ -61,7 +61,7 @@ public function getByType(string $type, bool $throw = false): ?string
 		} else {
 			$list = $types[$type];
 			natsort($list);
-			$hint = count($list) === 2 && ($tmp = strpos($list[0], '.') xor strpos($list[1], '.'))
+			$hint = count($list) === 2 && ($tmp = str_contains($list[0], '.') xor str_contains($list[1], '.'))
 				? '. If you want to overwrite service ' . $list[$tmp ? 0 : 1] . ', give it proper name.'
 				: '';
 			throw new ServiceCreationException(sprintf(
diff --git a/src/DI/CompilerExtension.php b/src/DI/CompilerExtension.php
@@ -137,7 +137,7 @@ public function getInitialization(): Nette\PhpGenerator\Closure
 	 */
 	public function prefix(string $id): string
 	{
-		return substr_replace($id, $this->name . '.', substr($id, 0, 1) === '@' ? 1 : 0, 0);
+		return substr_replace($id, $this->name . '.', str_starts_with($id, '@') ? 1 : 0, 0);
 	}
 
 
diff --git a/src/DI/Config/Adapters/NeonAdapter.php b/src/DI/Config/Adapters/NeonAdapter.php
@@ -40,7 +40,7 @@ public function process(array $arr): array
 	{
 		$res = [];
 		foreach ($arr as $key => $val) {
-			if (is_string($key) && substr($key, -1) === self::PREVENT_MERGING_SUFFIX) {
+			if (is_string($key) && str_ends_with($key, self::PREVENT_MERGING_SUFFIX)) {
 				if (!is_array($val) && $val !== null) {
 					throw new Nette\DI\InvalidConfigurationException(sprintf(
 						"Replacing operator is available only for arrays, item '%s' is not array.",
@@ -66,7 +66,7 @@ public function process(array $arr): array
 					$val = $tmp;
 				} else {
 					$tmp = $this->process([$val->value]);
-					if (is_string($tmp[0]) && strpos($tmp[0], '?') !== false) {
+					if (is_string($tmp[0]) && str_contains($tmp[0], '?')) {
 						trigger_error('Operator ? is deprecated in config files.', E_USER_DEPRECATED);
 					}
 					$val = new Statement($tmp[0], $this->process($val->attributes));
diff --git a/src/DI/Definitions/AccessorDefinition.php b/src/DI/Definitions/AccessorDefinition.php
@@ -69,7 +69,7 @@ public function setReference(string|Reference $reference): static
 		if ($reference instanceof Reference) {
 			$this->reference = $reference;
 		} else {
-			$this->reference = substr($reference, 0, 1) === '@'
+			$this->reference = str_starts_with($reference, '@')
 				? new Reference(substr($reference, 1))
 				: Reference::fromType($reference);
 		}
diff --git a/src/DI/Definitions/LocatorDefinition.php b/src/DI/Definitions/LocatorDefinition.php
@@ -61,7 +61,7 @@ public function setReferences(array $references): static
 	{
 		$this->references = [];
 		foreach ($references as $name => $ref) {
-			$this->references[$name] = substr($ref, 0, 1) === '@'
+			$this->references[$name] = str_starts_with($ref, '@')
 				? new Reference(substr($ref, 1))
 				: Reference::fromType($ref);
 		}
diff --git a/src/DI/Definitions/Reference.php b/src/DI/Definitions/Reference.php
@@ -26,7 +26,7 @@ final class Reference
 
 	public static function fromType(string $value): static
 	{
-		if (strpos($value, '\\') === false) {
+		if (!str_contains($value, '\\')) {
 			$value = '\\' . $value;
 		}
 		return new static($value);
@@ -47,13 +47,13 @@ public function getValue(): string
 
 	public function isName(): bool
 	{
-		return strpos($this->value, '\\') === false && $this->value !== self::SELF;
+		return !str_contains($this->value, '\\') && $this->value !== self::SELF;
 	}
 
 
 	public function isType(): bool
 	{
-		return strpos($this->value, '\\') !== false;
+		return str_contains($this->value, '\\');
 	}
 
 
diff --git a/src/DI/Definitions/Statement.php b/src/DI/Definitions/Statement.php
@@ -48,9 +48,9 @@ public function __construct(string|array|Definition|Reference|null $entity, arra
 		if (is_string($entity) && Strings::contains($entity, '::') && !Strings::contains($entity, '?')) {
 			$entity = explode('::', $entity, 2);
 		}
-		if (is_string($entity) && substr($entity, 0, 1) === '@') { // normalize @service to Reference
+		if (is_string($entity) && str_starts_with($entity, '@')) { // normalize @service to Reference
 			$entity = new Reference(substr($entity, 1));
-		} elseif (is_array($entity) && is_string($entity[0]) && substr($entity[0], 0, 1) === '@') {
+		} elseif (is_array($entity) && is_string($entity[0]) && str_starts_with($entity[0], '@')) {
 			$entity[0] = new Reference(substr($entity[0], 1));
 		}
 
diff --git a/src/DI/DependencyChecker.php b/src/DI/DependencyChecker.php
@@ -140,7 +140,7 @@ class_uses($name),
 
 		$flip = array_flip($classes);
 		foreach ($functions as $name) {
-			if (strpos($name, '::')) {
+			if (str_contains($name, '::')) {
 				$method = new ReflectionMethod($name);
 				$class = $method->getDeclaringClass();
 				if (isset($flip[$class->name])) {
diff --git a/src/DI/Extensions/InjectExtension.php b/src/DI/Extensions/InjectExtension.php
@@ -89,7 +89,7 @@ public static function getInjectMethods(string $class): array
 	{
 		$classes = [];
 		foreach (get_class_methods($class) as $name) {
-			if (substr($name, 0, 6) === 'inject') {
+			if (str_starts_with($name, 'inject')) {
 				$classes[$name] = (new \ReflectionMethod($class, $name))->getDeclaringClass()->name;
 			}
 		}
@@ -114,7 +114,7 @@ public static function getInjectProperties(string $class): array
 			if ($hasAttr || DI\Helpers::parseAnnotation($rp, 'inject') !== null) {
 				if ($type = Reflection::getPropertyType($rp)) {
 				} elseif (!$hasAttr && ($type = DI\Helpers::parseAnnotation($rp, 'var'))) {
-					if (strpos($type, '|') !== false) {
+					if (str_contains($type, '|')) {
 						throw new Nette\InvalidStateException(sprintf(
 							'The %s is not expected to have a union type.',
 							Reflection::toString($rp),
diff --git a/src/DI/Extensions/SearchExtension.php b/src/DI/Extensions/SearchExtension.php
@@ -139,7 +139,7 @@ private static function buildNameRegexp(array $masks): ?string
 	{
 		$res = [];
 		foreach ((array) $masks as $mask) {
-			$mask = (strpos($mask, '\\') === false ? '**\\' : '') . $mask;
+			$mask = (str_contains($mask, '\\') ? '' : '**\\') . $mask;
 			$mask = preg_quote($mask, '#');
 			$mask = str_replace('\*\*\\\\', '(.*\\\\)?', $mask);
 			$mask = str_replace('\\\\\*\*', '(\\\\.*)?', $mask);
diff --git a/src/DI/Extensions/ServicesExtension.php b/src/DI/Extensions/ServicesExtension.php
@@ -72,7 +72,7 @@ private function loadDefinition(?string $name, \stdClass $config): void
 
 		} catch (\Exception $e) {
 			$message = $e->getMessage();
-			if ($name && !Nette\Utils\Strings::startsWith($message, '[Service ')) {
+			if ($name && !str_starts_with($message, '[Service ')) {
 				$message = "[Service '$name']\n$message";
 			}
 			throw new Nette\DI\InvalidConfigurationException($message, 0, $e);
diff --git a/src/DI/PhpGenerator.php b/src/DI/PhpGenerator.php
@@ -126,7 +126,7 @@ public function formatStatement(Statement $statement): string
 				switch (true) {
 					case $entity[1][0] === '$': // property getter, setter or appender
 						$name = substr($entity[1], 1);
-						if ($append = (substr($name, -2) === '[]')) {
+						if ($append = (str_ends_with($name, '[]'))) {
 							$name = substr($name, 0, -2);
 						}
 						$prop = $entity[0] instanceof Reference
@@ -138,7 +138,7 @@ public function formatStatement(Statement $statement): string
 
 					case $entity[0] instanceof Statement:
 						$inner = $this->formatPhp('?', [$entity[0]]);
-						if (substr($inner, 0, 4) === 'new ') {
+						if (str_starts_with($inner, 'new ')) {
 							$inner = "($inner)";
 						}
 						return $this->formatPhp("$inner->?(...?)", [$entity[1], $arguments]);
diff --git a/src/DI/Resolver.php b/src/DI/Resolver.php
@@ -259,7 +259,7 @@ public function completeStatement(Statement $statement, bool $currentServiceAllo
 					case $entity[0] instanceof Reference:
 						if ($entity[1][0] === '$') { // property getter, setter or appender
 							Validators::assert($arguments, 'list:0..1', "setup arguments for '" . Nette\Utils\Callback::toString($entity) . "'");
-							if (!$arguments && substr($entity[1], -2) === '[]') {
+							if (!$arguments && str_ends_with($entity[1], '[]')) {
 								throw new ServiceCreationException(sprintf('Missing argument for %s.', $entity[1]));
 							}
 						} elseif (
@@ -287,7 +287,7 @@ public function completeStatement(Statement $statement, bool $currentServiceAllo
 			$arguments = $this->completeArguments($arguments);
 
 		} catch (ServiceCreationException $e) {
-			if (!strpos($e->getMessage(), "\nRelated to")) {
+			if (!str_contains($e->getMessage(), "\nRelated to")) {
 				if (is_string($entity)) {
 					$desc = $entity . '::__construct()';
 				} else {
@@ -432,7 +432,7 @@ public function addDependency(\ReflectionClass|\ReflectionFunctionAbstract|strin
 	private function completeException(\Exception $e, Definition $def): ServiceCreationException
 	{
 		$message = $e->getMessage();
-		if ($e instanceof ServiceCreationException && Strings::startsWith($message, '[Service ')) {
+		if ($e instanceof ServiceCreationException && str_starts_with($message, '[Service ')) {
 			return $e;
 		}
 
@@ -460,7 +460,7 @@ private function convertReferences(array $arguments): array
 					$val = new Statement([new Reference($pair[0]), '$' . $pair[1]]);
 				}
 
-			} elseif (is_string($val) && substr($val, 0, 2) === '@@') { // escaped text @@
+			} elseif (is_string($val) && str_starts_with($val, '@@')) { // escaped text @@
 				$val = substr($val, 1);
 			}
 		});

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ public function getInitialization(): Nette\PhpGenerator\Closure`
`137`	`137`	`*/`
`138`	`138`	`public function prefix(string $id): string`
`139`	`139`	`{`
`140`		`- return substr_replace($id, $this->name . '.', substr($id, 0, 1) === '@' ? 1 : 0, 0);`
	`140`	`+ return substr_replace($id, $this->name . '.', str_starts_with($id, '@') ? 1 : 0, 0);`
`141`	`141`	`}`
`142`	`142`
`143`	`143`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public function setReference(string\|Reference $reference): static`
`69`	`69`	`if ($reference instanceof Reference) {`
`70`	`70`	`$this->reference = $reference;`
`71`	`71`	`} else {`
`72`		`- $this->reference = substr($reference, 0, 1) === '@'`
	`72`	`+ $this->reference = str_starts_with($reference, '@')`
`73`	`73`	`? new Reference(substr($reference, 1))`
`74`	`74`	`: Reference::fromType($reference);`
`75`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public function setReferences(array $references): static`
`61`	`61`	`{`
`62`	`62`	`$this->references = [];`
`63`	`63`	`foreach ($references as $name => $ref) {`
`64`		`- $this->references[$name] = substr($ref, 0, 1) === '@'`
	`64`	`+ $this->references[$name] = str_starts_with($ref, '@')`
`65`	`65`	`? new Reference(substr($ref, 1))`
`66`	`66`	`: Reference::fromType($ref);`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ final class Reference`
`26`	`26`
`27`	`27`	`public static function fromType(string $value): static`
`28`	`28`	`{`
`29`		`- if (strpos($value, '\\') === false) {`
	`29`	`+ if (!str_contains($value, '\\')) {`
`30`	`30`	`$value = '\\' . $value;`
`31`	`31`	`}`
`32`	`32`	`return new static($value);`
`@@ -47,13 +47,13 @@ public function getValue(): string`
`47`	`47`
`48`	`48`	`public function isName(): bool`
`49`	`49`	`{`
`50`		`- return strpos($this->value, '\\') === false && $this->value !== self::SELF;`
	`50`	`+ return !str_contains($this->value, '\\') && $this->value !== self::SELF;`
`51`	`51`	`}`
`52`	`52`
`53`	`53`
`54`	`54`	`public function isType(): bool`
`55`	`55`	`{`
`56`		`- return strpos($this->value, '\\') !== false;`
	`56`	`+ return str_contains($this->value, '\\');`
`57`	`57`	`}`
`58`	`58`
`59`	`59`
Original file line number	Diff line number	Diff line change
`@@ -48,9 +48,9 @@ public function __construct(string\|array\|Definition\|Reference\|null $entity, arra`
`48`	`48`	`if (is_string($entity) && Strings::contains($entity, '::') && !Strings::contains($entity, '?')) {`
`49`	`49`	`$entity = explode('::', $entity, 2);`
`50`	`50`	`}`
`51`		`- if (is_string($entity) && substr($entity, 0, 1) === '@') { // normalize @service to Reference`
	`51`	`+ if (is_string($entity) && str_starts_with($entity, '@')) { // normalize @service to Reference`
`52`	`52`	`$entity = new Reference(substr($entity, 1));`
`53`		`- } elseif (is_array($entity) && is_string($entity[0]) && substr($entity[0], 0, 1) === '@') {`
	`53`	`+ } elseif (is_array($entity) && is_string($entity[0]) && str_starts_with($entity[0], '@')) {`
`54`	`54`	`$entity[0] = new Reference(substr($entity[0], 1));`
`55`	`55`	`}`
`56`	`56`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public static function getInjectMethods(string $class): array`
`89`	`89`	`{`
`90`	`90`	`$classes = [];`
`91`	`91`	`foreach (get_class_methods($class) as $name) {`
`92`		`- if (substr($name, 0, 6) === 'inject') {`
	`92`	`+ if (str_starts_with($name, 'inject')) {`
`93`	`93`	`$classes[$name] = (new \ReflectionMethod($class, $name))->getDeclaringClass()->name;`
`94`	`94`	`}`
`95`	`95`	`}`
`@@ -114,7 +114,7 @@ public static function getInjectProperties(string $class): array`
`114`	`114`	`if ($hasAttr \|\| DI\Helpers::parseAnnotation($rp, 'inject') !== null) {`
`115`	`115`	`if ($type = Reflection::getPropertyType($rp)) {`
`116`	`116`	`} elseif (!$hasAttr && ($type = DI\Helpers::parseAnnotation($rp, 'var'))) {`
`117`		`- if (strpos($type, '\|') !== false) {`
	`117`	`+ if (str_contains($type, '\|')) {`
`118`	`118`	`throw new Nette\InvalidStateException(sprintf(`
`119`	`119`	`'The %s is not expected to have a union type.',`
`120`	`120`	`Reflection::toString($rp),`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ private static function buildNameRegexp(array $masks): ?string`
`139`	`139`	`{`
`140`	`140`	`$res = [];`
`141`	`141`	`foreach ((array) $masks as $mask) {`
`142`		`- $mask = (strpos($mask, '\\') === false ? '**\\' : '') . $mask;`
	`142`	`+ $mask = (str_contains($mask, '\\') ? '' : '**\\') . $mask;`
`143`	`143`	`$mask = preg_quote($mask, '#');`
`144`	`144`	`$mask = str_replace('\\\\\\', '(.*\\\\)?', $mask);`
`145`	`145`	`$mask = str_replace('\\\\\\', '(\\\\.*)?', $mask);`