From f116484cf1cd8a796f05c493ace4deca84bc8fdc Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Fri, 21 Sep 2018 20:06:47 +0200 Subject: [PATCH] Rename *.php files in ext/dom tests to *.inc *.php files are ignored by Git and a better practice might be to rename PHP included files for tests. --- ext/dom/tests/DOMDocument_loadXML_basic.phpt | 2 +- ext/dom/tests/DOMDocument_loadXML_error1.phpt | 2 +- ext/dom/tests/DOMDocument_loadXML_error2.phpt | 2 +- ext/dom/tests/DOMDocument_loadXML_error3.phpt | 2 +- ext/dom/tests/DOMDocument_loadXML_error4.phpt | 2 +- ext/dom/tests/DOMDocument_loadXML_error5.phpt | 2 +- ext/dom/tests/DOMDocument_loadXML_variation1.phpt | 2 +- ext/dom/tests/DOMDocument_loadXML_variation2.phpt | 2 +- ext/dom/tests/DOMDocument_loadXML_variation3.phpt | 2 +- ext/dom/tests/DOMDocument_loadXML_variation4.phpt | 2 +- ext/dom/tests/DOMDocument_load_basic.phpt | 2 +- ext/dom/tests/DOMDocument_load_error1.phpt | 2 +- ext/dom/tests/DOMDocument_load_error2.phpt | 2 +- ext/dom/tests/DOMDocument_load_error3.phpt | 2 +- ext/dom/tests/DOMDocument_load_error4.phpt | 2 +- ext/dom/tests/DOMDocument_load_error5.phpt | 2 +- ext/dom/tests/DOMDocument_load_variation1.phpt | 2 +- ext/dom/tests/DOMDocument_load_variation2.phpt | 2 +- ext/dom/tests/DOMDocument_load_variation3.phpt | 2 +- ext/dom/tests/DOMDocument_load_variation4.phpt | 2 +- ...mentload_test_method.php => domdocumentload_test_method.inc} | 2 +- ...thod_savexml.php => domdocumentload_test_method_savexml.inc} | 2 +- ...documentload_utilities.php => domdocumentload_utilities.inc} | 0 ...adxml_test_method.php => domdocumentloadxml_test_method.inc} | 2 +- ...d_savexml.php => domdocumentloadxml_test_method_savexml.inc} | 2 +- 25 files changed, 24 insertions(+), 24 deletions(-) rename ext/dom/tests/{domdocumentload_test_method.php => domdocumentload_test_method.inc} (81%) rename ext/dom/tests/{domdocumentload_test_method_savexml.php => domdocumentload_test_method_savexml.inc} (82%) rename ext/dom/tests/{domdocumentload_utilities.php => domdocumentload_utilities.inc} (100%) rename ext/dom/tests/{domdocumentloadxml_test_method.php => domdocumentloadxml_test_method.inc} (82%) rename ext/dom/tests/{domdocumentloadxml_test_method_savexml.php => domdocumentloadxml_test_method_savexml.inc} (83%) diff --git a/ext/dom/tests/DOMDocument_loadXML_basic.phpt b/ext/dom/tests/DOMDocument_loadXML_basic.phpt index 569593c007..cf25c26d62 100644 --- a/ext/dom/tests/DOMDocument_loadXML_basic.phpt +++ b/ext/dom/tests/DOMDocument_loadXML_basic.phpt @@ -17,5 +17,5 @@ XML_FILE=/book.xml LOAD_OPTIONS=0 EXPECTED_RESULT=1 --FILE_EXTERNAL-- -domdocumentloadxml_test_method.php +domdocumentloadxml_test_method.inc --EXPECT-- diff --git a/ext/dom/tests/DOMDocument_loadXML_error1.phpt b/ext/dom/tests/DOMDocument_loadXML_error1.phpt index 52d44ea291..5a2f46e220 100644 --- a/ext/dom/tests/DOMDocument_loadXML_error1.phpt +++ b/ext/dom/tests/DOMDocument_loadXML_error1.phpt @@ -17,7 +17,7 @@ XML_FILE=/not_well_formed.xml LOAD_OPTIONS=0 EXPECTED_RESULT=0 --FILE_EXTERNAL-- -domdocumentloadxml_test_method.php +domdocumentloadxml_test_method.inc --EXPECTF-- Warning: DOMDocument::load%r(XML){0,1}%r(): Opening and ending tag mismatch: title line 5 and book %s diff --git a/ext/dom/tests/DOMDocument_loadXML_error2.phpt b/ext/dom/tests/DOMDocument_loadXML_error2.phpt index 6ac4193daf..3b8e2b48b1 100644 --- a/ext/dom/tests/DOMDocument_loadXML_error2.phpt +++ b/ext/dom/tests/DOMDocument_loadXML_error2.phpt @@ -17,7 +17,7 @@ XML_FILE=/not_well_formed2.xml LOAD_OPTIONS=0 EXPECTED_RESULT=0 --FILE_EXTERNAL-- -domdocumentloadxml_test_method.php +domdocumentloadxml_test_method.inc --EXPECTF-- Warning: DOMDocument::load%r(XML){0,1}%r(): AttValue: " or ' expected %s diff --git a/ext/dom/tests/DOMDocument_loadXML_error3.phpt b/ext/dom/tests/DOMDocument_loadXML_error3.phpt index 07f7ca7738..be37b5552b 100644 --- a/ext/dom/tests/DOMDocument_loadXML_error3.phpt +++ b/ext/dom/tests/DOMDocument_loadXML_error3.phpt @@ -17,6 +17,6 @@ XML_FILE=/not_well_formed3.xml LOAD_OPTIONS=0 EXPECTED_RESULT=0 --FILE_EXTERNAL-- -domdocumentloadxml_test_method.php +domdocumentloadxml_test_method.inc --EXPECTF-- Warning: DOMDocument::load%r(XML){0,1}%r(): Opening and ending tag mismatch: boOk line 8 and book %s diff --git a/ext/dom/tests/DOMDocument_loadXML_error4.phpt b/ext/dom/tests/DOMDocument_loadXML_error4.phpt index e35d3dcea5..d2cc3c5dd2 100644 --- a/ext/dom/tests/DOMDocument_loadXML_error4.phpt +++ b/ext/dom/tests/DOMDocument_loadXML_error4.phpt @@ -17,6 +17,6 @@ XML_FILE=/not_well_formed4.xml LOAD_OPTIONS=0 EXPECTED_RESULT=0 --FILE_EXTERNAL-- -domdocumentloadxml_test_method.php +domdocumentloadxml_test_method.inc --EXPECTF-- Warning: DOMDocument::load%r(XML){0,1}%r(): Unsupported version '3.1' %s diff --git a/ext/dom/tests/DOMDocument_loadXML_error5.phpt b/ext/dom/tests/DOMDocument_loadXML_error5.phpt index a4aa1858f5..d5eaadb06d 100644 --- a/ext/dom/tests/DOMDocument_loadXML_error5.phpt +++ b/ext/dom/tests/DOMDocument_loadXML_error5.phpt @@ -17,6 +17,6 @@ XML_FILE=/not_well_formed5.xml LOAD_OPTIONS=0 EXPECTED_RESULT=0 --FILE_EXTERNAL-- -domdocumentloadxml_test_method.php +domdocumentloadxml_test_method.inc --EXPECTF-- Warning: DOMDocument::load%r(XML){0,1}%r(): Extra content at the end of the document %s diff --git a/ext/dom/tests/DOMDocument_loadXML_variation1.phpt b/ext/dom/tests/DOMDocument_loadXML_variation1.phpt index 558137526f..e3a3d94d3b 100644 --- a/ext/dom/tests/DOMDocument_loadXML_variation1.phpt +++ b/ext/dom/tests/DOMDocument_loadXML_variation1.phpt @@ -17,5 +17,5 @@ XML_FILE=/book_with_dtd2.xml LOAD_OPTIONS=LIBXML_DTDLOAD EXPECTED_RESULT=1 --FILE_EXTERNAL-- -domdocumentloadxml_test_method.php +domdocumentloadxml_test_method.inc --EXPECT-- diff --git a/ext/dom/tests/DOMDocument_loadXML_variation2.phpt b/ext/dom/tests/DOMDocument_loadXML_variation2.phpt index 71f638efc1..9f9a5edc07 100644 --- a/ext/dom/tests/DOMDocument_loadXML_variation2.phpt +++ b/ext/dom/tests/DOMDocument_loadXML_variation2.phpt @@ -17,6 +17,6 @@ XML_FILE=/wrong_book_with_dtd2.xml LOAD_OPTIONS=LIBXML_DTDVALID EXPECTED_RESULT=1 --FILE_EXTERNAL-- -domdocumentloadxml_test_method.php +domdocumentloadxml_test_method.inc --EXPECTF-- Warning: DOMDocument::load%r(XML){0,1}%r(): Element book content does not follow the DTD, expecting (title , author), got (title author author ) %s diff --git a/ext/dom/tests/DOMDocument_loadXML_variation3.phpt b/ext/dom/tests/DOMDocument_loadXML_variation3.phpt index 8e61ec4dbc..e0186c802d 100644 --- a/ext/dom/tests/DOMDocument_loadXML_variation3.phpt +++ b/ext/dom/tests/DOMDocument_loadXML_variation3.phpt @@ -18,5 +18,5 @@ XML_FILE=/wrong_book_with_dtd.xml LOAD_OPTIONS=LIBXML_DTDVALID | LIBXML_NOERROR EXPECTED_RESULT=1 --FILE_EXTERNAL-- -domdocumentloadxml_test_method.php +domdocumentloadxml_test_method.inc --EXPECT-- diff --git a/ext/dom/tests/DOMDocument_loadXML_variation4.phpt b/ext/dom/tests/DOMDocument_loadXML_variation4.phpt index 4f1ea37c19..ab15063642 100644 --- a/ext/dom/tests/DOMDocument_loadXML_variation4.phpt +++ b/ext/dom/tests/DOMDocument_loadXML_variation4.phpt @@ -18,7 +18,7 @@ XML_FILE=/book_with_dtd2.xml LOAD_OPTIONS=LIBXML_DTDATTR|LIBXML_NOCDATA|LIBXML_NOENT|LIBXML_NOBLANKS EXPECTED_RESULT=1 --FILE_EXTERNAL-- -domdocumentloadxml_test_method_savexml.php +domdocumentloadxml_test_method_savexml.inc --EXPECT-- diff --git a/ext/dom/tests/domdocumentload_test_method.php b/ext/dom/tests/domdocumentload_test_method.inc similarity index 81% rename from ext/dom/tests/domdocumentload_test_method.php rename to ext/dom/tests/domdocumentload_test_method.inc index a15c9e53be..a643b428d1 100644 --- a/ext/dom/tests/domdocumentload_test_method.php +++ b/ext/dom/tests/domdocumentload_test_method.inc @@ -1,5 +1,5 @@