]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorJoe Watkins <krakjoe@php.net>
Sat, 28 Jan 2017 06:28:24 +0000 (06:28 +0000)
committerJoe Watkins <krakjoe@php.net>
Sat, 28 Jan 2017 06:28:24 +0000 (06:28 +0000)
* PHP-7.1:
  Added tests demonstrating the same effect with abstracts
  Inheritance checks should not ignore parents if these implement an interface

1  2 
Zend/zend_inheritance.c

Simple merge