Merge pull request #47865 from mattacosta/mattacosta/regenerate-php-globals

Fix #33132: Regenerate php functions.

extensions/php-language-features/src/features/completionItemProvider.ts

@@ -7,6 +7,7 @@
 
 import { CompletionItemProvider, CompletionItem, CompletionItemKind, CancellationToken, TextDocument, Position, Range, TextEdit, workspace, CompletionContext } from 'vscode';
 import phpGlobals = require('./phpGlobals');
+import phpGlobalFunctions = require('./phpGlobalFunctions');
 
 export default class PHPCompletionItemProvider implements CompletionItemProvider {
 
@@ -69,10 +70,10 @@ export default class PHPCompletionItemProvider implements CompletionItemProvider
 				result.push(createNewProposal(CompletionItemKind.Variable, globalvariables, phpGlobals.globalvariables[globalvariables]));
 			}
 		}
-		for (var globalfunctions in phpGlobals.globalfunctions) {
-			if (phpGlobals.globalfunctions.hasOwnProperty(globalfunctions) && matches(globalfunctions)) {
+		for (var globalfunctions in phpGlobalFunctions.globalfunctions) {
+			if (phpGlobalFunctions.globalfunctions.hasOwnProperty(globalfunctions) && matches(globalfunctions)) {
 				added[globalfunctions] = true;
-				result.push(createNewProposal(CompletionItemKind.Function, globalfunctions, phpGlobals.globalfunctions[globalfunctions]));
+				result.push(createNewProposal(CompletionItemKind.Function, globalfunctions, phpGlobalFunctions.globalfunctions[globalfunctions]));
 			}
 		}
 		for (var compiletimeconstants in phpGlobals.compiletimeconstants) {

extensions/php-language-features/src/features/hoverProvider.ts

@@ -6,8 +6,9 @@
 'use strict';
 
 import { HoverProvider, Hover, MarkedString, TextDocument, CancellationToken, Position, workspace } from 'vscode';
-import phpGlobals = require('./phpGlobals');
 import { textToMarkedString } from './utils/markedTextUtil';
+import phpGlobals = require('./phpGlobals');
+import phpGlobalFunctions = require('./phpGlobalFunctions');
 
 export default class PHPHoverProvider implements HoverProvider {
 
@@ -24,7 +25,7 @@ export default class PHPHoverProvider implements HoverProvider {
 
 		let name = document.getText(wordRange);
 
-		var entry = phpGlobals.globalfunctions[name] || phpGlobals.compiletimeconstants[name] || phpGlobals.globalvariables[name] || phpGlobals.keywords[name];
+		var entry = phpGlobalFunctions.globalfunctions[name] || phpGlobals.compiletimeconstants[name] || phpGlobals.globalvariables[name] || phpGlobals.keywords[name];
 		if (entry && entry.description) {
 			let signature = name + (entry.signature || '');
 			let contents: MarkedString[] = [textToMarkedString(entry.description), { language: 'php', value: signature }];

extensions/php-language-features/src/features/signatureHelpProvider.ts

@@ -7,6 +7,7 @@
 
 import { SignatureHelpProvider, SignatureHelp, SignatureInformation, CancellationToken, TextDocument, Position, workspace } from 'vscode';
 import phpGlobals = require('./phpGlobals');
+import phpGlobalFunctions = require('./phpGlobalFunctions');
 
 var _NL = '\n'.charCodeAt(0);
 var _TAB = '\t'.charCodeAt(0);
@@ -87,7 +88,7 @@ export default class PHPSignatureHelpProvider implements SignatureHelpProvider {
 			return null;
 		}
 
-		var entry = phpGlobals.globalfunctions[ident] || phpGlobals.keywords[ident];
+		var entry = phpGlobalFunctions.globalfunctions[ident] || phpGlobals.keywords[ident];
 		if (!entry || !entry.signature) {
 			return null;
 		}