Handle PCRE failures when attempting to trim body

minkphp · Jun 12, 2023 · e67a46e · e67a46e
1 parent d57832a
commit e67a46e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -10,11 +10,6 @@ parameters:
 			count: 1
 			path: src/Element/NodeElement.php
 
-		-
-			message: "#^Method Behat\\\\Mink\\\\Exception\\\\ExpectationException\\:\\:trimBody\\(\\) should return string but returns string\\|null\\.$#"
-			count: 1
-			path: src/Exception/ExpectationException.php
-
 		-
 			message: "#^Cannot cast array\\|bool\\|string\\|null to string\\.$#"
 			count: 2

diff --git a/src/Exception/ExpectationException.php b/src/Exception/ExpectationException.php
@@ -135,7 +135,7 @@ protected function pipeString($string)
      */
     protected function trimBody($string)
     {
-        $string = preg_replace(array('/^.*<body>/s', '/<\/body>.*$/s'), array('<body>', '</body>'), $string);
+        $string = preg_replace(array('/^.*<body>/s', '/<\/body>.*$/s'), array('<body>', '</body>'), $string) ?? $string;
 
         return $string;
     }