Fix tests

Author: kocsismate

ext/date/php_date.stub.php

@@ -396,7 +396,7 @@ class DatePeriod implements IteratorAggregate
     /**
      * @param DateTimeInterface|string $start
      * @param DateInterval|int $interval
-     * @param DateTimeInterface $end
+     * @param DateTimeInterface|int $end
      * @param int $options
      */
     public function __construct($start, $interval = UNKNOWN, $end = UNKNOWN, $options = UNKNOWN) {}

ext/date/php_date_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: abe167ed6e272ea3890d6205f7384b92680243e4 */
+ * Stub hash: fee95924adec03c89fdd677ec26bb6eea34d4b3c */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_strtotime, 0, 1, MAY_BE_LONG|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, datetime, IS_STRING, 0)

ext/phar/phar_object.c

@@ -4296,7 +4296,7 @@ PHP_METHOD(Phar, extractTo)
 	php_stream *fp;
 	php_stream_statbuf ssb;
 	char *pathto;
-	zend_string *filename;
+	zend_string *filename = NULL;
 	size_t pathto_len;
 	int ret;
 	zval *zval_file;

ext/phar/tests/cache_list/files/frontcontroller16.phar.inc

@@ -7,7 +7,7 @@ echo "hi";
 $a->setStub('<?php
 try {
 Phar::webPhar("test.phar", "/index.php", null, array(), array("fail", "here"));
-} catch (Exception $e) {
+} catch (TypeError|Exception $e) {
 die($e->getMessage() . "\n");
 }
 echo "oops did not run\n";

ext/phar/tests/cache_list/frontcontroller31.phpt

@@ -12,5 +12,9 @@ REQUEST_URI=/frontcontroller31.php
 Content-type: text/html; charset=UTF-8
 --FILE_EXTERNAL--
 files/frontcontroller16.phar
---EXPECT--
-phar error: invalid rewrite callback
+--EXPECTF--
+Fatal error: Uncaught TypeError: Phar::webPhar(): Argument #5 ($rewrites) must be a valid callback or null, class "fail" not found in %s:%d
+Stack trace:
+#0 %s(%d): Phar::webPhar('test.phar', '/index.php', '', Array, Array)
+#1 {main}
+  thrown in %s on line %d

ext/phar/tests/files/frontcontroller16.phar.inc

@@ -7,7 +7,7 @@ echo "hi";
 $a->setStub('<?php
 try {
 Phar::webPhar("test.phar", "/index.php", null, array(), array("fail", "here"));
-} catch (Exception $e) {
+} catch (TypeError|Exception $e) {
 die($e->getMessage() . "\n");
 }
 echo "oops did not run\n";

ext/phar/tests/frontcontroller31.phpt

@@ -11,5 +11,9 @@ REQUEST_URI=/frontcontroller31.php
 Content-type: text/html; charset=UTF-8
 --FILE_EXTERNAL--
 files/frontcontroller16.phar
---EXPECT--
-phar error: invalid rewrite callback
+--EXPECTF--
+Fatal error: Uncaught TypeError: Phar::webPhar(): Argument #5 ($rewrites) must be a valid callback or null, class "fail" not found in %s:%d
+Stack trace:
+#0 %s(%d): Phar::webPhar('test.phar', '/index.php', '', Array, Array)
+#1 {main}
+  thrown in %s on line %d

ext/phar/tests/phar_buildfromiterator1.phpt

@@ -10,7 +10,8 @@ phar.readonly=0
 $phar = new Phar(__DIR__ . '/buildfromiterator1.phar');
 try {
     ini_set('phar.readonly', 1);
-    $phar->buildFromIterator(1);
+
+    $phar->buildFromIterator(new ArrayIterator([]));
 } catch (Exception $e) {
     var_dump(get_class($e));
     echo $e->getMessage() . "\n";

ext/phar/tests/phar_extract.phpt

@@ -45,8 +45,8 @@ var_dump(file_get_contents(__DIR__ . '/extract1-2/file2.txt'));
 var_dump(is_dir(__DIR__ . '/extract1-2/one/level'));
 
 try {
-    $a->extractTo(__DIR__ . '/whatever', 134);
-} catch (Exception $e) {
+    $a->extractTo(__DIR__ . '/whatever', new stdClass());
+} catch (TypeError $e) {
     echo $e->getMessage(), "\n";
 }
 
@@ -141,7 +141,7 @@ string(2) "hi"
 string(3) "hi3"
 string(3) "hi2"
 bool(false)
-Invalid argument, expected a filename (string) or array of filenames
+Phar::extractTo(): Argument #2 ($files) must be of type string|array|null, stdClass given
 Phar::extractTo(): Argument #1 ($pathto) must be a valid path, array given
 Invalid argument, extraction path must be non-zero length
 Unable to use path "%soops" for extraction, it is a file, must be a directory