Refactor type resolvers to use interfaces throughout

grebaldi · grebaldi · commit 30cf64fe9871 · 2022-11-07T14:23:59.000+01:00
diff --git a/src/TypeSystem/Resolver/BinaryOperationTypeResolver/BinaryOperationTypeResolver.php b/src/TypeSystem/Resolver/BinaryOperationTypeResolver/BinaryOperationTypeResolver.php
@@ -25,16 +25,17 @@
 use PackageFactory\ComponentEngine\Definition\BinaryOperator;
 use PackageFactory\ComponentEngine\Parser\Ast\BinaryOperandNodes;
 use PackageFactory\ComponentEngine\Parser\Ast\BinaryOperationNode;
-use PackageFactory\ComponentEngine\TypeSystem\Resolver\ExpressionTypeResolver\ExpressionTypeResolver;
+use PackageFactory\ComponentEngine\TypeSystem\Resolver\ExpressionTypeResolver\ExpressionTypeResolverInterface;
 use PackageFactory\ComponentEngine\TypeSystem\Type\BooleanType\BooleanType;
 use PackageFactory\ComponentEngine\TypeSystem\Type\NumberType\NumberType;
 use PackageFactory\ComponentEngine\TypeSystem\Type\UnionType\UnionType;
 use PackageFactory\ComponentEngine\TypeSystem\TypeInterface;
 
-final class BinaryOperationTypeResolver
+final class BinaryOperationTypeResolver implements BinaryOperationTypeResolverInterface
 {
-    public function __construct(private readonly ExpressionTypeResolver $expressionTypeResolver)
-    {
+    public function __construct(
+        private readonly ExpressionTypeResolverInterface $expressionTypeResolver
+    ) {
     }
 
     public function resolveTypeOf(BinaryOperationNode $binaryOperationNode): TypeInterface
diff --git a/src/TypeSystem/Resolver/BinaryOperationTypeResolver/BinaryOperationTypeResolverInterface.php b/src/TypeSystem/Resolver/BinaryOperationTypeResolver/BinaryOperationTypeResolverInterface.php
@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * PackageFactory.ComponentEngine - Universal View Components for PHP
+ *   Copyright (C) 2022 Contributors of PackageFactory.ComponentEngine
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace PackageFactory\ComponentEngine\TypeSystem\Resolver\BinaryOperationTypeResolver;
+
+use PackageFactory\ComponentEngine\Parser\Ast\BinaryOperationNode;
+use PackageFactory\ComponentEngine\TypeSystem\TypeInterface;
+
+interface BinaryOperationTypeResolverInterface
+{
+    public function resolveTypeOf(BinaryOperationNode $binaryOperationNode): TypeInterface;
+}
diff --git a/src/TypeSystem/Resolver/BooleanLiteralTypeResolver/BooleanLiteralTypeResolver.php b/src/TypeSystem/Resolver/BooleanLiteralTypeResolver/BooleanLiteralTypeResolver.php
@@ -26,7 +26,7 @@
 use PackageFactory\ComponentEngine\TypeSystem\Type\BooleanType\BooleanType;
 use PackageFactory\ComponentEngine\TypeSystem\TypeInterface;
 
-final class BooleanLiteralTypeResolver
+final class BooleanLiteralTypeResolver implements BooleanLiteralTypeResolverInterface
 {
     public function resolveTypeOf(BooleanLiteralNode $numberLiteralNode): TypeInterface
     {
diff --git a/src/TypeSystem/Resolver/BooleanLiteralTypeResolver/BooleanLiteralTypeResolverInterface.php b/src/TypeSystem/Resolver/BooleanLiteralTypeResolver/BooleanLiteralTypeResolverInterface.php
@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * PackageFactory.ComponentEngine - Universal View Components for PHP
+ *   Copyright (C) 2022 Contributors of PackageFactory.ComponentEngine
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace PackageFactory\ComponentEngine\TypeSystem\Resolver\BooleanLiteralTypeResolver;
+
+use PackageFactory\ComponentEngine\Parser\Ast\BooleanLiteralNode;
+use PackageFactory\ComponentEngine\TypeSystem\TypeInterface;
+
+interface BooleanLiteralTypeResolverInterface
+{
+    public function resolveTypeOf(BooleanLiteralNode $numberLiteralNode): TypeInterface;
+}
diff --git a/src/TypeSystem/Resolver/ExpressionTypeResolver/ExpressionTypeResolver.php b/src/TypeSystem/Resolver/ExpressionTypeResolver/ExpressionTypeResolver.php
@@ -31,64 +31,71 @@
 use PackageFactory\ComponentEngine\Parser\Ast\TagNode;
 use PackageFactory\ComponentEngine\Parser\Ast\TernaryOperationNode;
 use PackageFactory\ComponentEngine\TypeSystem\Resolver\BinaryOperationTypeResolver\BinaryOperationTypeResolver;
+use PackageFactory\ComponentEngine\TypeSystem\Resolver\BinaryOperationTypeResolver\BinaryOperationTypeResolverInterface;
 use PackageFactory\ComponentEngine\TypeSystem\Resolver\BooleanLiteralTypeResolver\BooleanLiteralTypeResolver;
+use PackageFactory\ComponentEngine\TypeSystem\Resolver\BooleanLiteralTypeResolver\BooleanLiteralTypeResolverInterface;
 use PackageFactory\ComponentEngine\TypeSystem\Resolver\IdentifierTypeResolver\IdentifierTypeResolver;
+use PackageFactory\ComponentEngine\TypeSystem\Resolver\IdentifierTypeResolver\IdentifierTypeResolverInterface;
 use PackageFactory\ComponentEngine\TypeSystem\Resolver\NumberLiteralTypeResolver\NumberLiteralTypeResolver;
+use PackageFactory\ComponentEngine\TypeSystem\Resolver\NumberLiteralTypeResolver\NumberLiteralTypeResolverInterface;
 use PackageFactory\ComponentEngine\TypeSystem\Resolver\StringLiteralTypeResolver\StringLiteralTypeResolver;
+use PackageFactory\ComponentEngine\TypeSystem\Resolver\StringLiteralTypeResolver\StringLiteralTypeResolverInterface;
 use PackageFactory\ComponentEngine\TypeSystem\Resolver\TagTypeResolver\TagTypeResolver;
+use PackageFactory\ComponentEngine\TypeSystem\Resolver\TagTypeResolver\TagTypeResolverInterface;
 use PackageFactory\ComponentEngine\TypeSystem\Resolver\TernaryOperationTypeResolver\TernaryOperationTypeResolver;
+use PackageFactory\ComponentEngine\TypeSystem\Resolver\TernaryOperationTypeResolver\TernaryOperationTypeResolverInterface;
 use PackageFactory\ComponentEngine\TypeSystem\ScopeInterface;
 use PackageFactory\ComponentEngine\TypeSystem\TypeInterface;
 
-final class ExpressionTypeResolver
+final class ExpressionTypeResolver implements ExpressionTypeResolverInterface
 {
     public function __construct(
         private readonly ScopeInterface $scope,
-        private ?BinaryOperationTypeResolver $binaryOperationTypeResolver = null,
-        private ?BooleanLiteralTypeResolver $booleanLiteralTypeResolver = null,
-        private ?IdentifierTypeResolver $identifierTypeResolver = null,
-        private ?NumberLiteralTypeResolver $numberLiteralTypeResolver = null,
-        private ?StringLiteralTypeResolver $stringLiteralTypeResolver = null,
-        private ?TagTypeResolver $tagTypeResolver = null,
-        private ?TernaryOperationTypeResolver $ternaryOperationTypeResolver = null
+        private ?BinaryOperationTypeResolverInterface $binaryOperationTypeResolver = null,
+        private ?BooleanLiteralTypeResolverInterface $booleanLiteralTypeResolver = null,
+        private ?IdentifierTypeResolverInterface $identifierTypeResolver = null,
+        private ?NumberLiteralTypeResolverInterface $numberLiteralTypeResolver = null,
+        private ?StringLiteralTypeResolverInterface $stringLiteralTypeResolver = null,
+        private ?TagTypeResolverInterface $tagTypeResolver = null,
+        private ?TernaryOperationTypeResolverInterface $ternaryOperationTypeResolver = null
     ) {
     }
 
-    private function getBinaryOperationTypeResolver(): BinaryOperationTypeResolver
+    private function getBinaryOperationTypeResolver(): BinaryOperationTypeResolverInterface
     {
         return $this->binaryOperationTypeResolver ??= new BinaryOperationTypeResolver(
             expressionTypeResolver: $this
         );
     }
 
-    private function getBooleanLiteralTypeResolver(): BooleanLiteralTypeResolver
+    private function getBooleanLiteralTypeResolver(): BooleanLiteralTypeResolverInterface
     {
         return $this->booleanLiteralTypeResolver ??= new BooleanLiteralTypeResolver();
     }
 
-    private function getIdentifierTypeResolver(): IdentifierTypeResolver
+    private function getIdentifierTypeResolver(): IdentifierTypeResolverInterface
     {
         return $this->identifierTypeResolver ??= new IdentifierTypeResolver(
             scope: $this->scope
         );
     }
 
-    private function getNumberLiteralTypeResolver(): NumberLiteralTypeResolver
+    private function getNumberLiteralTypeResolver(): NumberLiteralTypeResolverInterface
     {
         return $this->numberLiteralTypeResolver ??= new NumberLiteralTypeResolver();
     }
 
-    private function getStringLiteralTypeResolver(): StringLiteralTypeResolver
+    private function getStringLiteralTypeResolver(): StringLiteralTypeResolverInterface
     {
         return $this->stringLiteralTypeResolver ??= new StringLiteralTypeResolver();
     }
 
-    private function getTagTypeResolver(): TagTypeResolver
+    private function getTagTypeResolver(): TagTypeResolverInterface
     {
         return $this->tagTypeResolver ??= new TagTypeResolver();
     }
 
-    private function getTernaryOperationTypeResolver(): TernaryOperationTypeResolver
+    private function getTernaryOperationTypeResolver(): TernaryOperationTypeResolverInterface
     {
         return $this->ternaryOperationTypeResolver ??= new TernaryOperationTypeResolver(
             expressionTypeResolver: $this
diff --git a/src/TypeSystem/Resolver/ExpressionTypeResolver/ExpressionTypeResolverInterface.php b/src/TypeSystem/Resolver/ExpressionTypeResolver/ExpressionTypeResolverInterface.php
@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * PackageFactory.ComponentEngine - Universal View Components for PHP
+ *   Copyright (C) 2022 Contributors of PackageFactory.ComponentEngine
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace PackageFactory\ComponentEngine\TypeSystem\Resolver\ExpressionTypeResolver;
+
+use PackageFactory\ComponentEngine\Parser\Ast\ExpressionNode;
+use PackageFactory\ComponentEngine\TypeSystem\TypeInterface;
+
+interface ExpressionTypeResolverInterface
+{
+    public function resolveTypeOf(ExpressionNode $expressionNode): TypeInterface;
+}
diff --git a/src/TypeSystem/Resolver/IdentifierTypeResolver/IdentifierTypeResolver.php b/src/TypeSystem/Resolver/IdentifierTypeResolver/IdentifierTypeResolver.php
@@ -26,7 +26,7 @@
 use PackageFactory\ComponentEngine\TypeSystem\ScopeInterface;
 use PackageFactory\ComponentEngine\TypeSystem\TypeInterface;
 
-final class IdentifierTypeResolver
+final class IdentifierTypeResolver implements IdentifierTypeResolverInterface
 {
     public function __construct(private readonly ScopeInterface $scope)
     {
diff --git a/src/TypeSystem/Resolver/IdentifierTypeResolver/IdentifierTypeResolverInterface.php b/src/TypeSystem/Resolver/IdentifierTypeResolver/IdentifierTypeResolverInterface.php
@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * PackageFactory.ComponentEngine - Universal View Components for PHP
+ *   Copyright (C) 2022 Contributors of PackageFactory.ComponentEngine
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace PackageFactory\ComponentEngine\TypeSystem\Resolver\IdentifierTypeResolver;
+
+use PackageFactory\ComponentEngine\Parser\Ast\IdentifierNode;
+use PackageFactory\ComponentEngine\TypeSystem\TypeInterface;
+
+interface IdentifierTypeResolverInterface
+{
+    public function resolveTypeOf(IdentifierNode $identifierNode): TypeInterface;
+}
diff --git a/src/TypeSystem/Resolver/NumberLiteralTypeResolver/NumberLiteralTypeResolver.php b/src/TypeSystem/Resolver/NumberLiteralTypeResolver/NumberLiteralTypeResolver.php
@@ -26,7 +26,7 @@
 use PackageFactory\ComponentEngine\TypeSystem\Type\NumberType\NumberType;
 use PackageFactory\ComponentEngine\TypeSystem\TypeInterface;
 
-final class NumberLiteralTypeResolver
+final class NumberLiteralTypeResolver implements NumberLiteralTypeResolverInterface
 {
     public function resolveTypeOf(NumberLiteralNode $numberLiteralNode): TypeInterface
     {
diff --git a/src/TypeSystem/Resolver/NumberLiteralTypeResolver/NumberLiteralTypeResolverInterface.php b/src/TypeSystem/Resolver/NumberLiteralTypeResolver/NumberLiteralTypeResolverInterface.php
@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * PackageFactory.ComponentEngine - Universal View Components for PHP
+ *   Copyright (C) 2022 Contributors of PackageFactory.ComponentEngine
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace PackageFactory\ComponentEngine\TypeSystem\Resolver\NumberLiteralTypeResolver;
+
+use PackageFactory\ComponentEngine\Parser\Ast\NumberLiteralNode;
+use PackageFactory\ComponentEngine\TypeSystem\TypeInterface;
+
+interface NumberLiteralTypeResolverInterface
+{
+    public function resolveTypeOf(NumberLiteralNode $numberLiteralNode): TypeInterface;
+}
diff --git a/src/TypeSystem/Resolver/StringLiteralTypeResolver/StringLiteralTypeResolver.php b/src/TypeSystem/Resolver/StringLiteralTypeResolver/StringLiteralTypeResolver.php
@@ -26,7 +26,7 @@
 use PackageFactory\ComponentEngine\TypeSystem\Type\StringType\StringType;
 use PackageFactory\ComponentEngine\TypeSystem\TypeInterface;
 
-final class StringLiteralTypeResolver
+final class StringLiteralTypeResolver implements StringLiteralTypeResolverInterface
 {
     public function resolveTypeOf(StringLiteralNode $stringLiteralNode): TypeInterface
     {
diff --git a/src/TypeSystem/Resolver/StringLiteralTypeResolver/StringLiteralTypeResolverInterface.php b/src/TypeSystem/Resolver/StringLiteralTypeResolver/StringLiteralTypeResolverInterface.php
@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * PackageFactory.ComponentEngine - Universal View Components for PHP
+ *   Copyright (C) 2022 Contributors of PackageFactory.ComponentEngine
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace PackageFactory\ComponentEngine\TypeSystem\Resolver\StringLiteralTypeResolver;
+
+use PackageFactory\ComponentEngine\Parser\Ast\StringLiteralNode;
+use PackageFactory\ComponentEngine\TypeSystem\TypeInterface;
+
+interface StringLiteralTypeResolverInterface
+{
+    public function resolveTypeOf(StringLiteralNode $stringLiteralNode): TypeInterface;
+}
diff --git a/src/TypeSystem/Resolver/TagTypeResolver/TagTypeResolver.php b/src/TypeSystem/Resolver/TagTypeResolver/TagTypeResolver.php
@@ -26,7 +26,7 @@
 use PackageFactory\ComponentEngine\TypeSystem\Type\StringType\StringType;
 use PackageFactory\ComponentEngine\TypeSystem\TypeInterface;
 
-final class TagTypeResolver
+final class TagTypeResolver implements TagTypeResolverInterface
 {
     public function resolveTypeOf(TagNode $tagNode): TypeInterface
     {
diff --git a/src/TypeSystem/Resolver/TagTypeResolver/TagTypeResolverInterface.php b/src/TypeSystem/Resolver/TagTypeResolver/TagTypeResolverInterface.php
@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * PackageFactory.ComponentEngine - Universal View Components for PHP
+ *   Copyright (C) 2022 Contributors of PackageFactory.ComponentEngine
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace PackageFactory\ComponentEngine\TypeSystem\Resolver\TagTypeResolver;
+
+use PackageFactory\ComponentEngine\Parser\Ast\TagNode;
+use PackageFactory\ComponentEngine\TypeSystem\TypeInterface;
+
+interface TagTypeResolverInterface
+{
+    public function resolveTypeOf(TagNode $tagNode): TypeInterface;
+}
diff --git a/src/TypeSystem/Resolver/TernaryOperationTypeResolver/TernaryOperationTypeResolver.php b/src/TypeSystem/Resolver/TernaryOperationTypeResolver/TernaryOperationTypeResolver.php
@@ -24,14 +24,15 @@
 
 use PackageFactory\ComponentEngine\Parser\Ast\BooleanLiteralNode;
 use PackageFactory\ComponentEngine\Parser\Ast\TernaryOperationNode;
-use PackageFactory\ComponentEngine\TypeSystem\Resolver\ExpressionTypeResolver\ExpressionTypeResolver;
+use PackageFactory\ComponentEngine\TypeSystem\Resolver\ExpressionTypeResolver\ExpressionTypeResolverInterface;
 use PackageFactory\ComponentEngine\TypeSystem\Type\UnionType\UnionType;
 use PackageFactory\ComponentEngine\TypeSystem\TypeInterface;
 
-final class TernaryOperationTypeResolver
+final class TernaryOperationTypeResolver implements TernaryOperationTypeResolverInterface
 {
-    public function __construct(private readonly ExpressionTypeResolver $expressionTypeResolver)
-    {
+    public function __construct(
+        private readonly ExpressionTypeResolverInterface $expressionTypeResolver
+    ) {
     }
 
     public function resolveTypeOf(TernaryOperationNode $ternaryOperationNode): TypeInterface
diff --git a/src/TypeSystem/Resolver/TernaryOperationTypeResolver/TernaryOperationTypeResolverInterface.php b/src/TypeSystem/Resolver/TernaryOperationTypeResolver/TernaryOperationTypeResolverInterface.php

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`use PackageFactory\ComponentEngine\TypeSystem\Type\BooleanType\BooleanType;`
`27`	`27`	`use PackageFactory\ComponentEngine\TypeSystem\TypeInterface;`
`28`	`28`
`29`		`-final class BooleanLiteralTypeResolver`
	`29`	`+final class BooleanLiteralTypeResolver implements BooleanLiteralTypeResolverInterface`
`30`	`30`	`{`
`31`	`31`	`public function resolveTypeOf(BooleanLiteralNode $numberLiteralNode): TypeInterface`
`32`	`32`	`{`
Original file line number	Diff line number	Diff line change
`@@ -31,64 +31,71 @@`
`31`	`31`	`use PackageFactory\ComponentEngine\Parser\Ast\TagNode;`
`32`	`32`	`use PackageFactory\ComponentEngine\Parser\Ast\TernaryOperationNode;`
`33`	`33`	`use PackageFactory\ComponentEngine\TypeSystem\Resolver\BinaryOperationTypeResolver\BinaryOperationTypeResolver;`
	`34`	`+use PackageFactory\ComponentEngine\TypeSystem\Resolver\BinaryOperationTypeResolver\BinaryOperationTypeResolverInterface;`
`34`	`35`	`use PackageFactory\ComponentEngine\TypeSystem\Resolver\BooleanLiteralTypeResolver\BooleanLiteralTypeResolver;`
	`36`	`+use PackageFactory\ComponentEngine\TypeSystem\Resolver\BooleanLiteralTypeResolver\BooleanLiteralTypeResolverInterface;`
`35`	`37`	`use PackageFactory\ComponentEngine\TypeSystem\Resolver\IdentifierTypeResolver\IdentifierTypeResolver;`
	`38`	`+use PackageFactory\ComponentEngine\TypeSystem\Resolver\IdentifierTypeResolver\IdentifierTypeResolverInterface;`
`36`	`39`	`use PackageFactory\ComponentEngine\TypeSystem\Resolver\NumberLiteralTypeResolver\NumberLiteralTypeResolver;`
	`40`	`+use PackageFactory\ComponentEngine\TypeSystem\Resolver\NumberLiteralTypeResolver\NumberLiteralTypeResolverInterface;`
`37`	`41`	`use PackageFactory\ComponentEngine\TypeSystem\Resolver\StringLiteralTypeResolver\StringLiteralTypeResolver;`
	`42`	`+use PackageFactory\ComponentEngine\TypeSystem\Resolver\StringLiteralTypeResolver\StringLiteralTypeResolverInterface;`
`38`	`43`	`use PackageFactory\ComponentEngine\TypeSystem\Resolver\TagTypeResolver\TagTypeResolver;`
	`44`	`+use PackageFactory\ComponentEngine\TypeSystem\Resolver\TagTypeResolver\TagTypeResolverInterface;`
`39`	`45`	`use PackageFactory\ComponentEngine\TypeSystem\Resolver\TernaryOperationTypeResolver\TernaryOperationTypeResolver;`
	`46`	`+use PackageFactory\ComponentEngine\TypeSystem\Resolver\TernaryOperationTypeResolver\TernaryOperationTypeResolverInterface;`
`40`	`47`	`use PackageFactory\ComponentEngine\TypeSystem\ScopeInterface;`
`41`	`48`	`use PackageFactory\ComponentEngine\TypeSystem\TypeInterface;`
`42`	`49`
`43`		`-final class ExpressionTypeResolver`
	`50`	`+final class ExpressionTypeResolver implements ExpressionTypeResolverInterface`
`44`	`51`	`{`
`45`	`52`	`public function __construct(`
`46`	`53`	`private readonly ScopeInterface $scope,`
`47`		`- private ?BinaryOperationTypeResolver $binaryOperationTypeResolver = null,`
`48`		`- private ?BooleanLiteralTypeResolver $booleanLiteralTypeResolver = null,`
`49`		`- private ?IdentifierTypeResolver $identifierTypeResolver = null,`
`50`		`- private ?NumberLiteralTypeResolver $numberLiteralTypeResolver = null,`
`51`		`- private ?StringLiteralTypeResolver $stringLiteralTypeResolver = null,`
`52`		`- private ?TagTypeResolver $tagTypeResolver = null,`
`53`		`- private ?TernaryOperationTypeResolver $ternaryOperationTypeResolver = null`
	`54`	`+ private ?BinaryOperationTypeResolverInterface $binaryOperationTypeResolver = null,`
	`55`	`+ private ?BooleanLiteralTypeResolverInterface $booleanLiteralTypeResolver = null,`
	`56`	`+ private ?IdentifierTypeResolverInterface $identifierTypeResolver = null,`
	`57`	`+ private ?NumberLiteralTypeResolverInterface $numberLiteralTypeResolver = null,`
	`58`	`+ private ?StringLiteralTypeResolverInterface $stringLiteralTypeResolver = null,`
	`59`	`+ private ?TagTypeResolverInterface $tagTypeResolver = null,`
	`60`	`+ private ?TernaryOperationTypeResolverInterface $ternaryOperationTypeResolver = null`
`54`	`61`	`) {`
`55`	`62`	`}`
`56`	`63`
`57`		`- private function getBinaryOperationTypeResolver(): BinaryOperationTypeResolver`
	`64`	`+ private function getBinaryOperationTypeResolver(): BinaryOperationTypeResolverInterface`
`58`	`65`	`{`
`59`	`66`	`return $this->binaryOperationTypeResolver ??= new BinaryOperationTypeResolver(`
`60`	`67`	`expressionTypeResolver: $this`
`61`	`68`	`);`
`62`	`69`	`}`
`63`	`70`
`64`		`- private function getBooleanLiteralTypeResolver(): BooleanLiteralTypeResolver`
	`71`	`+ private function getBooleanLiteralTypeResolver(): BooleanLiteralTypeResolverInterface`
`65`	`72`	`{`
`66`	`73`	`return $this->booleanLiteralTypeResolver ??= new BooleanLiteralTypeResolver();`
`67`	`74`	`}`
`68`	`75`
`69`		`- private function getIdentifierTypeResolver(): IdentifierTypeResolver`
	`76`	`+ private function getIdentifierTypeResolver(): IdentifierTypeResolverInterface`
`70`	`77`	`{`
`71`	`78`	`return $this->identifierTypeResolver ??= new IdentifierTypeResolver(`
`72`	`79`	`scope: $this->scope`
`73`	`80`	`);`
`74`	`81`	`}`
`75`	`82`
`76`		`- private function getNumberLiteralTypeResolver(): NumberLiteralTypeResolver`
	`83`	`+ private function getNumberLiteralTypeResolver(): NumberLiteralTypeResolverInterface`
`77`	`84`	`{`
`78`	`85`	`return $this->numberLiteralTypeResolver ??= new NumberLiteralTypeResolver();`
`79`	`86`	`}`
`80`	`87`
`81`		`- private function getStringLiteralTypeResolver(): StringLiteralTypeResolver`
	`88`	`+ private function getStringLiteralTypeResolver(): StringLiteralTypeResolverInterface`
`82`	`89`	`{`
`83`	`90`	`return $this->stringLiteralTypeResolver ??= new StringLiteralTypeResolver();`
`84`	`91`	`}`
`85`	`92`
`86`		`- private function getTagTypeResolver(): TagTypeResolver`
	`93`	`+ private function getTagTypeResolver(): TagTypeResolverInterface`
`87`	`94`	`{`
`88`	`95`	`return $this->tagTypeResolver ??= new TagTypeResolver();`
`89`	`96`	`}`
`90`	`97`
`91`		`- private function getTernaryOperationTypeResolver(): TernaryOperationTypeResolver`
	`98`	`+ private function getTernaryOperationTypeResolver(): TernaryOperationTypeResolverInterface`
`92`	`99`	`{`
`93`	`100`	`return $this->ternaryOperationTypeResolver ??= new TernaryOperationTypeResolver(`
`94`	`101`	`expressionTypeResolver: $this`