Skip to content

Commit 64cbc41

Browse files
committed
Update builtin definitions
Regenerated built-in definitions from to 8.2 manual Added support for ? in front of nullable params Updated enabled-by-default extensions for new/removed entries
1 parent 1b18bcb commit 64cbc41

File tree

5 files changed

+10285
-12933
lines changed

5 files changed

+10285
-12933
lines changed

autoload/phpcomplete.vim

+17-17
Original file line numberDiff line numberDiff line change
@@ -119,28 +119,28 @@ endif
119119

120120

121121
let g:phpcomplete_active_function_extensions = [
122-
\'apache', 'apc', 'apd', 'arrays', 'bc_math', 'bzip2', 'calendar', 'classes_objects', 'ctype', 'curl', 'date_time', 'dba', 'dbase',
122+
\'apache', 'apd', 'arrays', 'bc_math', 'bzip2', 'calendar', 'classes_objects', 'ctype', 'curl', 'date_time', 'dba', 'dbase',
123123
\'directories', 'dom', 'enchant', 'error_handling', 'exif', 'fastcgi_process_manager', 'fileinfo', 'filesystem', 'filter', 'ftp',
124-
\'function_handling', 'gd', 'geoip', 'gettext', 'gmp', 'hash', 'iconv', 'iis', 'json', 'ldap', 'libxml', 'mail', 'math', 'mcrypt',
125-
\'memcache', 'mhash', 'misc', 'mongo', 'msql', 'mssql', 'multibyte_string', 'mysql', 'mysqli', 'network', 'nsapi', 'oci8', 'odbc',
126-
\'openssl', 'output_control', 'parsekit', 'password_hashing', 'pcntl', 'pcre', 'php_options_info', 'posix', 'posix_regex', 'postgresql',
127-
\'program_execution', 'ps', 'pspell', 'readline', 'recode', 'runkit', 'sessions', 'shared_memory', 'simplexml', 'snmp', 'soap', 'sockets',
128-
\'solr', 'spl', 'sqlite', 'sqlsrv', 'streams', 'strings', 'tidy', 'tokenizer', 'urls', 'variable_handling', 'wddx', 'xml_parser',
124+
\'function_handling', 'gd', 'geoip', 'gettext', 'gmp', 'hash', 'iconv', 'json', 'ldap', 'libxml', 'mail', 'math', 'mcrypt',
125+
\'memcache', 'mhash', 'misc', 'multibyte_string', 'mysqli', 'mysql_xdevapi', 'network', 'oci8', 'odbc',
126+
\'openssl', 'output_control', 'password_hashing', 'pcntl', 'pcre', 'php_options_info', 'posix', 'postgresql',
127+
\'program_execution', 'ps', 'pspell', 'readline', 'random', 'recode', 'sessions', 'shared_memory', 'simplexml', 'snmp', 'soap', 'sockets',
128+
\'solr', 'spl', 'sqlsrv', 'streams', 'strings', 'runkit7', 'tidy', 'tokenizer', 'urls', 'variable_handling', 'var_representation', 'vendor_specific_database_extensions', 'wddx', 'xml_parser',
129129
\'xmlwriter', 'zip', 'zlib']
130130
let g:phpcomplete_active_class_extensions = [
131-
\'apc', 'curl', 'date_time', 'directories', 'dom', 'fileinfo', 'imagemagick', 'libxml', 'memcache', 'memcached', 'mongo', 'mysqli', 'pdo', 'phar',
132-
\'predefined_exceptions', 'predefined_interfaces_and_classes', 'reflection', 'sessions', 'simplexml', 'snmp', 'soap', 'solr', 'sphinx',
133-
\'spl', 'sqlite3', 'streams', 'tidy', 'varnish', 'xmlreader', 'xmlwriter', 'xsl', 'zip']
131+
\'curl', 'date_time', 'directories', 'dom', 'fileinfo', 'imagemagick', 'libxml', 'memcache', 'memcached', 'mysqli', 'mysql_xdevapi', 'pdo', 'phar',
132+
\'predefined_exceptions', 'phar', 'predefined_interfaces_and_classes', 'reflection', 'sessions', 'simplexml', 'snmp', 'soap', 'solr', 'sphinx',
133+
\'spl', 'sqlite3', 'streams', 'tidy', 'varnish', 'vendor_specific_database_extensions', 'xmlreader', 'xmlwriter', 'xsl', 'zip']
134134
let g:phpcomplete_active_interface_extensions = [
135-
\'json', 'predefined_interfaces_and_classes', 'spl', 'date_time', 'reflection']
135+
\'mysql_xdevapi', 'predefined_interfaces_and_classes', 'spl', 'data_structures', 'vendor_specific_database_extensions', 'random', 'reflection']
136136
let g:phpcomplete_active_constant_extensions = [
137-
\'apc', 'apd', 'arrays', 'calendar', 'classkit', 'command_line_usage', 'common', 'curl', 'date_time', 'directories', 'dom', 'error_handling', 'exif',
138-
\'fileinfo', 'filesystem', 'filter', 'ftp', 'gd', 'geoip', 'gmp', 'handling_file_uploads', 'hash', 'iconv', 'iis', 'imagemagick', 'imap',
139-
\'json', 'ldap', 'libxml', 'list_of_parser_tokens', 'list_of_reserved_words', 'math', 'mcrypt', 'memcache', 'mhash', 'misc', 'ms_sql_server_pdo',
140-
\'msql', 'mssql', 'multibyte_string', 'mysql', 'mysql_pdo', 'mysqli', 'network', 'odbc', 'openssl', 'output_control', 'parsekit', 'password_hashing',
141-
\'pcntl', 'pcre', 'pdo', 'php_options_info', 'phpini_directives', 'posix', 'posix_regex', 'postgresql', 'program_execution', 'pspell', 'runkit',
142-
\'sessions', 'snmp', 'soap', 'sockets', 'solr', 'sphinx', 'spl', 'sqlite', 'sqlite3', 'sqlsrv', 'streams', 'strings', 'tidy', 'types', 'urls',
143-
\'variable_handling', 'varnish', 'xml_parser', 'xsl', 'zlib']
137+
\'apd', 'arrays', 'calendar', 'command_line_usage', 'common', 'curl', 'date_time', 'directories', 'dom', 'error_handling', 'exif',
138+
\'fileinfo', 'filesystem', 'filter', 'ftp', 'gd', 'geoip', 'gmp', 'handling_file_uploads', 'hash', 'iconv', 'imagemagick', 'imap',
139+
\'json', 'ldap', 'libxml', 'list_of_parser_tokens', 'list_of_reserved_words', 'math', 'mcrypt', 'memcache', 'memcachedd', 'mhash', 'misc',
140+
\'multibyte_string', 'mysql_pdo', 'mysql_xdevapi', 'mysqli', 'network', 'oci8', 'phar', 'odbc', 'openssl', 'output_control', 'password_hashing',
141+
\'pcntl', 'pcre', 'pdo', 'php_options_info', 'phpini_directives', 'posix', 'phar', 'postgresql', 'program_execution', 'pspell', 'runkit7',
142+
\'sessions', 'snmp', 'soap', 'sockets', 'solr', 'simplexml', 'sphinx', 'spl', 'sqlite3', 'sqlsrv', 'streams', 'strings', 'tidy', 'types', 'urls',
143+
\'variable_handling', 'random', 'reflection', 'varnish', 'var_representation', 'vendor_specific_database_extensions', 'xml_parser', 'xsl', 'zlib']
144144
145145
if exists('g:phpcomplete_add_function_extensions')
146146
let g:phpcomplete_active_function_extensions += g:phpcomplete_add_function_extensions

bin/generator/functions.php

+6-1
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,13 @@ function handle_func_def($xpath, $nodes, $file) {
9595
$paramdefault = $xpath->query('*[@class="initializer"]', $param);
9696
if ($paramname->length) {
9797
// regular parameter
98+
// there can be more than one type nodes denote "?" in front of types
99+
$type = '';
100+
foreach ($paramtype as $type_node) {
101+
$type .= $type_node->textContent;
102+
}
98103
$p = array(
99-
'type' => $paramtype->item(0)->textContent,
104+
'type' => $type,
100105
'name' => $paramname->item(0)->textContent,
101106
'optional' => $optional,
102107
);

0 commit comments

Comments
 (0)