From bbe969b6dad779605e2b4d914384b311c2c1a35c Mon Sep 17 00:00:00 2001
From: Vincent Langlet <vincentlanglet@hotmail.fr>
Date: Tue, 3 Sep 2024 10:50:57 +0200
Subject: [PATCH] Update stubs and patch

---
 composer.json                                    |  2 +-
 composer.lock                                    | 10 +++++-----
 patches/PDO.patch                                | 16 ++++++++--------
 .../Rules/Generics/ClassAncestorsRuleTest.php    |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/composer.json b/composer.json
index 670a2ffb39..02ef955af2 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
 		"hoa/compiler": "3.17.08.08",
 		"hoa/exception": "^1.0",
 		"hoa/file": "1.17.07.11",
-		"jetbrains/phpstorm-stubs": "dev-master#5686f9ceebde3d9338bea53b78d70ebde5fb5710",
+		"jetbrains/phpstorm-stubs": "dev-master#56f6b9e55f5885e651553843a1aaf9ec9c586c04",
 		"nette/bootstrap": "^3.0",
 		"nette/di": "^3.1.4",
 		"nette/neon": "3.3.3",
diff --git a/composer.lock b/composer.lock
index dcea32fd8e..a72a0e69ef 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "8688fdadbf2effbbc87fb35192f48d8e",
+    "content-hash": "9cb259d4d2ef11aad375ee55188ab4d3",
     "packages": [
         {
             "name": "clue/ndjson-react",
@@ -1434,12 +1434,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/JetBrains/phpstorm-stubs.git",
-                "reference": "5686f9ceebde3d9338bea53b78d70ebde5fb5710"
+                "reference": "56f6b9e55f5885e651553843a1aaf9ec9c586c04"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/JetBrains/phpstorm-stubs/zipball/5686f9ceebde3d9338bea53b78d70ebde5fb5710",
-                "reference": "5686f9ceebde3d9338bea53b78d70ebde5fb5710",
+                "url": "https://api.github.com/repos/JetBrains/phpstorm-stubs/zipball/56f6b9e55f5885e651553843a1aaf9ec9c586c04",
+                "reference": "56f6b9e55f5885e651553843a1aaf9ec9c586c04",
                 "shasum": ""
             },
             "require-dev": {
@@ -1474,7 +1474,7 @@
             "support": {
                 "source": "https://github.com/JetBrains/phpstorm-stubs/tree/master"
             },
-            "time": "2024-07-24T19:11:43+00:00"
+            "time": "2024-09-01T14:35:14+00:00"
         },
         {
             "name": "nette/bootstrap",
diff --git a/patches/PDO.patch b/patches/PDO.patch
index 17aff2c148..607a23fda2 100644
--- a/patches/PDO.patch
+++ b/patches/PDO.patch
@@ -1,11 +1,11 @@
 --- PDO/PDO.php	2021-12-26 15:44:39.000000000 +0100
 +++ PDO/PDO.php	2022-01-03 22:54:21.000000000 +0100
-@@ -1415,7 +1415,7 @@
-      * @return array|false if one or more notifications is pending, returns a single row,
-      * with fields message and pid, otherwise <b>FALSE</b>.
-      */
--    public function pgsqlGetNotify(int $fetchMode = PDO::FETCH_DEFAULT, int $timeoutMilliseconds = 0): array|false {}
-+    public function pgsqlGetNotify(int $fetchMode = 1, int $timeoutMilliseconds = 0): array|false {}
+@@ -1476,7 +1476,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>.
+          */
+-        public function pgsqlGetNotify($fetchMode = PDO::FETCH_DEFAULT, $timeoutMilliseconds = 0) {}
++        public function pgsqlGetNotify($fetchMode = 1, $timeoutMilliseconds = 0) {}
 
-     /**
-      * (PHP 5 &gt;= 5.6.0, PHP 7, PHP 8)<br/>
+         /**
+          * (PHP 5 &gt;= 5.6.0, PHP 7, PHP 8)<br/>
diff --git a/tests/PHPStan/Rules/Generics/ClassAncestorsRuleTest.php b/tests/PHPStan/Rules/Generics/ClassAncestorsRuleTest.php
index 05963f5576..f8d27e2612 100644
--- a/tests/PHPStan/Rules/Generics/ClassAncestorsRuleTest.php
+++ b/tests/PHPStan/Rules/Generics/ClassAncestorsRuleTest.php
@@ -108,7 +108,7 @@ public function testRuleExtends(): void
 				215,
 			],
 			[
-				'Class ClassAncestorsExtends\FooObjectStorage @extends tag contains incompatible type ClassAncestorsExtends\FooObjectStorage.',
+				'Class ClassAncestorsExtends\FooObjectStorage @extends tag contains incompatible type ClassAncestorsExtends\FooObjectStorage&iterable<object>.',
 				226,
 			],
 			[