Merge branch 'master' into terser

benchmark/benchmark.js

@@ -6,7 +6,7 @@ const crypto = require('crypto');
 const { argv } = require('yargs');
 const fetch = require('node-fetch').default;
 const Benchmark = require('benchmark');
-const simpleGit = require('simple-git/promise');
+const simpleGit = require('simple-git');
 const { parseLanguageNames } = require('../tests/helper/test-case');
 
 
@@ -401,7 +401,7 @@ async function getCandidates(config) {
 	const remoteBaseDir = path.join(__dirname, 'remotes');
 	await fs.promises.mkdir(remoteBaseDir, { recursive: true });
 
-	const baseGit = simpleGit(remoteBaseDir);
+	const baseGit = simpleGit.gitP(remoteBaseDir);
 
 	for (const remote of config.remotes) {
 		const user = /[^/]+(?=\/prism.git)/.exec(remote.repo);
@@ -413,9 +413,9 @@ async function getCandidates(config) {
 		if (!fs.existsSync(remoteDir)) {
 			console.log(`Cloning ${remote.repo}`);
 			await baseGit.clone(remote.repo, remoteName);
-			remoteGit = simpleGit(remoteDir);
+			remoteGit = simpleGit.gitP(remoteDir);
 		} else {
-			remoteGit = simpleGit(remoteDir);
+			remoteGit = simpleGit.gitP(remoteDir);
 			await remoteGit.fetch('origin', branch); // get latest version of branch
 		}
 		await remoteGit.checkout(branch); // switch to branch

components/prism-php.js

@@ -100,7 +100,7 @@
 				//
 				// keywords cannot be preceded by "->"
 				// the complex lookbehind means `(?<!(?:->|::)\s*)`
-				pattern: /((?:^|[^\s>:]|(?:^|[^-])>|(?:^|[^:]):)\s*)\b(?:abstract|and|array|as|break|callable|case|catch|clone|const|continue|declare|default|die|do|echo|else|elseif|empty|enddeclare|endfor|endforeach|endif|endswitch|endwhile|enum|eval|exit|extends|final|finally|fn|for|foreach|function|global|goto|if|implements|include|include_once|instanceof|insteadof|interface|isset|list|match|namespace|new|or|parent|print|private|protected|public|require|require_once|return|self|static|switch|throw|trait|try|unset|use|var|while|xor|yield|__halt_compiler)\b/i,
+				pattern: /((?:^|[^\s>:]|(?:^|[^-])>|(?:^|[^:]):)\s*)\b(?:abstract|and|array|as|break|callable|case|catch|clone|const|continue|declare|default|die|do|echo|else|elseif|empty|enddeclare|endfor|endforeach|endif|endswitch|endwhile|enum|eval|exit|extends|final|finally|fn|for|foreach|function|global|goto|if|implements|include|include_once|instanceof|insteadof|interface|isset|list|match|namespace|new|or|parent|print|private|protected|public|readonly|require|require_once|return|self|static|switch|throw|trait|try|unset|use|var|while|xor|yield|__halt_compiler)\b/i,
 				lookbehind: true
 			}
 		],

dangerfile.js

@@ -1,7 +1,7 @@
 const { markdown } = require('danger');
 const fs = require('fs').promises;
 const gzipSize = require('gzip-size');
-const git = require('simple-git/promise')(__dirname).silent(true);
+const git = require('simple-git').gitP(__dirname);
 
 /**
  * Returns the contents of a text file in the base of the PR.

gulpfile.js/changelog.js

@@ -4,7 +4,7 @@ const { src, dest } = require('gulp');
 
 const replace = require('gulp-replace');
 const pump = require('pump');
-const git = require('simple-git/promise')(__dirname);
+const git = require('simple-git').gitP(__dirname);
 
 const { changelog } = require('./paths');
 

package.json

@@ -46,7 +46,7 @@
 		"docdash": "^1.2.0",
 		"eslint": "^7.22.0",
 		"eslint-plugin-jsdoc": "^32.3.0",
-		"eslint-plugin-regexp": "^1.4.0",
+		"eslint-plugin-regexp": "^1.6.0",
 		"gulp": "^4.0.2",
 		"gulp-clean-css": "^4.3.0",
 		"gulp-concat": "^2.3.4",

tests/languages/php/keyword_feature.test

@@ -55,6 +55,7 @@ print
 private
 protected
 public
+readonly
 require
 require_once
 return
@@ -135,6 +136,7 @@ yield from
 	["keyword", "private"],
 	["keyword", "protected"],
 	["keyword", "public"],
+	["keyword", "readonly"],
 	["keyword", "require"],
 	["keyword", "require_once"],
 	["keyword", "return"],