summaryrefslogtreecommitdiff
path: root/ext/dom/tests
diff options
context:
space:
mode:
Diffstat (limited to 'ext/dom/tests')
-rw-r--r--ext/dom/tests/DOMCharacterData_deleteData_basic_001.phpt2
-rw-r--r--ext/dom/tests/DOMDocument_loadHTMLfile.phpt2
-rw-r--r--ext/dom/tests/DOMDocument_loadHTMLfile_error1.phpt2
-rw-r--r--ext/dom/tests/DOMDocument_loadHTMLfile_error2.phpt4
-rw-r--r--ext/dom/tests/DOMDocument_loadHTMLfile_variation1.phpt2
-rw-r--r--ext/dom/tests/DOMDocument_loadHTMLfile_variation2.phpt2
-rw-r--r--ext/dom/tests/DOMNode_insertBefore_error2.phpt6
-rw-r--r--ext/dom/tests/DOMNode_insertBefore_error3.phpt8
-rw-r--r--ext/dom/tests/DOMNode_insertBefore_error4.phpt6
-rw-r--r--ext/dom/tests/DOMNode_insertBefore_error5.phpt6
-rw-r--r--ext/dom/tests/DOMNode_insertBefore_error6.phpt6
-rw-r--r--ext/dom/tests/bug40836.phpt2
-rw-r--r--ext/dom/tests/bug41374.phpt2
-rw-r--r--ext/dom/tests/domdocumentload_test_method.php2
-rw-r--r--ext/dom/tests/domdocumentload_test_method_savexml.php2
-rw-r--r--ext/dom/tests/domdocumentloadxml_test_method.php2
-rw-r--r--ext/dom/tests/domdocumentloadxml_test_method_savexml.php2
-rw-r--r--ext/dom/tests/domxpath.phpt2
18 files changed, 30 insertions, 30 deletions
diff --git a/ext/dom/tests/DOMCharacterData_deleteData_basic_001.phpt b/ext/dom/tests/DOMCharacterData_deleteData_basic_001.phpt
index ad104f1eef..c91071f364 100644
--- a/ext/dom/tests/DOMCharacterData_deleteData_basic_001.phpt
+++ b/ext/dom/tests/DOMCharacterData_deleteData_basic_001.phpt
@@ -17,4 +17,4 @@ $cdata->deleteData(1, 10);
var_dump($cdata->data);
?>
--EXPECTF--
-%unicode|string%(%d) "t" \ No newline at end of file
+string(%d) "t" \ No newline at end of file
diff --git a/ext/dom/tests/DOMDocument_loadHTMLfile.phpt b/ext/dom/tests/DOMDocument_loadHTMLfile.phpt
index 93a614903f..0431695737 100644
--- a/ext/dom/tests/DOMDocument_loadHTMLfile.phpt
+++ b/ext/dom/tests/DOMDocument_loadHTMLfile.phpt
@@ -12,6 +12,6 @@ assert.bail=true
<?php
$doc = new DOMDocument();
$result = $doc->loadHTMLFile(dirname(__FILE__) . "/test.html");
-assert('$result === true');
+assert($result === true);
?>
--EXPECT--
diff --git a/ext/dom/tests/DOMDocument_loadHTMLfile_error1.phpt b/ext/dom/tests/DOMDocument_loadHTMLfile_error1.phpt
index aee51966a3..9542b69e84 100644
--- a/ext/dom/tests/DOMDocument_loadHTMLfile_error1.phpt
+++ b/ext/dom/tests/DOMDocument_loadHTMLfile_error1.phpt
@@ -12,7 +12,7 @@ assert.bail=true
<?php
$doc = new DOMDocument();
$result = $doc->loadHTMLFile(dirname(__FILE__) . "/ffff/test.html");
-assert('$result === false');
+assert($result === false);
?>
--EXPECTF--
%r(PHP ){0,1}%rWarning: DOMDocument::loadHTMLFile(): I/O warning : failed to load external entity %s
diff --git a/ext/dom/tests/DOMDocument_loadHTMLfile_error2.phpt b/ext/dom/tests/DOMDocument_loadHTMLfile_error2.phpt
index e0d0923642..55b36e712d 100644
--- a/ext/dom/tests/DOMDocument_loadHTMLfile_error2.phpt
+++ b/ext/dom/tests/DOMDocument_loadHTMLfile_error2.phpt
@@ -12,10 +12,10 @@ assert.bail=true
<?php
$doc = new DOMDocument();
$result = $doc->loadHTMLFile("");
-assert('$result === false');
+assert($result === false);
$doc = new DOMDocument();
$result = $doc->loadHTMLFile("text.html\0something");
-assert('$result === false');
+assert($result === false);
?>
--EXPECTF--
%r(PHP ){0,1}%rWarning: DOMDocument::loadHTMLFile(): Empty string supplied as input %s
diff --git a/ext/dom/tests/DOMDocument_loadHTMLfile_variation1.phpt b/ext/dom/tests/DOMDocument_loadHTMLfile_variation1.phpt
index 2535772c78..991103649e 100644
--- a/ext/dom/tests/DOMDocument_loadHTMLfile_variation1.phpt
+++ b/ext/dom/tests/DOMDocument_loadHTMLfile_variation1.phpt
@@ -12,7 +12,7 @@ assert.bail=true
<?php
$doc = new DOMDocument();
$result = $doc->loadHTMLFile(dirname(__FILE__) . "/empty.html");
-assert('$result === true');
+assert($result === true);
?>
--EXPECTF--
%r(PHP ){0,1}%rWarning: DOMDocument::loadHTMLFile(): Document is empty %s
diff --git a/ext/dom/tests/DOMDocument_loadHTMLfile_variation2.phpt b/ext/dom/tests/DOMDocument_loadHTMLfile_variation2.phpt
index 829686dd65..28533bf8af 100644
--- a/ext/dom/tests/DOMDocument_loadHTMLfile_variation2.phpt
+++ b/ext/dom/tests/DOMDocument_loadHTMLfile_variation2.phpt
@@ -12,6 +12,6 @@ assert.bail=true
<?php
$doc = new DOMDocument();
$result = $doc->loadHTMLFile(dirname(__FILE__) . "/not_well.html");
-assert('$result === true');
+assert($result === true);
?>
--EXPECT--
diff --git a/ext/dom/tests/DOMNode_insertBefore_error2.phpt b/ext/dom/tests/DOMNode_insertBefore_error2.phpt
index 5d389f529e..835dfa065a 100644
--- a/ext/dom/tests/DOMNode_insertBefore_error2.phpt
+++ b/ext/dom/tests/DOMNode_insertBefore_error2.phpt
@@ -15,13 +15,13 @@ assert.bail=true
$dom = new DOMDocument();
$doc = $dom->load(dirname(__FILE__) . "/book.xml", LIBXML_NOBLANKS);
-assert('$doc === true');
+assert($doc === true);
$parent_node = $dom->getElementsByTagName("book")->item(0);
-assert('!is_null($parent_node)');
+assert(!is_null($parent_node));
$new_node = $dom->createElement('newnode');
-assert('$new_node !== false');
+assert($new_node !== false);
// getting a sibling as reference node to insert
diff --git a/ext/dom/tests/DOMNode_insertBefore_error3.phpt b/ext/dom/tests/DOMNode_insertBefore_error3.phpt
index 0d70a56073..a3bad5433e 100644
--- a/ext/dom/tests/DOMNode_insertBefore_error3.phpt
+++ b/ext/dom/tests/DOMNode_insertBefore_error3.phpt
@@ -15,18 +15,18 @@ assert.bail=true
$dom = new DOMDocument();
$doc = $dom->load(dirname(__FILE__) . "/book.xml", LIBXML_NOBLANKS);
-assert('$doc === true');
+assert($doc === true);
$parent_node = $dom->getElementsByTagName("book")->item(0);
-assert('!is_null($parent_node)');
+assert(!is_null($parent_node));
$new_node = $dom->createElement('newnode');
-assert('$new_node !== false');
+assert($new_node !== false);
// getting the parent node as reference node to insert
$ref_node = $dom->getElementsByTagName("book")->item(0)->parentNode;
-assert('!is_null($ref_node)');
+assert(!is_null($ref_node));
try {
$parent_node->insertBefore($new_node, $ref_node);
diff --git a/ext/dom/tests/DOMNode_insertBefore_error4.phpt b/ext/dom/tests/DOMNode_insertBefore_error4.phpt
index d063c5493b..a8d12914e3 100644
--- a/ext/dom/tests/DOMNode_insertBefore_error4.phpt
+++ b/ext/dom/tests/DOMNode_insertBefore_error4.phpt
@@ -15,13 +15,13 @@ assert.bail=true
$dom = new DOMDocument();
$doc = $dom->load(dirname(__FILE__) . "/book.xml", LIBXML_NOBLANKS);
-assert('$doc === true');
+assert($doc === true);
$parent_node = $dom->getElementsByTagName("book")->item(0);
-assert('!is_null($parent_node)');
+assert(!is_null($parent_node));
$new_node = $dom->createElement('newnode');
-assert('$new_node !== false');
+assert($new_node !== false);
// could be a brand new node
diff --git a/ext/dom/tests/DOMNode_insertBefore_error5.phpt b/ext/dom/tests/DOMNode_insertBefore_error5.phpt
index 36cc557579..c41a9edfbb 100644
--- a/ext/dom/tests/DOMNode_insertBefore_error5.phpt
+++ b/ext/dom/tests/DOMNode_insertBefore_error5.phpt
@@ -15,13 +15,13 @@ assert.bail=true
$dom = new DOMDocument();
$doc = $dom->load(dirname(__FILE__) . "/book.xml", LIBXML_NOBLANKS);
-assert('$doc === true');
+assert($doc === true);
$parent_node = $dom->getElementsByTagName("book")->item(0);
-assert('!is_null($parent_node)');
+assert(!is_null($parent_node));
$new_node = $dom->createElement('newnode');
-assert('$new_node !== false');
+assert($new_node !== false);
// creating a new node (descendant) and getting it as the refnode
diff --git a/ext/dom/tests/DOMNode_insertBefore_error6.phpt b/ext/dom/tests/DOMNode_insertBefore_error6.phpt
index 1fb3a96d02..99c72f8621 100644
--- a/ext/dom/tests/DOMNode_insertBefore_error6.phpt
+++ b/ext/dom/tests/DOMNode_insertBefore_error6.phpt
@@ -15,14 +15,14 @@ assert.bail=true
$dom = new DOMDocument();
$doc = $dom->load(dirname(__FILE__) . "/book.xml", LIBXML_NOBLANKS);
-assert('$doc === true');
+assert($doc === true);
$parent_node = $dom->getElementsByTagName("book")->item(0);
-assert('!is_null($parent_node)');
+assert(!is_null($parent_node));
$ref_node = $parent_node;
$new_node = $dom->createElement('newnode');
-assert('$new_node !== false');
+assert($new_node !== false);
try {
$parent_node->insertBefore($new_node, $ref_node);
diff --git a/ext/dom/tests/bug40836.phpt b/ext/dom/tests/bug40836.phpt
index b96b39cfe9..311b5b8caa 100644
--- a/ext/dom/tests/bug40836.phpt
+++ b/ext/dom/tests/bug40836.phpt
@@ -6,7 +6,7 @@ Bug #40836 (Segfault in insertBefore)
<?php
$dom = new DOMDocument("1.0", "UTF-8");
$dom->preserveWhiteSpace = false;
-$xml = (binary)'<?xml version="1.0" encoding="utf-8"?>
+$xml = '<?xml version="1.0" encoding="utf-8"?>
<feed xmlns="http://www.w3.org/2005/Atom">
<entry xmlns="http://www.w3.org/2005/Atom">
<updated>2007-02-14T00:00:00+01:00</updated>
diff --git a/ext/dom/tests/bug41374.phpt b/ext/dom/tests/bug41374.phpt
index 21fc3454cd..e2d4aa9b7a 100644
--- a/ext/dom/tests/bug41374.phpt
+++ b/ext/dom/tests/bug41374.phpt
@@ -4,7 +4,7 @@ Bug #41374 (wholetext concats values of wrong nodes)
<?php require_once('skipif.inc'); ?>
--FILE--
<?php
-$xml = (binary)<<<EOXML
+$xml = <<<EOXML
<?xml version="1.0" encoding="ISO-8859-1" ?>
<root>foo<child />baz</root>
EOXML;
diff --git a/ext/dom/tests/domdocumentload_test_method.php b/ext/dom/tests/domdocumentload_test_method.php
index 7afce15c3a..a15c9e53be 100644
--- a/ext/dom/tests/domdocumentload_test_method.php
+++ b/ext/dom/tests/domdocumentload_test_method.php
@@ -8,5 +8,5 @@ $libxml_options = libxml_options_to_int(getenv('LOAD_OPTIONS'));
$result = $doc->load(dirname(__FILE__) . getenv('XML_FILE'), $libxml_options);
$expectedResult = (bool) getenv('EXPECTED_RESULT');
-assert('$result === $expectedResult');
+assert($result === $expectedResult);
?>
diff --git a/ext/dom/tests/domdocumentload_test_method_savexml.php b/ext/dom/tests/domdocumentload_test_method_savexml.php
index 8ffd944524..c98ecf92f7 100644
--- a/ext/dom/tests/domdocumentload_test_method_savexml.php
+++ b/ext/dom/tests/domdocumentload_test_method_savexml.php
@@ -8,7 +8,7 @@ $libxml_options = libxml_options_to_int(getenv('LOAD_OPTIONS'));
$result = $doc->load(dirname(__FILE__) . getenv('XML_FILE'), $libxml_options);
$expectedResult = (bool) getenv('EXPECTED_RESULT');
-assert('$result === $expectedResult');
+assert($result === $expectedResult);
echo $doc->saveXML();
?>
diff --git a/ext/dom/tests/domdocumentloadxml_test_method.php b/ext/dom/tests/domdocumentloadxml_test_method.php
index 7c4be85cf1..ed2f38b6c6 100644
--- a/ext/dom/tests/domdocumentloadxml_test_method.php
+++ b/ext/dom/tests/domdocumentloadxml_test_method.php
@@ -8,5 +8,5 @@ $result = $doc->loadXML(file_get_contents(dirname(__FILE__) . getenv('XML_FILE')
$libxml_options);
$expectedResult = (bool) getenv('EXPECTED_RESULT');
-assert('$result === $expectedResult');
+assert($result === $expectedResult);
?>
diff --git a/ext/dom/tests/domdocumentloadxml_test_method_savexml.php b/ext/dom/tests/domdocumentloadxml_test_method_savexml.php
index 550219fb78..1ef72d58d7 100644
--- a/ext/dom/tests/domdocumentloadxml_test_method_savexml.php
+++ b/ext/dom/tests/domdocumentloadxml_test_method_savexml.php
@@ -8,7 +8,7 @@ $result = $doc->loadXML(file_get_contents(dirname(__FILE__) . getenv('XML_FILE')
$libxml_options);
$expectedResult = (bool) getenv('EXPECTED_RESULT');
-assert('$result === $expectedResult');
+assert($result === $expectedResult);
echo $doc->saveXML();
?>
diff --git a/ext/dom/tests/domxpath.phpt b/ext/dom/tests/domxpath.phpt
index 82396b5218..e63c96ba93 100644
--- a/ext/dom/tests/domxpath.phpt
+++ b/ext/dom/tests/domxpath.phpt
@@ -21,7 +21,7 @@ function MyAverage($nodelist) {
}
$dom = new DOMDocument;
-$dom->loadXML(b'<root xmlns="urn::default"><child>myval</child></root>');
+$dom->loadXML('<root xmlns="urn::default"><child>myval</child></root>');
$xpath = new DOMXPath($dom);
View Lorry Controller Status