aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests/utils/config
diff options
context:
space:
mode:
authorArthurHoaro <arthur@hoa.ro>2016-05-29 16:10:32 +0200
committerArthurHoaro <arthur@hoa.ro>2016-06-11 09:30:56 +0200
commitda10377b3c263d96a46cf9101c202554343d2cd0 (patch)
treed91d1fcdbd79367418007add4d135d3f84e57a04 /tests/utils/config
parenteeea1c3daa87f133c57c96fa17ed26b02c392636 (diff)
downloadShaarli-da10377b3c263d96a46cf9101c202554343d2cd0.tar.gz
Shaarli-da10377b3c263d96a46cf9101c202554343d2cd0.tar.zst
Shaarli-da10377b3c263d96a46cf9101c202554343d2cd0.zip
Rename configuration keys and fix GLOBALS in templates
Diffstat (limited to 'tests/utils/config')
-rw-r--r--tests/utils/config/configJson.json.php33
-rw-r--r--tests/utils/config/configUpdateDone.json.php4
-rw-r--r--tests/utils/config/configUpdater.php15
3 files changed, 22 insertions, 30 deletions
diff --git a/tests/utils/config/configJson.json.php b/tests/utils/config/configJson.json.php
index 71b59edd..6a841f8a 100644
--- a/tests/utils/config/configJson.json.php
+++ b/tests/utils/config/configJson.json.php
@@ -1,17 +1,28 @@
1<?php /* 1<?php /*
2{ 2{
3 "redirector":"lala", 3 "credentials": {
4 "login":"root", 4 "login":"root",
5 "hash":"hash", 5 "hash":"hash",
6 "salt":"salt", 6 "salt":"salt"
7 "timezone":"Europe\/Paris", 7 },
8 "disablesessionprotection":false, 8 "security": {
9 "privateLinkByDefault":true, 9 "session_protection_disabled":false
10 "title": "Shaarli", 10 },
11 "titleLink": "?", 11 "general": {
12 "timezone":"Europe\/Paris",
13 "default_private_linksheader_link":true,
14 "title": "Shaarli",
15 "header_link": "?"
16 },
17 "extras": {
18 "redirector":"lala"
19 },
12 "config": { 20 "config": {
13 "foo": "bar", 21 "foo": "bar"
14 "DATASTORE": "data\/datastore.php" 22 },
23 "path": {
24 "datastore": "tests\/utils\/config\/datastore.php",
25 "data_dir": "tests\/utils\/config"
15 }, 26 },
16 "plugins": { 27 "plugins": {
17 "WALLABAG_VERSION": 1 28 "WALLABAG_VERSION": 1
diff --git a/tests/utils/config/configUpdateDone.json.php b/tests/utils/config/configUpdateDone.json.php
deleted file mode 100644
index a4e460d1..00000000
--- a/tests/utils/config/configUpdateDone.json.php
+++ /dev/null
@@ -1,4 +0,0 @@
1<?php /*
2{
3 "login": "root"
4}
diff --git a/tests/utils/config/configUpdater.php b/tests/utils/config/configUpdater.php
deleted file mode 100644
index ee4a56b5..00000000
--- a/tests/utils/config/configUpdater.php
+++ /dev/null
@@ -1,15 +0,0 @@
1<?php
2$GLOBALS['login'] = 'login';
3$GLOBALS['hash'] = 'hash';
4$GLOBALS['salt'] = 'salt';
5$GLOBALS['timezone'] = 'Europe/Paris';
6$GLOBALS['title'] = 'title';
7$GLOBALS['titleLink'] = 'titleLink';
8$GLOBALS['redirector'] = '';
9$GLOBALS['disablesessionprotection'] = false;
10$GLOBALS['privateLinkByDefault'] = false;
11$GLOBALS['config']['DATADIR'] = 'tests/Updater';
12$GLOBALS['config']['PAGECACHE'] = 'sandbox/pagecache';
13$GLOBALS['config']['config1'] = 'config1data';
14$GLOBALS['config']['config2'] = 'config2data';
15$GLOBALS['plugins']['WALLABAG_VERSION'] = '2';