Skip to content

Commit 734f769

Browse files
author
Marcin Czarnecki
committed
Merge tests
1 parent 26be583 commit 734f769

File tree

3 files changed

+26
-1
lines changed

3 files changed

+26
-1
lines changed
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace JMS\Serializer\Tests\Fixtures\TypedProperties;
6+
7+
class FalseOrString
8+
{
9+
public false|string $data;
10+
11+
public function __construct(false|string $data)
12+
{
13+
$this->data = $data;
14+
}
15+
}

tests/Serializer/JsonSerializationTest.php

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
use JMS\Serializer\Tests\Fixtures\Tag;
2727
use JMS\Serializer\Tests\Fixtures\TypedProperties\BoolOrString;
2828
use JMS\Serializer\Tests\Fixtures\TypedProperties\ComplexDiscriminatedUnion;
29+
use JMS\Serializer\Tests\Fixtures\TypedProperties\FalseOrString;
2930
use JMS\Serializer\Tests\Fixtures\TypedProperties\UnionTypedProperties;
3031
use JMS\Serializer\Visitor\Factory\JsonSerializationVisitorFactory;
3132
use JMS\Serializer\Visitor\SerializationVisitorInterface;
@@ -572,6 +573,16 @@ public function testFalseDataType()
572573
$this->deserialize(static::getContent('data_false'), DataFalse::class),
573574
);
574575

576+
self::assertEquals(
577+
static::getContent('data_false'),
578+
$this->serialize(new FalseOrString(false)),
579+
);
580+
581+
self::assertEquals(
582+
new FalseOrString(false),
583+
$this->deserialize(static::getContent('data_false'), FalseOrString::class),
584+
);
585+
575586
$this->expectException(TypeError::class);
576587
$this->deserialize(static::getContent('data_true'), DataFalse::class);
577588
}

tests/Serializer/XmlSerializationTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
use JMS\Serializer\XmlSerializationVisitor;
5151
use PHPUnit\Framework\Attributes\DataProvider;
5252
use PHPUnit\Framework\Attributes\DoesNotPerformAssertions;
53-
use PHPUnit\Framework\Attributes\Group;
5453

5554
class XmlSerializationTest extends BaseSerializationTestCase
5655
{

0 commit comments

Comments
 (0)