Merge branch '5.0'

nicolas-grekas · nicolas-grekas · commit 8e69795bd8c8 · 2020-03-12T18:11:13.000+01:00
* 5.0: (36 commits) Add test for tagged iterator with numeric index Fix container lint command when a synthetic service is used in combination with the expression language Fix Travis script [Validator][Range] Fix typos [SecurityBundle] Minor fix in LDAP config tree builder [HttpClient] fix requests to hosts that idn_to_ascii() cannot handle Revert "minor symfony#35559 [FrameworkBundle] remove mention of the old Controller class (nicolas-grekas)" [FrameworkBundle] remove redundant PHPDoc in console Descriptor and subclass [Mime] remove phpdoc mentioning Utf8AddressEncoder Add missing phpdoc Remove int return type from FlattenException::getCode [Yaml] fix dumping strings containing CRs [DI] Fix XmlFileLoader bad error message [Form] Handle false as empty value on expanded choices [Messenger] Add ext-redis min version req to tests Tweak message improve PlaintextPasswordEncoder docBlock summary [Validator] Add two missing translations for the Arabic (ar) locale Use some PHP 5.4 constants unconditionally Add new packages on the link script ...
diff --git a/Exception/FlattenException.php b/Exception/FlattenException.php
@@ -210,7 +210,10 @@ public function setMessage($message): self
         return $this;
     }
 
-    public function getCode(): int
+    /**
+     * @return int|string int most of the time (might be a string with PDOException)
+     */
+    public function getCode()
     {
         return $this->code;
     }
diff --git a/Tests/Exception/FlattenExceptionTest.php b/Tests/Exception/FlattenExceptionTest.php
@@ -13,6 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\ErrorHandler\Exception\FlattenException;
+use Symfony\Component\ErrorHandler\Tests\Fixtures\StringErrorCodeException;
 use Symfony\Component\HttpFoundation\Exception\SuspiciousOperationException;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
@@ -183,6 +184,15 @@ public function testFile(\Throwable $exception)
         $this->assertSame($exception->getFile(), $flattened->getFile());
     }
 
+    /**
+     * @dataProvider stringAndIntDataProvider
+     */
+    public function testCode(\Throwable $exception)
+    {
+        $flattened = FlattenException::createFromThrowable($exception);
+        $this->assertSame($exception->getCode(), $flattened->getCode());
+    }
+
     /**
      * @dataProvider flattenDataProvider
      */
@@ -224,6 +234,14 @@ public function flattenDataProvider(): array
         ];
     }
 
+    public function stringAndIntDataProvider(): array
+    {
+        return [
+            [new \Exception('test1', 123)],
+            [new StringErrorCodeException('test2', '42S02')],
+        ];
+    }
+
     public function testArguments()
     {
         if (\PHP_VERSION_ID >= 70400) {
diff --git a/Tests/Fixtures/StringErrorCodeException.php b/Tests/Fixtures/StringErrorCodeException.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Symfony\Component\ErrorHandler\Tests\Fixtures;
+
+class StringErrorCodeException extends \Exception
+{
+
+    public function __construct(string $message, string $code) {
+        parent::__construct($message);
+        $this->code = $code;
+    }
+
+}

Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,10 @@ public function setMessage($message): self`
`210`	`210`	`return $this;`
`211`	`211`	`}`
`212`	`212`
`213`		`- public function getCode(): int`
	`213`	`+ /**`
	`214`	`+ * @return int\|string int most of the time (might be a string with PDOException)`
	`215`	`+ */`
	`216`	`+ public function getCode()`
`214`	`217`	`{`
`215`	`218`	`return $this->code;`
`216`	`219`	`}`