From: Dmitry Stogov <dmitry@zend.com>
Date: Wed, 11 Feb 2015 14:41:52 +0000 (+0300)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: PRE_PHP7_EREG_MYSQL_REMOVALS~184
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a75d1d99b4f390bca19e8e9bf20f7af3a2b7803d;p=php

Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  add missing test for class member access with deference relates to https://wiki.php.net/rfc/uniform_variable_syntax
  fix dir separator in test
---

a75d1d99b4f390bca19e8e9bf20f7af3a2b7803d