Merge branch 'master' of github.com:jetbrains/phpstorm-stubs into fork

Author: dktapps

.gitattributes

@@ -0,0 +1,5 @@
+.gitattributes export-ignore
+.gitignore export-ignore
+.php-cs-fixer.php export-ignore
+docker-compose.yml export-ignore
+phpunit.xml.dist export-ignore

.github/workflows/main.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
+        php: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5']
     name: Run tests against php ${{matrix.php}}
     steps:
       - name: Checkout
@@ -50,4 +50,4 @@ jobs:
         run: docker compose -f docker-compose.yml run test_runner vendor/bin/phpunit --no-progress --testsuite Structure
 
       - name: run cs fixer
-        run: docker compose -f docker-compose.yml run test_runner composer cs -- --show-progress=none
+        run:  docker run --rm -e PHP_CS_FIXER_IGNORE_ENV=1 -v .:/opt/project -w /opt/project php:8.4-cli sh -c 'curl -sS https://getcomposer.org/installer | php && php composer.phar run cs'

.github/workflows/testLinks.yml

@@ -13,16 +13,16 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Composer Install
-        run: docker-compose -f docker-compose.yml run test_runner composer install
+        run: docker compose -f docker-compose.yml run test_runner composer install
         env:
-          PHP_VERSION: '8.0'
+          PHP_VERSION: '8.4'
 
       - name: Build Docker Container
-        run: docker-compose -f docker-compose.yml build >/dev/null
+        run: docker compose -f docker-compose.yml build >/dev/null
         env:
-          PHP_VERSION: '8.0'
+          PHP_VERSION: '8.4'
 
       - name: Run Tests
-        run: docker-compose -f docker-compose.yml run -e CHECK_LINKS=true test_runner vendor/bin/phpunit --testsuite PhpDoc
+        run: docker compose -f docker-compose.yml run -e CHECK_LINKS=true test_runner vendor/bin/phpunit --testsuite PhpDoc
         env:
-          PHP_VERSION: '8.0'
+          PHP_VERSION: '8.4'

.github/workflows/testPeclExtensions.yml

@@ -13,23 +13,23 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Build Docker Container
-        run: docker-compose -f docker-compose.yml build >/dev/null
+        run: docker compose -f docker-compose.yml build >/dev/null
         env:
-          PHP_VERSION: '8.0'
+          PHP_VERSION: '8.4'
 
       - name: Composer Install
-        run: docker-compose -f docker-compose.yml run test_runner composer install
+        run: docker compose -f docker-compose.yml run test_runner composer install
 
       - name: Dump Reflection With Pecl To File
-        run: docker-compose -f docker-compose.yml run pecl_extensions /usr/local/bin/php tests/Tools/dump-reflection-to-file.php ReflectionDataPecl.json
+        run: docker compose -f docker-compose.yml run pecl_extensions /usr/local/bin/php tests/Tools/dump-reflection-to-file.php ReflectionDataPecl.json
 
       - name: Dump Reflection Without Pecl To File
-        run: docker-compose -f docker-compose.yml run php_under_test /usr/local/bin/php tests/Tools/dump-reflection-to-file.php ReflectionData.json
+        run: docker compose -f docker-compose.yml run php_under_test /usr/local/bin/php tests/Tools/dump-reflection-to-file.php ReflectionData.json
 
       - name: Build Reflection Data With Pecl Only
-        run: docker-compose -f docker-compose.yml run php_under_test /usr/local/bin/php tests/Tools/dump-pecl-to-file.php
+        run: docker compose -f docker-compose.yml run php_under_test /usr/local/bin/php tests/Tools/dump-pecl-to-file.php
 
       - name: Run Tests
-        run: docker-compose -f docker-compose.yml run -e PHP_VERSION='8.0' test_runner vendor/bin/phpunit tests/
+        run: docker compose -f docker-compose.yml run -e PHP_VERSION='8.4' test_runner vendor/bin/phpunit tests/
         env:
-          PHP_VERSION: '8.0'
+          PHP_VERSION: '8.4'

.php-cs-fixer.php

@@ -8,9 +8,15 @@
 $finder = PhpCsFixer\Finder::create()
     ->in(__DIR__)
     ->append(['.php-cs-fixer.php'])
-    ->notName('PhpStormStubsMap.php');
+    ->notName('PhpStormStubsMap.php')
+    ->notPath([
+        'tests/Parsers/StubParser.php',
+        'tests/Parsers/Visitors/ASTVisitor.php',
+        'Core/Core.php',
+    ]);
 
 return (new PhpCsFixer\Config())
+    ->setUnsupportedPhpVersionAllowed(true)
     ->registerCustomFixers([
         new BracesOneLineFixer(),
     ])

Core/Core.php

@@ -431,8 +431,7 @@ function method_exists($object_or_class, string $method): bool {}
  * @param string $property <p>
  * The name of the property
  * </p>
- * @return bool true if the property exists, false if it doesn't exist or
- * null in case of an error.
+ * @return bool true if the property exists, false otherwise
  */
 #[Pure]
 function property_exists($object_or_class, string $property): bool {}
@@ -441,7 +440,7 @@ function property_exists($object_or_class, string $property): bool {}
  * Checks if the trait exists
  * @param string $trait Name of the trait to check
  * @param bool $autoload [optional] Whether to autoload if not already loaded.
- * @return bool Returns TRUE if trait exists, FALSE if not, NULL in case of an error.
+ * @return bool Returns true if trait exists, false otherwise
  * @link https://secure.php.net/manual/en/function.trait-exists.php
  * @since 5.4
  */
@@ -605,7 +604,7 @@ function get_class_vars(string $class): array {}
  * for the specified <i>object</i> in scope. If a property have
  * not been assigned a value, it will be returned with a null value.
  */
-#[Pure]
+#[Pure(true)]
 function get_object_vars(object $object): array {}
 
 /**
@@ -708,6 +707,10 @@ function set_error_handler(?callable $callback, int $error_levels = E_ALL) {}
 #[LanguageLevelTypeAware(['8.2' => 'true'], default: 'bool')]
 function restore_error_handler(): bool {}
 
+/**
+ * @since 8.5
+ */
+function get_error_handler(): ?callable {}
 /**
  * Sets a user-defined exception handler function
  * @link https://php.net/manual/en/function.set-exception-handler.php
@@ -724,6 +727,11 @@ function restore_error_handler(): bool {}
  */
 function set_exception_handler(?callable $callback) {}
 
+/**
+ * @since 8.5
+ */
+function get_exception_handler(): ?callable {}
+
 /**
  * Restores the previously defined exception handler function
  * @link https://php.net/manual/en/function.restore-exception-handler.php
@@ -813,6 +821,7 @@ function create_function(string $args, string $code): false|string {}
  * by this function, the return value will be the string
  * Unknown.
  */
+#[Pure(true)]
 function get_resource_type($resource): string {}
 
 /**
@@ -1032,6 +1041,7 @@ function get_defined_constants(bool $categorize = false): array {}
  * </tr>
  * </table>
  */
+#[Pure(true)]
 function debug_backtrace(int $options = DEBUG_BACKTRACE_PROVIDE_OBJECT, int $limit = 0): array {}
 
 /**
@@ -1139,4 +1149,9 @@ function exit(string|int $status = 0): never {}
 /**
  * @since 8.4
  */
-function die(string|int $status = 0): never {}
+function die(string|int $status = 0): never {}
+
+/**
+ * @since 8.5
+ */
+function clone(object $object, array $withProperties = []): object {}

Core/Core_c.php

@@ -279,7 +279,10 @@ public function __toString();
  */
 class Exception implements Throwable
 {
-    /** The error message */
+    /**
+     * The error message
+     * @var string
+     */
     protected $message;
 
     /** The error code */
@@ -526,6 +529,12 @@ private function __clone(): void {}
     public function __wakeup(): void {}
 }
 
+/**
+ * Is thrown when the type of an argument is correct but the value of it is incorrect. For example, passing a negative
+ * integer when the function expects a positive one, or passing an empty string/array when the function expects it to not be empty.
+ * @link https://www.php.net/manual/en/class.valueerror.php
+ * @since 8.0
+ */
 class ValueError extends Error {}
 
 /**
@@ -604,7 +613,7 @@ class ErrorException extends Exception
      * @param int $severity [optional] The severity level of the exception.
      * @param string $filename [optional] The filename where the exception is thrown.
      * @param int $line [optional] The line number where the exception is thrown.
-     * @param Exception $previous [optional] The previous exception used for the exception chaining.
+     * @param Throwable $previous [optional] The previous exception used for the exception chaining.
      */
     #[Pure]
     public function __construct(
@@ -693,6 +702,11 @@ public function call(object $newThis, mixed ...$args): mixed {}
      * @since 7.1
      */
     public static function fromCallable(callable $callback): Closure {}
+
+    /**
+     * @since 8.5
+     */
+    public static function getCurrent(): Closure {}
 }
 
 /**
@@ -875,10 +889,16 @@ final class Attribute
      */
     public const TARGET_PARAMETER = 32;
 
+    /**
+     * Marks that attribute declaration is allowed only in constants.
+     * @since 8.5
+     */
+    public const TARGET_CONSTANT = 32;
+
     /**
      * Marks that attribute declaration is allowed anywhere.
      */
-    public const TARGET_ALL = 63;
+    public const TARGET_ALL = 127;
 
     /**
      * Notes that an attribute declaration in the same place is
@@ -890,7 +910,7 @@ final class Attribute
      * @param int $flags A value in the form of a bitmask indicating the places
      * where attributes can be defined.
      */
-    public function __construct(#[ExpectedValues(flagsFromClass: Attribute::class)] int $flags = self::TARGET_ALL) {}
+    public function __construct(#[ExpectedValues(flagsFromClass: Attribute::class)] int $flags = Attribute::TARGET_ALL) {}
 }
 
 /**
@@ -937,7 +957,7 @@ interface BackedEnum extends UnitEnum
      * case, if any. If there is no matching case defined, it will throw a
      * <code>ValueError</code>.
      * @param int|string $value
-     * @throws ValueError
+     * @throws ValueError if there is no matching case defined
      * @throws TypeError
      * @return static
      * @link https://www.php.net/manual/en/backedenum.from.php
@@ -968,15 +988,23 @@ interface IntBackedEnum extends BackedEnum
     public readonly int $value;
 
     /**
+     * Translates an int into the corresponding <code>Enum</code>
+     * case, if any. If there is no matching case defined, it will throw a
+     * <code>ValueError</code>.
      * @param int $value
      * @return static
+     * @throws ValueError if there is no matching case defined
+     * @link https://www.php.net/manual/en/backedenum.from.php
      */
     #[Pure]
     public static function from(int $value): static;
 
     /**
+     * Translates an int into the corresponding <code>Enum</code>
+     * case, if any. If there is no matching case defined, it will return null.
      * @param int $value
      * @return static|null
+     * @link https://www.php.net/manual/en/backedenum.tryfrom.php
      */
     #[Pure]
     public static function tryFrom(int $value): ?static;
@@ -992,9 +1020,25 @@ interface StringBackedEnum extends BackedEnum
 {
     public readonly string $value;
 
+    /**
+     * Translates a string into the corresponding <code>Enum</code>
+     * case, if any. If there is no matching case defined, it will throw a
+     * <code>ValueError</code>.
+     * @param string $value
+     * @return static
+     * @throws ValueError if there is no matching case defined
+     * @link https://www.php.net/manual/en/backedenum.from.php
+     */
     #[Pure]
     public static function from(string $value): static;
 
+    /**
+     * Translates a string or int into the corresponding <code>Enum</code>
+     * case, if any. If there is no matching case defined, it will return null.
+     * @param string $value
+     * @return static|null
+     * @link https://www.php.net/manual/en/backedenum.tryfrom.php
+     */
     #[Pure]
     public static function tryFrom(string $value): ?static;
 }
@@ -1160,11 +1204,28 @@ public function __construct() {}
 /**
  * @since 8.4
  */
-#[Attribute(Attribute::TARGET_METHOD|Attribute::TARGET_FUNCTION|Attribute::TARGET_CLASS_CONSTANT)]
+#[Attribute(Attribute::TARGET_METHOD|Attribute::TARGET_FUNCTION|Attribute::TARGET_CLASS_CONSTANT|Attribute::TARGET_CONSTANT)]
 final class Deprecated
 {
     public readonly ?string $message;
     public readonly ?string $since;
 
     public function __construct(?string $message = null, ?string $since = null) {}
 }
+
+/**
+ * @since 8.5
+ */
+#[Attribute(Attribute::TARGET_METHOD|Attribute::TARGET_FUNCTION)]
+final class NoDiscard
+{
+    public readonly ?string $message;
+
+    public function __construct(?string $message = null) {}
+}
+
+/**
+ * @since 8.5
+ */
+#[Attribute(Attribute::TARGET_ALL)]
+final class DelayedTargetValidation {}

Core/Core_d.php

@@ -147,6 +147,8 @@
 define('null', null, true);
 define('ZEND_THREAD_SAFE', false);
 define('ZEND_DEBUG_BUILD', false);
+define('ZEND_VM_KIND_HYBRID', 4);
+define('ZEND_VM_KIND', ZEND_VM_KIND_HYBRID);
 define('PHP_WINDOWS_VERSION_BUILD', 0);
 define('PHP_WINDOWS_VERSION_MAJOR', 0);
 define('PHP_WINDOWS_VERSION_MINOR', 0);
@@ -281,3 +283,6 @@
  * @link https://php.net/manual/en/reserved.constants.php
  */
 define('PHP_MANDIR', '/usr/local/php/php/man');
+
+define('PHP_BUILD_DATE', 'Aug 14 2025 22:21:58');
+define('PHP_BUILD_PROVIDER', 'https://github.com/docker-library/php');

LuaSandbox/LuaSandbox.php

@@ -371,7 +371,7 @@ class LuaSandboxFunction
      * which may be empty, or false on error.</p>
      * @since luasandbox >= 1.0.0
      */
-    public function call($arguments) {}
+    public function call(string ...$args) {}
 
     /**
      * Dump the function as a binary blob.