8000 Merge branch '6.2' into 6.3 · symfony/symfony@0f3e24c · GitHub
[go: up one dir, main page]
Skip to content

Commit 0f3e24c

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '6.2' into 6.3
* 6.2: [Validator] Fix tests [VarDumper] fix test
2 parents 9172865 + a234a66 commit 0f3e24c

File tree

7 files changed

+7
-7
lines changed

7 files changed

+7
-7
lines changed

‎src/Symfony/Component/Validator/Tests/Fixtures/Annotation/Entity.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class Entity extends EntityParent implements EntityInterfaceB
5858
/**
5959
* @Assert\Type("integer")
6060
*/
61-
protected $other;
61+
protected ?int $other;
6262

6363
public function __construct($internal = null)
6464
{

‎src/Symfony/Component/Validator/Tests/Fixtures/Annotation/EntityParent.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class EntityParent implements EntityInterfaceA
2424
/**
2525
* @NotNull
2626
*/
27-
protected $other;
27+
protected ?int $other;
2828

2929
public function getData()
3030
{

‎src/Symfony/Component/Validator/Tests/Fixtures/Attribute/Entity.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class Entity extends EntityParent implements EntityInterfaceB
5858
public $data = 'Overridden data';
5959
public $initialized = false;
6060
#[Assert\Type('integer')]
61-
protected $other;
61+
protected ?int $other;
6262

6363
public function __construct($internal = null)
6464
{

‎src/Symfony/Component/Validator/Tests/Fixtures/Attribute/EntityParent.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class EntityParent implements EntityInterfaceA
2222
private $child;
2323

2424
#[NotNull]
25-
protected $other;
25+
protected ?int $other;
2626

2727
public function getData()
2828
{

‎src/Symfony/Component/Validator/Tests/Fixtures/NestedAttribute/Entity.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ class Entity extends EntityParent implements EntityInterfaceB
7979
public $data = 'Overridden data';
8080
public $initialized = false;
8181
#[Assert\Type('integer')]
82-
protected $other;
82+
protected ?int $other;
8383

8484
public function __construct($internal = null)
8585
{

‎src/Symfony/Component/Validator/Tests/Fixtures/NestedAttribute/EntityParent.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class EntityParent implements EntityInterfaceA
2222
private $child;
2323

2424
#[NotNull]
25-
protected $other;
25+
protected ?int $other;
2626

2727
public function getData()
2828
{

‎src/Symfony/Component/VarDumper/Tests/Caster/FFICasterTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ public function testCastNonTrailingCharPointer()
213213
\FFI::memcpy($pointer, $actualMessage, $actualLength);
214214

215215
// Remove automatically addition of the trailing "\0" and remove trailing "\0"
216-
$pointer = \FFI::cdef()->cast('char*', \FFI::cast('void*', $pointer));
216+
$pointer = \FFI::cdef()->cast('char*', \FFI::cdef()->cast('void*', $pointer));
217217
$pointer[$actualLength] = "\x01";
218218

219219
$this->assertDumpMatchesFormat(<<<PHP

0 commit comments

Comments
 (0)
0