Merge branch '10.5' into 11.3

Author: sebastianbergmann

ChangeLog-11.3.md

@@ -9,6 +9,10 @@ All notable changes of the PHPUnit 11.3 release series are documented in this fi
 * [#5957](https://github.com/sebastianbergmann/phpunit/pull/5957): Skip data provider build when requirements are not satisfied
 * [#5969](https://github.com/sebastianbergmann/phpunit/pull/5969): Check for requirements before creating a separate process
 
+### Fixed
+
+* [#5965](https://github.com/sebastianbergmann/phpunit/issues/5965): `PHPUnit\Framework\Exception` does not handle string error codes (`PDOException` with error code `'HY000'`, for example)
+
 ## [11.3.6] - 2024-09-19
 
 ### Changed

src/Framework/Exception/Exception.php

@@ -11,6 +11,8 @@
 
 use function array_keys;
 use function get_object_vars;
+use function is_int;
+use function sprintf;
 use RuntimeException;
 use Throwable;
 
@@ -45,8 +47,20 @@ class Exception extends RuntimeException implements \PHPUnit\Exception
      */
     protected array $serializableTrace;
 
-    public function __construct(string $message = '', int $code = 0, ?Throwable $previous = null)
+    public function __construct(string $message = '', int|string $code = 0, ?Throwable $previous = null)
     {
+        /**
+         * @see https://github.com/sebastianbergmann/phpunit/issues/5965
+         */
+        if (!is_int($code)) {
+            $message .= sprintf(
+                ' (exception code: %s)',
+                $code,
+            );
+
+            $code = 0;
+        }
+
         parent::__construct($message, $code, $previous);
 
         $this->serializableTrace = $this->getTrace();

tests/end-to-end/regression/5965.phpt

@@ -0,0 +1,30 @@
+--TEST--
+https://github.com/sebastianbergmann/phpunit/issues/5965
+--FILE--
+<?php declare(strict_types=1);
+$_SERVER['argv'][] = '--do-not-cache-result';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--debug';
+$_SERVER['argv'][] = __DIR__ . '/5965/Issue5965Test.php';
+
+require_once __DIR__ . '/../../bootstrap.php';
+
+(new PHPUnit\TextUI\Application)->run($_SERVER['argv']);
+--EXPECTF--
+PHPUnit Started (PHPUnit %s using %s)
+Test Runner Configured
+Test Suite Loaded (1 test)
+Event Facade Sealed
+Test Runner Started
+Test Suite Sorted
+Test Runner Execution Started (1 test)
+Test Suite Started (PHPUnit\TestFixture\Issue5891\Issue5965Test, 1 test)
+Test Preparation Started (PHPUnit\TestFixture\Issue5891\Issue5965Test::testOne)
+Test Prepared (PHPUnit\TestFixture\Issue5891\Issue5965Test::testOne)
+Test Errored (PHPUnit\TestFixture\Issue5891\Issue5965Test::testOne)
+(exception code: HY000)
+Test Finished (PHPUnit\TestFixture\Issue5891\Issue5965Test::testOne)
+Test Suite Finished (PHPUnit\TestFixture\Issue5891\Issue5965Test, 1 test)
+Test Runner Execution Finished
+Test Runner Finished
+PHPUnit Finished (Shell Exit Code: 2)

tests/end-to-end/regression/5965/Issue5965Test.php

@@ -0,0 +1,49 @@
+<?php declare(strict_types=1);
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace PHPUnit\TestFixture\Issue5891;
+
+use IteratorAggregate;
+use PDOException;
+use PHPUnit\Framework\Attributes\RequiresPhpExtension;
+use PHPUnit\Framework\TestCase;
+use ReflectionClass;
+use Traversable;
+
+#[RequiresPhpExtension('pdo')]
+final class Issue5965Test extends TestCase
+{
+    public function testOne(): void
+    {
+        $exception = new PDOException;
+        $reflector = new ReflectionClass($exception);
+
+        $property = $reflector->getProperty('code');
+        $property->setValue($exception, 'HY000');
+
+        $this->assertIsString($exception->getCode());
+
+        $iterator = new class($exception) implements IteratorAggregate
+        {
+            public PDOException $exception;
+
+            public function __construct($exception)
+            {
+                $this->exception = $exception;
+            }
+
+            public function getIterator(): Traversable
+            {
+                throw $this->exception;
+            }
+        };
+
+        $this->assertCount(0, $iterator);
+    }
+}