Fix testing functions with return types

Author: nicolas-grekas

src/Php80/bootstrap.php

@@ -17,7 +17,7 @@ function fdiv(float $dividend, float $divisor): float { return p\Php80::fdiv($di
     }
 
     if (!function_exists('preg_last_error_msg')) {
-        function preg_last_error_msg() { return p\Php80::preg_last_error_msg(); }
+        function preg_last_error_msg(): string { return p\Php80::preg_last_error_msg(); }
     }
 
     if (!defined('FILTER_VALIDATE_BOOL') && defined('FILTER_VALIDATE_BOOLEAN')) {

src/Util/TestListenerTrait.php

@@ -65,7 +65,7 @@ public function startTestSuite($mainSuite)
             $bootstrap->rewind();
 
             foreach (new \RegexIterator($bootstrap, '/return p\\\\'.$testedClass->getShortName().'::/') as $defLine) {
-                if (!preg_match('/^\s*function (?P<name>[^\(]++)(?P<signature>\(.*\)) \{ (?<return>return p\\\\'.$testedClass->getShortName().'::[^\(]++)(?P<args>\([^\)]*+\)); \}$/', $defLine, $f)) {
+                if (!preg_match('/^\s*function (?P<name>[^\(]++)(?P<signature>\(.*\)(?: ?: [^ ]++)?) \{ (?<return>return p\\\\'.$testedClass->getShortName().'::[^\(]++)(?P<args>\([^\)]*+\)); \}$/', $defLine, $f)) {
                     $warnings[] = TestListener::warning('Invalid line in bootstrap.php: '.trim($defLine));
                     continue;
                 }

tests/Php80/Php80Test.php

@@ -59,15 +59,15 @@ public function testFilterValidateBool()
     }
 
     /**
-     * @covers \Symfony\Polyfill\Php80\Php80::pregLastErrorMsg
+     * @covers \Symfony\Polyfill\Php80\Php80::preg_last_error_msg
      */
     public function testPregNoError()
     {
         $this->assertSame('No error', preg_last_error_msg());
     }
 
     /**
-     * @covers \Symfony\Polyfill\Php80\Php80::pregLastErrorMsg
+     * @covers \Symfony\Polyfill\Php80\Php80::preg_last_error_msg
      */
     public function testPregMalformedUtfError()
     {
@@ -76,7 +76,7 @@ public function testPregMalformedUtfError()
     }
 
     /**
-     * @covers \Symfony\Polyfill\Php80\Php80::pregLastErrorMsg
+     * @covers \Symfony\Polyfill\Php80\Php80::preg_last_error_msg
      */
     public function testPregMalformedUtf8Offset()
     {