Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"hoa/compiler": "3.17.08.08",
"hoa/exception": "^1.0",
"hoa/file": "1.17.07.11",
"jetbrains/phpstorm-stubs": "dev-master#5f24d7aef6ada9de9a894ce899345b3054d6c639",
"jetbrains/phpstorm-stubs": "dev-master#59e06fde7aaeddf92b0b38da6d1c51ee03b18fb3",
"nette/bootstrap": "^3.0",
"nette/di": "^3.1.4",
"nette/neon": "3.3.4",
Expand Down Expand Up @@ -130,6 +130,7 @@
],
"jetbrains/phpstorm-stubs": [
"patches/PDO.patch",
"patches/ReflectionClass.patch",
"patches/ReflectionProperty.patch",
"patches/SessionHandler.patch",
"patches/xmlreader.patch",
Expand Down
10 changes: 5 additions & 5 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion patches/PDO.patch
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
--- PDO/PDO.php 2021-12-26 15:44:39.000000000 +0100
+++ PDO/PDO.php 2022-01-03 22:54:21.000000000 +0100
@@ -1476,7 +1476,7 @@ namespace {
@@ -1610,7 +1610,7 @@ namespace {
* @return array|false if one or more notifications is pending, returns a single row,
* with fields message and pid, otherwise <b>FALSE</b>.
*/
#[Deprecated('use Pdo\Pgsql::getNotify instead', '\Pdo\Pgsql::getNotify(%parametersList%)', since: '8.5')]
- public function pgsqlGetNotify($fetchMode = PDO::FETCH_DEFAULT, $timeoutMilliseconds = 0) {}
+ public function pgsqlGetNotify($fetchMode = 1, $timeoutMilliseconds = 0) {}

@staabm staabm Apr 27, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this PR should have a explanation why this patches is required.

It might also be helpful to have a test for it

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This patch exist for a long time and i dunno why.

I just fixed the conflict

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ohh I see. what about the second patch file?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Second patch is temporary until JetBrains/phpstorm-stubs#1879 is merged

@staabm staabm Apr 27, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Second patch is temporary until JetBrains/phpstorm-stubs#1879 is merged

yeah, but that was not clear from this PR. thanks for adjusting the PR description.

LGTM


Expand Down
20 changes: 20 additions & 0 deletions patches/ReflectionClass.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
--- Reflection/ReflectionClass.php 2026-04-24 11:57:10
+++ Reflection/ReflectionClass.php 2026-04-25 21:47:47
@@ -305,7 +305,7 @@
*
* @link https://php.net/manual/en/reflectionclass.getconstants.php
* @param int|null $filter [optional] allows the filtering of constants defined in a class by their visibility. Since 8.0.
- * @return array<string, scalar|array<scalar>> An array of constants, where the keys hold the name and
+ * @return array<string, mixed> An array of constants, where the keys hold the name and
* the values the value of the constants.
*/
#[Pure]
@@ -317,7 +317,7 @@
*
* @link https://php.net/manual/en/reflectionclass.getconstant.php
* @param string $name Name of the constant.
- * @return scalar|array<scalar> Value of the constant with the name name.
+ * @return mixed Value of the constant with the name name.
* Returns {@see false} if the constant was not found in the class.
*/
#[Pure]
Loading