From: Anatol Belski <ab@php.net>
Date: Wed, 3 Oct 2018 12:34:08 +0000 (+0200)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.3.0RC3~23^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b8cfa09657aed6f616068d44aca5dc0b3295b8f6;p=php

Merge branch 'PHP-7.1' into PHP-7.2

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

b8cfa09657aed6f616068d44aca5dc0b3295b8f6