From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 24 May 2019 09:02:03 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=038db184964bffbc57031534660ee769ca246626;p=php

Merge branch 'PHP-7.4'
---

038db184964bffbc57031534660ee769ca246626
diff --cc Zend/tests/type_declarations/variance/parent_in_class_failure1.phpt
index 5e1f43d875,0000000000..2261b3c016
mode 100644,000000..100644
--- a/Zend/tests/type_declarations/variance/parent_in_class_failure1.phpt
+++ b/Zend/tests/type_declarations/variance/parent_in_class_failure1.phpt
@@@ -1,16 -1,0 +1,18 @@@
 +--TEST--
 +Use of parent inside a class that has / has no parent (failure case 1)
 +--FILE--
 +<?php
 +
 +// Illegal: A::parent is ill-defined
 +class A {
 +    public function method(parent $x) {}
 +}
 +class B extends A {
 +    public function method(parent $x) {}
 +}
 +
 +?>
 +--EXPECTF--
++Deprecated: Cannot use "parent" when current class scope has no parent in %s on line %d
++
 +Fatal error: Could not check compatibility between B::method(A $x) and A::method(parent $x), because class parent is not available in %s on line %d