Skip to content

Commit 32df723

Browse files
Update psalm and composer normalize (#144)
Currently composer normalize is erroring and psalm is erroring which blocks other pull requests. This will udpate the composer.json and add the parent::__construct($options); call to the baseline.
1 parent fdd25e1 commit 32df723

File tree

4 files changed

+41
-23
lines changed

4 files changed

+41
-23
lines changed

.github/workflows/static.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
with:
8181
php-version: 8.1
8282
coverage: none
83-
tools: vimeo/psalm:5.0.0-beta1
83+
tools: vimeo/psalm:5.15.0
8484

8585
- name: Download dependencies
8686
uses: ramsey/composer-install@v2

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,18 @@
3838
"autoload": {
3939
"psr-4": {
4040
"Runtime\\Bref\\": "src/bref/src",
41-
"Runtime\\Guzzle\\": "src/psr-guzzle/src",
4241
"Runtime\\GoogleCloud\\": "src/google-cloud/src",
42+
"Runtime\\Guzzle\\": "src/psr-guzzle/src",
4343
"Runtime\\Laravel\\": "src/laravel/src",
4444
"Runtime\\Psr17\\": "src/psr-17/src",
4545
"Runtime\\PsrLaminas\\": "src/psr-laminas/src",
46-
"Runtime\\PsrNyholm\\": "src/psr-nyholm/src",
4746
"Runtime\\PsrNyholmLaminas\\": "src/psr-nyholm-laminas/src",
47+
"Runtime\\PsrNyholm\\": "src/psr-nyholm/src",
4848
"Runtime\\React\\": "src/react/src",
4949
"Runtime\\RoadRunnerNyholm\\": "src/roadrunner-nyholm/src",
5050
"Runtime\\RoadRunnerSymfonyNyholm\\": "src/roadrunner-symfony-nyholm/src",
51-
"Runtime\\Swoole\\": "src/swoole/src",
52-
"Runtime\\SwooleNyholm\\": "src/swoole-nyholm/src"
51+
"Runtime\\SwooleNyholm\\": "src/swoole-nyholm/src",
52+
"Runtime\\Swoole\\": "src/swoole/src"
5353
}
5454
},
5555
"autoload-dev": {

psalm.baseline.xml

Lines changed: 32 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,51 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<files psalm-version="4.29.0@7ec5ffbd5f68ae03782d7fd33fff0c45a69f95b3">
2+
<files psalm-version="5.15.0@5c774aca4746caf3d239d9c8cadb9f882ca29352">
3+
<file src="src/bref/src/Runtime.php">
4+
<InvalidArgument>
5+
<code>$options</code>
6+
</InvalidArgument>
7+
</file>
38
<file src="src/bref/src/SymfonyRequestBridge.php">
4-
<InvalidArgument occurrences="1">
5-
<code>$response-&gt;headers-&gt;all()</code>
9+
<InvalidArgument>
10+
<code><![CDATA[$response->headers->all()]]></code>
611
</InvalidArgument>
712
</file>
813
<file src="src/frankenphp-symfony/src/Runner.php">
9-
<UndefinedFunction occurrences="1"/>
14+
<UndefinedFunction>
15+
<code><![CDATA[\frankenphp_handle_request(function () use ($server, &$sfRequest, &$sfResponse): void {
16+
// Merge the environment variables coming from DotEnv with the ones tight to the current request
17+
$_SERVER += $server;
18+
19+
$sfRequest = Request::createFromGlobals();
20+
$sfResponse = $this->kernel->handle($sfRequest);
21+
22+
$sfResponse->send();
23+
})]]></code>
24+
</UndefinedFunction>
1025
</file>
1126
<file src="src/google-cloud/router.php">
12-
<MissingFile occurrences="1">
13-
<code>require_once $_SERVER['SCRIPT_FILENAME'] = $defaultSource</code>
27+
<MissingFile>
28+
<code><![CDATA[require_once $_SERVER['SCRIPT_FILENAME'] = $defaultSource]]></code>
1429
</MissingFile>
1530
</file>
31+
<file src="src/psr-17/src/Runtime.php">
32+
<InvalidArgument>
33+
<code>$options</code>
34+
</InvalidArgument>
35+
</file>
1636
<file src="src/psr-laminas/src/Runtime.php">
17-
<InvalidArgument occurrences="2">
18-
<code>['emitter' =&gt; $this-&gt;options['laminas_emitter'] ?? null]</code>
19-
<code>['emitter' =&gt; $this-&gt;options['laminas_emitter'] ?? null]</code>
37+
<InvalidArgument>
38+
<code>$options</code>
2039
</InvalidArgument>
2140
</file>
2241
<file src="src/psr-nyholm-laminas/src/Runtime.php">
23-
<InvalidArgument occurrences="2">
24-
<code>['emitter' =&gt; $this-&gt;options['laminas_emitter'] ?? null]</code>
25-
<code>['emitter' =&gt; $this-&gt;options['laminas_emitter'] ?? null]</code>
42+
<InvalidArgument>
43+
<code>$options</code>
2644
</InvalidArgument>
2745
</file>
2846
<file src="src/swoole/src/SymfonyHttpBridge.php">
29-
<InvalidScalarArgument occurrences="1">
30-
<code>$sfResponse-&gt;getStatusCode()</code>
47+
<InvalidScalarArgument>
48+
<code><![CDATA[$sfResponse->getStatusCode()]]></code>
3149
</InvalidScalarArgument>
3250
</file>
3351
</files>

src/google-cloud/composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@
2121
"prefer-stable": true,
2222
"autoload": {
2323
"psr-4": {
24+
"Google\\CloudFunctions\\": "google/",
2425
"Runtime\\GoogleCloud\\": "src/",
25-
"Symfony\\Runtime\\Google\\CloudFunctions\\": "runtime/",
26-
"Google\\CloudFunctions\\": "google/"
26+
"Symfony\\Runtime\\Google\\CloudFunctions\\": "runtime/"
2727
}
2828
},
2929
"autoload-dev": {
3030
"psr-4": {
31-
"Runtime\\GoogleCloud\\Tests\\": "tests/runtime",
32-
"Google\\CloudFunctions\\Tests\\": "tests/google/"
31+
"Google\\CloudFunctions\\Tests\\": "tests/google/",
32+
"Runtime\\GoogleCloud\\Tests\\": "tests/runtime"
3333
}
3434
},
3535
"bin": [

0 commit comments

Comments
 (0)