Merge pull request #5465 from janw-me/master

schlessera · web-flow · commit fea0a965a625 · 2020-11-05T08:08:54.000+01:00
diff --git a/php/utils.php b/php/utils.php
@@ -29,11 +29,12 @@
  * We try to be smart and only replace the constants when they are not within quotes.
  * Regular expressions being stateless, this is probably not 100% correct for edge cases.
  *
- * @see https://regex101.com/r/9hXp5d/4/
+ * @see https://regex101.com/r/9hXp5d/11
+ * @see https://stackoverflow.com/a/171499/933065
  *
  * @var string
  */
-const FILE_DIR_PATTERN = '/(?>\'[^\']*?\')|(?>"[^"]*?")|(?<file>\b__FILE__\b)|(?<dir>\b__DIR__\b)/m';
+const FILE_DIR_PATTERN = '%(?>#.*?$)|(?>//.*?$)|(?>/\*.*?\*/)|(?>\'(?:(?=(\\\\?))\1.)*?\')|(?>"(?:(?=(\\\\?))\2.)*?")|(?<file>\b__FILE__\b)|(?<dir>\b__DIR__\b)%ms';
 
 function inside_phar() {
 	return 0 === strpos( WP_CLI_ROOT, PHAR_STREAM_PREFIX );

Original file line number	Diff line number	Diff line change
`@@ -29,11 +29,12 @@`
`29`	`29`	`* We try to be smart and only replace the constants when they are not within quotes.`
`30`	`30`	`* Regular expressions being stateless, this is probably not 100% correct for edge cases.`
`31`	`31`	`*`
`32`		`- * @see https://regex101.com/r/9hXp5d/4/`
	`32`	`+ * @see https://regex101.com/r/9hXp5d/11`
	`33`	`+ * @see https://stackoverflow.com/a/171499/933065`
`33`	`34`	`*`
`34`	`35`	`* @var string`
`35`	`36`	`*/`
`36`		`-const FILE_DIR_PATTERN = '/(?>\'[^\']?\')\|(?>"[^"]?")\|(?<file>\b__FILE__\b)\|(?<dir>\b__DIR__\b)/m';`
	`37`	`+const FILE_DIR_PATTERN = '%(?>#.?$)\|(?>//.?$)\|(?>/\.?\/)\|(?>\'(?:(?=(\\\\?))\1.)?\')\|(?>"(?:(?=(\\\\?))\2.)*?")\|(?<file>\b__FILE__\b)\|(?<dir>\b__DIR__\b)%ms';`
`37`	`38`
`38`	`39`	`function inside_phar() {`
`39`	`40`	`return 0 === strpos( WP_CLI_ROOT, PHAR_STREAM_PREFIX );`