Merge branch '3.2.x'

This commit is contained in:
Marc Alexander 2017-08-13 16:15:43 +02:00
commit 52d356da88
No known key found for this signature in database
GPG key ID: 50E0D2423696F995

View file

@ -392,7 +392,7 @@ class php_exporter
public function get_vars_from_single_line_array($line, $throw_multiline = true) public function get_vars_from_single_line_array($line, $throw_multiline = true)
{ {
$match = array(); $match = array();
preg_match('#^\$vars = array\(\'([a-zA-Z0-9_\' ,]+)\'\);$#', $line, $match); preg_match('#^\$vars = (?:\[|array\()\'([a-zA-Z0-9_\' ,]+)\'[\)\]];$#', $line, $match);
if (isset($match[1])) if (isset($match[1]))
{ {