Skip to content

Commit a9834c9

Browse files
committed
Use dev-master of jetbrains/phpstorm-stubs
1 parent be72fc4 commit a9834c9

2 files changed

Lines changed: 6 additions & 31 deletions

File tree

compiler/patches/stubs/PDO/PDO.stub.patch

Lines changed: 4 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,9 @@
1-
--- PDO.stub 2019-12-05 17:56:26.000000000 +0100
2-
+++ PDO2.stub 2020-05-26 14:16:32.000000000 +0200
3-
@@ -268,7 +268,6 @@
4-
* As <b>PDO::FETCH_INTO</b> but object is provided as a serialized string.
5-
* Available since PHP 5.1.0. Since PHP 5.3.0 the class constructor is never called if this
6-
* flag is set.
7-
- * @since 5.1 Available
8-
* @link https://php.net/manual/en/pdo.constants.php#pdo.constants.fetch-serialize
9-
*/
10-
const FETCH_SERIALIZE = 524288;
11-
@@ -727,7 +726,7 @@
12-
* <p>
13-
* Note, this constant can only be used in the driver_options array when constructing a new database handle.
14-
* </p>
15-
- * @since 5.5.21 and 5.6.5
16-
+ * @since 5.5.21
17-
* @link https://php.net/manual/en/ref.pdo-mysql.php#pdo.constants.mysql-attr-multi-statements
18-
*/
19-
const MYSQL_ATTR_MULTI_STATEMENTS = 1015;
20-
@@ -747,6 +746,7 @@
21-
*/
22-
const PGSQL_ASSOC = 1;
23-
const PGSQL_ATTR_DISABLE_NATIVE_PREPARED_STATEMENT = 1000;
24-
+ const PGSQL_ATTR_DISABLE_PREPARES = 1000;
25-
const PGSQL_BAD_RESPONSE = 5;
26-
const PGSQL_BOTH = 3;
27-
const PGSQL_TRANSACTION_IDLE = 0;
28-
@@ -839,6 +839,15 @@
1+
--- PDO/PDO.stub 2020-06-14 14:26:12.000000000 +0200
2+
+++ PDO/PDO2.stub 2020-06-14 14:26:12.000000000 +0200
3+
@@ -843,6 +843,15 @@
294
*/
305
const SQLITE_ATTR_EXTENDED_RESULT_CODES = 2;
31-
6+
327
+ const FB_ATTR_DATE_FORMAT = 1;
338
+ const FB_ATTR_TIME_FORMAT = 2;
349
+ const FB_ATTR_TIMESTAMP_FORMAT = 3;

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"hoa/exception": "^1.0",
1313
"hoa/regex": "1.17.01.13",
1414
"jean85/pretty-package-versions": "^1.0.3",
15-
"jetbrains/phpstorm-stubs": "2019.3",
15+
"jetbrains/phpstorm-stubs": "dev-master",
1616
"nette/bootstrap": "^3.0",
1717
"nette/di": "^3.0",
1818
"nette/finder": "^2.5",
@@ -21,7 +21,7 @@
2121
"nette/utils": "^3.1.1",
2222
"nikic/php-parser": "^4.5.0",
2323
"ondram/ci-detector": "^3.1",
24-
"ondrejmirtes/better-reflection": "^4.3.11",
24+
"ondrejmirtes/better-reflection": "^4.3.12",
2525
"phpdocumentor/type-resolver": "1.0.1",
2626
"phpstan/phpdoc-parser": "^0.4.8",
2727
"react/child-process": "^0.6.1",

0 commit comments

Comments
 (0)