diff --git a/compiler/patches/stubs/PDO/PDO.stub.patch b/compiler/patches/stubs/PDO/PDO.stub.patch index 089aa13d21..0f65cc6010 100644 --- a/compiler/patches/stubs/PDO/PDO.stub.patch +++ b/compiler/patches/stubs/PDO/PDO.stub.patch @@ -1,34 +1,9 @@ ---- PDO.stub 2019-12-05 17:56:26.000000000 +0100 -+++ PDO2.stub 2020-05-26 14:16:32.000000000 +0200 -@@ -268,7 +268,6 @@ - * As PDO::FETCH_INTO but object is provided as a serialized string. - * Available since PHP 5.1.0. Since PHP 5.3.0 the class constructor is never called if this - * flag is set. -- * @since 5.1 Available - * @link https://php.net/manual/en/pdo.constants.php#pdo.constants.fetch-serialize - */ - const FETCH_SERIALIZE = 524288; -@@ -727,7 +726,7 @@ - *

- * Note, this constant can only be used in the driver_options array when constructing a new database handle. - *

-- * @since 5.5.21 and 5.6.5 -+ * @since 5.5.21 - * @link https://php.net/manual/en/ref.pdo-mysql.php#pdo.constants.mysql-attr-multi-statements - */ - const MYSQL_ATTR_MULTI_STATEMENTS = 1015; -@@ -747,6 +746,7 @@ - */ - const PGSQL_ASSOC = 1; - const PGSQL_ATTR_DISABLE_NATIVE_PREPARED_STATEMENT = 1000; -+ const PGSQL_ATTR_DISABLE_PREPARES = 1000; - const PGSQL_BAD_RESPONSE = 5; - const PGSQL_BOTH = 3; - const PGSQL_TRANSACTION_IDLE = 0; -@@ -839,6 +839,15 @@ +--- PDO/PDO.stub 2020-06-14 14:26:12.000000000 +0200 ++++ PDO/PDO2.stub 2020-06-14 14:26:12.000000000 +0200 +@@ -843,6 +843,15 @@ */ const SQLITE_ATTR_EXTENDED_RESULT_CODES = 2; - + + const FB_ATTR_DATE_FORMAT = 1; + const FB_ATTR_TIME_FORMAT = 2; + const FB_ATTR_TIMESTAMP_FORMAT = 3; diff --git a/composer.json b/composer.json index c9397be39d..3e6457c768 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ "hoa/exception": "^1.0", "hoa/regex": "1.17.01.13", "jean85/pretty-package-versions": "^1.0.3", - "jetbrains/phpstorm-stubs": "2019.3", + "jetbrains/phpstorm-stubs": "dev-master", "nette/bootstrap": "^3.0", "nette/di": "^3.0", "nette/finder": "^2.5", @@ -21,7 +21,7 @@ "nette/utils": "^3.1.1", "nikic/php-parser": "^4.5.0", "ondram/ci-detector": "^3.1", - "ondrejmirtes/better-reflection": "^4.3.11", + "ondrejmirtes/better-reflection": "^4.3.12", "phpdocumentor/type-resolver": "1.0.1", "phpstan/phpdoc-parser": "^0.4.8", "react/child-process": "^0.6.1",