From: Nikita Popov <nikita.ppv@gmail.com>
Date: Wed, 10 Feb 2021 11:21:15 +0000 (+0100)
Subject: Merge branch 'PHP-8.0'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=89c55afeb570acaed6c07c404379aed58ca498ed;p=php

Merge branch 'PHP-8.0'

* PHP-8.0:
  Make finfo_open() $magic_database nullable
---

89c55afeb570acaed6c07c404379aed58ca498ed
diff --cc ext/fileinfo/fileinfo.stub.php
index 76f0444428,4ed4e445f1..5a9d346c7c
--- a/ext/fileinfo/fileinfo.stub.php
+++ b/ext/fileinfo/fileinfo.stub.php
@@@ -28,21 -28,30 +28,21 @@@ class finf
      public function set_flags(int $flags) {}
  }
  
- function finfo_open(int $flags = FILEINFO_NONE, string $magic_database = ""): finfo|false {}
 -/** @return resource|false */
 -function finfo_open(int $flags = FILEINFO_NONE, ?string $magic_database = null) {}
++function finfo_open(int $flags = FILEINFO_NONE, ?string $magic_database = null): finfo|false {}
  
 -/**
 - * @param resource $finfo
 - */
 -function finfo_close($finfo): bool {}
 +function finfo_close(finfo $finfo): bool {}
  
 -/**
 - * @param resource $finfo
 - */
 -function finfo_set_flags($finfo, int $flags): bool {}
 +function finfo_set_flags(finfo $finfo, int $flags): bool {}
  
  /**
 - * @param resource $finfo
   * @param resource|null $context
   */
 -function finfo_file($finfo, string $filename, int $flags = FILEINFO_NONE, $context = null): string|false {}
 +function finfo_file(finfo $finfo, string $filename, int $flags = FILEINFO_NONE, $context = null): string|false {}
  
  /**
 - * @param resource $finfo
   * @param resource|null $context
   */
 -function finfo_buffer($finfo, string $string, int $flags = FILEINFO_NONE, $context = null): string|false {}
 +function finfo_buffer(finfo $finfo, string $string, int $flags = FILEINFO_NONE, $context = null): string|false {}
  
  /**
   * @param resource|string $filename
diff --cc ext/fileinfo/fileinfo_arginfo.h
index 6648c6074c,34b3698842..2ae31e7b71
--- a/ext/fileinfo/fileinfo_arginfo.h
+++ b/ext/fileinfo/fileinfo_arginfo.h
@@@ -1,9 -1,9 +1,9 @@@
  /* This is a generated file, edit the .stub.php file instead.
-  * Stub hash: 6b31c20139e3360cb7ff692cc0d5ccfbfd3812bb */
 - * Stub hash: 648085986695281bd5a8fb536d5ec6c2a9f8c6e8 */
++ * Stub hash: 2cd166d444d7324a9fe70170db434c05ccfbf386 */
  
 -ZEND_BEGIN_ARG_INFO_EX(arginfo_finfo_open, 0, 0, 0)
 +ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_finfo_open, 0, 0, finfo, MAY_BE_FALSE)
  	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "FILEINFO_NONE")
- 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, magic_database, IS_STRING, 0, "\"\"")
+ 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, magic_database, IS_STRING, 1, "null")
  ZEND_END_ARG_INFO()
  
  ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_finfo_close, 0, 1, _IS_BOOL, 0)
@@@ -33,10 -33,7 +33,10 @@@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX
  	ZEND_ARG_INFO(0, filename)
  ZEND_END_ARG_INFO()
  
 -#define arginfo_class_finfo___construct arginfo_finfo_open
 +ZEND_BEGIN_ARG_INFO_EX(arginfo_class_finfo___construct, 0, 0, 0)
 +	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "FILEINFO_NONE")
- 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, magic_database, IS_STRING, 0, "\"\"")
++	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, magic_database, IS_STRING, 1, "null")
 +ZEND_END_ARG_INFO()
  
  ZEND_BEGIN_ARG_INFO_EX(arginfo_class_finfo_file, 0, 0, 1)
  	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)