Fix tests

Author: kocsismate

Zend/tests/bug21478.phpt

@@ -3,7 +3,7 @@ Bug #21478 (Zend/zend_alloc.c :: shutdown_memory_manager produces segfault)
 --FILE--
 <?php
 class debugfilter extends php_user_filter {
-  function filter($in, $out, &$consumed, $closing) {
+  function filter($in, $out, &$consumed, $closing): int {
     while ($bucket = stream_bucket_make_writeable($in)) {
       $bucket->data = strtoupper($bucket->data);
       stream_bucket_append($out, $bucket);

Zend/tests/bug78406.phpt

@@ -10,7 +10,7 @@ if (!class_exists(SampleFilter::class)) {
     {
         private $data = '';
 
-        public function filter($in, $out, &$consumed, $closing)
+        public function filter($in, $out, &$consumed, $closing): int
         {
             while ($bucket = stream_bucket_make_writeable($in))
             {

Zend/tests/foreach_004.phpt

@@ -16,10 +16,26 @@ class IT extends ArrayIterator {
         }
     }
 
-    function rewind()  {$this->trap(__FUNCTION__); return parent::rewind();}
-    function valid()   {$this->trap(__FUNCTION__); return parent::valid();}
-    function key()     {$this->trap(__FUNCTION__); return parent::key();}
-    function next()    {$this->trap(__FUNCTION__); return parent::next();}
+    function rewind(): void
+    {
+        $this->trap(__FUNCTION__);
+        parent::rewind();
+    }
+
+    function valid(): bool {
+        $this->trap(__FUNCTION__);
+        return parent::valid();
+    }
+
+    function key(): mixed {
+        $this->trap(__FUNCTION__);
+        return parent::key();
+    }
+
+    function next(): void {
+        $this->trap(__FUNCTION__);
+        parent::next();
+    }
 }
 
 foreach(['rewind', 'valid', 'key', 'next'] as $trap) {

Zend/tests/ns_054.phpt

@@ -5,18 +5,18 @@
 namespace test\ns1;
 
 class Foo implements \SplObserver {
-    function update(\SplSubject $x) {
+    function update(\SplSubject $x): void {
         echo "ok\n";
     }
 }
 
 class Bar implements \SplSubject {
-    function attach(\SplObserver $x) {
+    function attach(\SplObserver $x): void {
         echo "ok\n";
     }
-    function notify() {
+    function notify(): void {
     }
-    function detach(\SplObserver $x) {
+    function detach(\SplObserver $x): void {
     }
 }
 $foo = new Foo();

Zend/tests/ns_056.phpt

@@ -6,18 +6,18 @@ namespace test\ns1;
 use \SplObserver;
 
 class Foo implements SplObserver {
-    function update(\SplSubject $x) {
+    function update(\SplSubject $x): void {
         echo "ok\n";
     }
 }
 
 class Bar implements \SplSubject {
-    function attach(SplObserver $x) {
+    function attach(SplObserver $x): void {
         echo "ok\n";
     }
-    function notify() {
+    function notify(): void {
     }
-    function detach(SplObserver $x) {
+    function detach(SplObserver $x): void {
     }
 }
 $foo = new Foo();

Zend/tests/type_declarations/variance/internal_parent/incompatible_return_type.phpt

@@ -13,5 +13,5 @@ class MyDateTimeZone extends DateTimeZone
 var_dump(MyDateTimeZone::listIdentifiers());
 ?>
 --EXPECTF--
-Strict Standards: Declaration of MyDateTimeZone::listIdentifiers(int $timezoneGroup = DateTimeZone::ALL, ?string $countryCode = null): string should be compatible with DateTimeZone::listIdentifiers(int $timezoneGroup = DateTimeZone::ALL, ?string $countryCode = null): array in %s on line %d
+Deprecated: Declaration of MyDateTimeZone::listIdentifiers(int $timezoneGroup = DateTimeZone::ALL, ?string $countryCode = null): string should be compatible with DateTimeZone::listIdentifiers(int $timezoneGroup = DateTimeZone::ALL, ?string $countryCode = null): array in %s on line %d
 string(0) ""

Zend/tests/type_declarations/variance/internal_parent/missing_return_type.phpt

@@ -10,4 +10,4 @@ class MyDateTimeZone extends DateTimeZone
 }
 ?>
 --EXPECTF--
-Strict Standards: Declaration of MyDateTimeZone::listIdentifiers(int $timezoneGroup = DateTimeZone::ALL, ?string $countryCode = null) should be compatible with DateTimeZone::listIdentifiers(int $timezoneGroup = DateTimeZone::ALL, ?string $countryCode = null): array in %s on line %d
+Deprecated: Declaration of MyDateTimeZone::listIdentifiers(int $timezoneGroup = DateTimeZone::ALL, ?string $countryCode = null) should be compatible with DateTimeZone::listIdentifiers(int $timezoneGroup = DateTimeZone::ALL, ?string $countryCode = null): array in %s on line %d

Zend/tests/type_declarations/variance/optional_return_type/incompatible_return_type.phpt

@@ -23,6 +23,6 @@ $bar = new Bar();
 var_dump($bar->x());
 ?>
 --EXPECTF--
-Strict Standards: Declaration of Bar::x(): array should be compatible with Foo::x(): string|false in %s on line %d
+Deprecated: Declaration of Bar::x(): array should be compatible with Foo::x(): string|false in %s on line %d
 array(0) {
 }

Zend/tests/type_declarations/variance/optional_return_type/incompatible_return_type2.phpt

@@ -23,6 +23,6 @@ $bar = new Bar();
 var_dump($bar->x());
 ?>
 --EXPECTF--
-Strict Standards: Declaration of Bar::x() should be compatible with Foo::x(): string|false in %s on line %d
+Deprecated: Declaration of Bar::x() should be compatible with Foo::x(): string|false in %s on line %d
 array(0) {
 }

Zend/tests/type_declarations/variance/optional_return_type/incompatible_return_type3.phpt

@@ -29,6 +29,6 @@ class Baz extends Bar
 
 ?>
 --EXPECTF--
-Strict Standards: Declaration of Bar::x(): array should be compatible with Foo::x(): string|false in %s on line %d
+Deprecated: Declaration of Bar::x(): array should be compatible with Foo::x(): string|false in %s on line %d
 
 Fatal error: Declaration of Baz::x() must be compatible with Bar::x(): array in %s on line %d