Skip to content

Commit ca26f5a

Browse files
picamatorpicamator
committed
Remaned classes and variables contained BuildIn to BuiltIn
1 parent 4840eec commit ca26f5a

File tree

18 files changed

+94
-94
lines changed

18 files changed

+94
-94
lines changed

‎config/definition/transfer-generator.transfer.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ DefinitionProperty:
4343
propertyName:
4444
type: string
4545
required:
46-
buildInType:
47-
type: DefinitionBuildInType
46+
builtInType:
47+
type: DefinitionBuiltInType
4848
transferType:
4949
type: DefinitionEmbeddedType
5050
collectionType:
@@ -71,9 +71,9 @@ DefinitionAttribute:
7171
type: DefinitionNamespace
7272
required:
7373

74-
DefinitionBuildInType:
74+
DefinitionBuiltInType:
7575
name:
76-
enumType: "Picamator\\TransferObject\\TransferGenerator\\Definition\\Enum\\BuildInTypeEnum"
76+
enumType: "Picamator\\TransferObject\\TransferGenerator\\Definition\\Enum\\BuiltInTypeEnum"
7777
required:
7878
docBlock:
7979
type: string

‎src/DefinitionGenerator/Content/DefinitionContentFactory.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
use Picamator\TransferObject\DefinitionGenerator\Content\Builder\ContentBuilder;
88
use Picamator\TransferObject\DefinitionGenerator\Content\Builder\ContentBuilderInterface;
99
use Picamator\TransferObject\DefinitionGenerator\Content\Expander\BuilderExpanderInterface;
10-
use Picamator\TransferObject\DefinitionGenerator\Content\Expander\BuildInTypeBuilderExpander;
10+
use Picamator\TransferObject\DefinitionGenerator\Content\Expander\BuiltInTypeBuilderExpander;
1111
use Picamator\TransferObject\DefinitionGenerator\Content\Expander\CollectionTypeBuilderExpander;
1212
use Picamator\TransferObject\DefinitionGenerator\Content\Expander\TransferTypeBuilderExpander;
1313
use Picamator\TransferObject\DefinitionGenerator\Content\Reader\ContentReader;
@@ -40,14 +40,14 @@ protected function createBuilderExpander(): BuilderExpanderInterface
4040

4141
$builderExpander
4242
->setNextExpander($this->createCollectionTypeBuilderExpander())
43-
->setNextExpander($this->createBuildInTypeBuilderExpander());
43+
->setNextExpander($this->createBuiltInTypeBuilderExpander());
4444

4545
return $builderExpander;
4646
}
4747

48-
protected function createBuildInTypeBuilderExpander(): BuilderExpanderInterface
48+
protected function createBuiltInTypeBuilderExpander(): BuilderExpanderInterface
4949
{
50-
return new BuildInTypeBuilderExpander();
50+
return new BuiltInTypeBuilderExpander();
5151
}
5252

5353
protected function createCollectionTypeBuilderExpander(): BuilderExpanderInterface

src/DefinitionGenerator/Content/Expander/BuildInTypeBuilderExpander.php renamed to src/DefinitionGenerator/Content/Expander/BuiltInTypeBuilderExpander.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
use Picamator\TransferObject\DefinitionGenerator\Content\Enum\ObjectTypeEnum;
1313
use Picamator\TransferObject\DefinitionGenerator\Exception\DefinitionGeneratorException;
1414
use Picamator\TransferObject\Generated\DefinitionBuilderTransfer;
15-
use Picamator\TransferObject\Generated\DefinitionBuildInTypeTransfer;
15+
use Picamator\TransferObject\Generated\DefinitionBuiltInTypeTransfer;
1616
use Picamator\TransferObject\Generated\DefinitionEmbeddedTypeTransfer;
1717
use Picamator\TransferObject\Generated\DefinitionPropertyTransfer;
1818
use Picamator\TransferObject\Shared\Parser\DocBlockParserTrait;
19-
use Picamator\TransferObject\TransferGenerator\Definition\Enum\BuildInTypeEnum;
19+
use Picamator\TransferObject\TransferGenerator\Definition\Enum\BuiltInTypeEnum;
2020

21-
final class BuildInTypeBuilderExpander extends AbstractBuilderExpander
21+
final class BuiltInTypeBuilderExpander extends AbstractBuilderExpander
2222
{
2323
use DocBlockParserTrait;
2424

@@ -130,23 +130,23 @@ private function createDateTimePropertyTransfer(string $propertyName): Definitio
130130
return $propertyTransfer;
131131
}
132132

133-
private function createPropertyTransfer(string $propertyName, string $buildInType): DefinitionPropertyTransfer
133+
private function createPropertyTransfer(string $propertyName, string $builtInType): DefinitionPropertyTransfer
134134
{
135-
$tapeWithDocBlock = $this->parseTypeWithDocBlock($buildInType) ?? [];
135+
$tapeWithDocBlock = $this->parseTypeWithDocBlock($builtInType) ?? [];
136136

137137
/** @var string $type */
138138
$type = array_key_first($tapeWithDocBlock);
139-
$type = BuildInTypeEnum::from($type);
139+
$type = BuiltInTypeEnum::from($type);
140140

141141
$docBlock = array_first($tapeWithDocBlock);
142142

143-
$buildInTypeTransfer = new DefinitionBuildInTypeTransfer();
144-
$buildInTypeTransfer->name = $type;
145-
$buildInTypeTransfer->docBlock = $docBlock;
143+
$builtInTypeTransfer = new DefinitionBuiltInTypeTransfer();
144+
$builtInTypeTransfer->name = $type;
145+
$builtInTypeTransfer->docBlock = $docBlock;
146146

147147
$propertyTransfer = new DefinitionPropertyTransfer();
148148
$propertyTransfer->propertyName = $propertyName;
149-
$propertyTransfer->buildInType = $buildInTypeTransfer;
149+
$propertyTransfer->builtInType = $builtInTypeTransfer;
150150

151151
return $propertyTransfer;
152152
}

‎src/DefinitionGenerator/Generator/Render/TemplateRender.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ public function renderContent(DefinitionContentTransfer $contentTransfer): strin
6969
private function renderProperty(DefinitionPropertyTransfer $propertyTransfer): string
7070
{
7171
return match (true) {
72-
$propertyTransfer->buildInType !== null
73-
=> $this->renderBuildInType($propertyTransfer),
72+
$propertyTransfer->builtInType !== null
73+
=> $this->renderBuiltInType($propertyTransfer),
7474

7575
$propertyTransfer->transferType !== null
7676
=> $this->renderTransferType($propertyTransfer),
@@ -125,22 +125,22 @@ private function renderTransferType(DefinitionPropertyTransfer $propertyTransfer
125125
);
126126
}
127127

128-
private function renderBuildInType(DefinitionPropertyTransfer $propertyTransfer): string
128+
private function renderBuiltInType(DefinitionPropertyTransfer $propertyTransfer): string
129129
{
130-
/** @var \Picamator\TransferObject\Generated\DefinitionBuildInTypeTransfer $buildInType */
131-
$buildInType = $propertyTransfer->buildInType;
130+
/** @var \Picamator\TransferObject\Generated\DefinitionBuiltInTypeTransfer $builtInType */
131+
$builtInType = $propertyTransfer->builtInType;
132132

133-
return $buildInType->docBlock
133+
return $builtInType->docBlock
134134
? sprintf(
135135
self::TYPE_WITH_DOC_BLOCK_TEMPLATE,
136136
$propertyTransfer->propertyName,
137-
$buildInType->name->value,
138-
$buildInType->docBlock,
137+
$builtInType->name->value,
138+
$builtInType->docBlock,
139139
)
140140
: sprintf(
141141
self::TYPE_TEMPLATE,
142142
$propertyTransfer->propertyName,
143-
$buildInType->name->value,
143+
$builtInType->name->value,
144144
);
145145
}
146146
}

src/Generated/DefinitionBuildInTypeTransfer.php renamed to src/Generated/DefinitionBuiltInTypeTransfer.php

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Generated/DefinitionPropertyTransfer.php‎

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/TransferGenerator/Definition/Enum/BuildInTypeEnum.php renamed to src/TransferGenerator/Definition/Enum/BuiltInTypeEnum.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace Picamator\TransferObject\TransferGenerator\Definition\Enum;
66

7-
enum BuildInTypeEnum: string
7+
enum BuiltInTypeEnum: string
88
{
99
case BOOL = 'bool';
1010
case TRUE = 'true';

‎src/TransferGenerator/Definition/Parser/Expander/AttributesPropertyExpander.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ private function getAttributeTransfer(string $attribute): ?DefinitionAttributeTr
5858
$namespace = $matches['namespace'] ?? '';
5959
$namespaceTransfer = $this->namespaceBuilder->createNamespaceTransfer($namespace);
6060

61-
$buildInTypeTransfer = new DefinitionAttributeTransfer();
62-
$buildInTypeTransfer->arguments = $matches['arguments'] ?? null;
63-
$buildInTypeTransfer->namespace = $namespaceTransfer;
61+
$builtInTypeTransfer = new DefinitionAttributeTransfer();
62+
$builtInTypeTransfer->arguments = $matches['arguments'] ?? null;
63+
$builtInTypeTransfer->namespace = $namespaceTransfer;
6464

65-
return $buildInTypeTransfer;
65+
return $builtInTypeTransfer;
6666
}
6767
}

‎src/TransferGenerator/Definition/Parser/Expander/RequiredPropertyExpander.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ protected function handleExpander(string $matchedType, DefinitionPropertyTransfe
2828

2929
private function isNullableAllowed(DefinitionPropertyTransfer $propertyTransfer): bool
3030
{
31-
$buildInType = $propertyTransfer->buildInType?->name;
32-
if ($buildInType !== null && ($buildInType->isArray() || $buildInType->isArrayObject())) {
31+
$builtInType = $propertyTransfer->builtInType?->name;
32+
if ($builtInType !== null && ($builtInType->isArray() || $builtInType->isArrayObject())) {
3333
return false;
3434
}
3535

‎src/TransferGenerator/Definition/Parser/Expander/TypePropertyExpander.php‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
namespace Picamator\TransferObject\TransferGenerator\Definition\Parser\Expander;
66

7-
use Picamator\TransferObject\Generated\DefinitionBuildInTypeTransfer;
7+
use Picamator\TransferObject\Generated\DefinitionBuiltInTypeTransfer;
88
use Picamator\TransferObject\Generated\DefinitionPropertyTransfer;
99
use Picamator\TransferObject\Shared\Parser\DocBlockParserTrait;
10-
use Picamator\TransferObject\TransferGenerator\Definition\Enum\BuildInTypeEnum;
10+
use Picamator\TransferObject\TransferGenerator\Definition\Enum\BuiltInTypeEnum;
1111
use Picamator\TransferObject\TransferGenerator\Definition\Parser\Expander\Builder\EmbeddedTypeBuilderInterface;
1212

1313
final class TypePropertyExpander extends AbstractPropertyExpander
@@ -29,17 +29,17 @@ protected function matchType(array $propertyType): ?string
2929

3030
protected function handleExpander(string $matchedType, DefinitionPropertyTransfer $propertyTransfer): void
3131
{
32-
$buildInTypeTransfer = $this->getBuildInTypeTransfer($matchedType);
33-
if ($buildInTypeTransfer !== null) {
34-
$propertyTransfer->buildInType = $buildInTypeTransfer;
32+
$builtInTypeTransfer = $this->getBuiltInTypeTransfer($matchedType);
33+
if ($builtInTypeTransfer !== null) {
34+
$propertyTransfer->builtInType = $builtInTypeTransfer;
3535

3636
return;
3737
}
3838

3939
$propertyTransfer->transferType = $this->typeBuilder->createPrefixTypeTransfer($matchedType);
4040
}
4141

42-
private function getBuildInTypeTransfer(string $matchedType): ?DefinitionBuildInTypeTransfer
42+
private function getBuiltInTypeTransfer(string $matchedType): ?DefinitionBuiltInTypeTransfer
4343
{
4444
$tapeWithDocBlock = $this->parseTypeWithDocBlock($matchedType);
4545
if ($tapeWithDocBlock === null) {
@@ -48,16 +48,16 @@ private function getBuildInTypeTransfer(string $matchedType): ?DefinitionBuildIn
4848

4949
/** @var string $type */
5050
$type = array_key_first($tapeWithDocBlock);
51-
$type = BuildInTypeEnum::tryFrom($type);
51+
$type = BuiltInTypeEnum::tryFrom($type);
5252

5353
if ($type === null) {
5454
return null;
5555
}
5656

57-
$buildInTypeTransfer = new DefinitionBuildInTypeTransfer();
58-
$buildInTypeTransfer->name = $type;
59-
$buildInTypeTransfer->docBlock = array_first($tapeWithDocBlock);
57+
$builtInTypeTransfer = new DefinitionBuiltInTypeTransfer();
58+
$builtInTypeTransfer->name = $type;
59+
$builtInTypeTransfer->docBlock = array_first($tapeWithDocBlock);
6060

61-
return $buildInTypeTransfer;
61+
return $builtInTypeTransfer;
6262
}
6363
}

0 commit comments

Comments
 (0)