Skip to content

Commit 6718fd3

Browse files
committed
Fix stan issues
1 parent 5f7b08b commit 6718fd3

7 files changed

Lines changed: 149 additions & 113 deletions

File tree

packages/guides-restructured-text/src/RestructuredText/Directives/Attributes/Option.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ final class Option
2222
public function __construct(
2323
public readonly string $name,
2424
public readonly OptionType $type = OptionType::String,
25-
public readonly mixed $default = null,
25+
public readonly bool|string|int|float|null $default = null,
2626
public readonly string $description = '',
2727
public readonly string|null $example = null,
2828
) {

packages/guides-restructured-text/src/RestructuredText/Directives/BaseDirective.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ final protected function readOption(Directive $directive, string $optionName): m
184184
return $this->getOptionValue($directive, $optionAttribute);
185185
}
186186

187-
/** @return array<string, bool|float|int|string|null> */
187+
/** @return array<string, scalar|scalar[]|null> */
188188
final protected function readAllOptions(Directive $directive): array
189189
{
190190
$this->initialize();
@@ -195,7 +195,8 @@ final protected function readAllOptions(Directive $directive): array
195195
);
196196
}
197197

198-
private function getOptionValue(Directive $directive, Option|null $option): mixed
198+
/** @return scalar|scalar[]|null */
199+
private function getOptionValue(Directive $directive, Option|null $option): bool|float|int|string|array|null
199200
{
200201
if ($option === null) {
201202
return null;

packages/guides-restructured-text/src/RestructuredText/Directives/GeneralDirective.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
*/
3232
final class GeneralDirective extends SubDirective
3333
{
34-
/** @param Rule<Node> $startingRule */
34+
/** @param Rule<CollectionNode> $startingRule */
3535
public function __construct(
3636
Rule $startingRule,
3737
private readonly SettingsManager $settingsManager,

packages/guides-restructured-text/src/RestructuredText/Parser/Productions/DirectiveContentRule.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
use phpDocumentor\Guides\Nodes\Node;
1919
use phpDocumentor\Guides\RestructuredText\Parser\BlockContext;
2020

21-
/** @implements Rule<Node> */
21+
/** @implements Rule<CollectionNode> */
2222
final class DirectiveContentRule implements Rule
2323
{
2424
public function __construct(private readonly RuleContainer $bodyElements)

packages/guides/src/Nodes/AbstractNode.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ abstract class AbstractNode implements Node
2626
/** @var string[] */
2727
protected array $classes = [];
2828

29-
/** @var array<string, scalar|null> */
29+
/** @var array<string, scalar|scalar[]|null> */
3030
protected array $options = [];
3131

3232
/** @var TValue */
3333
protected $value;
3434

35-
/** @return array<string, scalar|null> */
35+
/** @return array<string, scalar|scalar[]|null> */
3636
public function getOptions(): array
3737
{
3838
return $this->options;
@@ -89,7 +89,7 @@ public function getClassesString(): string
8989
}
9090

9191
/**
92-
* @param array<string, scalar|null> $options
92+
* @param array<string, scalar|scalar[]|null> $options
9393
*
9494
* @return static
9595
*/

packages/guides/src/Nodes/Node.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515

1616
interface Node
1717
{
18-
/** @return array<string, scalar|null> */
18+
/** @return array<string, scalar|scalar[]|null> */
1919
public function getOptions(): array;
2020

21-
/** @param array<string, scalar|null> $options */
21+
/** @param array<string, scalar|scalar[]|null> $options */
2222
public function withOptions(array $options): Node;
2323

2424
/** @param array<string, scalar|null> $options */

phpstan-baseline.neon

Lines changed: 138 additions & 103 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)