Merge remote-tracking branch 'upstream/master'

4 files changed, 33 insertions, 0 deletions

diff --git a/src/tests/strict_mode/config/config_strict_mode_disabled.ini b/src/tests/strict_mode/config/config_strict_mode_disabled.ini
new file mode 100644
index 0000000..2e68471
--- /dev/null
+++ b/src/tests/strict_mode/config/config_strict_mode_disabled.ini
@@ -0,0 +1 @@
+sp.global_strict.disable();
diff --git a/src/tests/strict_mode/config/config_strict_mode_enabled.ini b/src/tests/strict_mode/config/config_strict_mode_enabled.ini
new file mode 100644
index 0000000..2dc11fc
--- /dev/null
+++ b/src/tests/strict_mode/config/config_strict_mode_enabled.ini
@@ -0,0 +1 @@
+sp.global_strict.enable();
diff --git a/src/tests/strict_mode/strict_mode_disabled.phpt b/src/tests/strict_mode/strict_mode_disabled.phpt
new file mode 100644
index 0000000..105f43c
--- /dev/null
+++ b/src/tests/strict_mode/strict_mode_disabled.phpt
@@ -0,0 +1,13 @@
+--TEST--
+Strict mode disabled
+--SKIPIF--
+<?php
+if (!extension_loaded("snuffleupagus")) print "skip snuffleupagus extension missing";
+?>
+--INI--
+sp.configuration_file={PWD}/config/config_strict_mode_disabled.ini
+--FILE--
+<?php 
+ini_set('display_errors', 1);
+?>
+--EXPECTF--
diff --git a/src/tests/strict_mode/strict_mode_enabled.phpt b/src/tests/strict_mode/strict_mode_enabled.phpt
new file mode 100644
index 0000000..a986987
--- /dev/null
+++ b/src/tests/strict_mode/strict_mode_enabled.phpt
@@ -0,0 +1,18 @@
+--TEST--
+Strict mode enabled
+--SKIPIF--
+<?php
+if (!extension_loaded("snuffleupagus")) print "skip snuffleupagus extension missing";
+?>
+--INI--
+sp.configuration_file={PWD}/config/config_strict_mode_enabled.ini
+--FILE--
+<?php 
+ini_set('display_errors', 1);
+?>
+--EXPECTF--
+Fatal error: Uncaught TypeError: ini_set()%s given in %s/tests/strict_mode/strict_mode_enabled.php:%d
+Stack trace:
+#0 %s/tests/strict_mode/strict_mode_enabled.php(2): ini_set('display_errors', 1)
+#1 {main}
+  thrown in %s/tests/strict_mode/strict_mode_enabled.php on line 2