diff options
| author | jvoisin | 2020-05-14 00:38:57 +0200 |
|---|---|---|
| committer | jvoisin | 2020-05-14 00:38:57 +0200 |
| commit | e8c97f3f16351b750c3395383269d6d206c7048d (patch) | |
| tree | 7442ca1296173575565bedb898b2f93c2d04c758 | |
| parent | 3e2b6545b623f0ba1b016c03b43d999cfcbc8d2f (diff) | |
Fix the testsuite under php7.4
| -rw-r--r-- | src/tests/xxe/disable_xxe_dom.phpt | 12 | ||||
| -rw-r--r-- | src/tests/xxe/disable_xxe_dom_disabled.phpt | 9 | ||||
| -rw-r--r-- | src/tests/xxe/disable_xxe_simplexml.phpt | 9 | ||||
| -rw-r--r-- | src/tests/xxe/disable_xxe_simplexml_oop.phpt | 9 |
4 files changed, 12 insertions, 27 deletions
diff --git a/src/tests/xxe/disable_xxe_dom.phpt b/src/tests/xxe/disable_xxe_dom.phpt index 2f45f66..58467f7 100644 --- a/src/tests/xxe/disable_xxe_dom.phpt +++ b/src/tests/xxe/disable_xxe_dom.phpt | |||
| @@ -1,17 +1,11 @@ | |||
| 1 | --TEST-- | 1 | --TEST-- |
| 2 | Disable XXE | 2 | Disable XXE |
| 3 | --SKIPIF-- | 3 | --SKIPIF-- |
| 4 | <?php | 4 | <?php if (!extension_loaded("snuffleupagus") || !extension_loaded("dom")) print("skip"); ?> |
| 5 | if (!extension_loaded("snuffleupagus")) { | ||
| 6 | echo "skip"; | ||
| 7 | } elseif (!extension_loaded("dom")) { | ||
| 8 | echo "skip"; | ||
| 9 | } | ||
| 10 | ?> | ||
| 11 | --EXTENSIONS-- | ||
| 12 | dom | ||
| 13 | --INI-- | 5 | --INI-- |
| 14 | sp.configuration_file={PWD}/config/disable_xxe.ini | 6 | sp.configuration_file={PWD}/config/disable_xxe.ini |
| 7 | --EXTENSIONS-- | ||
| 8 | dom | ||
| 15 | --FILE-- | 9 | --FILE-- |
| 16 | <?php | 10 | <?php |
| 17 | $dir = __DIR__; | 11 | $dir = __DIR__; |
diff --git a/src/tests/xxe/disable_xxe_dom_disabled.phpt b/src/tests/xxe/disable_xxe_dom_disabled.phpt index 59526d2..fe88d76 100644 --- a/src/tests/xxe/disable_xxe_dom_disabled.phpt +++ b/src/tests/xxe/disable_xxe_dom_disabled.phpt | |||
| @@ -1,14 +1,11 @@ | |||
| 1 | --TEST-- | 1 | --TEST-- |
| 2 | Disable XXE | 2 | Disable XXE |
| 3 | --SKIPIF-- | 3 | --SKIPIF-- |
| 4 | <?php | 4 | <?php if (!extension_loaded("snuffleupagus") || !extension_loaded("dom")) print("skip"); ?> |
| 5 | if (!extension_loaded("snuffleupagus")) echo "skip"; | ||
| 6 | if (!extension_loaded("dom")) echo "skip"; | ||
| 7 | ?> | ||
| 8 | --extensions-- | ||
| 9 | dom | ||
| 10 | --INI-- | 5 | --INI-- |
| 11 | sp.configuration_file={PWD}/config/disable_xxe_disable.ini | 6 | sp.configuration_file={PWD}/config/disable_xxe_disable.ini |
| 7 | --EXTENSIONS-- | ||
| 8 | dom | ||
| 12 | --FILE-- | 9 | --FILE-- |
| 13 | <?php | 10 | <?php |
| 14 | $dir = __DIR__; | 11 | $dir = __DIR__; |
diff --git a/src/tests/xxe/disable_xxe_simplexml.phpt b/src/tests/xxe/disable_xxe_simplexml.phpt index 35d79de..bbd9336 100644 --- a/src/tests/xxe/disable_xxe_simplexml.phpt +++ b/src/tests/xxe/disable_xxe_simplexml.phpt | |||
| @@ -1,14 +1,11 @@ | |||
| 1 | --TEST-- | 1 | --TEST-- |
| 2 | Disable XXE | 2 | Disable XXE |
| 3 | --SKIPIF-- | 3 | --SKIPIF-- |
| 4 | <?php | 4 | <?php if (!extension_loaded("snuffleupagus") || !extension_loaded("simplexml")) print("skip"); ?> |
| 5 | if (!extension_loaded("snuffleupagus")) echo "skip"; | ||
| 6 | if (!extension_loaded("simplexml")) echo "skip"; | ||
| 7 | ?> | ||
| 8 | --EXTENSIONS-- | ||
| 9 | xml | ||
| 10 | --INI-- | 5 | --INI-- |
| 11 | sp.configuration_file={PWD}/config/disable_xxe.ini | 6 | sp.configuration_file={PWD}/config/disable_xxe.ini |
| 7 | --EXTENSIONS-- | ||
| 8 | simplexml | ||
| 12 | --FILE-- | 9 | --FILE-- |
| 13 | <?php | 10 | <?php |
| 14 | $dir = __DIR__; | 11 | $dir = __DIR__; |
diff --git a/src/tests/xxe/disable_xxe_simplexml_oop.phpt b/src/tests/xxe/disable_xxe_simplexml_oop.phpt index 33c3bb5..e11e565 100644 --- a/src/tests/xxe/disable_xxe_simplexml_oop.phpt +++ b/src/tests/xxe/disable_xxe_simplexml_oop.phpt | |||
| @@ -1,14 +1,11 @@ | |||
| 1 | --TEST-- | 1 | --TEST-- |
| 2 | Disable XXE | 2 | Disable XXE |
| 3 | --SKIPIF-- | 3 | --SKIPIF-- |
| 4 | <?php | 4 | <?php if (!extension_loaded("snuffleupagus") || !extension_loaded("simplexml")) print("skip"); ?> |
| 5 | if (!extension_loaded("snuffleupagus")) echo "skip"; | ||
| 6 | if (!extension_loaded("simplexml")) echo "skip"; | ||
| 7 | ?> | ||
| 8 | --EXTENSIONS-- | ||
| 9 | xml | ||
| 10 | --INI-- | 5 | --INI-- |
| 11 | sp.configuration_file={PWD}/config/disable_xxe.ini | 6 | sp.configuration_file={PWD}/config/disable_xxe.ini |
| 7 | --EXTENSIONS-- | ||
| 8 | simplexml | ||
| 12 | --FILE-- | 9 | --FILE-- |
| 13 | <?php | 10 | <?php |
| 14 | $dir = __DIR__; | 11 | $dir = __DIR__; |