Merge branch '10.5' into 11.4

Author: sebastianbergmann

ChangeLog-11.4.md

@@ -4,6 +4,10 @@ All notable changes of the PHPUnit 11.4 release series are documented in this fi
 
 ## [11.4.1] - 2024-MM-DD
 
+### Changed
+
+* Updated regular expressions used by `StringMatchesFormatDescription` constraint to be consistent with PHP's `run-tests.php`
+
 ### Fixed
 
 * [#5977](https://github.com/sebastianbergmann/phpunit/pull/5977): TestDox result collector does not correctly handle baseline-ignored `E_DEPRECATED` issues

src/Framework/Constraint/String/StringMatchesFormatDescription.php

@@ -87,17 +87,18 @@ private function regularExpressionForFormatDescription(string $string): string
             preg_quote($string, '/'),
             [
                 '%%' => '%',
-                '%e' => '\\' . DIRECTORY_SEPARATOR,
+                '%e' => preg_quote(DIRECTORY_SEPARATOR, '/'),
                 '%s' => '[^\r\n]+',
                 '%S' => '[^\r\n]*',
-                '%a' => '.+',
-                '%A' => '.*',
+                '%a' => '.+?',
+                '%A' => '.*?',
                 '%w' => '\s*',
                 '%i' => '[+-]?\d+',
                 '%d' => '\d+',
                 '%x' => '[0-9a-fA-F]+',
-                '%f' => '[+-]?\.?\d+\.?\d*(?:[Ee][+-]?\d+)?',
+                '%f' => '[+-]?(?:\d+|(?=\.\d))(?:\.\d+)?(?:[Ee][+-]?\d+)?',
                 '%c' => '.',
+                '%0' => '\x00',
             ],
         );
 

tests/unit/Framework/Constraint/String/StringMatchesFormatDescriptionTest.php

@@ -141,12 +141,12 @@ public function testConstraintStringMatchesFloat(): void
         $this->assertFalse($constraint->evaluate('**', '', true));
         $this->assertFalse($constraint->evaluate('***', '', true));
         $this->assertFalse($constraint->evaluate('*a*', '', true));
+        $this->assertFalse($constraint->evaluate('*1.*', '', true));
 
         $this->assertTrue($constraint->evaluate('*1.0*', '', true));
         $this->assertTrue($constraint->evaluate('*0*', '', true));
         $this->assertTrue($constraint->evaluate('*12*', '', true));
         $this->assertTrue($constraint->evaluate('*.1*', '', true));
-        $this->assertTrue($constraint->evaluate('*1.*', '', true));
         $this->assertTrue($constraint->evaluate('*2e3*', '', true));
         $this->assertTrue($constraint->evaluate('*-2.34e-56*', '', true));
         $this->assertTrue($constraint->evaluate('*+2.34e+56*', '', true));