From 684e662a58b02bde225e44d3677987b6fc3adf0b Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Wed, 18 May 2016 21:48:24 +0200
Subject: Replace $GLOBALS configuration with the configuration manager in the
 whole code base

---
 tests/utils/config/configPhp.php     | 14 ++++++++++++++
 tests/utils/config/configUpdater.php | 15 +++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 tests/utils/config/configPhp.php
 create mode 100644 tests/utils/config/configUpdater.php

(limited to 'tests/utils')

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';
diff --git a/tests/utils/config/configUpdater.php b/tests/utils/config/configUpdater.php
new file mode 100644
index 00000000..ee4a56b5
--- /dev/null
+++ b/tests/utils/config/configUpdater.php
@@ -0,0 +1,15 @@
+<?php 
+$GLOBALS['login'] = 'login';
+$GLOBALS['hash'] = 'hash';
+$GLOBALS['salt'] = 'salt';
+$GLOBALS['timezone'] = 'Europe/Paris';
+$GLOBALS['title'] = 'title';
+$GLOBALS['titleLink'] = 'titleLink';
+$GLOBALS['redirector'] = '';
+$GLOBALS['disablesessionprotection'] = false;
+$GLOBALS['privateLinkByDefault'] = false;
+$GLOBALS['config']['DATADIR'] = 'tests/Updater';
+$GLOBALS['config']['PAGECACHE'] = 'sandbox/pagecache';
+$GLOBALS['config']['config1'] = 'config1data';
+$GLOBALS['config']['config2'] = 'config2data';
+$GLOBALS['plugins']['WALLABAG_VERSION'] = '2';
-- 
cgit v1.2.3


From b74b96bfbd0b778ac50fd17f5e107c51435b1678 Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Sun, 29 May 2016 12:32:14 +0200
Subject: Adds ConfigJson which handle the configuration in JSON format.

Also use the Updater to make the transition
---
 tests/utils/config/configInvalid.json.php    |  4 ++++
 tests/utils/config/configJson.json.php       | 19 +++++++++++++++++++
 tests/utils/config/configUpdateDone.json.php |  4 ++++
 3 files changed, 27 insertions(+)
 create mode 100644 tests/utils/config/configInvalid.json.php
 create mode 100644 tests/utils/config/configJson.json.php
 create mode 100644 tests/utils/config/configUpdateDone.json.php

(limited to 'tests/utils')

diff --git a/tests/utils/config/configInvalid.json.php b/tests/utils/config/configInvalid.json.php
new file mode 100644
index 00000000..c53e471d
--- /dev/null
+++ b/tests/utils/config/configInvalid.json.php
@@ -0,0 +1,4 @@
+<?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..71b59edd
--- /dev/null
+++ b/tests/utils/config/configJson.json.php
@@ -0,0 +1,19 @@
+<?php /*
+{
+    "redirector":"lala",
+    "login":"root",
+    "hash":"hash",
+    "salt":"salt",
+    "timezone":"Europe\/Paris",
+    "disablesessionprotection":false,
+    "privateLinkByDefault":true,
+    "title": "Shaarli",
+    "titleLink": "?",
+    "config": {
+        "foo": "bar",
+        "DATASTORE": "data\/datastore.php"
+    },
+    "plugins": {
+        "WALLABAG_VERSION": 1
+    }
+}
diff --git a/tests/utils/config/configUpdateDone.json.php b/tests/utils/config/configUpdateDone.json.php
new file mode 100644
index 00000000..a4e460d1
--- /dev/null
+++ b/tests/utils/config/configUpdateDone.json.php
@@ -0,0 +1,4 @@
+<?php /*
+{
+  "login": "root"
+}
-- 
cgit v1.2.3


From da10377b3c263d96a46cf9101c202554343d2cd0 Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Sun, 29 May 2016 16:10:32 +0200
Subject: Rename configuration keys and fix GLOBALS in templates

---
 tests/utils/config/configJson.json.php       | 33 ++++++++++++++++++----------
 tests/utils/config/configUpdateDone.json.php |  4 ----
 tests/utils/config/configUpdater.php         | 15 -------------
 3 files changed, 22 insertions(+), 30 deletions(-)
 delete mode 100644 tests/utils/config/configUpdateDone.json.php
 delete mode 100644 tests/utils/config/configUpdater.php

(limited to 'tests/utils')

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 @@
 <?php /*
 {
-    "redirector":"lala",
-    "login":"root",
-    "hash":"hash",
-    "salt":"salt",
-    "timezone":"Europe\/Paris",
-    "disablesessionprotection":false,
-    "privateLinkByDefault":true,
-    "title": "Shaarli",
-    "titleLink": "?",
+    "credentials": {
+        "login":"root",
+        "hash":"hash",
+        "salt":"salt"
+    },
+    "security": {
+        "session_protection_disabled":false
+    },
+    "general": {
+        "timezone":"Europe\/Paris",
+        "default_private_linksheader_link":true,
+        "title": "Shaarli",
+        "header_link": "?"
+    },
+    "extras": {
+        "redirector":"lala"
+    },
     "config": {
-        "foo": "bar",
-        "DATASTORE": "data\/datastore.php"
+        "foo": "bar"
+    },
+    "path": {
+        "datastore": "tests\/utils\/config\/datastore.php",
+        "data_dir": "tests\/utils\/config"
     },
     "plugins": {
         "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 @@
-<?php /*
-{
-  "login": "root"
-}
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 @@
-<?php 
-$GLOBALS['login'] = 'login';
-$GLOBALS['hash'] = 'hash';
-$GLOBALS['salt'] = 'salt';
-$GLOBALS['timezone'] = 'Europe/Paris';
-$GLOBALS['title'] = 'title';
-$GLOBALS['titleLink'] = 'titleLink';
-$GLOBALS['redirector'] = '';
-$GLOBALS['disablesessionprotection'] = false;
-$GLOBALS['privateLinkByDefault'] = false;
-$GLOBALS['config']['DATADIR'] = 'tests/Updater';
-$GLOBALS['config']['PAGECACHE'] = 'sandbox/pagecache';
-$GLOBALS['config']['config1'] = 'config1data';
-$GLOBALS['config']['config2'] = 'config2data';
-$GLOBALS['plugins']['WALLABAG_VERSION'] = '2';
-- 
cgit v1.2.3


From 894a3c4bf38d8dcadb6941049b9167e5101805bd Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Sat, 11 Jun 2016 09:08:02 +0200
Subject: Rename configuration key for better sections

---
 tests/utils/config/configJson.json.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'tests/utils')

diff --git a/tests/utils/config/configJson.json.php b/tests/utils/config/configJson.json.php
index 6a841f8a..c54882c3 100644
--- a/tests/utils/config/configJson.json.php
+++ b/tests/utils/config/configJson.json.php
@@ -10,17 +10,19 @@
     },
     "general": {
         "timezone":"Europe\/Paris",
-        "default_private_linksheader_link":true,
         "title": "Shaarli",
         "header_link": "?"
     },
-    "extras": {
-        "redirector":"lala"
+    "privacy": {
+        "default_private_links":true
+    },
+    "redirector": {
+        "url":"lala"
     },
     "config": {
         "foo": "bar"
     },
-    "path": {
+    "resource": {
         "datastore": "tests\/utils\/config\/datastore.php",
         "data_dir": "tests\/utils\/config"
     },
-- 
cgit v1.2.3


From 5ff23f02b80ec6ddee28dee869171ee8e3656b7c Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Mon, 20 Jun 2016 18:30:37 +0200
Subject: Add closing PHP tags to JSON config files

---
 tests/utils/config/configInvalid.json.php | 1 +
 tests/utils/config/configJson.json.php    | 2 ++
 2 files changed, 3 insertions(+)

(limited to 'tests/utils')

diff --git a/tests/utils/config/configInvalid.json.php b/tests/utils/config/configInvalid.json.php
index c53e471d..167f2168 100644
--- a/tests/utils/config/configInvalid.json.php
+++ b/tests/utils/config/configInvalid.json.php
@@ -2,3 +2,4 @@
 {
     bad: bad,
 }
+*/ ?>
\ No newline at end of file
diff --git a/tests/utils/config/configJson.json.php b/tests/utils/config/configJson.json.php
index c54882c3..06a302e8 100644
--- a/tests/utils/config/configJson.json.php
+++ b/tests/utils/config/configJson.json.php
@@ -30,3 +30,5 @@
         "WALLABAG_VERSION": 1
     }
 }
+*/ ?>
+
-- 
cgit v1.2.3