[ErrorHandler][Debug] Do not use the php80 polyfill

nicolas-grekas · nicolas-grekas · commit 2f9160e92eb6 · 2021-07-22T09:21:39.000+02:00
diff --git a/DebugClassLoader.php b/DebugClassLoader.php
@@ -61,7 +61,7 @@ public function __construct(callable $classLoader)
             if (false === $test || false === $i) {
                 // filesystem is case sensitive
                 self::$caseCheck = 0;
-            } elseif (str_ends_with($test, $file)) {
+            } elseif (substr($test, -\strlen($file)) === $file) {
                 // filesystem is case insensitive and realpath() normalizes the case of characters
                 self::$caseCheck = 1;
             } elseif (false !== stripos(\PHP_OS, 'darwin')) {
@@ -210,7 +210,7 @@ private function checkClass(string $class, string $file = null)
         }
 
         if (!$exists) {
-            if (str_contains($class, '/')) {
+            if (false !== strpos($class, '/')) {
                 throw new \RuntimeException(sprintf('Trying to autoload a class with an invalid name "%s". Be careful that the namespace separator is "\" in PHP, not "/".', $class));
             }
 
@@ -237,17 +237,17 @@ public function checkAnnotations(\ReflectionClass $refl, $class)
         // Detect annotations on the class
         if (false !== $doc = $refl->getDocComment()) {
             foreach (['final', 'deprecated', 'internal'] as $annotation) {
-                if (str_contains($doc, $annotation) && preg_match('#\n\s+\* @'.$annotation.'(?:( .+?)\.?)?\r?\n\s+\*(?: @|/$|\r?\n)#s', $doc, $notice)) {
+                if (false !== strpos($doc, $annotation) && preg_match('#\n\s+\* @'.$annotation.'(?:( .+?)\.?)?\r?\n\s+\*(?: @|/$|\r?\n)#s', $doc, $notice)) {
                     self::${$annotation}[$class] = isset($notice[1]) ? preg_replace('#\.?\r?\n( \*)? *(?= |\r?\n|$)#', '', $notice[1]) : '';
                 }
             }
 
-            if ($refl->isInterface() && str_contains($doc, 'method') && preg_match_all('#\n \* @method\s+(static\s+)?+(?:[\w\|&\[\]\\\]+\s+)?(\w+(?:\s*\([^\)]*\))?)+(.+?([[:punct:]]\s*)?)?(?=\r?\n \*(?: @|/$|\r?\n))#', $doc, $notice, \PREG_SET_ORDER)) {
+            if ($refl->isInterface() && false !== strpos($doc, 'method') && preg_match_all('#\n \* @method\s+(static\s+)?+(?:[\w\|&\[\]\\\]+\s+)?(\w+(?:\s*\([^\)]*\))?)+(.+?([[:punct:]]\s*)?)?(?=\r?\n \*(?: @|/$|\r?\n))#', $doc, $notice, \PREG_SET_ORDER)) {
                 foreach ($notice as $method) {
                     $static = '' !== $method[1];
                     $name = $method[2];
                     $description = $method[3] ?? null;
-                    if (!str_contains($name, '(')) {
+                    if (false === strpos($name, '(')) {
                         $name .= '()';
                     }
                     if (null !== $description) {
@@ -369,14 +369,14 @@ public function checkAnnotations(\ReflectionClass $refl, $class)
             $finalOrInternal = false;
 
             foreach (['final', 'internal'] as $annotation) {
-                if (str_contains($doc, $annotation) && preg_match('#\n\s+\* @'.$annotation.'(?:( .+?)\.?)?\r?\n\s+\*(?: @|/$|\r?\n)#s', $doc, $notice)) {
+                if (false !== strpos($doc, $annotation) && preg_match('#\n\s+\* @'.$annotation.'(?:( .+?)\.?)?\r?\n\s+\*(?: @|/$|\r?\n)#s', $doc, $notice)) {
                     $message = isset($notice[1]) ? preg_replace('#\.?\r?\n( \*)? *(?= |\r?\n|$)#', '', $notice[1]) : '';
                     self::${$annotation.'Methods'}[$class][$method->name] = [$class, $message];
                     $finalOrInternal = true;
                 }
             }
 
-            if ($finalOrInternal || $method->isConstructor() || !str_contains($doc, '@param') || StatelessInvocation::class === $class) {
+            if ($finalOrInternal || $method->isConstructor() || false === strpos($doc, '@param') || StatelessInvocation::class === $class) {
                 continue;
             }
             if (!preg_match_all('#\n\s+\* @param +((?(?!callable *\().*?|callable *\(.*\).*?))(?<= )\$([a-zA-Z0-9_\x7f-\xff]++)#', $doc, $matches, \PREG_SET_ORDER)) {
diff --git a/ErrorHandler.php b/ErrorHandler.php
@@ -385,7 +385,7 @@ private function reRegister(int $prev)
      */
     public function handleError($type, $message, $file, $line)
     {
-        if (\PHP_VERSION_ID >= 70300 && \E_WARNING === $type && '"' === $message[0] && str_contains($message, '" targeting switch is equivalent to "break')) {
+        if (\PHP_VERSION_ID >= 70300 && \E_WARNING === $type && '"' === $message[0] && false !== strpos($message, '" targeting switch is equivalent to "break')) {
             $type = \E_DEPRECATED;
         }
 
@@ -403,7 +403,7 @@ public function handleError($type, $message, $file, $line)
         }
         $scope = $this->scopedErrors & $type;
 
-        if (str_contains($message, "@anonymous\0")) {
+        if (false !== strpos($message, "@anonymous\0")) {
             $logMessage = $this->levels[$type].': '.(new FlattenException())->setMessage($message)->getMessage();
         } else {
             $logMessage = $this->levels[$type].': '.$message;
@@ -530,7 +530,7 @@ public function handleException($exception, array $error = null)
         $handlerException = null;
 
         if (($this->loggedErrors & $type) || $exception instanceof FatalThrowableError) {
-            if (str_contains($message = $exception->getMessage(), "@anonymous\0")) {
+            if (false !== strpos($message = $exception->getMessage(), "@anonymous\0")) {
                 $message = (new FlattenException())->setMessage($message)->getMessage();
             }
             if ($exception instanceof FatalErrorException) {
@@ -638,7 +638,7 @@ public static function handleFatalError(array $error = null)
             $handler->throwAt(0, true);
             $trace = $error['backtrace'] ?? null;
 
-            if (str_starts_with($error['message'], 'Allowed memory') || str_starts_with($error['message'], 'Out of memory')) {
+            if (0 === strpos($error['message'], 'Allowed memory') || 0 === strpos($error['message'], 'Out of memory')) {
                 $exception = new OutOfMemoryException($handler->levels[$error['type']].': '.$error['message'], 0, $error['type'], $error['file'], $error['line'], 2, false, $trace);
             } else {
                 $exception = new FatalErrorException($handler->levels[$error['type']].': '.$error['message'], 0, $error['type'], $error['file'], $error['line'], 2, true, $trace);
diff --git a/Exception/FatalThrowableError.php b/Exception/FatalThrowableError.php
@@ -26,7 +26,7 @@ class FatalThrowableError extends FatalErrorException
 
     public function __construct(\Throwable $e)
     {
-        $this->originalClassName = get_debug_type($e);
+        $this->originalClassName = \get_class($e);
 
         if ($e instanceof \ParseError) {
             $severity = \E_PARSE;
diff --git a/Exception/FlattenException.php b/Exception/FlattenException.php
@@ -67,7 +67,7 @@ public static function createFromThrowable(\Throwable $exception, int $statusCod
         $e->setStatusCode($statusCode);
         $e->setHeaders($headers);
         $e->setTraceFromThrowable($exception);
-        $e->setClass($exception instanceof FatalThrowableError ? $exception->getOriginalClassName() : get_debug_type($exception));
+        $e->setClass($exception instanceof FatalThrowableError ? $exception->getOriginalClassName() : \get_class($exception));
         $e->setFile($exception->getFile());
         $e->setLine($exception->getLine());
 
@@ -134,7 +134,7 @@ public function getClass()
      */
     public function setClass($class)
     {
-        $this->class = str_contains($class, "@anonymous\0") ? (get_parent_class($class) ?: key(class_implements($class)) ?: 'class').'@anonymous' : $class;
+        $this->class = false !== strpos($class, "@anonymous\0") ? (get_parent_class($class) ?: key(class_implements($class)) ?: 'class').'@anonymous' : $class;
 
         return $this;
     }
@@ -179,7 +179,7 @@ public function getMessage()
      */
     public function setMessage($message)
     {
-        if (str_contains($message, "@anonymous\0")) {
+        if (false !== strpos($message, "@anonymous\0")) {
             $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];
             }, $message);
diff --git a/ExceptionHandler.php b/ExceptionHandler.php
@@ -401,7 +401,7 @@ private function formatPath(string $path, int $line): string
             $fmt = [substr($f, 0, $i)] + preg_split('/&([^>]++)>/', substr($f, $i), -1, \PREG_SPLIT_DELIM_CAPTURE);
 
             for ($i = 1; isset($fmt[$i]); ++$i) {
-                if (str_starts_with($path, $k = $fmt[$i++])) {
+                if (0 === strpos($path, $k = $fmt[$i++])) {
                     $path = substr_replace($path, $fmt[$i], 0, \strlen($k));
                     break;
                 }
diff --git a/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php b/FatalErrorHandler/ClassNotFoundFatalErrorHandler.php
@@ -149,7 +149,7 @@ private function convertFileToClass(string $path, string $file, string $prefix):
         ];
 
         if ($prefix) {
-            $candidates = array_filter($candidates, function ($candidate) use ($prefix) { return str_starts_with($candidate, $prefix); });
+            $candidates = array_filter($candidates, function ($candidate) use ($prefix) { return 0 === strpos($candidate, $prefix); });
         }
 
         // We cannot use the autoloader here as most of them use require; but if the class
diff --git a/FatalErrorHandler/UndefinedFunctionFatalErrorHandler.php b/FatalErrorHandler/UndefinedFunctionFatalErrorHandler.php
@@ -43,7 +43,7 @@ public function handleError(array $error, FatalErrorException $exception)
 
         $prefix = 'Call to undefined function ';
         $prefixLen = \strlen($prefix);
-        if (!str_starts_with($error['message'], $prefix)) {
+        if (0 !== strpos($error['message'], $prefix)) {
             return null;
         }
 
diff --git a/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php b/FatalErrorHandler/UndefinedMethodFatalErrorHandler.php
@@ -48,7 +48,7 @@ public function handleError(array $error, FatalErrorException $exception)
         $candidates = [];
         foreach ($methods as $definedMethodName) {
             $lev = levenshtein($methodName, $definedMethodName);
-            if ($lev <= \strlen($methodName) / 3 || str_contains($definedMethodName, $methodName)) {
+            if ($lev <= \strlen($methodName) / 3 || false !== strpos($definedMethodName, $methodName)) {
                 $candidates[] = $definedMethodName;
             }
         }
diff --git a/composer.json b/composer.json
@@ -17,8 +17,7 @@
     ],
     "require": {
         "php": ">=7.1.3",
-        "psr/log": "^1|^2|^3",
-        "symfony/polyfill-php80": "^1.16"
+        "psr/log": "^1|^2|^3"
     },
     "conflict": {
         "symfony/http-kernel": "<3.4"

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class FatalThrowableError extends FatalErrorException`
`26`	`26`
`27`	`27`	`public function __construct(\Throwable $e)`
`28`	`28`	`{`
`29`		`- $this->originalClassName = get_debug_type($e);`
	`29`	`+ $this->originalClassName = \get_class($e);`
`30`	`30`
`31`	`31`	`if ($e instanceof \ParseError) {`
`32`	`32`	`$severity = \E_PARSE;`
Original file line number	Diff line number	Diff line change
`@@ -401,7 +401,7 @@ private function formatPath(string $path, int $line): string`
`401`	`401`	`$fmt = [substr($f, 0, $i)] + preg_split('/&([^>]++)>/', substr($f, $i), -1, \PREG_SPLIT_DELIM_CAPTURE);`
`402`	`402`
`403`	`403`	`for ($i = 1; isset($fmt[$i]); ++$i) {`
`404`		`- if (str_starts_with($path, $k = $fmt[$i++])) {`
	`404`	`+ if (0 === strpos($path, $k = $fmt[$i++])) {`
`405`	`405`	`$path = substr_replace($path, $fmt[$i], 0, \strlen($k));`
`406`	`406`	`break;`
`407`	`407`	`}`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ private function convertFileToClass(string $path, string $file, string $prefix):`
`149`	`149`	`];`
`150`	`150`
`151`	`151`	`if ($prefix) {`
`152`		`- $candidates = array_filter($candidates, function ($candidate) use ($prefix) { return str_starts_with($candidate, $prefix); });`
	`152`	`+ $candidates = array_filter($candidates, function ($candidate) use ($prefix) { return 0 === strpos($candidate, $prefix); });`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`// We cannot use the autoloader here as most of them use require; but if the class`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public function handleError(array $error, FatalErrorException $exception)`
`43`	`43`
`44`	`44`	`$prefix = 'Call to undefined function ';`
`45`	`45`	`$prefixLen = \strlen($prefix);`
`46`		`- if (!str_starts_with($error['message'], $prefix)) {`
	`46`	`+ if (0 !== strpos($error['message'], $prefix)) {`
`47`	`47`	`return null;`
`48`	`48`	`}`
`49`	`49`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public function handleError(array $error, FatalErrorException $exception)`
`48`	`48`	`$candidates = [];`
`49`	`49`	`foreach ($methods as $definedMethodName) {`
`50`	`50`	`$lev = levenshtein($methodName, $definedMethodName);`
`51`		`- if ($lev <= \strlen($methodName) / 3 \|\| str_contains($definedMethodName, $methodName)) {`
	`51`	`+ if ($lev <= \strlen($methodName) / 3 \|\| false !== strpos($definedMethodName, $methodName)) {`
`52`	`52`	`$candidates[] = $definedMethodName;`
`53`	`53`	`}`
`54`	`54`	`}`