From: Joe Watkins <krakjoe@php.net>
Date: Wed, 5 Jun 2019 17:26:33 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9e49a545aab988ffde2749f8bfa381619470bc0f;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  this test is flaky on azure, and can't see why from current output so refactored, and restored an accidentally removed check (resource)
---

9e49a545aab988ffde2749f8bfa381619470bc0f