Improve tests

Author: SerafimArts

.php-cs-fixer.php

@@ -1,12 +1,15 @@
 <?php
 
 $files = PhpCsFixer\Finder::create()
-    ->in([__DIR__ . '/src']);
+    ->in([
+        __DIR__ . '/src',
+        // __DIR__ . '/tests',
+    ]);
 
 return (new PhpCsFixer\Config())
     ->setRules([
-        '@PER-CS2.0' => true,
-        '@PER-CS2.0:risky' => true,
+        '@PER-CS3x0' => true,
+        '@PER-CS3x0:risky' => true,
         'strict_param' => true,
         'align_multiline_comment' => true,
         'array_syntax' => [

src/Runtime/Extractor/TypeExtractorInterface.php

@@ -8,7 +8,6 @@ interface TypeExtractorInterface
 {
     /**
      * @return non-empty-string
-     *
      * @throws \Throwable in case of any internal error occurs
      */
     public function getDefinitionByValue(mixed $value): string;

src/Runtime/Parser/InMemoryTypeParser.php

@@ -33,6 +33,7 @@ public function __construct(
 
     /**
      * @param non-empty-string $definition
+     *
      * @return non-empty-string
      */
     private function keyOf(string $definition): string

src/Runtime/Repository/ReferencesResolver.php

@@ -4,7 +4,6 @@
 
 namespace TypeLang\Mapper\Runtime\Repository;
 
-use TypeLang\Mapper\Runtime\Repository\Reference\NativeReferencesReader;
 use TypeLang\Mapper\Runtime\Repository\Reference\ReferencesReaderInterface;
 use TypeLang\Parser\Node\Name;
 use TypeLang\Parser\Node\Stmt\TypeStatement;

tests/Mapping/Metadata/ClassMetadataTest.php

@@ -94,5 +94,3 @@ public function testDiscriminatorManagement(): void
         self::assertNull($m->findDiscriminator());
     }
 }
-
-

tests/Mapping/Metadata/DiscriminatorMapMetadataTest.php

@@ -7,7 +7,7 @@
 use PHPUnit\Framework\Attributes\CoversClass;
 use TypeLang\Mapper\Mapping\Metadata\DiscriminatorMapMetadata;
 use TypeLang\Mapper\Mapping\Metadata\TypeMetadata;
-use TypeLang\Mapper\Type\IntType;
+use TypeLang\Mapper\Type\TypeInterface;
 use TypeLang\Parser\Node\Stmt\NamedTypeNode;
 
 #[CoversClass(DiscriminatorMapMetadata::class)]
@@ -25,7 +25,7 @@ public function testBasics(): void
 
     public function testAddAndFindType(): void
     {
-        $type = new IntType();
+        $type = $this->createMock(TypeInterface::class);
         $stmt = new NamedTypeNode('int');
         $tm = new TypeMetadata($type, $stmt);
 
@@ -39,7 +39,7 @@ public function testAddAndFindType(): void
 
     public function testDefaultType(): void
     {
-        $type = new IntType();
+        $type = $this->createMock(TypeInterface::class);
         $stmt = new NamedTypeNode('int');
         $tm = new TypeMetadata($type, $stmt);
 
@@ -51,5 +51,3 @@ public function testDefaultType(): void
         self::assertNull($m->getDefaultType());
     }
 }
-
-

tests/Mapping/Metadata/EmptyConditionMetadataTest.php

@@ -24,5 +24,3 @@ public function testMatch(): void
         self::assertFalse($cond->match(new \stdClass(), [1]));
     }
 }
-
-

tests/Mapping/Metadata/ExpressionConditionMetadataTest.php

@@ -5,34 +5,25 @@
 namespace TypeLang\Mapper\Tests\Mapping\Metadata;
 
 use PHPUnit\Framework\Attributes\CoversClass;
-use Symfony\Component\ExpressionLanguage\Node\ArgumentsNode;
 use Symfony\Component\ExpressionLanguage\Node\ConstantNode;
-use Symfony\Component\ExpressionLanguage\Node\GetAttrNode;
-use Symfony\Component\ExpressionLanguage\Node\NameNode;
-use Symfony\Component\ExpressionLanguage\Node\Node;
 use Symfony\Component\ExpressionLanguage\ParsedExpression;
 use TypeLang\Mapper\Mapping\Metadata\ExpressionConditionMetadata;
 
 #[CoversClass(ExpressionConditionMetadata::class)]
 final class ExpressionConditionMetadataTest extends MetadataTestCase
 {
-    private function createParsedExpressionAlwaysTrue(string $context = ExpressionConditionMetadata::DEFAULT_CONTEXT_VARIABLE_NAME): ParsedExpression
+    private function createParsedExpressionAlwaysTrue(): ParsedExpression
     {
         $root = new ConstantNode(true);
-        return new ParsedExpression('true', $root);
-    }
 
-    private function createParsedExpressionCheckContext(string $property, string $context = ExpressionConditionMetadata::DEFAULT_CONTEXT_VARIABLE_NAME): ParsedExpression
-    {
-        $name = new NameNode($context);
-        $attr = new GetAttrNode($name, new ConstantNode($property), new ArgumentsNode());
-        return new ParsedExpression($context . '.' . $property, $attr);
+        return new ParsedExpression('true', $root);
     }
 
     public function testGetters(): void
     {
-        $expr = $this->createParsedExpressionAlwaysTrue('ctx');
+        $expr = $this->createParsedExpressionAlwaysTrue();
         $m = new ExpressionConditionMetadata($expr, 'ctx', 5);
+
         self::assertSame($expr, $m->getExpression());
         self::assertSame('ctx', $m->getContextVariableName());
         self::assertSame(5, $m->getTimestamp());
@@ -42,8 +33,7 @@ public function testMatchUsesExpressionNodesEvaluation(): void
     {
         $expr = $this->createParsedExpressionAlwaysTrue();
         $m = new ExpressionConditionMetadata($expr);
+
         self::assertTrue($m->match(new \stdClass(), null));
     }
 }
-
-

tests/Mapping/Metadata/MatchConditionMetadataTest.php

@@ -12,23 +12,34 @@ final class MatchConditionMetadataTest extends MetadataTestCase
 {
     public function testAbstractContract(): void
     {
-        $impl = new class () extends MatchConditionMetadata { public function match(object $object, mixed $value): bool { return $value === 1; } };
+        $impl = new class extends MatchConditionMetadata {
+            public function match(object $object, mixed $value): bool
+            {
+                return $value === 1;
+            }
+        };
+
         self::assertTrue($impl->match(new \stdClass(), 1));
         self::assertFalse($impl->match(new \stdClass(), 2));
     }
 
     public function testTimestampInheritance(): void
     {
         $impl = new class (123) extends MatchConditionMetadata {
-            public function match(object $object, mixed $value): bool { return true; }
+            public function match(object $object, mixed $value): bool
+            {
+                return true;
+            }
         };
+
         self::assertSame(123, $impl->getTimestamp());
     }
 
     public function testMatchWithDifferentObjects(): void
     {
-        $impl = new class () extends MatchConditionMetadata {
-            public function match(object $object, mixed $value): bool {
+        $impl = new class extends MatchConditionMetadata {
+            public function match(object $object, mixed $value): bool
+            {
                 return $object instanceof \stdClass && $value === 'test';
             }
         };
@@ -38,5 +49,3 @@ public function match(object $object, mixed $value): bool {
         self::assertFalse($impl->match(new \DateTime(), 'test'));
     }
 }
-
-

tests/Mapping/Metadata/MetadataTest.php

@@ -19,11 +19,9 @@ public function testTimestampIsFromConstructor(): void
 
     public function testTimestampAutoGeneratedIsInt(): void
     {
-        $m = new class () extends Metadata {};
+        $m = new class extends Metadata {};
 
         self::assertIsInt($m->getTimestamp());
         self::assertGreaterThanOrEqual(0, $m->getTimestamp());
     }
 }
-
-