MFH

diff --git a/Zend/ZEND_CHANGES b/Zend/ZEND_CHANGES
index 6508ccf91fc82dfd680345d26e2df67af862a869..81f14d279319675484b6d28fca0865f35fdc9335 100644 (file)
--- a/Zend/ZEND_CHANGES
+++ b/Zend/ZEND_CHANGES
@@ -545,7 +545,7 @@ Changes in the Zend Engine 2.0
 
         <?php
         class Exception {
-          function __construct(string $message=NULL, int $code=0) {
+          function __construct(/*string*/ $message=NULL, /*int*/ $code=0) {
             if (func_num_args()) {
               $this->message = $message;
             }

diff --git a/ext/dom/php_dom.c b/ext/dom/php_dom.c
index 8c2857e64f891550d2d4a4d8c49f9ebbe2ccf6dc..ac7a5ae1fcb343b8f7af12dbb6af729b0443fd6f 100644 (file)
--- a/ext/dom/php_dom.c
+++ b/ext/dom/php_dom.c
@@ -384,7 +384,6 @@ PHP_MINIT_FUNCTION(dom)
        INIT_CLASS_ENTRY(ce, "DOMException", php_dom_domexception_class_functions);
        dom_domexception_class_entry = zend_register_internal_class_ex(&ce, zend_exception_get_default(), NULL TSRMLS_CC);
        dom_domexception_class_entry->ce_flags |= ZEND_ACC_FINAL;
-       dom_domexception_class_entry->constructor->common.fn_flags |= ZEND_ACC_PROTECTED;
        zend_declare_property_long(dom_domexception_class_entry, "code", sizeof("code")-1, 0, ZEND_ACC_PUBLIC TSRMLS_CC);
 
        REGISTER_DOM_CLASS(ce, "DOMStringList", NULL, php_dom_domstringlist_class_functions, dom_domstringlist_class_entry);