From: Nikita Popov <nikita.ppv@gmail.com>
Date: Thu, 28 Jan 2021 09:04:17 +0000 (+0100)
Subject: Merge branch 'PHP-8.0'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6971c720b05623f0d10fa7c44e8fc175e89e0fa3;p=php

Merge branch 'PHP-8.0'

* PHP-8.0:
  Observe fake closures
---

6971c720b05623f0d10fa7c44e8fc175e89e0fa3
diff --cc ext/zend_test/tests/observer_closure_02.phpt
index 0000000000,9d6cc900e3..d2fbba5296
mode 000000,100644..100644
--- a/ext/zend_test/tests/observer_closure_02.phpt
+++ b/ext/zend_test/tests/observer_closure_02.phpt
@@@ -1,0 -1,32 +1,32 @@@
+ --TEST--
+ Observer: Observability of fake closures
+ --SKIPIF--
 -<?php if (!extension_loaded('zend-test')) die('skip: zend_test extension required'); ?>
++<?php if (!extension_loaded('zend_test')) die('skip: zend_test extension required'); ?>
+ --INI--
+ zend_test.observer.enabled=1
+ zend_test.observer.observe_all=1
+ --FILE--
+ <?php
+ class Foo
+ {
+     public function bar()
+     {
+         echo 'Called as fake closure.' . PHP_EOL;
+     }
+ }
+ 
+ $callable = [new Foo(), 'bar'];
+ $closure = \Closure::fromCallable($callable);
+ $closure();
+ 
+ echo 'DONE' . PHP_EOL;
+ ?>
+ --EXPECTF--
+ <!-- init '%s%eobserver_closure_%d.php' -->
+ <file '%s%eobserver_closure_%d.php'>
+   <!-- init Foo::bar() -->
+   <Foo::bar>
+ Called as fake closure.
+   </Foo::bar>
+ DONE
+ </file '%s%eobserver_closure_%d.php'>
diff --cc ext/zend_test/tests/observer_error_05.phpt
index d3e5f67a4e,d3e5f67a4e..0a00d16ce7
--- a/ext/zend_test/tests/observer_error_05.phpt
+++ b/ext/zend_test/tests/observer_error_05.phpt
@@@ -1,7 -1,7 +1,7 @@@
  --TEST--
  Observer: End handlers fire after a userland fatal error
  --SKIPIF--
--<?php if (!extension_loaded('zend-test')) die('skip: zend-test extension required'); ?>
++<?php if (!extension_loaded('zend_test')) die('skip: zend_test extension required'); ?>
  --INI--
  zend_test.observer.enabled=1
  zend_test.observer.observe_all=1