Skip to content

Commit 634a235

Browse files
grebaldigrebaldi
committed
TASK: Rename NumberType to IntegerType 
1 parent a6af4fc commit 634a235

19 files changed

Lines changed: 97 additions & 98 deletions

File tree

‎src/Target/Php/Transpiler/Expression/ExpressionTranspiler.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
use PackageFactory\ComponentEngine\Target\Php\Transpiler\Identifier\IdentifierTranspiler;
4242
use PackageFactory\ComponentEngine\Target\Php\Transpiler\Match\MatchTranspiler;
4343
use PackageFactory\ComponentEngine\Target\Php\Transpiler\NullLiteral\NullLiteralTranspiler;
44-
use PackageFactory\ComponentEngine\Target\Php\Transpiler\NumberLiteral\NumberLiteralTranspiler;
44+
use PackageFactory\ComponentEngine\Target\Php\Transpiler\IntegerLiteral\IntegerLiteralTranspiler;
4545
use PackageFactory\ComponentEngine\Target\Php\Transpiler\StringLiteral\StringLiteralTranspiler;
4646
use PackageFactory\ComponentEngine\Target\Php\Transpiler\Tag\TagTranspiler;
4747
use PackageFactory\ComponentEngine\Target\Php\Transpiler\TemplateLiteral\TemplateLiteralTranspiler;
@@ -80,7 +80,7 @@ public function transpile(ExpressionNode $expressionNode): string
8080
scope: $this->scope
8181
),
8282
NullLiteralNode::class => new NullLiteralTranspiler(),
83-
IntegerLiteralNode::class => new NumberLiteralTranspiler(),
83+
IntegerLiteralNode::class => new IntegerLiteralTranspiler(),
8484
StringLiteralNode::class => new StringLiteralTranspiler(
8585
shouldAddQuotes: $this->shouldAddQuotesIfNecessary
8686
),

src/Target/Php/Transpiler/NumberLiteral/NumberLiteralTranspiler.php renamed to src/Target/Php/Transpiler/IntegerLiteral/IntegerLiteralTranspiler.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020

2121
declare(strict_types=1);
2222

23-
namespace PackageFactory\ComponentEngine\Target\Php\Transpiler\NumberLiteral;
23+
namespace PackageFactory\ComponentEngine\Target\Php\Transpiler\IntegerLiteral;
2424

2525
use PackageFactory\ComponentEngine\Definition\NumberFormat;
2626
use PackageFactory\ComponentEngine\Parser\Ast\IntegerLiteralNode;
2727

28-
final class NumberLiteralTranspiler
28+
final class IntegerLiteralTranspiler
2929
{
3030
public function transpile(IntegerLiteralNode $IntegerLiteralNode): string
3131
{

‎src/Target/Php/Transpiler/TypeReference/TypeReferenceTranspiler.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
use PackageFactory\ComponentEngine\TypeSystem\Type\BooleanType\BooleanType;
2828
use PackageFactory\ComponentEngine\TypeSystem\Type\ComponentType\ComponentType;
2929
use PackageFactory\ComponentEngine\TypeSystem\Type\EnumType\EnumStaticType;
30-
use PackageFactory\ComponentEngine\TypeSystem\Type\NumberType\NumberType;
30+
use PackageFactory\ComponentEngine\TypeSystem\Type\IntegerType\IntegerType;
3131
use PackageFactory\ComponentEngine\TypeSystem\Type\SlotType\SlotType;
3232
use PackageFactory\ComponentEngine\TypeSystem\Type\StringType\StringType;
3333
use PackageFactory\ComponentEngine\TypeSystem\Type\StructType\StructType;
@@ -44,7 +44,7 @@ public function transpile(TypeReferenceNode $typeReferenceNode): string
4444
{
4545
$type = $this->scope->resolveTypeReference($typeReferenceNode);
4646
$phpTypeReference = match ($type::class) {
47-
NumberType::class => 'int|float',
47+
IntegerType::class => 'int|float',
4848
StringType::class => 'string',
4949
BooleanType::class => 'bool',
5050
SlotType::class => $this->strategy->getPhpTypeReferenceForSlotType($type, $typeReferenceNode),

‎src/TypeSystem/Resolver/Expression/ExpressionTypeResolver.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
use PackageFactory\ComponentEngine\TypeSystem\Resolver\Identifier\IdentifierTypeResolver;
4141
use PackageFactory\ComponentEngine\TypeSystem\Resolver\Match\MatchTypeResolver;
4242
use PackageFactory\ComponentEngine\TypeSystem\Resolver\NullLiteral\NullLiteralTypeResolver;
43-
use PackageFactory\ComponentEngine\TypeSystem\Resolver\NumberLiteral\NumberLiteralTypeResolver;
43+
use PackageFactory\ComponentEngine\TypeSystem\Resolver\IntegerLiteral\IntegerLiteralTypeResolver;
4444
use PackageFactory\ComponentEngine\TypeSystem\Resolver\StringLiteral\StringLiteralTypeResolver;
4545
use PackageFactory\ComponentEngine\TypeSystem\Resolver\Tag\TagTypeResolver;
4646
use PackageFactory\ComponentEngine\TypeSystem\Resolver\TemplateLiteral\TemplateLiteralTypeResolver;
@@ -72,7 +72,7 @@ public function resolveTypeOf(ExpressionNode $expressionNode): TypeInterface
7272
))->resolveTypeOf($rootNode),
7373
NullLiteralNode::class => (new NullLiteralTypeResolver())
7474
->resolveTypeOf($rootNode),
75-
IntegerLiteralNode::class => (new NumberLiteralTypeResolver())
75+
IntegerLiteralNode::class => (new IntegerLiteralTypeResolver())
7676
->resolveTypeOf($rootNode),
7777
StringLiteralNode::class => (new StringLiteralTypeResolver())
7878
->resolveTypeOf($rootNode),

src/TypeSystem/Resolver/NumberLiteral/NumberLiteralTypeResolver.php renamed to src/TypeSystem/Resolver/IntegerLiteral/IntegerLiteralTypeResolver.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@
2020

2121
declare(strict_types=1);
2222

23-
namespace PackageFactory\ComponentEngine\TypeSystem\Resolver\NumberLiteral;
23+
namespace PackageFactory\ComponentEngine\TypeSystem\Resolver\IntegerLiteral;
2424

2525
use PackageFactory\ComponentEngine\Parser\Ast\IntegerLiteralNode;
26-
use PackageFactory\ComponentEngine\TypeSystem\Type\NumberType\NumberType;
26+
use PackageFactory\ComponentEngine\TypeSystem\Type\IntegerType\IntegerType;
2727
use PackageFactory\ComponentEngine\TypeSystem\TypeInterface;
2828

29-
final class NumberLiteralTypeResolver
29+
final class IntegerLiteralTypeResolver
3030
{
3131
public function resolveTypeOf(IntegerLiteralNode $IntegerLiteralNode): TypeInterface
3232
{
33-
return NumberType::get();
33+
return IntegerType::get();
3434
}
3535
}

‎src/TypeSystem/Scope/GlobalScope/GlobalScope.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,10 @@
2222

2323
namespace PackageFactory\ComponentEngine\TypeSystem\Scope\GlobalScope;
2424

25-
use PackageFactory\ComponentEngine\Parser\Ast\ComponentDeclarationNode;
2625
use PackageFactory\ComponentEngine\Parser\Ast\TypeReferenceNode;
2726
use PackageFactory\ComponentEngine\TypeSystem\ScopeInterface;
2827
use PackageFactory\ComponentEngine\TypeSystem\Type\BooleanType\BooleanType;
29-
use PackageFactory\ComponentEngine\TypeSystem\Type\NumberType\NumberType;
28+
use PackageFactory\ComponentEngine\TypeSystem\Type\IntegerType\IntegerType;
3029
use PackageFactory\ComponentEngine\TypeSystem\Type\SlotType\SlotType;
3130
use PackageFactory\ComponentEngine\TypeSystem\Type\StringType\StringType;
3231
use PackageFactory\ComponentEngine\TypeSystem\TypeInterface;
@@ -53,7 +52,7 @@ public function resolveTypeReference(TypeReferenceNode $typeReferenceNode): Type
5352
{
5453
return match ($typeReferenceNode->name) {
5554
'string' => StringType::get(),
56-
'number' => NumberType::get(),
55+
'number' => IntegerType::get(),
5756
'boolean' => BooleanType::get(),
5857
'slot' => SlotType::get(),
5958
default => throw new \Exception('@TODO: Unknown Type ' . $typeReferenceNode->name)

src/TypeSystem/Type/NumberType/NumberType.php renamed to src/TypeSystem/Type/IntegerType/IntegerType.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020

2121
declare(strict_types=1);
2222

23-
namespace PackageFactory\ComponentEngine\TypeSystem\Type\NumberType;
23+
namespace PackageFactory\ComponentEngine\TypeSystem\Type\IntegerType;
2424

2525
use PackageFactory\ComponentEngine\TypeSystem\TypeInterface;
2626

27-
final class NumberType implements TypeInterface
27+
final class IntegerType implements TypeInterface
2828
{
2929
private static null|self $instance = null;
3030

test/Unit/Target/Php/Transpiler/NumberLiteral/NumberLiteralTranspilerTest.php renamed to test/Unit/Target/Php/Transpiler/IntegerLiteral/IntegerLiteralTranspilerTest.php

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,19 @@
2020

2121
declare(strict_types=1);
2222

23-
namespace PackageFactory\ComponentEngine\Test\Unit\Target\Php\Transpiler\NumberLiteral;
23+
namespace PackageFactory\ComponentEngine\Test\Unit\Target\Php\Transpiler\IntegerLiteral;
2424

2525
use PackageFactory\ComponentEngine\Parser\Ast\ExpressionNode;
2626
use PackageFactory\ComponentEngine\Parser\Ast\IntegerLiteralNode;
27-
use PackageFactory\ComponentEngine\Target\Php\Transpiler\NumberLiteral\NumberLiteralTranspiler;
27+
use PackageFactory\ComponentEngine\Target\Php\Transpiler\IntegerLiteral\IntegerLiteralTranspiler;
2828
use PHPUnit\Framework\TestCase;
2929

30-
final class NumberLiteralTranspilerTest extends TestCase
30+
final class IntegerLiteralTranspilerTest extends TestCase
3131
{
3232
/**
3333
* @return array<string,mixed>
3434
*/
35-
public static function numberLiteralExamples(): array
35+
public static function integerLiteralExamples(): array
3636
{
3737
return [
3838
// Decimal
@@ -66,20 +66,20 @@ public static function numberLiteralExamples(): array
6666
}
6767

6868
/**
69-
* @dataProvider numberLiteralExamples
69+
* @dataProvider integerLiteralExamples
7070
* @test
71-
* @param string $numberLiteralAsString
71+
* @param string $integerLiteralAsString
7272
* @param string $expectedTranspilationResult
7373
* @return void
7474
*/
75-
public function transpilesIntegerLiteralNodes(string $numberLiteralAsString, string $expectedTranspilationResult): void
75+
public function transpilesIntegerLiteralNodes(string $integerLiteralAsString, string $expectedTranspilationResult): void
7676
{
77-
$numberLiteralTranspiler = new NumberLiteralTranspiler();
78-
$IntegerLiteralNode = ExpressionNode::fromString($numberLiteralAsString)->root;
79-
assert($IntegerLiteralNode instanceof IntegerLiteralNode);
77+
$integerLiteralTranspiler = new IntegerLiteralTranspiler();
78+
$integerLiteralNode = ExpressionNode::fromString($integerLiteralAsString)->root;
79+
assert($integerLiteralNode instanceof IntegerLiteralNode);
8080

81-
$actualTranspilationResult = $numberLiteralTranspiler->transpile(
82-
$IntegerLiteralNode
81+
$actualTranspilationResult = $integerLiteralTranspiler->transpile(
82+
$integerLiteralNode
8383
);
8484

8585
$this->assertEquals(

‎test/Unit/Target/Php/Transpiler/TypeReference/TypeReferenceTranspilerTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
use PackageFactory\ComponentEngine\TypeSystem\Type\BooleanType\BooleanType;
3333
use PackageFactory\ComponentEngine\TypeSystem\Type\ComponentType\ComponentType;
3434
use PackageFactory\ComponentEngine\TypeSystem\Type\EnumType\EnumStaticType;
35-
use PackageFactory\ComponentEngine\TypeSystem\Type\NumberType\NumberType;
35+
use PackageFactory\ComponentEngine\TypeSystem\Type\IntegerType\IntegerType;
3636
use PackageFactory\ComponentEngine\TypeSystem\Type\StringType\StringType;
3737
use PackageFactory\ComponentEngine\TypeSystem\Type\StructType\StructType;
3838
use PackageFactory\ComponentEngine\TypeSystem\TypeInterface;
@@ -46,7 +46,7 @@ protected function getTypeReferenceTranspiler(): TypeReferenceTranspiler
4646
scope: new DummyScope([], [
4747
'string' => StringType::get(),
4848
'boolean' => BooleanType::get(),
49-
'number' => NumberType::get(),
49+
'number' => IntegerType::get(),
5050
'Button' => ComponentType::fromComponentDeclarationNode(
5151
ComponentDeclarationNode::fromString('component Button { return "" }')
5252
),

‎test/Unit/TypeSystem/Resolver/BinaryOperation/BinaryOperationTypeResolverTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
use PackageFactory\ComponentEngine\Test\Unit\TypeSystem\Scope\Fixtures\DummyScope;
2828
use PackageFactory\ComponentEngine\TypeSystem\Resolver\BinaryOperation\BinaryOperationTypeResolver;
2929
use PackageFactory\ComponentEngine\TypeSystem\Type\BooleanType\BooleanType;
30-
use PackageFactory\ComponentEngine\TypeSystem\Type\NumberType\NumberType;
30+
use PackageFactory\ComponentEngine\TypeSystem\Type\IntegerType\IntegerType;
3131
use PackageFactory\ComponentEngine\TypeSystem\Type\StringType\StringType;
3232
use PackageFactory\ComponentEngine\TypeSystem\Type\UnionType\UnionType;
3333
use PackageFactory\ComponentEngine\TypeSystem\TypeInterface;
@@ -45,8 +45,8 @@ public static function binaryOperationExamples(): array
4545
'true || false' => ['true || false', BooleanType::get()],
4646
'true && "foo"' => ['true && "foo"', UnionType::of(BooleanType::get(), StringType::get())],
4747
'true || "foo"' => ['true || "foo"', UnionType::of(BooleanType::get(), StringType::get())],
48-
'true && 42' => ['true && 42', UnionType::of(BooleanType::get(), NumberType::get())],
49-
'true || 42' => ['true || 42', UnionType::of(BooleanType::get(), NumberType::get())],
48+
'true && 42' => ['true && 42', UnionType::of(BooleanType::get(), IntegerType::get())],
49+
'true || 42' => ['true || 42', UnionType::of(BooleanType::get(), IntegerType::get())],
5050

5151
'4 === 2' => ['4 === 2', BooleanType::get()],
5252
'4 !== 2' => ['4 !== 2', BooleanType::get()],

0 commit comments

Comments
 (0)