Skip to content

Commit 5817f4d

Browse files
committed
feat: Update OpenAPI implementation
1 parent 2d4a5e9 commit 5817f4d

File tree

10 files changed

+141
-108
lines changed

10 files changed

+141
-108
lines changed

.editorconfig

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
[*.html]
2-
indent_size = 2
2+
indent_size = 4
33
indent_style = space
44

55
[*.php]
6-
indent_size = 2
7-
tab_width = 2
6+
indent_size = 4
87
indent_style = space

src/PHPDraft/Model/Elements/ArrayStructureElement.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class ArrayStructureElement extends BasicStructureElement
2727
*
2828
* @return self Self reference
2929
*/
30-
public function parse(?object $object, array &$dependencies): StructureElement
30+
public function parse(?object $object, array &$dependencies): self
3131
{
3232
$this->element = $object->element ?? 'array';
3333

src/PHPDraft/Model/Elements/BasicStructureElement.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ abstract class BasicStructureElement implements StructureElement
7575
*
7676
* @return self self reference
7777
*/
78-
abstract public function parse(?object $object, array &$dependencies): StructureElement;
78+
abstract public function parse(?object $object, array &$dependencies): self;
7979

8080
/**
8181
* Print a string representation.

src/PHPDraft/Model/Elements/EnumStructureElement.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class EnumStructureElement extends BasicStructureElement
2424
*
2525
* @return self
2626
*/
27-
public function parse(?object $object, array &$dependencies): StructureElement
27+
public function parse(?object $object, array &$dependencies): self
2828
{
2929
$this->element = $object->element;
3030

src/PHPDraft/Model/Elements/ObjectStructureElement.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ public function __clearForTest(): void
4141
* @param object|null $object An object to parse
4242
* @param string[] $dependencies Dependencies of this object
4343
*
44-
* @return ObjectStructureElement self reference
44+
* @return self self reference
4545
*/
46-
public function parse(?object $object, array &$dependencies): StructureElement
46+
public function parse(?object $object, array &$dependencies): self
4747
{
4848
$this->object = $object;
4949
if (is_null($object) || !isset($object->element) || !(isset($object->content) || isset($object->meta) )) {

src/PHPDraft/Model/HTTPRequest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ class HTTPRequest implements Comparable
4242
/**
4343
* Description of the request.
4444
*
45-
* @var string
45+
* @var string|null
4646
*/
47-
public string $description = '';
47+
public ?string $description = NULL;
4848

4949
/**
5050
* Parent class.

src/PHPDraft/Model/Transition.php

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,16 @@ class Transition extends HierarchyElement
3737
/**
3838
* URL variables.
3939
*
40-
* @var StructureElement[]
40+
* @var BasicStructureElement[]
4141
*/
4242
public array $url_variables = [];
4343

4444
/**
4545
* Data variables.
4646
*
47-
* @var StructureElement|null
47+
* @var ObjectStructureElement|BasicStructureElement|null
4848
*/
49-
public ?StructureElement $data_variables = null;
49+
public ?BasicStructureElement $data_variables = null;
5050

5151
/**
5252
* The request.
@@ -65,7 +65,7 @@ class Transition extends HierarchyElement
6565
/**
6666
* Structures used (if any).
6767
*
68-
* @var StructureElement[]
68+
* @var BasicStructureElement[]
6969
*/
7070
public array $structures = [];
7171

@@ -94,7 +94,7 @@ public function parse(object $object): self
9494
$this->href = $href->content ?? $href;
9595

9696
if (isset($object->attributes->hrefVariables)) {
97-
$deps = [];
97+
$deps = [];
9898
foreach ($object->attributes->hrefVariables->content as $variable) {
9999
$struct = (new ObjectStructureElement())->get_class($variable->element);
100100
$this->url_variables[] = $struct->parse($variable, $deps);
@@ -165,10 +165,6 @@ public function build_url(string $base_url = '', bool $clean = false): string
165165
$vars = [];
166166
if ($this->url_variables !== []) {
167167
foreach ($this->url_variables as $item) {
168-
if (!is_subclass_of($item, BasicStructureElement::class)) {
169-
continue;
170-
}
171-
172168
$vars[$item->key->value] = $item->string_value(true);
173169
}
174170
}

0 commit comments

Comments
 (0)