From: Anatol Belski <ab@php.net>
Date: Wed, 3 Oct 2018 12:36:09 +0000 (+0200)
Subject: Merge branch 'PHP-7.3'
X-Git-Tag: php-7.4.0alpha1~1778^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1c11fc7f135fbcba7172acae28284d1a873b2bc7;p=php

Merge branch 'PHP-7.3'

* PHP-7.3:
  Avoid code duplication and don't miss env restore
---

1c11fc7f135fbcba7172acae28284d1a873b2bc7