prepare v4.2.5

[m6w6/ext-http] / tests / client013.phpt

diff --git a/tests/client013.phpt b/tests/client013.phpt
index f246a30c850a36a83879c14f06b6a36194c8b19d..962d448e5dd69a9327c6ab7a7ce7df2ec599d06c 100644 (file)
--- a/tests/client013.phpt
+++ b/tests/client013.phpt
@@ -8,7 +8,7 @@ skip_client_test();
 --FILE--
 <?php 
 
-include "server.inc";
+include "helper/server.inc";
 
 echo "Test\n";
 
@@ -16,11 +16,13 @@ class Client extends http\Client {
        public $pi;
 }
 class ProgressObserver1 implements SplObserver {
+       #[ReturnTypeWillChange]
        function update(SplSubject $c, $r = null) {
                if ($c->getProgressInfo($r)) $c->pi .= "-";
        }
 }
 class ProgressObserver2 implements SplObserver {
+       #[ReturnTypeWillChange]
        function update(SplSubject $c, $r = null) {
                if ($c->getProgressInfo($r)) $c->pi .= ".";
        }
@@ -30,6 +32,7 @@ class CallbackObserver implements SplObserver {
        function __construct($callback) {
                $this->callback = $callback;
        }
+       #[ReturnTypeWillChange]
        function update(SplSubject $c, $r = null) {
                call_user_func($this->callback, $c, $r);
        }
@@ -43,6 +46,9 @@ server("proxy.inc", function($port) {
                        $o3 = new CallbackObserver(
                                        function ($c, $r) {
                                                $p = (array) $c->getProgressInfo($r);
+                                               if (!$p) {
+                                                       return;
+                                               }
                                                var_dump(array_key_exists("started", $p));
                                                var_dump(array_key_exists("finished", $p));
                                                var_dump(array_key_exists("dlnow", $p));