Use str_starts_with()/str_ends_with() instead of substr()

phpstan · Apr 16, 2024 · 01b1c59 · 01b1c59
1 parent ad7551c
commit 01b1c59
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/src/File/FileHelper.php b/src/File/FileHelper.php
@@ -9,6 +9,7 @@
 use function ltrim;
 use function preg_match;
 use function rtrim;
+use function str_ends_with;
 use function str_replace;
 use function str_starts_with;
 use function strlen;
@@ -36,14 +37,13 @@ public function getWorkingDirectory(): string
 	public function absolutizePath(string $path): string
 	{
 		if (DIRECTORY_SEPARATOR === '/') {
-			if (substr($path, 0, 1) === '/') {
-				return $path;
-			}
-		} else {
-			if (substr($path, 1, 1) === ':') {
+			if (str_starts_with($path, '/')) {
 				return $path;
 			}
+		} elseif (substr($path, 1, 1) === ':') {
+			return $path;
 		}
+
 		if (preg_match('~^[a-z0-9+\-.]+://~i', $path) === 1) {
 			return $path;
 		}
@@ -87,12 +87,10 @@ public function normalizePath(string $originalPath, string $directorySeparator =
 				continue;
 			}
 			if ($pathPart === '..') {
-				/** @var string $removedPart */
 				$removedPart = array_pop($normalizedPathParts);
-				if ($scheme === 'phar' && substr($removedPart, -5) === '.phar') {
+				if ($scheme === 'phar' && $removedPart !== null && str_ends_with($removedPart, '.phar')) {
 					$scheme = null;
 				}
-
 			} else {
 				$normalizedPathParts[] = $pathPart;
 			}

diff --git a/src/File/FuzzyRelativePathHelper.php b/src/File/FuzzyRelativePathHelper.php
@@ -40,7 +40,7 @@ public function __construct(
 		$pathBeginning = null;
 		$pathToTrimArray = null;
 		$trimBeginning = static function (string $path): array {
-			if (substr($path, 0, 1) === '/') {
+			if (str_starts_with($path, '/')) {
 				return [
 					'/',
 					substr($path, 1),

diff --git a/src/Type/IntersectionType.php b/src/Type/IntersectionType.php
@@ -34,6 +34,7 @@
 use function array_intersect_key;
 use function array_map;
 use function array_shift;
+use function str_starts_with;
 use function array_unique;
 use function array_values;
 use function count;
@@ -388,7 +389,7 @@ private function describeItself(VerbosityLevel $level, bool $skipAccessoryTypes)
 			}
 
 			if (
-				substr($typeDescription, 0, strlen('array<')) === 'array<'
+				str_starts_with($typeDescription, 'array<')
 				&& in_array('array', $skipTypeNames, true)
 			) {
 				$nonEmpty = false;