Merge branch '6.4' into 7.2

xabbuh · xabbuh · commit 56820ede58c9 · 2025-02-24T11:49:57.000+01:00
* 6.4:
  skip failing Semaphore component tests on GitHub Actions with PHP 8.5
  Update GetSetMethodNormalizer.php
  [Stopwatch] Fix StopWatchEvent never throws InvalidArgumentException
diff --git a/src/Symfony/Component/Semaphore/Tests/Store/RelayStoreTest.php b/src/Symfony/Component/Semaphore/Tests/Store/RelayStoreTest.php
@@ -25,6 +25,10 @@ protected function setUp(): void
 
     public static function setUpBeforeClass(): void
     {
+        if (\PHP_VERSION_ID <= 80500 && isset($_SERVER['GITHUB_ACTIONS'])) {
+            self::markTestSkipped('Test segfaults on PHP 8.5');
+        }
+
         try {
             new Relay(...explode(':', getenv('REDIS_HOST')));
         } catch (\Relay\Exception $e) {
diff --git a/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
@@ -100,6 +100,7 @@ private function isSetMethod(\ReflectionMethod $method): bool
         return !$method->isStatic()
             && !$method->getAttributes(Ignore::class)
             && 0 < $method->getNumberOfParameters()
+            && 3 < \strlen($method->name)
             && str_starts_with($method->name, 'set')
             && !ctype_lower($method->name[3])
             ;
diff --git a/src/Symfony/Component/Stopwatch/StopwatchEvent.php b/src/Symfony/Component/Stopwatch/StopwatchEvent.php
@@ -38,8 +38,6 @@ class StopwatchEvent
      * @param string|null $category      The event category or null to use the default
      * @param bool        $morePrecision If true, time is stored as float to keep the original microsecond precision
      * @param string|null $name          The event name or null to define the name as default
-     *
-     * @throws \InvalidArgumentException When the raw time is not valid
      */
     public function __construct(
         float $origin,
@@ -219,8 +217,6 @@ protected function getNow(): float
 
     /**
      * Formats a time.
-     *
-     * @throws \InvalidArgumentException When the raw time is not valid
      */
     private function formatTime(float $time): float
     {

Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,7 @@ private function isSetMethod(\ReflectionMethod $method): bool`
`100`	`100`	`return !$method->isStatic()`
`101`	`101`	`&& !$method->getAttributes(Ignore::class)`
`102`	`102`	`&& 0 < $method->getNumberOfParameters()`
	`103`	`+ && 3 < \strlen($method->name)`
`103`	`104`	`&& str_starts_with($method->name, 'set')`
`104`	`105`	`&& !ctype_lower($method->name[3])`
`105`	`106`	`;`