diff options
Diffstat (limited to 'ext/dom')
-rw-r--r-- | ext/dom/config.m4 | 4 | ||||
-rw-r--r-- | ext/dom/document.c | 4 | ||||
-rw-r--r-- | ext/dom/examples/dom1.php | 2 | ||||
-rw-r--r-- | ext/dom/examples/note-invalid.xml | 2 | ||||
-rw-r--r-- | ext/dom/examples/note.xml | 2 | ||||
-rw-r--r-- | ext/dom/tests/domdocumentload_utilities.php | 4 | ||||
-rw-r--r-- | ext/dom/tests/domdocumentloadxml_test_method.php | 2 | ||||
-rw-r--r-- | ext/dom/tests/domdocumentloadxml_test_method_savexml.php | 2 | ||||
-rw-r--r-- | ext/dom/tests/note.xml | 2 |
9 files changed, 12 insertions, 12 deletions
diff --git a/ext/dom/config.m4 b/ext/dom/config.m4 index 5ea62ad24c..ea3cb03793 100644 --- a/ext/dom/config.m4 +++ b/ext/dom/config.m4 @@ -12,7 +12,7 @@ fi if test "$PHP_DOM" != "no"; then - if test "$PHP_LIBXML" = "no"; then + if test "$PHP_LIBXML" = "no"; then AC_MSG_ERROR([DOM extension requires LIBXML extension, add --enable-libxml]) fi @@ -27,7 +27,7 @@ if test "$PHP_DOM" != "no"; then nodelist.c text.c comment.c domconfiguration.c \ domimplementationsource.c entityreference.c \ notation.c xpath.c dom_iterators.c \ - typeinfo.c domerror.c domlocator.c namednodemap.c userdatahandler.c], + typeinfo.c domerror.c domlocator.c namednodemap.c userdatahandler.c], $ext_shared) PHP_SUBST(DOM_SHARED_LIBADD) PHP_INSTALL_HEADERS([ext/dom/xml_common.h]) diff --git a/ext/dom/document.c b/ext/dom/document.c index fdb71f6738..c9e1802f78 100644 --- a/ext/dom/document.c +++ b/ext/dom/document.c @@ -2038,7 +2038,7 @@ static void dom_load_html(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ */ RETURN_FALSE; } - + ctxt->vctxt.error = php_libxml_ctx_error; ctxt->vctxt.warning = php_libxml_ctx_warning; if (ctxt->sax != NULL) { @@ -2247,7 +2247,7 @@ PHP_METHOD(domdocument, registerNodeClass) dom_set_doc_classmap(intern->document, basece, ce); RETURN_TRUE; } - + zend_throw_error(NULL, "Class %s is not derived from %s.", ZSTR_VAL(ce->name), ZSTR_VAL(basece->name)); RETURN_FALSE; } diff --git a/ext/dom/examples/dom1.php b/ext/dom/examples/dom1.php index 8ea367458d..ca55739c8a 100644 --- a/ext/dom/examples/dom1.php +++ b/ext/dom/examples/dom1.php @@ -41,7 +41,7 @@ echo "--------- creating a new attribute\n"; //$attr = $dom->createAttribute("src", "picture.gif"); //print_r($attr); -//$rootnode->set_attributeNode($attr); +//$rootnode->set_attributeNode($attr); $attr = $rootnode->setAttribute("src", "picture.gif"); $attr = $rootnode->getAttribute("src"); print_r($attr); diff --git a/ext/dom/examples/note-invalid.xml b/ext/dom/examples/note-invalid.xml index 58d4e65044..0f4611c6a2 100644 --- a/ext/dom/examples/note-invalid.xml +++ b/ext/dom/examples/note-invalid.xml @@ -6,4 +6,4 @@ <heading>Reminder</heading> <body>Don't forget the meeting tonight!</body> <footer>Or I'll clobber you!</footer> -</note> +</note> diff --git a/ext/dom/examples/note.xml b/ext/dom/examples/note.xml index 49614a1b52..f580ef1c25 100644 --- a/ext/dom/examples/note.xml +++ b/ext/dom/examples/note.xml @@ -5,4 +5,4 @@ <from>Shane</from> <heading>Reminder</heading> <body>Don't forget the meeting tonight!</body> -</note> +</note> diff --git a/ext/dom/tests/domdocumentload_utilities.php b/ext/dom/tests/domdocumentload_utilities.php index efd1e5a1a5..d40f7639ff 100644 --- a/ext/dom/tests/domdocumentload_utilities.php +++ b/ext/dom/tests/domdocumentload_utilities.php @@ -1,13 +1,13 @@ <?php function libxml_options_to_int($libxmlOptions) { - + $defined_constants = get_defined_constants(true); $env_array = explode('|', $libxmlOptions); $libxml_constants = array_intersect_key($defined_constants['libxml'], array_flip($env_array)); $sum = 0; - foreach($libxml_constants as $value) { + foreach($libxml_constants as $value) { $sum = $sum|$value; } diff --git a/ext/dom/tests/domdocumentloadxml_test_method.php b/ext/dom/tests/domdocumentloadxml_test_method.php index ed2f38b6c6..9b97e2badd 100644 --- a/ext/dom/tests/domdocumentloadxml_test_method.php +++ b/ext/dom/tests/domdocumentloadxml_test_method.php @@ -4,7 +4,7 @@ include(dirname(__FILE__) . '/domdocumentload_utilities.php'); $doc = new DOMDocument(); $libxml_options = libxml_options_to_int(getenv('LOAD_OPTIONS')); -$result = $doc->loadXML(file_get_contents(dirname(__FILE__) . getenv('XML_FILE')), +$result = $doc->loadXML(file_get_contents(dirname(__FILE__) . getenv('XML_FILE')), $libxml_options); $expectedResult = (bool) getenv('EXPECTED_RESULT'); diff --git a/ext/dom/tests/domdocumentloadxml_test_method_savexml.php b/ext/dom/tests/domdocumentloadxml_test_method_savexml.php index 1ef72d58d7..1bcf8a8e33 100644 --- a/ext/dom/tests/domdocumentloadxml_test_method_savexml.php +++ b/ext/dom/tests/domdocumentloadxml_test_method_savexml.php @@ -4,7 +4,7 @@ include(dirname(__FILE__) . '/domdocumentload_utilities.php'); $doc = new DOMDocument(); $libxml_options = libxml_options_to_int(getenv('LOAD_OPTIONS')); -$result = $doc->loadXML(file_get_contents(dirname(__FILE__) . getenv('XML_FILE')), +$result = $doc->loadXML(file_get_contents(dirname(__FILE__) . getenv('XML_FILE')), $libxml_options); $expectedResult = (bool) getenv('EXPECTED_RESULT'); diff --git a/ext/dom/tests/note.xml b/ext/dom/tests/note.xml index 49614a1b52..f580ef1c25 100644 --- a/ext/dom/tests/note.xml +++ b/ext/dom/tests/note.xml @@ -5,4 +5,4 @@ <from>Shane</from> <heading>Reminder</heading> <body>Don't forget the meeting tonight!</body> -</note> +</note> |