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

Update JetBrains PhpStorm stubs to v2020.2 #4465

Merged
merged 2 commits into from
Mar 20, 2021
Merged

Update JetBrains PhpStorm stubs to v2020.2 #4465

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
3f44415
Secure connection parameters for mysqli are non-nullable strings
morozov Dec 13, 2020
4330e8b
Update JetBrains PhpStorm stubs to v2020.2
morozov Dec 13, 2020
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
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
},
"require-dev": {
"doctrine/coding-standard": "8.2.0",
"jetbrains/phpstorm-stubs": "2019.3",
"jetbrains/phpstorm-stubs": "2020.2",
"phpstan/phpstan": "0.12.81",
"phpunit/phpunit": "9.5.0",
"psalm/plugin-phpunit": "0.13.0",
Expand Down
12 changes: 6 additions & 6 deletions lib/Doctrine/DBAL/Driver/Mysqli/MysqliConnection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ public function ping()
/**
* Establish a secure connection
*
* @param mixed[] $params
* @param array<string,string> $params
*
* @throws MysqliException
*/
Expand All @@ -315,11 +315,11 @@ private function setSecureConnection(array $params): void
}

$this->conn->ssl_set(
$params['ssl_key'] ?? null,
$params['ssl_cert'] ?? null,
$params['ssl_ca'] ?? null,
$params['ssl_capath'] ?? null,
$params['ssl_cipher'] ?? null
$params['ssl_key'] ?? '',
$params['ssl_cert'] ?? '',
$params['ssl_ca'] ?? '',
$params['ssl_capath'] ?? '',
$params['ssl_cipher'] ?? ''
);
}
}
27 changes: 13 additions & 14 deletions psalm.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,15 +362,6 @@
<file name="lib/Doctrine/DBAL/Driver/PDOQueryImplementation.php"/>
</errorLevel>
</ReservedWord>
<TooFewArguments>
<errorLevel type="suppress">
<!--
Requires a release of
https://github.com/JetBrains/phpstorm-stubs/pull/727
-->
<file name="lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvStatement.php"/>
</errorLevel>
</TooFewArguments>
<TooManyArguments>
<errorLevel type="suppress">
<!-- See https://github.com/doctrine/dbal/pull/3080 -->
Expand All @@ -385,11 +376,6 @@
<UndefinedConstant>
<errorLevel type="suppress">
<directory name="lib/Doctrine/DBAL/Driver/SQLAnywhere"/>
<!--
Requires a release of
https://github.com/JetBrains/phpstorm-stubs/pull/732
-->
<file name="tests/Doctrine/Tests/DBAL/Driver/PDOPgSql/DriverTest.php" />
</errorLevel>
</UndefinedConstant>
<UndefinedFunction>
Expand All @@ -403,6 +389,19 @@
<file name="lib/Doctrine/DBAL/Tools/Dumper.php"/>
</errorLevel>
</UndefinedClass>
<UnimplementedInterfaceMethod>
<errorLevel type="suppress">
<!--
Psalm doesn't support the proprietary annotations used in JeBrains PhpStorm stubs
like #[PhpStormStubsElementAvailable(...)]. This suppression should be removed in 3.0.x,
where https://github.com/doctrine/dbal/pull/4347 is no longer effective
-->
<file name="lib/Doctrine/DBAL/Driver/PDO/SQLSrv/Statement.php"/>
<file name="lib/Doctrine/DBAL/Driver/PDO/Statement.php"/>
<file name="lib/Doctrine/DBAL/Driver/PDOSqlsrv/Statement.php"/>
<file name="lib/Doctrine/DBAL/Driver/PDOStatement.php"/>
</errorLevel>
</UnimplementedInterfaceMethod>
<UnsafeInstantiation>
<errorLevel type="suppress">
<!-- See https://github.com/doctrine/dbal/issues/4510 -->
Expand Down