From de6b9efdddf20b670b35de803729eb3a983345ae Mon Sep 17 00:00:00 2001 From: Maxime Helias Date: Mon, 12 Aug 2019 11:54:04 +0200 Subject: [PATCH] [Form] fix return type on FormDataCollector --- .../Extension/DataCollector/FormDataCollectorInterface.php | 3 ++- .../Component/HttpKernel/DataCollector/DataCollector.php | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollectorInterface.php b/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollectorInterface.php index d2a7818cd0..64b8f83c4b 100644 --- a/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollectorInterface.php +++ b/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollectorInterface.php @@ -14,6 +14,7 @@ namespace Symfony\Component\Form\Extension\DataCollector; use Symfony\Component\Form\FormInterface; use Symfony\Component\Form\FormView; use Symfony\Component\HttpKernel\DataCollector\DataCollectorInterface; +use Symfony\Component\VarDumper\Cloner\Data; /** * Collects and structures information about forms. @@ -78,7 +79,7 @@ interface FormDataCollectorInterface extends DataCollectorInterface /** * Returns all collected data. * - * @return array + * @return array|Data */ public function getData(); } diff --git a/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php index 4346e0ec0f..94307cf56c 100644 --- a/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php +++ b/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php @@ -28,6 +28,9 @@ use Symfony\Component\VarDumper\Cloner\VarCloner; */ abstract class DataCollector implements DataCollectorInterface, \Serializable { + /** + * @var array|Data + */ protected $data = []; /**