Merge branch '6.2' into 6.3

nicolas-grekas · nicolas-grekas · commit 6600f8835442 · 2023-07-21T09:05:52.000+02:00
* 6.2:
  [Validator] Fix tests
  [VarDumper] fix test
diff --git a/Tests/Fixtures/Annotation/Entity.php b/Tests/Fixtures/Annotation/Entity.php
@@ -58,7 +58,7 @@ class Entity extends EntityParent implements EntityInterfaceB
     /**
      * @Assert\Type("integer")
      */
-    protected $other;
+    protected ?int $other;
 
     public function __construct($internal = null)
     {
diff --git a/Tests/Fixtures/Annotation/EntityParent.php b/Tests/Fixtures/Annotation/EntityParent.php
@@ -24,7 +24,7 @@ class EntityParent implements EntityInterfaceA
     /**
      * @NotNull
      */
-    protected $other;
+    protected ?int $other;
 
     public function getData()
     {
diff --git a/Tests/Fixtures/Attribute/Entity.php b/Tests/Fixtures/Attribute/Entity.php
@@ -58,7 +58,7 @@ class Entity extends EntityParent implements EntityInterfaceB
     public $data = 'Overridden data';
     public $initialized = false;
     #[Assert\Type('integer')]
-    protected $other;
+    protected ?int $other;
 
     public function __construct($internal = null)
     {
diff --git a/Tests/Fixtures/Attribute/EntityParent.php b/Tests/Fixtures/Attribute/EntityParent.php
@@ -22,7 +22,7 @@ class EntityParent implements EntityInterfaceA
     private $child;
 
     #[NotNull]
-    protected $other;
+    protected ?int $other;
 
     public function getData()
     {
diff --git a/Tests/Fixtures/NestedAttribute/Entity.php b/Tests/Fixtures/NestedAttribute/Entity.php
@@ -79,7 +79,7 @@ class Entity extends EntityParent implements EntityInterfaceB
     public $data = 'Overridden data';
     public $initialized = false;
     #[Assert\Type('integer')]
-    protected $other;
+    protected ?int $other;
 
     public function __construct($internal = null)
     {
diff --git a/Tests/Fixtures/NestedAttribute/EntityParent.php b/Tests/Fixtures/NestedAttribute/EntityParent.php
@@ -22,7 +22,7 @@ class EntityParent implements EntityInterfaceA
     private $child;
 
     #[NotNull]
-    protected $other;
+    protected ?int $other;
 
     public function getData()
     {

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ class Entity extends EntityParent implements EntityInterfaceB`
`58`	`58`	`/**`
`59`	`59`	`* @Assert\Type("integer")`
`60`	`60`	`*/`
`61`		`- protected $other;`
	`61`	`+ protected ?int $other;`
`62`	`62`
`63`	`63`	`public function __construct($internal = null)`
`64`	`64`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class EntityParent implements EntityInterfaceA`
`24`	`24`	`/**`
`25`	`25`	`* @NotNull`
`26`	`26`	`*/`
`27`		`- protected $other;`
	`27`	`+ protected ?int $other;`
`28`	`28`
`29`	`29`	`public function getData()`
`30`	`30`	`{`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class EntityParent implements EntityInterfaceA`
`22`	`22`	`private $child;`
`23`	`23`
`24`	`24`	`#[NotNull]`
`25`		`- protected $other;`
	`25`	`+ protected ?int $other;`
`26`	`26`
`27`	`27`	`public function getData()`
`28`	`28`	`{`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ class Entity extends EntityParent implements EntityInterfaceB`
`79`	`79`	`public $data = 'Overridden data';`
`80`	`80`	`public $initialized = false;`
`81`	`81`	`#[Assert\Type('integer')]`
`82`		`- protected $other;`
	`82`	`+ protected ?int $other;`
`83`	`83`
`84`	`84`	`public function __construct($internal = null)`
`85`	`85`	`{`