Skip to content

Commit 39c636a

Browse files
committed
chore: fix syntax error
1 parent 9453c1b commit 39c636a

17 files changed

Lines changed: 7027 additions & 44 deletions

src/PHPDraft/Model/Elements/ArrayStructureElement.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,13 @@ public function __toString(): string
5959
{
6060
if (is_string($this->value)) {
6161
$type = $this->get_element_as_html($this->element);
62+
$desc = '';
63+
if ($this->description !== NULL)
64+
{
65+
$desc = MarkdownExtra::defaultTransform($this->description);
66+
}
6267

63-
return '<tr><td>' . $this->key . '</td><td>' . $type . '</td><td>' . MarkdownExtra::defaultTransform($this->description) . '</td></tr>';
68+
return "<tr><td>{$this->key}</td><td>{$type}</td><td>{$desc}</td></tr>";
6469
}
6570

6671
$return = '';

src/PHPDraft/Model/Elements/ElementStructureElement.php

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,14 @@ public function __toString(): string
5252
return '<li class="list-group-item mdl-list__item">' . $type . $desc . $value . '</li>';
5353
}
5454

55-
public function string_value($flat = false)
55+
/**
56+
* Get a string representation of the value.
57+
*
58+
* @param bool $flat get a flat representation of the item.
59+
*
60+
* @return string
61+
*/
62+
public function string_value(bool $flat = false)
5663
{
5764
if ($flat === true) {
5865
return $this->value;
@@ -64,12 +71,17 @@ public function string_value($flat = false)
6471
/**
6572
* Represent the element in HTML.
6673
*
67-
* @param string $element Element name
74+
* @param string|null $element Element name
6875
*
6976
* @return string HTML string
7077
*/
71-
protected function get_element_as_html($element): string
78+
protected function get_element_as_html(?string $element): string
7279
{
80+
if ($element === null)
81+
{
82+
return '<code>null</code>';
83+
}
84+
7385
if (in_array($element, self::DEFAULTS)) {
7486
return '<code>' . $element . '</code>';
7587
}

src/PHPDraft/Model/Elements/EnumStructureElement.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,13 @@ public function __toString(): string
8181
{
8282
if (is_string($this->value)) {
8383
$type = $this->get_element_as_html($this->element);
84+
$desc = '';
85+
if ($this->description !== NULL)
86+
{
87+
$desc = MarkdownExtra::defaultTransform($this->description);
88+
}
8489

85-
return '<tr><td>' . $this->key->value . '</td><td>' . $type . '</td><td>' . MarkdownExtra::defaultTransform($this->description) . '</td></tr>';
90+
return "<tr><td>{$this->key->value}</td><td>{$type}</td><td>{$desc}</td></tr>";
8691
}
8792

8893
$return = '';

src/PHPDraft/Model/Elements/ObjectStructureElement.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
namespace PHPDraft\Model\Elements;
1414

1515
use Michelf\MarkdownExtra;
16+
use stdClass;
1617

1718
/**
1819
* Class ObjectStructureElement.
@@ -21,7 +22,7 @@ class ObjectStructureElement extends BasicStructureElement
2122
{
2223
/**
2324
* Object representation before parsing
24-
* @var \stdClass|null
25+
* @var stdClass|null
2526
* @phpstan-ignore-next-line
2627
*/
2728
private $object;
@@ -209,13 +210,12 @@ protected function construct_string_return(string $value): string
209210
$tooltip = 'This is a variable key of type &quot;' . $this->key->type . '&quot;';
210211
$variable = '<a class="variable-key" title="' . $this->key->type . '" href="#object-' . $link_name . '"><span class="fas fa-info variable-info" data-toggle="tooltip" data-placement="top" data-tooltip="' . $tooltip . '" title="' . $tooltip . '"></span></a>';
211212
}
213+
$desc = '';
214+
if ($this->description !== NULL)
215+
{
216+
$desc = MarkdownExtra::defaultTransform($this->description);
217+
}
212218

213-
return '<tr>' .
214-
'<td>' . '<span>' . $this->key->value . '</span>' . $variable . '</td>' .
215-
'<td>' . $type . '</td>' .
216-
'<td> <span class="status">' . $this->status . '</span></td>' .
217-
'<td>' . MarkdownExtra::defaultTransform($this->description) . '</td>' .
218-
'<td>' . $value . '</td>' .
219-
'</tr>';
219+
return "<tr><td><span>{$this->key->value}</span>{$variable}</td><td>{$type}</td><td> <span class=\"status\">{$this->status}</span></td><td>{$desc}</td><td>{$value}</td></tr>";
220220
}
221221
}

src/PHPDraft/Model/Elements/Tests/BasicStructureElementTest.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,7 @@ public function testStringValue($value, $string_value): void
5858
{
5959
$this->set_reflection_property_value('value', $value);
6060

61-
$this->mock_function('rand', function () {
62-
return 0;
63-
});
61+
$this->mock_function('rand', fn() => 0);
6462
$return = $this->class->string_value();
6563
$this->unmock_function('rand');
6664

src/PHPDraft/Model/Elements/Tests/ElementStructureElementTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public function testParse(): void
5050
*/
5151
public function testStringValue(): void
5252
{
53-
$this->assertSame('<li class="list-group-item mdl-list__item"><a class="code" title="" href="#object-"></a></li>', $this->class->string_value());
53+
$this->assertSame('<li class="list-group-item mdl-list__item"><code>null</code></li>', $this->class->string_value());
5454
}
5555

5656
/**

src/PHPDraft/Model/Elements/Tests/EnumStructureElementTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public function testToStringWithString(): void
7777
$this->class->key->value = 'key';
7878
$this->class->element = 'string';
7979
$return = $this->class->__toString();
80-
$this->assertSame('<tr><td>key</td><td><code>string</code></td><td>' . PHP_EOL . '</td></tr>', $return);
80+
$this->assertSame('<tr><td>key</td><td><code>string</code></td><td></td></tr>', $return);
8181
}
8282

8383
/**
@@ -91,7 +91,7 @@ public function testToStringWithStringComplex(): void
9191
$this->class->key->value = 'key';
9292
$this->class->element = 'Car';
9393
$return = $this->class->__toString();
94-
$this->assertSame('<tr><td>key</td><td><a class="code" title="Car" href="#object-car">Car</a></td><td>' . PHP_EOL . '</td></tr>', $return);
94+
$this->assertSame('<tr><td>key</td><td><a class="code" title="Car" href="#object-car">Car</a></td><td></td></tr>', $return);
9595
}
9696

9797
/**
@@ -120,7 +120,7 @@ public function testToStringWithComplexArray(): void
120120
*
121121
* @covers \PHPDraft\Model\Elements\EnumStructureElement::parse
122122
*/
123-
public function testSuccesfulParse(string $object, EnumStructureElement $expected): void
123+
public function testSuccessfulParse(string $object, EnumStructureElement $expected): void
124124
{
125125
$dep = [];
126126
$res = $this->class->parse(json_decode($object), $dep);

src/PHPDraft/Model/Elements/Tests/ObjectStructureElementTest.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ public function testToStringArray(): void
359359
$val->value = 'stuff';
360360
$this->class->value = [$val];
361361
$return = $this->class->__toString();
362-
$this->assertSame('<table class="table table-striped mdl-data-table mdl-js-data-table "><tr><td></td><td><a class="code" title="things" href="#object-things">things</a></td><td>' . PHP_EOL . '</td></tr></table>', $return);
362+
$this->assertSame('<table class="table table-striped mdl-data-table mdl-js-data-table "><tr><td></td><td><a class="code" title="things" href="#object-things">things</a></td><td></td></tr></table>', $return);
363363
}
364364

365365
/**
@@ -373,7 +373,7 @@ public function testToStringNullValue(): void
373373
$this->class->key->value = 'hello';
374374
$this->class->type = 'mixed';
375375
$return = $this->class->__toString();
376-
$this->assertSame('<tr><td><span>hello</span></td><td><a class="code" title="mixed" href="#object-mixed">mixed</a></td><td> <span class="status"></span></td><td>' . PHP_EOL . '</td><td></td></tr>', $return);
376+
$this->assertSame('<tr><td><span>hello</span></td><td><a class="code" title="mixed" href="#object-mixed">mixed</a></td><td> <span class="status"></span></td><td></td><td></td></tr>', $return);
377377
}
378378

379379
/**
@@ -388,7 +388,7 @@ public function testToStringObjectValue(): void
388388
$this->class->value = new ObjectStructureElement();
389389
$this->class->type = 'object';
390390
$return = $this->class->__toString();
391-
$this->assertSame('<tr><td><span>hello</span></td><td><code>object</code></td><td> <span class="status"></span></td><td>' . PHP_EOL . '</td><td><div class="sub-struct"><span class="example-value pull-right">{ }</span></div></td></tr>', $return);
391+
$this->assertSame('<tr><td><span>hello</span></td><td><code>object</code></td><td> <span class="status"></span></td><td></td><td><div class="sub-struct"><span class="example-value pull-right">{ }</span></div></td></tr>', $return);
392392
}
393393

394394
/**
@@ -405,7 +405,7 @@ public function testToStringArrayValue(): void
405405
$this->class->value->value = 'value';
406406
$this->class->type = 'array';
407407
$return = $this->class->__toString();
408-
$this->assertSame('<tr><td><span>hello</span></td><td><code>array</code></td><td> <span class="status"></span></td><td>' . PHP_EOL . '</td><td><div class="array-struct"><tr><td></td><td><a class="code" title="value" href="#object-value">value</a></td><td>' . PHP_EOL . '</td></tr></div></td></tr>', $return);
408+
$this->assertSame('<tr><td><span>hello</span></td><td><code>array</code></td><td> <span class="status"></span></td><td></td><td><div class="array-struct"><tr><td></td><td><a class="code" title="value" href="#object-value">value</a></td><td></td></tr></div></td></tr>', $return);
409409
}
410410

411411
/**
@@ -425,7 +425,7 @@ public function testToStringEnumValue(): void
425425
$this->class->value->key->value = 'key';
426426
$this->class->value->type = 'enum';
427427
$return = $this->class->__toString();
428-
$this->assertSame('<div class="enum-struct"><tr><td>key</td><td><a class="code" title="value" href="#object-value">value</a></td><td>' . PHP_EOL . '</td></tr></div>', $return);
428+
$this->assertSame('<div class="enum-struct"><tr><td>key</td><td><a class="code" title="value" href="#object-value">value</a></td><td></td></tr></div>', $return);
429429
}
430430

431431
/**
@@ -440,7 +440,7 @@ public function testToStringBoolValue(): void
440440
$this->class->value = true;
441441
$this->class->type = 'boolean';
442442
$return = $this->class->__toString();
443-
$this->assertSame('<tr><td><span>hello</span></td><td><code>boolean</code></td><td> <span class="status"></span></td><td>' . PHP_EOL . '</td><td><span class="example-value pull-right">true</span></td></tr>', $return);
443+
$this->assertSame('<tr><td><span>hello</span></td><td><code>boolean</code></td><td> <span class="status"></span></td><td></td><td><span class="example-value pull-right">true</span></td></tr>', $return);
444444
}
445445

446446
/**
@@ -455,7 +455,7 @@ public function testToStringOtherValue(): void
455455
$this->class->value = 'world';
456456
$this->class->type = 'Cow';
457457
$return = $this->class->__toString();
458-
$this->assertSame('<tr><td><span>hello</span></td><td><a class="code" title="Cow" href="#object-cow">Cow</a></td><td> <span class="status"></span></td><td>' . PHP_EOL . '</td><td><span class="example-value pull-right">world</span></td></tr>', $return);
458+
$this->assertSame('<tr><td><span>hello</span></td><td><a class="code" title="Cow" href="#object-cow">Cow</a></td><td> <span class="status"></span></td><td></td><td><span class="example-value pull-right">world</span></td></tr>', $return);
459459
}
460460

461461
/**
@@ -470,6 +470,6 @@ public function testToStringOtherValueTypeKnown(): void
470470
$this->class->key->value = 'hello';
471471
$this->class->value = 'world';
472472
$return = $this->class->__toString();
473-
$this->assertSame('<tr><td><span>hello</span></td><td><code>string</code></td><td> <span class="status"></span></td><td>' . PHP_EOL . '</td><td><span class="example-value pull-right">world</span></td></tr>', $return);
473+
$this->assertSame('<tr><td><span>hello</span></td><td><code>string</code></td><td> <span class="status"></span></td><td></td><td><span class="example-value pull-right">world</span></td></tr>', $return);
474474
}
475475
}

src/PHPDraft/Model/HTTPRequest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,9 +210,9 @@ public function get_curl_command(string $base_url, array $additional = []): stri
210210
}
211211

212212
$options = array_merge($options, $additional);
213-
$url = escapeshellarg($this->parent->build_url($base_url, true);
213+
$url = escapeshellarg($this->parent->build_url($base_url, true));
214214

215-
return htmlspecialchars('curl ' . join(' ', $options) . ' ' . $url), ENT_NOQUOTES | ENT_SUBSTITUTE);
215+
return htmlspecialchars('curl ' . join(' ', $options) . ' ' . $url, ENT_NOQUOTES | ENT_SUBSTITUTE);
216216
}
217217

218218
/**

src/PHPDraft/Model/HierarchyElement.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ public function parse(stdClass $object)
6868
if ($item->element === 'copy') {
6969
$this->description = $item->content;
7070
unset($object->content[$key]);
71-
continue;
7271
}
7372
}
7473

0 commit comments

Comments
 (0)