From: Dmitry Stogov <dmitry@zend.com>
Date: Thu, 2 Nov 2017 20:25:34 +0000 (+0300)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: php-7.3.0alpha1~1099
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3f6693c5e01f42e51bef8c8664abacfaccfdf3fa;p=php

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

* 'master' of git.php.net:php-src:
  Fix #74922 - Try to resolve constants when importing trait properties
  Fix ext/soap/tests/bug69137.phpt
  Don't dup after fetch_dimension_const
  Small browscap cleanup
---

3f6693c5e01f42e51bef8c8664abacfaccfdf3fa