Merge branch '6.0' into 6.1

* 6.0: [Serializer] Fix AbstractObjectNormalizer not considering pseudo type false [Serializer] Fix JsonSerializableNormalizer ignores circular reference handler in $context [Serializer][PropertyInfo] Fix support for "false" built-in type on PHP 8.2 [ErrorHandler] Fix list of tentative return types Fix CS in Console Table after symfony#45565 Suppress unhandled error in some specific use-cases. fix italian translation for validators

Author: nicolas-grekas

src/Symfony/Component/Console/Command/DumpCompletionCommand.php

@@ -43,7 +43,7 @@ protected function configure()
  {
  $fullCommand = $_SERVER['PHP_SELF'];
  $commandName = basename($fullCommand);
- $fullCommand = realpath($fullCommand) ?: $fullCommand;
+ $fullCommand = @realpath($fullCommand) ?: $fullCommand;
 
  $shell = $this->guessShell();
  [$rcFile, $completionFile] = match ($shell) {

src/Symfony/Component/Console/Helper/Table.php

@@ -790,18 +790,18 @@ private function calculateColumnsWidth(iterable $groups)
  continue;
  }
 
- foreach ($row as $i => $cell) {
- if ($cell instanceof TableCell) {
- $textContent = Helper::removeDecoration($this->output->getFormatter(), $cell);
- $textLength = Helper::width($textContent);
- if ($textLength > 0) {
- $contentColumns = str_split($textContent, ceil($textLength / $cell->getColspan()));
- foreach ($contentColumns as $position => $content) {
- $row[$i + $position] = $content;
+ foreach ($row as $i => $cell) {
+ if ($cell instanceof TableCell) {
+ $textContent = Helper::removeDecoration($this->output->getFormatter(), $cell);
+ $textLength = Helper::width($textContent);
+ if ($textLength > 0) {
+ $contentColumns = str_split($textContent, ceil($textLength / $cell->getColspan()));
+ foreach ($contentColumns as $position => $content) {
+ $row[$i + $position] = $content;
+ }
  }
  }
  }
- }
 
  $lengths[] = $this->getCellWidth($row, $column);
  }

src/Symfony/Component/ErrorHandler/Internal/TentativeTypes.php

@@ -1102,6 +1102,8 @@ class TentativeTypes
  'isDot' => 'bool',
  'rewind' => 'void',
  'valid' => 'bool',
+ 'key' => 'mixed',
+ 'current' => 'mixed',
  'next' => 'void',
  'seek' => 'void',
  ],

src/Symfony/Component/Form/Resources/translations/validators.it.xlf

@@ -44,15 +44,15 @@
  </trans-unit>
  <trans-unit id="106">
  <source>Please choose a valid date interval.</source>
- <target>Per favore, scegli a valid date interval.</target>
+ <target>Per favore, scegli un intervallo di date valido.</target>
  </trans-unit>
  <trans-unit id="107">
  <source>Please enter a valid date and time.</source>
- <target>Per favore, inserisci a valid date and time.</target>
+ <target>Per favore, inserisci una data e ora valida.</target>
  </trans-unit>
  <trans-unit id="108">
  <source>Please enter a valid date.</source>
- <target>Per favore, inserisci a valid date.</target>
+ <target>Per favore, inserisci una data valida.</target>
  </trans-unit>
  <trans-unit id="109">
  <source>Please select a valid file.</source>

src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php

@@ -300,6 +300,21 @@ public function php81TypesProvider()
  ];
  }
 
+ /**
+ * @dataProvider php82TypesProvider
+ * @requires PHP 8.2
+ */
+ public function testExtractPhp82Type($property, array $type = null)
+ {
+ $this->assertEquals($type, $this->extractor->getTypes('Symfony\Component\PropertyInfo\Tests\Fixtures\Php82Dummy', $property, []));
+ }
+
+ public function php82TypesProvider()
+ {
+ yield ['nil', null];
+ yield ['false', [new Type(Type::BUILTIN_TYPE_FALSE)]];
+ }
+
  /**
  * @dataProvider defaultValueProvider
  */

src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php82Dummy.php

@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyInfo\Tests\Fixtures;
+
+class Php82Dummy
+{
+ public null $nil = null;
+
+ public false $false = false;
+}

src/Symfony/Component/PropertyInfo/Type.php

@@ -24,12 +24,12 @@ class Type
  public const BUILTIN_TYPE_FLOAT = 'float';
  public const BUILTIN_TYPE_STRING = 'string';
  public const BUILTIN_TYPE_BOOL = 'bool';
- public const BUILTIN_TYPE_TRUE = 'true';
- public const BUILTIN_TYPE_FALSE = 'false';
  public const BUILTIN_TYPE_RESOURCE = 'resource';
  public const BUILTIN_TYPE_OBJECT = 'object';
  public const BUILTIN_TYPE_ARRAY = 'array';
  public const BUILTIN_TYPE_NULL = 'null';
+ public const BUILTIN_TYPE_FALSE = 'false';
+ public const BUILTIN_TYPE_TRUE = 'true';
  public const BUILTIN_TYPE_CALLABLE = 'callable';
  public const BUILTIN_TYPE_ITERABLE = 'iterable';
 
@@ -43,12 +43,12 @@ class Type
  self::BUILTIN_TYPE_FLOAT,
  self::BUILTIN_TYPE_STRING,
  self::BUILTIN_TYPE_BOOL,
- self::BUILTIN_TYPE_TRUE,
- self::BUILTIN_TYPE_FALSE,
  self::BUILTIN_TYPE_RESOURCE,
  self::BUILTIN_TYPE_OBJECT,
  self::BUILTIN_TYPE_ARRAY,
  self::BUILTIN_TYPE_CALLABLE,
+ self::BUILTIN_TYPE_FALSE,
+ self::BUILTIN_TYPE_TRUE,
  self::BUILTIN_TYPE_NULL,
  self::BUILTIN_TYPE_ITERABLE,
  ];

src/Symfony/Component/Serializer/Normalizer/JsonSerializableNormalizer.php

@@ -27,7 +27,7 @@ class JsonSerializableNormalizer extends AbstractNormalizer
  public function normalize(mixed $object, string $format = null, array $context = []): array|string|int|float|bool|\ArrayObject|null
  {
  if ($this->isCircularReference($object, $context)) {
- return $this->handleCircularReference($object);
+ return $this->handleCircularReference($object, $format, $context);
  }
 
  if (!$object instanceof \JsonSerializable) {

src/Symfony/Component/Serializer/Tests/Fixtures/FalseBuiltInDummy.php

@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Tests\Fixtures;
+
+class FalseBuiltInDummy
+{
+ public false $false = false;
+}

src/Symfony/Component/Serializer/Tests/Fixtures/JsonSerializableCircularReferenceDummy.php

@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Tests\Fixtures;
+
+/**
+ * @author Marvin Feldmann <breyndot.echse@gmail.com>
+ */
+class JsonSerializableCircularReferenceDummy implements \JsonSerializable
+{
+ public function jsonSerialize(): array
+ {
+ return [
+ 'me' => $this,
+ ];
+ }
+}