Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[2.6] Update deps #609

Merged
merged 2 commits into from
Jul 18, 2024
Merged

[2.6] Update deps #609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
984d63c
Update deps
GrahamCampbell Jul 18, 2024
df95d4b
Fixes
GrahamCampbell Jul 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@
},
"require-dev": {
"bamarni/composer-bin-plugin": "^1.8.2",
"http-interop/http-factory-tests": "^0.9",
"phpunit/phpunit": "^8.5.36 || ^9.6.15"
"http-interop/http-factory-tests": "0.9.0",
"phpunit/phpunit": "^8.5.39 || ^9.6.20"
},
"suggest": {
"laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
Expand Down
5 changes: 0 additions & 5 deletions phpstan-baseline.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,11 +225,6 @@ parameters:
count: 1
path: src/Utils.php

-
message: "#^Offset 'uri' on array\\{timed_out\\: bool, blocked\\: bool, eof\\: bool, unread_bytes\\: int, stream_type\\: string, wrapper_type\\: string, wrapper_data\\: mixed, mode\\: string, \\.\\.\\.\\} on left side of \\?\\? always exists and is not nullable\\.$#"
count: 1
path: src/Utils.php

-
message: "#^Parameter \\#1 \\$source of class GuzzleHttp\\\\Psr7\\\\PumpStream constructor expects callable\\(int\\)\\: \\(string\\|false\\|null\\), Closure\\(\\)\\: mixed given\\.$#"
count: 1
Expand Down
4 changes: 3 additions & 1 deletion phpstan.neon.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ includes:
- vendor-bin/phpstan/vendor/phpstan/phpstan-deprecation-rules/rules.neon

parameters:
checkMissingIterableValueType: false
ignoreErrors:
-
identifier: missingType.iterableValue
level: max
paths:
- src
81 changes: 43 additions & 38 deletions psalm-baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<files psalm-version="5.15.0@5c774aca4746caf3d239d9c8cadb9f882ca29352">
<files psalm-version="5.25.0@01a8eb06b9e9cc6cfb6a320bf9fb14331919d505">
<file src="src/FnStream.php">
<InvalidFunctionCall>
<code><![CDATA[($this->_fn___toString)()]]></code>
Expand All @@ -21,77 +21,82 @@
</file>
<file src="src/Header.php">
<PossiblyUndefinedArrayOffset>
<code>$m[0]</code>
<code><![CDATA[$m[0]]]></code>
</PossiblyUndefinedArrayOffset>
</file>
<file src="src/HttpFactory.php">
<ParamNameMismatch>
<code>$file</code>
<code><![CDATA[$file]]></code>
</ParamNameMismatch>
</file>
<file src="src/Message.php">
<PossiblyNullArgument>
<code><![CDATA[$matches[1] === '/' ? self::parseRequestUri($parts[1], $data['headers']) : $parts[1]]]></code>
<code><![CDATA[$parts[1]]]></code>
<code><![CDATA[$parts[1]]]></code>
</PossiblyNullArgument>
<PossiblyUndefinedArrayOffset>
<code>$parts[1]</code>
<code>$parts[1]</code>
<code>$parts[1]</code>
<code>$parts[1]</code>
<code><![CDATA[$parts[1]]]></code>
<code><![CDATA[$parts[1]]]></code>
<code><![CDATA[$parts[1]]]></code>
<code><![CDATA[$parts[1]]]></code>
</PossiblyUndefinedArrayOffset>
</file>
<file src="src/MessageTrait.php">
<LessSpecificImplementedReturnType>
<code>MessageInterface</code>
<code>MessageInterface</code>
<code>MessageInterface</code>
<code>MessageInterface</code>
<code>MessageInterface</code>
<code>array</code>
<code>array</code>
<code><![CDATA[MessageInterface]]></code>
<code><![CDATA[MessageInterface]]></code>
<code><![CDATA[MessageInterface]]></code>
<code><![CDATA[MessageInterface]]></code>
<code><![CDATA[MessageInterface]]></code>
<code><![CDATA[array]]></code>
<code><![CDATA[array]]></code>
</LessSpecificImplementedReturnType>
<ParamNameMismatch>
<code>$header</code>
<code>$header</code>
<code>$header</code>
<code>$header</code>
<code>$header</code>
<code>$header</code>
<code><![CDATA[$header]]></code>
<code><![CDATA[$header]]></code>
<code><![CDATA[$header]]></code>
<code><![CDATA[$header]]></code>
<code><![CDATA[$header]]></code>
<code><![CDATA[$header]]></code>
</ParamNameMismatch>
</file>
<file src="src/Request.php">
<NoValue>
<code>$header</code>
<code><![CDATA[$header]]></code>
</NoValue>
</file>
<file src="src/Response.php">
<RedundantCast>
<code>(int) $code</code>
<code>(string) $reasonPhrase</code>
<code><![CDATA[(int) $code]]></code>
<code><![CDATA[(string) $reasonPhrase]]></code>
</RedundantCast>
</file>
<file src="src/ServerRequest.php">
<InvalidArgument>
<code>$_SERVER['SERVER_PORT']</code>
<code><![CDATA[$_SERVER['SERVER_PORT']]]></code>
</InvalidArgument>
<InvalidArrayOffset>
<code>$normalizedFiles[$key]</code>
<code><![CDATA[$normalizedFiles[$key]]]></code>
</InvalidArrayOffset>
<InvalidReturnStatement>
<code>$normalizedFiles</code>
<code><![CDATA[$normalizedFiles]]></code>
</InvalidReturnStatement>
<InvalidReturnType>
<code>UploadedFileInterface[]</code>
<code><![CDATA[UploadedFileInterface[]]]></code>
</InvalidReturnType>
<ParamNameMismatch>
<code>$attribute</code>
<code>$attribute</code>
<code>$attribute</code>
<code><![CDATA[$attribute]]></code>
<code><![CDATA[$attribute]]></code>
<code><![CDATA[$attribute]]></code>
</ParamNameMismatch>
</file>
<file src="src/Stream.php">
<InvalidPropertyAssignmentValue>
<code><![CDATA[$this->stream]]></code>
</InvalidPropertyAssignmentValue>
<RedundantCast>
<code>(int) $whence</code>
<code><![CDATA[(int) $whence]]></code>
</RedundantCast>
<RedundantPropertyInitializationCheck>
<code><![CDATA[isset($this->stream)]]></code>
Expand All @@ -108,25 +113,25 @@
</file>
<file src="src/Uri.php">
<PossiblyInvalidArgument>
<code>$result</code>
<code><![CDATA[$result]]></code>
</PossiblyInvalidArgument>
</file>
<file src="src/UriResolver.php">
<TypeDoesNotContainType>
<code>'' === $relativePath</code>
<code><![CDATA['' === $relativePath]]></code>
</TypeDoesNotContainType>
</file>
<file src="src/Utils.php">
<FalsableReturnStatement>
<code>$contents</code>
<code><![CDATA[$contents]]></code>
</FalsableReturnStatement>
<MissingDocblockType>
<code>throw $ex;</code>
<code>throw $ex;</code>
<code><![CDATA[throw $ex;]]></code>
<code><![CDATA[throw $ex;]]></code>
</MissingDocblockType>
<PossiblyUndefinedVariable>
<code>$contents</code>
<code>$handle</code>
<code><![CDATA[$contents]]></code>
<code><![CDATA[$handle]]></code>
</PossiblyUndefinedVariable>
</file>
</files>
2 changes: 2 additions & 0 deletions psalm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
xmlns="https://getpsalm.org/schema/config"
xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
errorBaseline="psalm-baseline.xml"
findUnusedBaselineEntry="true"
findUnusedCode="false"
>
<projectFiles>
<directory name="src" />
Expand Down
2 changes: 1 addition & 1 deletion vendor-bin/php-cs-fixer/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"require": {
"php": "^7.4 || ^8.0",
"friendsofphp/php-cs-fixer": "3.52.1"
"friendsofphp/php-cs-fixer": "3.59.3"
},
"config": {
"preferred-install": "dist"
Expand Down
4 changes: 2 additions & 2 deletions vendor-bin/phpstan/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"require": {
"php": "^7.4 || ^8.0",
"phpstan/phpstan": "1.10.47",
"phpstan/phpstan-deprecation-rules": "1.1.4"
"phpstan/phpstan": "1.11.7",
"phpstan/phpstan-deprecation-rules": "1.2.0"
},
"config": {
"preferred-install": "dist"
Expand Down
2 changes: 1 addition & 1 deletion vendor-bin/psalm/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"require": {
"php": "^7.4 || ^8.0",
"psalm/phar": "5.16.0"
"psalm/phar": "5.25.0"
},
"config": {
"preferred-install": "dist"
Expand Down