Merge branch '7.3' into 7.4

nicolas-grekas · nicolas-grekas · commit 36d8d5d464b3 · 2025-07-10T10:49:53.000+02:00
* 7.3:
  -
  -
  -
  CS fixes
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -4,5 +4,7 @@ f4118e110a46de3ffb799e7d79bf15128d1646ea
 ae0a783425b80b78376488619bf9106e69193fa4
 9c1e36257c4df0929179462d6b2bdd00453ac8aa
 6ae74d38e3d20d0ffcc66c7c3d28767fab76bdfb
-# Prefix all sprintf() calls
 6ce530c5e90397d88e3a76a56db266c74d651584
+77bd236b8da064c90b19b84a35becfb3e43348db
+d0bc10e7432901098fe50bcccad53f487978c33d
+2e0c0d39bdc99712cc40b8a5b77e267150a92509
diff --git a/src/Symfony/Component/Emoji/Resources/bin/build.php b/src/Symfony/Component/Emoji/Resources/bin/build.php
@@ -48,7 +48,7 @@ public static function getEmojisCodePoints(): array
             // 263A FE0F    ; fully-qualified     # ☺️ E0.6 smiling face
             preg_match('{^(?<codePoints>[\w ]+) +; [\w-]+ +# (?<emoji>.+) E\d+\.\d+ ?(?<name>.+)$}Uu', $line, $matches);
             if (!$matches) {
-                throw new \DomainException("Could not parse line: \"$line\".");
+                throw new DomainException("Could not parse line: \"$line\".");
             }
 
             $codePoints = str_replace(' ', '-', trim($matches['codePoints']));
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/Node/GetAttrNodeTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/Node/GetAttrNodeTest.php
@@ -11,11 +11,11 @@
 
 namespace Symfony\Component\ExpressionLanguage\Tests\Node;
 
+use Symfony\Component\ExpressionLanguage\Node\ArgumentsNode;
 use Symfony\Component\ExpressionLanguage\Node\ArrayNode;
 use Symfony\Component\ExpressionLanguage\Node\ConstantNode;
 use Symfony\Component\ExpressionLanguage\Node\GetAttrNode;
 use Symfony\Component\ExpressionLanguage\Node\NameNode;
-use Symfony\Component\ExpressionLanguage\Node\ArgumentsNode;
 
 class GetAttrNodeTest extends AbstractNodeTestCase
 {
diff --git a/src/Symfony/Component/ObjectMapper/ObjectMapper.php b/src/Symfony/Component/ObjectMapper/ObjectMapper.php
@@ -178,7 +178,7 @@ private function getRawValue(object $source, string $propertyName): mixed
         }
 
         if (!property_exists($source, $propertyName) && !isset($source->{$propertyName})) {
-            throw new NoSuchPropertyException(sprintf('The property "%s" does not exist on "%s".', $propertyName, get_debug_type($source)));
+            throw new NoSuchPropertyException(\sprintf('The property "%s" does not exist on "%s".', $propertyName, get_debug_type($source)));
         }
 
         return $source->{$propertyName};

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public static function getEmojisCodePoints(): array`
`48`	`48`	`// 263A FE0F ; fully-qualified # ☺️ E0.6 smiling face`
`49`	`49`	`preg_match('{^(?<codePoints>[\w ]+) +; [\w-]+ +# (?<emoji>.+) E\d+\.\d+ ?(?<name>.+)$}Uu', $line, $matches);`
`50`	`50`	`if (!$matches) {`
`51`		`- throw new \DomainException("Could not parse line: \"$line\".");`
	`51`	`+ throw new DomainException("Could not parse line: \"$line\".");`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`$codePoints = str_replace(' ', '-', trim($matches['codePoints']));`
Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ private function getRawValue(object $source, string $propertyName): mixed`
`178`	`178`	`}`
`179`	`179`
`180`	`180`	`if (!property_exists($source, $propertyName) && !isset($source->{$propertyName})) {`
`181`		`- throw new NoSuchPropertyException(sprintf('The property "%s" does not exist on "%s".', $propertyName, get_debug_type($source)));`
	`181`	`+ throw new NoSuchPropertyException(\sprintf('The property "%s" does not exist on "%s".', $propertyName, get_debug_type($source)));`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`return $source->{$propertyName};`