diff options
| author | jvoisin | 2017-09-25 22:28:31 +0200 |
|---|---|---|
| committer | jvoisin | 2017-09-25 23:08:33 +0200 |
| commit | 07c148b3790429c9da5a9500bfab9cbaa6d8ecf5 (patch) | |
| tree | 9dd50bb0ddbfd09d6eca7a6f505a927094a1571a | |
| parent | ae15242e59bc77355d76c7407bca8c4665c430c2 (diff) | |
Fix XXE test when running without XML support
Apparently, using `echo` instead of `die` works betterâ„¢
| -rw-r--r-- | src/tests/disable_xxe_dom.phpt | 7 | ||||
| -rw-r--r-- | src/tests/disable_xxe_dom_disabled.phpt | 4 | ||||
| -rw-r--r-- | src/tests/disable_xxe_simplexml.phpt | 4 | ||||
| -rw-r--r-- | src/tests/disable_xxe_simplexml_oop.phpt | 4 | ||||
| -rw-r--r-- | src/tests/disable_xxe_xml_parse.phpt | 9 |
5 files changed, 17 insertions, 11 deletions
diff --git a/src/tests/disable_xxe_dom.phpt b/src/tests/disable_xxe_dom.phpt index 8b63589..e1459e3 100644 --- a/src/tests/disable_xxe_dom.phpt +++ b/src/tests/disable_xxe_dom.phpt | |||
| @@ -2,8 +2,11 @@ | |||
| 2 | Disable XXE | 2 | Disable XXE |
| 3 | --SKIPIF-- | 3 | --SKIPIF-- |
| 4 | <?php | 4 | <?php |
| 5 | if (!extension_loaded("snuffleupagus")) die "skip"; | 5 | if (!extension_loaded("snuffleupagus")) { |
| 6 | if (!extension_loaded("dom")) die "skip"; | 6 | echo "skip"; |
| 7 | } elseif (!extension_loaded("dom")) { | ||
| 8 | echo "skip"; | ||
| 9 | } | ||
| 7 | ?> | 10 | ?> |
| 8 | --INI-- | 11 | --INI-- |
| 9 | sp.configuration_file={PWD}/config/disable_xxe.ini | 12 | sp.configuration_file={PWD}/config/disable_xxe.ini |
diff --git a/src/tests/disable_xxe_dom_disabled.phpt b/src/tests/disable_xxe_dom_disabled.phpt index a7ccd60..a791ebc 100644 --- a/src/tests/disable_xxe_dom_disabled.phpt +++ b/src/tests/disable_xxe_dom_disabled.phpt | |||
| @@ -2,8 +2,8 @@ | |||
| 2 | Disable XXE | 2 | Disable XXE |
| 3 | --SKIPIF-- | 3 | --SKIPIF-- |
| 4 | <?php | 4 | <?php |
| 5 | if (!extension_loaded("snuffleupagus")) die "skip"; | 5 | if (!extension_loaded("snuffleupagus")) echo "skip"; |
| 6 | if (!extension_loaded("dom")) die "skip"; | 6 | if (!extension_loaded("dom")) echo "skip"; |
| 7 | ?> | 7 | ?> |
| 8 | --INI-- | 8 | --INI-- |
| 9 | sp.configuration_file={PWD}/config/disable_xxe_disable.ini | 9 | sp.configuration_file={PWD}/config/disable_xxe_disable.ini |
diff --git a/src/tests/disable_xxe_simplexml.phpt b/src/tests/disable_xxe_simplexml.phpt index 7825167..88396c0 100644 --- a/src/tests/disable_xxe_simplexml.phpt +++ b/src/tests/disable_xxe_simplexml.phpt | |||
| @@ -2,8 +2,8 @@ | |||
| 2 | Disable XXE | 2 | Disable XXE |
| 3 | --SKIPIF-- | 3 | --SKIPIF-- |
| 4 | <?php | 4 | <?php |
| 5 | if (!extension_loaded("snuffleupagus")) die "skip"; | 5 | if (!extension_loaded("snuffleupagus")) echo "skip"; |
| 6 | if (!extension_loaded("simplexml")) die "skip"; | 6 | if (!extension_loaded("simplexml")) echo "skip"; |
| 7 | ?> | 7 | ?> |
| 8 | --INI-- | 8 | --INI-- |
| 9 | sp.configuration_file={PWD}/config/disable_xxe.ini | 9 | sp.configuration_file={PWD}/config/disable_xxe.ini |
diff --git a/src/tests/disable_xxe_simplexml_oop.phpt b/src/tests/disable_xxe_simplexml_oop.phpt index 65e4574..43c4fbf 100644 --- a/src/tests/disable_xxe_simplexml_oop.phpt +++ b/src/tests/disable_xxe_simplexml_oop.phpt | |||
| @@ -2,8 +2,8 @@ | |||
| 2 | Disable XXE | 2 | Disable XXE |
| 3 | --SKIPIF-- | 3 | --SKIPIF-- |
| 4 | <?php | 4 | <?php |
| 5 | if (!extension_loaded("snuffleupagus")) die "skip"; | 5 | if (!extension_loaded("snuffleupagus")) echo "skip"; |
| 6 | if (!extension_loaded("simplexml")) die "skip"; | 6 | if (!extension_loaded("simplexml")) echo "skip"; |
| 7 | ?> | 7 | ?> |
| 8 | --INI-- | 8 | --INI-- |
| 9 | sp.configuration_file={PWD}/config/disable_xxe.ini | 9 | sp.configuration_file={PWD}/config/disable_xxe.ini |
diff --git a/src/tests/disable_xxe_xml_parse.phpt b/src/tests/disable_xxe_xml_parse.phpt index 2bbf0be..ca77729 100644 --- a/src/tests/disable_xxe_xml_parse.phpt +++ b/src/tests/disable_xxe_xml_parse.phpt | |||
| @@ -1,9 +1,12 @@ | |||
| 1 | --TEST-- | 1 | --TEST-- |
| 2 | Disable XXE | 2 | Disable XXE in xml_parse |
| 3 | --SKIPIF-- | 3 | --SKIPIF-- |
| 4 | <?php | 4 | <?php |
| 5 | if (!extension_loaded("snuffleupagus")) die "skip"; | 5 | if (!extension_loaded("snuffleupagus")) { |
| 6 | if (!extension_loaded("xml")) die "skip"; | 6 | echo "skip because snuffleupagus isn't loaded"; |
| 7 | } elseif (!extension_loaded("xml")) { | ||
| 8 | echo "skip because the `xml` extension isn't loaded"; | ||
| 9 | } | ||
| 7 | ?> | 10 | ?> |
| 8 | --INI-- | 11 | --INI-- |
| 9 | sp.configuration_file={PWD}/config/disable_xxe.ini | 12 | sp.configuration_file={PWD}/config/disable_xxe.ini |
