From: Joe Watkins <krakjoe@php.net>
Date: Wed, 1 Feb 2017 19:05:50 +0000 (+0000)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~430
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=11a1670cffd55dfe2cfacef64601953a2d7b10dd;p=php

Merge branch 'PHP-7.1'

* PHP-7.1:
  Revert "Inheritance checks should not ignore parents if these implement an interface"
  Revert "Added tests demonstrating the same effect with abstracts"
---

11a1670cffd55dfe2cfacef64601953a2d7b10dd