Parse and validate AT Protocol Lexicons with DTO generation for Laravel
Run through PHP CS Fixer
+43
-40
+3
-3
src/Generator/ClassGenerator.php
+3
-3
src/Generator/ClassGenerator.php
···
49
49
?DocBlockGenerator $docBlockGenerator = null,
50
50
?ExtensionManager $extensions = null
51
51
) {
52
-
$this->naming = $naming ?? new NamingConverter;
52
+
$this->naming = $naming ?? new NamingConverter();
53
53
$this->typeMapper = $typeMapper ?? new TypeMapper($this->naming);
54
-
$this->renderer = $renderer ?? new StubRenderer;
54
+
$this->renderer = $renderer ?? new StubRenderer();
55
55
$this->methodGenerator = $methodGenerator ?? new MethodGenerator($this->naming, $this->typeMapper, $this->renderer);
56
56
$this->docBlockGenerator = $docBlockGenerator ?? new DocBlockGenerator($this->typeMapper);
57
-
$this->extensions = $extensions ?? new ExtensionManager;
57
+
$this->extensions = $extensions ?? new ExtensionManager();
58
58
}
59
59
60
60
/**
+2
-2
src/Generator/ConstructorGenerator.php
+2
-2
src/Generator/ConstructorGenerator.php
···
21
21
?PropertyGenerator $propertyGenerator = null,
22
22
?StubRenderer $renderer = null
23
23
) {
24
-
$this->propertyGenerator = $propertyGenerator ?? new PropertyGenerator;
25
-
$this->renderer = $renderer ?? new StubRenderer;
24
+
$this->propertyGenerator = $propertyGenerator ?? new PropertyGenerator();
25
+
$this->renderer = $renderer ?? new StubRenderer();
26
26
}
27
27
28
28
/**
+2
-2
src/Generator/DTOGenerator.php
+2
-2
src/Generator/DTOGenerator.php
···
67
67
$this->outputDirectory = rtrim($outputDirectory, '/');
68
68
$this->typeParser = $typeParser ?? new TypeParser(schemaLoader: $schemaLoader);
69
69
$this->namespaceResolver = $namespaceResolver ?? new NamespaceResolver($baseNamespace);
70
-
$this->templateRenderer = $templateRenderer ?? new TemplateRenderer;
71
-
$this->fileWriter = $fileWriter ?? new FileWriter;
70
+
$this->templateRenderer = $templateRenderer ?? new TemplateRenderer();
71
+
$this->fileWriter = $fileWriter ?? new FileWriter();
72
72
73
73
// Initialize ClassGenerator with proper naming converter
74
74
$naming = new NamingConverter($this->baseNamespace);
+1
-1
src/Generator/DocBlockGenerator.php
+1
-1
src/Generator/DocBlockGenerator.php
+3
-3
src/Generator/MethodGenerator.php
+3
-3
src/Generator/MethodGenerator.php
···
42
42
?ModelMapper $modelMapper = null,
43
43
?ExtensionManager $extensions = null
44
44
) {
45
-
$this->naming = $naming ?? new NamingConverter;
45
+
$this->naming = $naming ?? new NamingConverter();
46
46
$this->typeMapper = $typeMapper ?? new TypeMapper($this->naming);
47
-
$this->renderer = $renderer ?? new StubRenderer;
47
+
$this->renderer = $renderer ?? new StubRenderer();
48
48
$this->modelMapper = $modelMapper ?? new ModelMapper($this->naming, $this->typeMapper);
49
-
$this->extensions = $extensions ?? new ExtensionManager;
49
+
$this->extensions = $extensions ?? new ExtensionManager();
50
50
}
51
51
52
52
/**
+1
-1
src/Generator/ModelMapper.php
+1
-1
src/Generator/ModelMapper.php
···
19
19
*/
20
20
public function __construct(?NamingConverter $naming = null, ?TypeMapper $typeMapper = null)
21
21
{
22
-
$this->naming = $naming ?? new NamingConverter;
22
+
$this->naming = $naming ?? new NamingConverter();
23
23
$this->typeMapper = $typeMapper ?? new TypeMapper($this->naming);
24
24
}
25
25
+2
-2
src/Generator/PropertyGenerator.php
+2
-2
src/Generator/PropertyGenerator.php
···
19
19
*/
20
20
public function __construct(?TypeMapper $typeMapper = null, ?StubRenderer $renderer = null)
21
21
{
22
-
$this->typeMapper = $typeMapper ?? new TypeMapper;
23
-
$this->renderer = $renderer ?? new StubRenderer;
22
+
$this->typeMapper = $typeMapper ?? new TypeMapper();
23
+
$this->renderer = $renderer ?? new StubRenderer();
24
24
}
25
25
26
26
/**
+2
-2
src/Generator/TypeMapper.php
+2
-2
src/Generator/TypeMapper.php
···
28
28
*/
29
29
public function __construct(?NamingConverter $naming = null, ?ExtensionManager $extensions = null)
30
30
{
31
-
$this->naming = $naming ?? new NamingConverter;
32
-
$this->extensions = $extensions ?? new ExtensionManager;
31
+
$this->naming = $naming ?? new NamingConverter();
32
+
$this->extensions = $extensions ?? new ExtensionManager();
33
33
}
34
34
35
35
/**
+1
-1
src/Parser/ComplexTypeParser.php
+1
-1
src/Parser/ComplexTypeParser.php
+2
-1
src/Parser/DnsLexiconResolver.php
+2
-1
src/Parser/DnsLexiconResolver.php
···
45
45
) {
46
46
$this->enabled = $enabled;
47
47
$this->httpTimeout = $httpTimeout;
48
-
$this->parser = $parser ?? new DefaultLexiconParser;
48
+
$this->parser = $parser ?? new DefaultLexiconParser();
49
49
$this->hasResolver = class_exists('SocialDept\\Resolver\\Resolver');
50
50
}
51
51
···
60
60
61
61
if (! $this->hasResolver) {
62
62
$this->showResolverWarning();
63
+
63
64
throw SchemaNotFoundException::forNsid($nsid);
64
65
}
65
66
+1
-1
src/Parser/TypeParser.php
+1
-1
src/Parser/TypeParser.php
···
45
45
?ComplexTypeParser $complexParser = null,
46
46
?SchemaLoader $schemaLoader = null
47
47
) {
48
-
$this->primitiveParser = $primitiveParser ?? new PrimitiveParser;
48
+
$this->primitiveParser = $primitiveParser ?? new PrimitiveParser();
49
49
$this->complexParser = $complexParser ?? new ComplexTypeParser($this->primitiveParser);
50
50
$this->schemaLoader = $schemaLoader;
51
51
}
+7
-7
src/SchemaServiceProvider.php
+7
-7
src/SchemaServiceProvider.php
···
132
132
133
133
// Register AT Protocol validation rules
134
134
$validator->extend('nsid', function ($attribute, $value) {
135
-
$rule = new Validation\Rules\Nsid;
135
+
$rule = new Validation\Rules\Nsid();
136
136
$failed = false;
137
137
$rule->validate($attribute, $value, function () use (&$failed) {
138
138
$failed = true;
···
142
142
}, 'The :attribute is not a valid NSID.');
143
143
144
144
$validator->extend('did', function ($attribute, $value) {
145
-
$rule = new Validation\Rules\Did;
145
+
$rule = new Validation\Rules\Did();
146
146
$failed = false;
147
147
$rule->validate($attribute, $value, function () use (&$failed) {
148
148
$failed = true;
···
152
152
}, 'The :attribute is not a valid DID.');
153
153
154
154
$validator->extend('handle', function ($attribute, $value) {
155
-
$rule = new Validation\Rules\Handle;
155
+
$rule = new Validation\Rules\Handle();
156
156
$failed = false;
157
157
$rule->validate($attribute, $value, function () use (&$failed) {
158
158
$failed = true;
···
162
162
}, 'The :attribute is not a valid handle.');
163
163
164
164
$validator->extend('at_uri', function ($attribute, $value) {
165
-
$rule = new Validation\Rules\AtUri;
165
+
$rule = new Validation\Rules\AtUri();
166
166
$failed = false;
167
167
$rule->validate($attribute, $value, function () use (&$failed) {
168
168
$failed = true;
···
172
172
}, 'The :attribute is not a valid AT URI.');
173
173
174
174
$validator->extend('at_datetime', function ($attribute, $value) {
175
-
$rule = new Validation\Rules\AtDatetime;
175
+
$rule = new Validation\Rules\AtDatetime();
176
176
$failed = false;
177
177
$rule->validate($attribute, $value, function () use (&$failed) {
178
178
$failed = true;
···
182
182
}, 'The :attribute is not a valid AT Protocol datetime.');
183
183
184
184
$validator->extend('cid', function ($attribute, $value) {
185
-
$rule = new Validation\Rules\Cid;
185
+
$rule = new Validation\Rules\Cid();
186
186
$failed = false;
187
187
$rule->validate($attribute, $value, function () use (&$failed) {
188
188
$failed = true;
···
218
218
}, 'The :attribute must be at least :min_graphemes graphemes.');
219
219
220
220
$validator->extend('language', function ($attribute, $value) {
221
-
$rule = new Validation\Rules\Language;
221
+
$rule = new Validation\Rules\Language();
222
222
$failed = false;
223
223
$rule->validate($attribute, $value, function () use (&$failed) {
224
224
$failed = true;
+2
-1
src/Services/UnionResolver.php
+2
-1
src/Services/UnionResolver.php
+1
src/Support/UnionHelper.php
+1
src/Support/UnionHelper.php
+2
-2
src/Validation/Rules/AtUri.php
+2
-2
src/Validation/Rules/AtUri.php
+5
-5
src/Validation/TypeValidators/ArrayValidator.php
+5
-5
src/Validation/TypeValidators/ArrayValidator.php
···
75
75
$type = $definition['type'] ?? null;
76
76
77
77
$validator = match ($type) {
78
-
'string' => new StringValidator,
79
-
'integer' => new IntegerValidator,
80
-
'boolean' => new BooleanValidator,
81
-
'object' => new ObjectValidator,
82
-
'array' => new ArrayValidator,
78
+
'string' => new StringValidator(),
79
+
'integer' => new IntegerValidator(),
80
+
'boolean' => new BooleanValidator(),
81
+
'object' => new ObjectValidator(),
82
+
'array' => new ArrayValidator(),
83
83
default => null,
84
84
};
85
85
+5
-5
src/Validation/TypeValidators/ObjectValidator.php
+5
-5
src/Validation/TypeValidators/ObjectValidator.php
···
48
48
$type = $definition['type'] ?? null;
49
49
50
50
$validator = match ($type) {
51
-
'string' => new StringValidator,
52
-
'integer' => new IntegerValidator,
53
-
'boolean' => new BooleanValidator,
54
-
'object' => new ObjectValidator,
55
-
'array' => new ArrayValidator,
51
+
'string' => new StringValidator(),
52
+
'integer' => new IntegerValidator(),
53
+
'boolean' => new BooleanValidator(),
54
+
'object' => new ObjectValidator(),
55
+
'array' => new ArrayValidator(),
56
56
default => null,
57
57
};
58
58