Skip to content

Commit 3dba420

Browse files
SerafimArtsSerafimArts
committed
Fix tests
1 parent d66b3a2 commit 3dba420

10 files changed

Lines changed: 42 additions & 41 deletions

File tree

‎src/Context/RootContext.php‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ public static function forNormalization(
2626
TypeParserInterface $parser,
2727
TypeRepositoryInterface $types,
2828
): self {
29+
if (!$config->isStrictTypesOptionDefined()) {
30+
$config = $config->withStrictTypes(true);
31+
}
32+
2933
return new self(
3034
value: $value,
3135
direction: Direction::Normalize,
@@ -43,6 +47,10 @@ public static function forDenormalization(
4347
TypeParserInterface $parser,
4448
TypeRepositoryInterface $types,
4549
): self {
50+
if (!$config->isStrictTypesOptionDefined()) {
51+
$config = $config->withStrictTypes(false);
52+
}
53+
4654
return new self(
4755
value: $value,
4856
direction: Direction::Denormalize,

‎tests/Context/ContextConfigMutationTest.php‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ final class ContextConfigMutationTest extends ContextTestCase
1313
{
1414
public function testOverrideConfig(): void
1515
{
16-
$context = $this->createNormalizationContext(42);
16+
$context = self::createNormalizationContext(42);
1717

18-
self::assertFalse($context->config->isStrictTypesEnabled());
18+
self::assertTrue($context->config->isStrictTypesEnabled());
1919
self::assertTrue($context->config->isObjectAsArray());
2020

2121
$context = $context->enter(42, new ObjectEntry('object'),
@@ -27,9 +27,9 @@ public function testOverrideConfig(): void
2727

2828
public function testConfigRollbackAfterEntrance(): void
2929
{
30-
$context = $this->createNormalizationContext(42);
30+
$context = self::createNormalizationContext(42);
3131

32-
self::assertFalse($context->config->isStrictTypesEnabled());
32+
self::assertTrue($context->config->isStrictTypesEnabled());
3333
self::assertTrue($context->config->isObjectAsArray());
3434

3535
$context = $context->enter(42, new ObjectEntry('object'),
@@ -40,15 +40,15 @@ public function testConfigRollbackAfterEntrance(): void
4040

4141
$context = $context->enter(42, new ObjectEntry('object'));
4242

43-
self::assertFalse($context->config->isStrictTypesEnabled());
43+
self::assertTrue($context->config->isStrictTypesEnabled());
4444
self::assertTrue($context->config->isObjectAsArray());
4545
}
4646

4747
public function testConfigRollbackAfterMultipleEntrance(): void
4848
{
49-
$context = $this->createNormalizationContext(42);
49+
$context = self::createNormalizationContext(42);
5050

51-
self::assertFalse($context->config->isStrictTypesEnabled());
51+
self::assertTrue($context->config->isStrictTypesEnabled());
5252
self::assertTrue($context->config->isObjectAsArray());
5353

5454
$context = $context->enter(42, new ObjectEntry('object'),
@@ -71,13 +71,13 @@ public function testConfigRollbackAfterMultipleEntrance(): void
7171

7272
$context = $context->enter(42, new ObjectEntry('object'));
7373

74-
self::assertFalse($context->config->isStrictTypesEnabled());
74+
self::assertTrue($context->config->isStrictTypesEnabled());
7575
self::assertTrue($context->config->isObjectAsArray());
7676
}
7777

7878
public function testNonDefaultConfigRollbackAfterMultipleEntrance(): void
7979
{
80-
$context = $this->createNormalizationContext(42, new Configuration(
80+
$context = self::createNormalizationContext(42, new Configuration(
8181
objectAsArray: false,
8282
strictTypes: false,
8383
));
@@ -105,7 +105,7 @@ public function testNonDefaultConfigRollbackAfterMultipleEntrance(): void
105105

106106
public function testOnlyOneConfigChanged(): void
107107
{
108-
$context = $this->createNormalizationContext(42, new Configuration(
108+
$context = self::createNormalizationContext(42, new Configuration(
109109
objectAsArray: false,
110110
strictTypes: false,
111111
));

‎tests/Platform/PlatformTestCase.php‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use TypeLang\Mapper\Context\Direction;
99
use TypeLang\Mapper\Exception\Definition\TypeNotFoundException;
1010
use TypeLang\Mapper\Platform\PlatformInterface;
11+
use TypeLang\Mapper\Tests\Concerns\InteractWithTypeParser;
1112
use TypeLang\Mapper\Tests\Platform\Stub\ExampleClassStub;
1213
use TypeLang\Mapper\Tests\Platform\Stub\ExampleInterfaceStub;
1314
use TypeLang\Mapper\Tests\Platform\Stub\IntBackedEnumStub;
@@ -19,6 +20,8 @@
1920

2021
abstract class PlatformTestCase extends TestCase
2122
{
23+
use InteractWithTypeParser;
24+
2225
// v2.1
2326
protected const TYPES_PHPSTAN = [
2427
'int',
@@ -167,7 +170,7 @@ abstract class PlatformTestCase extends TestCase
167170
'lowercase-string',
168171
'non-empty-lowercase-string',
169172
'resource',
170-
'resource (closed)',
173+
//'resource (closed)',
171174
'closed-resource',
172175
'positive-int',
173176
'non-positive-int',
@@ -258,7 +261,7 @@ abstract class PlatformTestCase extends TestCase
258261
'false',
259262
'true',
260263
// TODO: Intersection types not supported yet
261-
'int|(true&int)',
264+
//'int|(true&int)',
262265
];
263266

264267
public static function typesDataProvider(): iterable

‎tests/Runtime/Repository/RepositoryTestCase.php‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎tests/Runtime/RuntimeTestCase.php‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎tests/TestCase.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ protected function expectTypeErrorIfException(mixed $expected): void
3737
}
3838

3939
$this->expectExceptionMessage($expected->getMessage());
40-
$this->expectException(InvalidValueException::class);
4140
}
4241

4342
protected static function assertIfNotException(mixed $expected, mixed $actual): void

‎tests/Type/Coercer/TypeCoercerTestCase.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public function testCoerceForNormalization(mixed $value, mixed $expected): void
4848

4949
$coercer = static::createCoercer();
5050

51-
$actual = $coercer->coerce($value, $this->createNormalizationContext(
51+
$actual = $coercer->coerce($value, self::createNormalizationContext(
5252
value: $value,
5353
));
5454

@@ -73,7 +73,7 @@ public function testCoerceForDenormalization(mixed $value, mixed $expected): voi
7373

7474
$coercer = static::createCoercer();
7575

76-
$actual = $coercer->coerce($value, $this->createNormalizationContext(
76+
$actual = $coercer->coerce($value, self::createNormalizationContext(
7777
value: $value,
7878
));
7979

‎tests/Type/MixedTypeTest.php‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
use PHPUnit\Framework\Attributes\CoversClass;
88
use PHPUnit\Framework\Attributes\Group;
99
use TypeLang\Mapper\Context\Direction;
10+
use TypeLang\Mapper\Exception\Definition\TypeNotFoundException;
11+
use TypeLang\Mapper\Exception\Runtime\InvalidValueException;
1012
use TypeLang\Mapper\Platform\PlatformInterface;
1113
use TypeLang\Mapper\Platform\StandardPlatform;
1214
use TypeLang\Mapper\Tests\Type\Stub\AnyTypeStub;
@@ -16,6 +18,7 @@
1618
use TypeLang\Mapper\Type\Builder\SimpleTypeBuilder;
1719
use TypeLang\Mapper\Type\MixedType;
1820
use TypeLang\Mapper\Type\TypeInterface;
21+
use TypeLang\Parser\Node\Stmt\NamedTypeNode;
1922

2023
#[Group('type')]
2124
#[CoversClass(MixedType::class)]
@@ -65,12 +68,16 @@ protected static function castValues(bool $normalize): iterable
6568
$value == (object) ['val'] => ['val'],
6669
default => $value,
6770
},
71+
\get_debug_type($value) === 'resource (closed)',
72+
\is_resource($value) => new \ValueError('Type "resource" is not defined'),
6873
default => $value,
6974
}
7075
: match (true) {
71-
$value === UnitEnumStub::ExampleCase => UnitEnumStub::ExampleCase,
72-
$value === IntBackedEnumStub::ExampleCase => IntBackedEnumStub::ExampleCase,
73-
$value === StringBackedEnumStub::ExampleCase => StringBackedEnumStub::ExampleCase,
76+
\get_debug_type($value) === 'resource (closed)',
77+
\is_resource($value) => new \ValueError('Type "resource" is not defined'),
78+
$value === UnitEnumStub::ExampleCase => new \ValueError('Passed value "ExampleCase" is invalid'),
79+
$value === IntBackedEnumStub::ExampleCase => new \ValueError('Passed value 3735928559 is invalid'),
80+
$value === StringBackedEnumStub::ExampleCase => new \ValueError('Passed value "case" is invalid'),
7481
default => $value,
7582
};
7683
}

‎tests/Type/Stub/DataSamples.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
namespace TypeLang\Mapper\Tests\Type\Stub;
66

7+
use TypeLang\Mapper\Context\Path\Path;
8+
use TypeLang\Mapper\Exception\Runtime\InvalidValueException;
79
use TypeLang\Mapper\Exception\Value\JsonLikeValuePrinter;
810

911
/**
@@ -34,7 +36,7 @@ public function getCastsIterator(): \Traversable
3436
foreach ($this as $value) {
3537
yield $value => new \ValueError(\sprintf(
3638
'Passed value %s is invalid',
37-
$printer->print($value),
39+
$printer->print($value)
3840
));
3941
}
4042
}

‎tests/Type/TypeTestCase.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public function testMatchNormalization(mixed $value, bool $expected): void
6363
{
6464
$type = static::createType();
6565

66-
$actual = $type->match($value, $this->createNormalizationContext(
66+
$actual = $type->match($value, self::createNormalizationContext(
6767
value: $value,
6868
));
6969

@@ -86,7 +86,7 @@ public function testMatchDenormalization(mixed $value, bool $expected): void
8686
{
8787
$type = static::createType();
8888

89-
$actual = $type->match($value, $this->createDenormalizationContext(
89+
$actual = $type->match($value, self::createDenormalizationContext(
9090
value: $value,
9191
));
9292

@@ -111,7 +111,7 @@ public function testCastNormalization(mixed $value, mixed $expected): void
111111

112112
$type = static::createType();
113113

114-
$actual = $type->cast($value, $this->createNormalizationContext(
114+
$actual = $type->cast($value, self::createNormalizationContext(
115115
value: $value,
116116
));
117117

@@ -136,7 +136,7 @@ public function testCastDenormalization(mixed $value, mixed $expected): void
136136

137137
$type = static::createType();
138138

139-
$actual = $type->cast($value, $this->createDenormalizationContext(
139+
$actual = $type->cast($value, self::createDenormalizationContext(
140140
value: $value,
141141
));
142142

0 commit comments

Comments
 (0)