Merge tag 'v0.8.4' into stable

Release v0.8.4

3 files changed, 53 insertions, 0 deletions

diff --git a/tests/utils/config/configInvalid.json.php b/tests/utils/config/configInvalid.json.php
new file mode 100644
index 00000000..e39d640a
--- /dev/null
+++ b/tests/utils/config/configInvalid.json.php
@@ -0,0 +1,5 @@
+<?php /*
+{
+    bad: bad,
+}
+*/ ?>
diff --git a/tests/utils/config/configJson.json.php b/tests/utils/config/configJson.json.php
new file mode 100644
index 00000000..06a302e8
--- /dev/null
+++ b/tests/utils/config/configJson.json.php
@@ -0,0 +1,34 @@
+<?php /*
+{
+    "credentials": {
+        "login":"root",
+        "hash":"hash",
+        "salt":"salt"
+    },
+    "security": {
+        "session_protection_disabled":false
+    },
+    "general": {
+        "timezone":"Europe\/Paris",
+        "title": "Shaarli",
+        "header_link": "?"
+    },
+    "privacy": {
+        "default_private_links":true
+    },
+    "redirector": {
+        "url":"lala"
+    },
+    "config": {
+        "foo": "bar"
+    },
+    "resource": {
+        "datastore": "tests\/utils\/config\/datastore.php",
+        "data_dir": "tests\/utils\/config"
+    },
+    "plugins": {
+        "WALLABAG_VERSION": 1
+    }
+}
+*/ ?>
+
diff --git a/tests/utils/config/configPhp.php b/tests/utils/config/configPhp.php
new file mode 100644
index 00000000..0e034175
--- /dev/null
+++ b/tests/utils/config/configPhp.php
@@ -0,0 +1,14 @@
+<?php 
+$GLOBALS['login'] = 'root';
+$GLOBALS['hash'] = 'hash';
+$GLOBALS['salt'] = 'salt';
+$GLOBALS['timezone'] = 'Europe/Paris';
+$GLOBALS['title'] = 'title';
+$GLOBALS['titleLink'] = 'titleLink';
+$GLOBALS['redirector'] = 'lala';
+$GLOBALS['disablesessionprotection'] = false;
+$GLOBALS['privateLinkByDefault'] = false;
+$GLOBALS['config']['DATADIR'] = 'tests/Updater';
+$GLOBALS['config']['PAGECACHE'] = 'sandbox/pagecache';
+$GLOBALS['config']['DATASTORE'] = 'data/datastore.php';
+$GLOBALS['plugins']['WALLABAG_VERSION'] = '1';