Merge 5.x

.github/workflows/macos-scan.yml

@@ -0,0 +1,29 @@
+name: Run Psalm (mac OS)
+
+on: [push, pull_request]
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: macos-15
+
+    steps:
+    - uses: actions/checkout@v4
+    - uses: shivammathur/setup-php@v2
+      with:
+        php-version: '8.4'
+        ini-values: zend.assertions=1
+        tools: composer:v2
+        coverage: none
+      env:
+        fail-fast: true
+
+    - name: Install dependencies
+      run: composer install --prefer-dist --no-progress --no-suggest
+      env:
+        COMPOSER_ROOT_VERSION: dev-master
+
+    - name: Run Psalm
+      run: ./psalm --output-format=github

.github/workflows/shepherd.yml

@@ -13,7 +13,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: shivammathur/setup-php@v2
       with:
-        php-version: '8.2'
+        php-version: '8.4'
         ini-values: zend.assertions=1
         tools: composer:v2
         coverage: none
@@ -26,4 +26,4 @@ jobs:
         COMPOSER_ROOT_VERSION: dev-master
 
     - name: Run Psalm
-      run: ./psalm --threads=2 --output-format=github --shepherd
+      run: ./psalm --output-format=github --shepherd

composer.json

@@ -15,7 +15,7 @@
         }
     ],
     "require": {
-        "php": "~8.1.17 || ~8.2.4 || ~8.3.0",
+        "php": "~8.1.17 || ~8.2.4 || ~8.3.0 || ~8.4.0",
         "ext-SimpleXML": "*",
         "ext-ctype": "*",
         "ext-dom": "*",

config.xsd

@@ -315,6 +315,7 @@
             <xs:element name="MismatchingDocblockParamType" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="MismatchingDocblockPropertyType" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="MismatchingDocblockReturnType" type="IssueHandlerType" minOccurs="0" />
+            <xs:element name="MissingClassConstType" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="MissingClosureParamType" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="MissingClosureReturnType" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="MissingConstructor" type="IssueHandlerType" minOccurs="0" />

dictionaries/CallMap_73_delta.php

@@ -120,6 +120,10 @@
         'old' => ['bool', 'directory'=>'string', 'permissions='=>'int', 'recursive='=>'bool', 'context='=>'resource'],
         'new' => ['bool', 'directory'=>'string', 'permissions='=>'int', 'recursive='=>'bool', 'context='=>'null|resource'],
     ],
+    'session_get_cookie_params' => [
+        'old' => ['array{lifetime:?int,path:?string,domain:?string,secure:?bool,httponly:?bool}'],
+        'new' => ['array{lifetime:?int,path:?string,domain:?string,secure:?bool,httponly:?bool,samesite:?string}'],
+    ]
   ],
   'removed' => [
   ],

dictionaries/CallMap_81_delta.php

@@ -727,6 +727,30 @@
       'old' => ['bool', 'statement' => 'mysqli_stmt'],
       'new' => ['bool', 'statement' => 'mysqli_stmt', 'params=' => 'list<mixed>|null'],
     ],
+    'mysqli_fetch_field' => [
+      'old' => ['object{name:string,orgname:string,table:string,orgtable:string,max_length:int,length:int,charsetnr:int,flags:int,type:int,decimals:int,db:string,def:\'\',catalog:\'def\'}|false', 'result'=>'mysqli_result'],
+      'new' => ['object{name:string,orgname:string,table:string,orgtable:string,max_length:0,length:int,charsetnr:int,flags:int,type:int,decimals:int,db:string,def:\'\',catalog:\'def\'}|false', 'result'=>'mysqli_result'],
+    ],
+    'mysqli_fetch_field_direct' => [
+      'old' => ['object{name:string,orgname:string,table:string,orgtable:string,max_length:int,length:int,charsetnr:int,flags:int,type:int,decimals:int,db:string,def:\'\',catalog:\'def\'}|false', 'result'=>'mysqli_result', 'index'=>'int'],
+      'new' => ['object{name:string,orgname:string,table:string,orgtable:string,max_length:0,length:int,charsetnr:int,flags:int,type:int,decimals:int,db:string,def:\'\',catalog:\'def\'}|false', 'result'=>'mysqli_result', 'index'=>'int'],
+    ],
+    'mysqli_fetch_fields' => [
+      'old' => ['list<object{name:string,orgname:string,table:string,orgtable:string,max_length:int,length:int,charsetnr:int,flags:int,type:int,decimals:int,db:string,def:\'\',catalog:\'def\'}>', 'result'=>'mysqli_result'],
+      'new' => ['list<object{name:string,orgname:string,table:string,orgtable:string,max_length:0,length:int,charsetnr:int,flags:int,type:int,decimals:int,db:string,def:\'\',catalog:\'def\'}>', 'result'=>'mysqli_result'],
+    ],
+    'mysqli_result::fetch_field' => [
+      'old' => ['object{name:string,orgname:string,table:string,orgtable:string,max_length:int,length:int,charsetnr:int,flags:int,type:int,decimals:int,db:string,def:\'\',catalog:\'def\'}|false'],
+      'new' => ['object{name:string,orgname:string,table:string,orgtable:string,max_length:0,length:int,charsetnr:int,flags:int,type:int,decimals:int,db:string,def:\'\',catalog:\'def\'}|false'],
+    ],
+    'mysqli_result::fetch_field_direct' => [
+      'old' => ['object{name:string,orgname:string,table:string,orgtable:string,max_length:int,length:int,charsetnr:int,flags:int,type:int,decimals:int,db:string,def:\'\',catalog:\'def\'}|false', 'index'=>'int'],
+      'new' => ['object{name:string,orgname:string,table:string,orgtable:string,max_length:0,length:int,charsetnr:int,flags:int,type:int,decimals:int,db:string,def:\'\',catalog:\'def\'}|false', 'index'=>'int'],
+    ],
+    'mysqli_result::fetch_fields' => [
+      'old' => ['list<object{name:string,orgname:string,table:string,orgtable:string,max_length:int,length:int,charsetnr:int,flags:int,type:int,decimals:int,db:string,def:\'\',catalog:\'def\'}>'],
+      'new' => ['list<object{name:string,orgname:string,table:string,orgtable:string,max_length:0,length:int,charsetnr:int,flags:int,type:int,decimals:int,db:string,def:\'\',catalog:\'def\'}>'],
+    ],
     'mysqli_stmt_execute' => [
       'old' => ['bool', 'statement' => 'mysqli_stmt'],
       'new' => ['bool', 'statement' => 'mysqli_stmt', 'params=' => 'list<mixed>|null'],
@@ -1211,6 +1235,74 @@
       'old' => ['int|false', '&rw_read'=>'?resource[]', '&rw_write'=>'?resource[]', '&rw_except'=>'?resource[]', 'seconds'=>'?int', 'microseconds='=>'int'],
       'new' => ['int|false', '&rw_read'=>'?resource[]', '&rw_write'=>'?resource[]', '&rw_except'=>'?resource[]', 'seconds'=>'?int', 'microseconds='=>'?int'],
     ],
+    'mb_check_encoding' => [
+        'old' => ['bool', 'value='=>'array|string|null', 'encoding='=>'string|null'],
+        'new' => ['bool', 'value'=>'array|string', 'encoding='=>'string|null'],
+    ],
+    'ctype_alnum' => [
+        'old' => ['bool', 'text'=>'string|int'],
+        'new' => ['bool', 'text'=>'string'],
+    ],
+    'ctype_alpha' => [
+        'old' => ['bool', 'text'=>'string|int'],
+        'new' => ['bool', 'text'=>'string'],
+    ],
+    'ctype_cntrl' => [
+        'old' => ['bool', 'text'=>'string|int'],
+        'new' => ['bool', 'text'=>'string'],
+    ],
+    'ctype_digit' => [
+        'old' => ['bool', 'text'=>'string|int'],
+        'new' => ['bool', 'text'=>'string'],
+    ],
+    'ctype_graph' => [
+        'old' => ['bool', 'text'=>'string|int'],
+        'new' => ['bool', 'text'=>'string'],
+    ],
+    'ctype_lower' => [
+        'old' => ['bool', 'text'=>'string|int'],
+        'new' => ['bool', 'text'=>'string'],
+    ],
+    'ctype_print' => [
+        'old' => ['bool', 'text'=>'string|int'],
+        'new' => ['bool', 'text'=>'string'],
+    ],
+    'ctype_punct' => [
+        'old' => ['bool', 'text'=>'string|int'],
+        'new' => ['bool', 'text'=>'string'],
+    ],
+    'ctype_space' => [
+        'old' => ['bool', 'text'=>'string|int'],
+        'new' => ['bool', 'text'=>'string'],
+    ],
+    'ctype_upper' => [
+        'old' => ['bool', 'text'=>'string|int'],
+        'new' => ['bool', 'text'=>'string'],
+    ],
+    'ctype_xdigit' => [
+        'old' => ['bool', 'text'=>'string|int'],
+        'new' => ['bool', 'text'=>'string'],
+    ],
+    'key' => [
+        'old' => ['int|string|null', 'array'=>'array|object'],
+        'new' => ['int|string|null', 'array'=>'array'],
+    ],
+    'current' => [
+        'old' => ['mixed|false', 'array'=>'array|object'],
+        'new' => ['mixed|false', 'array'=>'array'],
+    ],
+    'next' => [
+        'old' => ['mixed', '&r_array'=>'array|object'],
+        'new' => ['mixed', '&r_array'=>'array'],
+    ],
+    'prev' => [
+        'old' => ['mixed', '&r_array'=>'array|object'],
+        'new' => ['mixed', '&r_array'=>'array'],
+    ],
+    'reset' => [
+        'old' => ['mixed|false', '&r_array'=>'array|object'],
+        'new' => ['mixed|false', '&r_array'=>'array'],
+    ],
   ],
 
   'removed' => [

dictionaries/CallMap_82_delta.php

@@ -57,6 +57,30 @@
         'old' => ['array|string|int|false', 'type='=>'string'],
         'new' => ['array|string|int|false|null', 'type='=>'string'],
     ],
+    'strcmp' => [
+        'old' => ['int', 'string1' => 'string', 'string2' => 'string'],
+        'new' => ['int<-1,1>', 'string1' => 'string', 'string2' => 'string'],
+    ],
+    'strcasecmp' => [
+        'old' => ['int', 'string1' => 'string', 'string2' => 'string'],
+        'new' => ['int<-1,1>', 'string1' => 'string', 'string2' => 'string'],
+    ],
+    'strnatcasecmp' => [
+        'old' => ['int', 'string1' => 'string', 'string2' => 'string'],
+        'new' => ['int<-1,1>', 'string1' => 'string', 'string2' => 'string'],
+    ],
+    'strnatcmp' => [
+        'old' => ['int', 'string1' => 'string', 'string2' => 'string'],
+        'new' => ['int<-1,1>', 'string1' => 'string', 'string2' => 'string'],
+    ],
+    'strncmp' => [
+        'old' => ['int', 'string1'=>'string', 'string2'=>'string', 'length'=>'int'],
+        'new' => ['int<-1,1>', 'string1' => 'string', 'string2' => 'string', 'length'=>'positive-int|0'],
+    ],
+    'strncasecmp' => [
+        'old' => ['int', 'string1'=>'string', 'string2'=>'string', 'length'=>'int'],
+        'new' => ['int<-1,1>', 'string1' => 'string', 'string2' => 'string', 'length'=>'positive-int|0'],
+    ],
   ],
 
   'removed' => [

dictionaries/CallMap_83_delta.php

@@ -117,6 +117,14 @@
       'old' => ['string|false', 'haystack'=>'string', 'needle'=>'string'],
       'new' => ['string|false', 'haystack'=>'string', 'needle'=>'string', 'before_needle='=>'bool'],
     ],
+    'get_class' => [
+        'old' => ['class-string', 'object='=>'object'],
+        'new' => ['class-string', 'object'=>'object'],
+    ],
+    'get_parent_class' => [
+        'old' => ['class-string|false', 'object_or_class='=>'object|class-string'],
+        'new' => ['class-string|false', 'object_or_class'=>'object|class-string'],
+    ],
   ],
 
   'removed' => [

dictionaries/CallMap_historical.php

@@ -3393,7 +3393,7 @@
     'LimitIterator::seek' => ['int', 'offset'=>'int'],
     'LimitIterator::valid' => ['bool'],
     'Locale::acceptFromHttp' => ['string|false', 'header'=>'string'],
-    'Locale::canonicalize' => ['string', 'locale'=>'string'],
+    'Locale::canonicalize' => ['?string', 'locale'=>'string'],
     'Locale::composeLocale' => ['string', 'subtags'=>'array'],
     'Locale::filterMatches' => ['?bool', 'languageTag'=>'string', 'locale'=>'string', 'canonicalize='=>'bool'],
     'Locale::getAllVariants' => ['array', 'locale'=>'string'],
@@ -5968,7 +5968,7 @@
     'ReflectionParameter::getDeclaringFunction' => ['ReflectionFunctionAbstract'],
     'ReflectionParameter::getDefaultValue' => ['mixed'],
     'ReflectionParameter::getDefaultValueConstantName' => ['?string'],
-    'ReflectionParameter::getName' => ['string'],
+    'ReflectionParameter::getName' => ['non-empty-string'],
     'ReflectionParameter::getPosition' => ['int<0, max>'],
     'ReflectionParameter::getType' => ['?ReflectionType'],
     'ReflectionParameter::hasType' => ['bool'],
@@ -10671,7 +10671,7 @@
     'getimagesize' => ['array{0:int, 1: int, 2: int, 3: string, mime: string, channels?: 3|4, bits?: int}|false', 'filename'=>'string', '&w_image_info='=>'array'],
     'getimagesizefromstring' => ['array{0:int, 1: int, 2: int, 3: string, mime: string, channels?: 3|4, bits?: int}|false', 'string'=>'string', '&w_image_info='=>'array'],
     'getlastmod' => ['int|false'],
-    'getmxrr' => ['bool', 'hostname'=>'string', '&w_hosts'=>'array', '&w_weights='=>'array'],
+    'getmxrr' => ['bool', 'hostname'=>'string', '&w_hosts'=>'array<int, string>', '&w_weights='=>'array<int, int>'],
     'getmygid' => ['int|false'],
     'getmyinode' => ['int|false'],
     'getmypid' => ['int|false'],
@@ -12728,9 +12728,9 @@
     'mysqli_fetch_array\'1' => ['array<string,null|int|float|string>|false|null', 'result'=>'mysqli_result', 'mode='=>'1'],
     'mysqli_fetch_array\'2' => ['list<null|int|float|string>|false|null', 'result'=>'mysqli_result', 'mode='=>'2'],
     'mysqli_fetch_assoc' => ['array<string,null|int|float|string>|false|null', 'result'=>'mysqli_result'],
-    'mysqli_fetch_field' => ['object{name:non-empty-string,orgname:string,table:string,orgtable:string,max_length:int,length:int,charsetnr:int,flags:int,type:int,decimals:int,db:string,def:string,catalog:string}|false', 'result'=>'mysqli_result'],
-    'mysqli_fetch_field_direct' => ['object{name:non-empty-string,orgname:string,table:string,orgtable:string,max_length:int,length:int,charsetnr:int,flags:int,type:int,decimals:int,db:string,def:string,catalog:string}|false', 'result'=>'mysqli_result', 'index'=>'int'],
-    'mysqli_fetch_fields' => ['list<object{name:non-empty-string,orgname:string,table:string,orgtable:string,max_length:int,length:int,charsetnr:int,flags:int,type:int,decimals:int,db:string,def:string,catalog:string}>', 'result'=>'mysqli_result'],
+    'mysqli_fetch_field' => ['object{name:string,orgname:string,table:string,orgtable:string,max_length:int,length:int,charsetnr:int,flags:int,type:int,decimals:int,db:string,def:\'\',catalog:\'def\'}|false', 'result'=>'mysqli_result'],
+    'mysqli_fetch_field_direct' => ['object{name:string,orgname:string,table:string,orgtable:string,max_length:int,length:int,charsetnr:int,flags:int,type:int,decimals:int,db:string,def:\'\',catalog:\'def\'}|false', 'result'=>'mysqli_result', 'index'=>'int'],
+    'mysqli_fetch_fields' => ['list<object{name:string,orgname:string,table:string,orgtable:string,max_length:int,length:int,charsetnr:int,flags:int,type:int,decimals:int,db:string,def:\'\',catalog:\'def\'}>', 'result'=>'mysqli_result'],
     'mysqli_fetch_lengths' => ['array|false', 'result'=>'mysqli_result'],
     'mysqli_fetch_object' => ['object|false|null', 'result'=>'mysqli_result', 'class='=>'string', 'constructor_args='=>'array'],
     'mysqli_fetch_row' => ['list<null|int|float|string>|false|null', 'result'=>'mysqli_result'],
@@ -12742,7 +12742,7 @@
     'mysqli_get_charset' => ['?object', 'mysql'=>'mysqli'],
     'mysqli_get_client_info' => ['string', 'mysql='=>'?mysqli'],
     'mysqli_get_client_stats' => ['array'],
-    'mysqli_get_client_version' => ['int', 'link'=>'mysqli'],
+    'mysqli_get_client_version' => ['int'],
     'mysqli_get_connection_stats' => ['array', 'mysql'=>'mysqli'],
     'mysqli_get_host_info' => ['string', 'mysql'=>'mysqli'],
     'mysqli_get_links_stats' => ['array'],
@@ -12783,9 +12783,9 @@
     'mysqli_result::fetch_array\'1' => ['array<string,null|int|float|string>|false|null', 'mode='=>'1'],
     'mysqli_result::fetch_array\'2' => ['list<null|int|float|string>|false|null', 'mode='=>'2'],
     'mysqli_result::fetch_assoc' => ['array<string,null|int|float|string>|false|null'],
-    'mysqli_result::fetch_field' => ['object{name:non-empty-string,orgname:string,table:string,orgtable:string,max_length:int,length:int,charsetnr:int,flags:int,type:int,decimals:int,db:string,def:string,catalog:string}|false'],
-    'mysqli_result::fetch_field_direct' => ['object{name:non-empty-string,orgname:string,table:string,orgtable:string,max_length:int,length:int,charsetnr:int,flags:int,type:int,decimals:int,db:string,def:string,catalog:string}|false', 'index'=>'int'],
-    'mysqli_result::fetch_fields' => ['list<object{name:non-empty-string,orgname:string,table:string,orgtable:string,max_length:int,length:int,charsetnr:int,flags:int,type:int,decimals:int,db:string,def:string,catalog:string}>'],
+    'mysqli_result::fetch_field' => ['object{name:string,orgname:string,table:string,orgtable:string,max_length:int,length:int,charsetnr:int,flags:int,type:int,decimals:int,db:string,def:\'\',catalog:\'def\'}|false'],
+    'mysqli_result::fetch_field_direct' => ['object{name:string,orgname:string,table:string,orgtable:string,max_length:int,length:int,charsetnr:int,flags:int,type:int,decimals:int,db:string,def:\'\',catalog:\'def\'}|false', 'index'=>'int'],
+    'mysqli_result::fetch_fields' => ['list<object{name:string,orgname:string,table:string,orgtable:string,max_length:int,length:int,charsetnr:int,flags:int,type:int,decimals:int,db:string,def:\'\',catalog:\'def\'}>'],
     'mysqli_result::fetch_object' => ['object|false|null', 'class='=>'string', 'constructor_args='=>'array'],
     'mysqli_result::fetch_row' => ['list<null|int|float|string>|false|null'],
     'mysqli_result::field_seek' => ['bool', 'index'=>'int'],
@@ -13499,9 +13499,9 @@
     'preg_filter' => ['string|string[]|null', 'pattern'=>'string|string[]', 'replacement'=>'string|string[]', 'subject'=>'string|string[]', 'limit='=>'int', '&w_count='=>'int'],
     'preg_grep' => ['array|false', 'pattern'=>'string', 'array'=>'array', 'flags='=>'int'],
     'preg_last_error' => ['int'],
-    'preg_match' => ['int|false', 'pattern'=>'string', 'subject'=>'string', '&w_matches='=>'string[]', 'flags='=>'0', 'offset='=>'int'],
-    'preg_match\'1' => ['int|false', 'pattern'=>'string', 'subject'=>'string', '&w_matches='=>'array', 'flags='=>'int', 'offset='=>'int'],
-    'preg_match_all' => ['int|false', 'pattern'=>'string', 'subject'=>'string', '&w_matches='=>'array', 'flags='=>'int', 'offset='=>'int'],
+    'preg_match' => ['0|1|false', 'pattern'=>'string', 'subject'=>'string', '&w_matches='=>'string[]', 'flags='=>'0', 'offset='=>'int'],
+    'preg_match\'1' => ['0|1|false', 'pattern'=>'string', 'subject'=>'string', '&w_matches='=>'array', 'flags='=>'int', 'offset='=>'int'],
+    'preg_match_all' => ['int<0,max>|false', 'pattern'=>'string', 'subject'=>'string', '&w_matches='=>'array', 'flags='=>'int', 'offset='=>'int'],
     'preg_quote' => ['string', 'str'=>'string', 'delimiter='=>'string'],
     'preg_replace' => ['string|string[]|null', 'pattern'=>'string|array', 'replacement'=>'string|array', 'subject'=>'string|array', 'limit='=>'int', '&w_count='=>'int'],
     'preg_replace_callback' => ['string|null', 'pattern'=>'string|array', 'callback'=>'callable(string[]):string', 'subject'=>'string', 'limit='=>'int', '&w_count='=>'int'],
@@ -13840,7 +13840,7 @@
     'session_decode' => ['bool', 'data'=>'string'],
     'session_destroy' => ['bool'],
     'session_encode' => ['string|false'],
-    'session_get_cookie_params' => ['array'],
+    'session_get_cookie_params' => ['array{lifetime:?int,path:?string,domain:?string,secure:?bool,httponly:?bool}'],
     'session_id' => ['string|false', 'id='=>'string'],
     'session_is_registered' => ['bool', 'name'=>'string'],
     'session_module_name' => ['string|false', 'module='=>'string'],

dictionaries/ImpureFunctionsList.php

@@ -254,4 +254,9 @@
     'openssl_pkcs12_export_to_file' => true,
     'openssl_pkey_export_to_file' => true,
     'openssl_x509_export_to_file' => true,
+    // xml
+    'xml_parser_set_option' => true,
+    'xml_parser_free' => true,
+    // mail
+    'mail' => true,
 ];