Skip to content

Commit 7b69bbe

Browse files
committed
reverse dependency changes + tidy types
1 parent 0f73584 commit 7b69bbe

File tree

6 files changed

+72
-20
lines changed

6 files changed

+72
-20
lines changed

composer.json

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,19 @@
3232
}
3333
},
3434
"require-dev": {
35-
"pestphp/pest": "^4.0",
36-
"laravel/pint": "^1.24",
37-
"phpstan/phpstan": "^2.1.22",
38-
"pestphp/pest-plugin-arch": "^4.0",
39-
"pestphp/pest-plugin-laravel": "^4.0",
40-
"phpstan/extension-installer": "^1.4.3",
41-
"phpstan/phpstan-deprecation-rules": "^2.0.3",
42-
"rector/rector": "^2.1.4",
43-
"projektgopher/whisky": "^0.7.4",
44-
"orchestra/testbench": "^10.6.0",
35+
"pestphp/pest": "^3.0",
36+
"laravel/pint": "^1.14",
37+
"phpstan/phpstan": "^1.11",
38+
"pestphp/pest-plugin-arch": "^3.0",
39+
"pestphp/pest-plugin-laravel": "^3.0",
40+
"phpstan/extension-installer": "^1.3",
41+
"phpstan/phpstan-deprecation-rules": "^1.2",
42+
"rector/rector": "^1.1",
43+
"projektgopher/whisky": "^0.7.0",
44+
"orchestra/testbench": "^9.4",
4545
"mockery/mockery": "^1.6",
46-
"phpstan/phpdoc-parser": "^2.2.0",
46+
"symplify/rule-doc-generator-contracts": "^11.2",
47+
"phpstan/phpdoc-parser": "^1.24",
4748
"spatie/laravel-ray": "^1.40"
4849
},
4950
"autoload-dev": {

src/Rectors/ReorderMethodsRector.php

Lines changed: 56 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@
33
namespace Prism\Bedrock\Rectors;
44

55
use PhpParser\Node;
6-
use PhpParser\Node\Stmt;
76
use PhpParser\Node\Stmt\Class_;
87
use PhpParser\Node\Stmt\ClassMethod;
98
use Rector\Rector\AbstractRector;
9+
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
10+
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
1011

11-
/**
12-
* Reorders class methods: magic methods first, then public, protected, and private.
13-
*/
1412
class ReorderMethodsRector extends AbstractRector
1513
{
1614
#[\Override]
@@ -38,13 +36,66 @@ public function refactor(Node $node): ?Node
3836
}
3937

4038
$node->stmts = array_merge(
41-
array_filter($node->stmts, fn (Stmt $stmt): bool => ! $stmt instanceof ClassMethod),
39+
array_filter($node->stmts, fn ($stmt): bool => ! $stmt instanceof ClassMethod),
4240
$reorderedMethods
4341
);
4442

4543
return $node;
4644
}
4745

46+
#[\Override]
47+
public function getRuleDefinition(): RuleDefinition
48+
{
49+
return new RuleDefinition(
50+
'Reorders class methods: magic methods first, then public, protected, and private.',
51+
[
52+
new CodeSample(
53+
<<<'CODE_SAMPLE'
54+
class SomeClass
55+
{
56+
private function privateMethod()
57+
{
58+
}
59+
60+
public function publicMethod()
61+
{
62+
}
63+
64+
protected function protectedMethod()
65+
{
66+
}
67+
68+
public function __construct()
69+
{
70+
}
71+
}
72+
CODE_SAMPLE
73+
,
74+
<<<'CODE_SAMPLE'
75+
class SomeClass
76+
{
77+
public function __construct()
78+
{
79+
}
80+
81+
public function publicMethod()
82+
{
83+
}
84+
85+
protected function protectedMethod()
86+
{
87+
}
88+
89+
private function privateMethod()
90+
{
91+
}
92+
}
93+
CODE_SAMPLE
94+
),
95+
]
96+
);
97+
}
98+
4899
/**
49100
* @param array<int, ClassMethod> $methods
50101
* @return array<int, ClassMethod>

src/Schemas/Anthropic/AnthropicStructuredHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public static function buildPayload(Request $request, ?string $apiVersion): arra
7878
'system' => MessageMap::mapSystemMessages($request->systemPrompts()),
7979
'temperature' => $request->temperature(),
8080
'top_p' => $request->topP(),
81-
], fn (string|float|int|array|null $value): bool => $value !== null);
81+
], fn (mixed $value): bool => $value !== null);
8282
}
8383

8484
protected function sendRequest(Request $request): void

src/Schemas/Anthropic/AnthropicTextHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public static function buildPayload(Request $request, ?string $apiVersion): arra
7878
'top_p' => $request->topP(),
7979
'tools' => ToolMap::map($request->tools()),
8080
'tool_choice' => ToolChoiceMap::map($request->toolChoice()),
81-
], fn (float|int|string|array|null $value): bool => $value !== null);
81+
], fn (mixed $value): bool => $value !== null);
8282
}
8383

8484
protected function sendRequest(Request $request): void

src/Schemas/Converse/ConverseStructuredHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public static function buildPayload(Request $request): array
7676
'maxTokens' => $request->maxTokens(),
7777
'temperature' => $request->temperature(),
7878
'topP' => $request->topP(),
79-
], fn (float|int|null $value): bool => $value !== null),
79+
], fn (mixed $value): bool => $value !== null),
8080
'messages' => MessageMap::map($request->messages()),
8181
'performanceConfig' => $request->providerOptions('performanceConfig'),
8282
'promptVariables' => $request->providerOptions('promptVariables'),

src/Schemas/Converse/ConverseTextHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public static function buildPayload(Request $request, int $stepCount = 0): array
7373
'maxTokens' => $request->maxTokens(),
7474
'temperature' => $request->temperature(),
7575
'topP' => $request->topP(),
76-
], fn (float|int|null $value): bool => $value !== null),
76+
], fn (mixed $value): bool => $value !== null),
7777
'messages' => MessageMap::map($request->messages()),
7878
'system' => MessageMap::mapSystemMessages($request->systemPrompts()),
7979
'toolConfig' => $request->tools() === []

0 commit comments

Comments
 (0)