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

Merge branch 'PHP-8.0'

* PHP-8.0:
  Make createDocument() $namespace nullable
---

e32d5e8fe79360daa6d75f496776d91cf9d32852
diff --cc ext/dom/php_dom.stub.php
index c1310a2399,29e7a0ad80..8f28056a19
--- a/ext/dom/php_dom.stub.php
+++ b/ext/dom/php_dom.stub.php
@@@ -112,10 -105,10 +112,10 @@@ class DOMImplementatio
      public function createDocumentType(string $qualifiedName, string $publicId = "", string $systemId = "") {}
  
      /** @return DOMDocument|false */
-     public function createDocument(string $namespace = "", string $qualifiedName = "", ?DOMDocumentType $doctype = null) {}
+     public function createDocument(?string $namespace = null, string $qualifiedName = "", ?DOMDocumentType $doctype = null) {}
  }
  
 -class DOMDocumentFragment implements DOMParentNode
 +class DOMDocumentFragment extends DOMNode implements DOMParentNode
  {
      public function __construct() {}
  
diff --cc ext/dom/php_dom_arginfo.h
index 53f3e98624,43ed756b29..592e713c05
--- a/ext/dom/php_dom_arginfo.h
+++ b/ext/dom/php_dom_arginfo.h
@@@ -1,5 -1,5 +1,5 @@@
  /* This is a generated file, edit the .stub.php file instead.
-  * Stub hash: 5d6877f7b7474a39a710ffde69122cd029663f26 */
 - * Stub hash: f4f6923a713a51d2944a21a123967343320be15c */
++ * Stub hash: 506911ba27d7f57bc66fcba93ea0c284689d9527 */
  
  ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_dom_import_simplexml, 0, 1, DOMElement, 1)
  	ZEND_ARG_TYPE_INFO(0, node, IS_OBJECT, 0)