Merge pull request #5854 from annando/ap-parser

We now parse a compacted JSON

diff --git a/bin/auth_ejabberd.php b/bin/auth_ejabberd.php
index 55917bf6d906e8cb7f55b9d7ca0f65a01bc4d825..1f03b94af90017fb164221b2d6eab38a5d391aa9 100755 (executable)
--- a/bin/auth_ejabberd.php
+++ b/bin/auth_ejabberd.php
@@ -54,7 +54,7 @@ require_once "include/dba.php";
 
 $a = new App(dirname(__DIR__));
 
-if (App\Mode::isNormal()) {
+if ($a->getMode()->isNormal()) {
        $oAuth = new ExAuth();
        $oAuth->readStdin();
-}
\ No newline at end of file
+}

diff --git a/bin/daemon.php b/bin/daemon.php
index e2bad90df59775e74ad4cd96164a84d6df41d13c..f0f5826d928fb04c97e36e12f57020dd8cd88ec2 100755 (executable)
--- a/bin/daemon.php
+++ b/bin/daemon.php
@@ -34,7 +34,7 @@ require_once "include/dba.php";
 
 $a = new App(dirname(__DIR__));
 
-if (App\Mode::isInstall()) {
+if ($a->getMode()->isInstall()) {
        die("Friendica isn't properly installed yet.\n");
 }
 

diff --git a/composer.json b/composer.json
index a37010a9ef1f60d3c6ed00593f12bf48dd1ce1ab..5df9a5355b866d4fdc1a259024d9e9e09617b55a 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -75,7 +75,8 @@
                "phpunit/dbunit": "^2.0",
                "phpdocumentor/reflection-docblock": "^3.0.2",
                "phpunit/php-token-stream": "^1.4.2",
-               "mikey179/vfsStream": "^1.6"
+               "mikey179/vfsStream": "^1.6",
+               "mockery/mockery": "^1.2"
        },
        "scripts": {
                "test": "phpunit"

diff --git a/composer.lock b/composer.lock
index a07d56e69236ca7895736de5f130094f7e17c916..7973167762cefac25b68a9886d81085b4bdb1973 100644 (file)
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "c2306df3b19ec46d53bb16ac2cffa51a",
+    "content-hash": "9f0dbeccbae197460a0ce74a940177cd",
     "packages": [
         {
             "name": "asika/simple-console",
@@ -818,6 +818,28 @@
                 "reference": null,
                 "shasum": "30dc7a7ce872155b23a33bd10ad4c76c0d613f55"
             },
+            "require-dev": {
+                "npm-asset/babel-core": ">=6.26.0,<7.0.0",
+                "npm-asset/babel-plugin-external-helpers": ">=6.22.0,<7.0.0",
+                "npm-asset/babel-preset-env": ">=1.6.1,<2.0.0",
+                "npm-asset/cpy-cli": ">=1.0.1,<2.0.0",
+                "npm-asset/cssnano": ">=3.10.0,<4.0.0",
+                "npm-asset/del-cli": ">=1.1.0,<2.0.0",
+                "npm-asset/eslint": ">=4.14.0,<5.0.0",
+                "npm-asset/eslint-config-airbnb-base": ">=12.1.0,<13.0.0",
+                "npm-asset/eslint-plugin-import": ">=2.8.0,<3.0.0",
+                "npm-asset/node-qunit-phantomjs": ">=2.0.0,<3.0.0",
+                "npm-asset/npm-run-all": ">=4.1.2,<5.0.0",
+                "npm-asset/postcss-cli": ">=4.1.1,<5.0.0",
+                "npm-asset/postcss-cssnext": ">=3.0.2,<4.0.0",
+                "npm-asset/postcss-header": ">=1.0.0,<2.0.0",
+                "npm-asset/postcss-url": ">=7.3.0,<8.0.0",
+                "npm-asset/rollup": ">=0.53.3,<0.54.0",
+                "npm-asset/rollup-plugin-babel": ">=3.0.3,<4.0.0",
+                "npm-asset/rollup-watch": ">=4.3.1,<5.0.0",
+                "npm-asset/stylefmt": ">=6.0.0,<7.0.0",
+                "npm-asset/uglify-js": ">=3.3.4,<4.0.0"
+            },
             "type": "npm-asset-library",
             "extra": {
                 "npm-asset-bugs": {
@@ -997,6 +1019,22 @@
             "require": {
                 "npm-asset/ev-emitter": ">=1.0.0,<2.0.0"
             },
+            "require-dev": {
+                "npm-asset/chalk": ">=1.1.1,<2.0.0",
+                "npm-asset/cheerio": ">=0.19.0,<0.20.0",
+                "npm-asset/gulp": ">=3.9.0,<4.0.0",
+                "npm-asset/gulp-jshint": ">=1.11.2,<2.0.0",
+                "npm-asset/gulp-json-lint": ">=0.1.0,<0.2.0",
+                "npm-asset/gulp-rename": ">=1.2.2,<2.0.0",
+                "npm-asset/gulp-replace": ">=0.5.4,<0.6.0",
+                "npm-asset/gulp-requirejs-optimize": "dev-github:metafizzy/gulp-requirejs-optimize",
+                "npm-asset/gulp-uglify": ">=1.4.2,<2.0.0",
+                "npm-asset/gulp-util": ">=3.0.7,<4.0.0",
+                "npm-asset/highlight.js": ">=8.9.1,<9.0.0",
+                "npm-asset/marked": ">=0.3.5,<0.4.0",
+                "npm-asset/minimist": ">=1.2.0,<2.0.0",
+                "npm-asset/transfob": ">=1.0.0,<2.0.0"
+            },
             "type": "npm-asset-library",
             "extra": {
                 "npm-asset-bugs": {
@@ -1042,6 +1080,14 @@
                 "reference": null,
                 "shasum": "2736e332aaee73ccf0a14a5f0066391a0a13f4a3"
             },
+            "require-dev": {
+                "npm-asset/grunt": "~0.4.2",
+                "npm-asset/grunt-contrib-cssmin": "~0.9.0",
+                "npm-asset/grunt-contrib-jshint": "~0.6.3",
+                "npm-asset/grunt-contrib-less": "~0.11.0",
+                "npm-asset/grunt-contrib-uglify": "~0.4.0",
+                "npm-asset/grunt-contrib-watch": "~0.6.1"
+            },
             "type": "npm-asset-library",
             "extra": {
                 "npm-asset-bugs": {
@@ -1075,6 +1121,32 @@
                 "reference": null,
                 "shasum": "2c89d6889b5eac522a7eea32c14521559c6cbf02"
             },
+            "require-dev": {
+                "npm-asset/commitplease": "2.0.0",
+                "npm-asset/core-js": "0.9.17",
+                "npm-asset/grunt": "0.4.5",
+                "npm-asset/grunt-babel": "5.0.1",
+                "npm-asset/grunt-cli": "0.1.13",
+                "npm-asset/grunt-compare-size": "0.4.0",
+                "npm-asset/grunt-contrib-jshint": "0.11.2",
+                "npm-asset/grunt-contrib-uglify": "0.9.2",
+                "npm-asset/grunt-contrib-watch": "0.6.1",
+                "npm-asset/grunt-git-authors": "2.0.1",
+                "npm-asset/grunt-jscs": "2.1.0",
+                "npm-asset/grunt-jsonlint": "1.0.4",
+                "npm-asset/grunt-npmcopy": "0.1.0",
+                "npm-asset/gzip-js": "0.3.2",
+                "npm-asset/jsdom": "5.6.1",
+                "npm-asset/load-grunt-tasks": "1.0.0",
+                "npm-asset/qunit-assert-step": "1.0.3",
+                "npm-asset/qunitjs": "1.17.1",
+                "npm-asset/requirejs": "2.1.17",
+                "npm-asset/sinon": "1.10.3",
+                "npm-asset/sizzle": "2.2.1",
+                "npm-asset/strip-json-comments": "1.0.3",
+                "npm-asset/testswarm": "1.1.0",
+                "npm-asset/win-spawn": "2.0.0"
+            },
             "type": "npm-asset-library",
             "extra": {
                 "npm-asset-bugs": {
@@ -1225,6 +1297,12 @@
                 "reference": null,
                 "shasum": "06f0335f16e353a695e7206bf50503cb523a6ee5"
             },
+            "require-dev": {
+                "npm-asset/grunt": "~0.4.1",
+                "npm-asset/grunt-contrib-connect": "~0.5.0",
+                "npm-asset/grunt-contrib-jshint": "~0.7.1",
+                "npm-asset/grunt-contrib-uglify": "~0.2.7"
+            },
             "type": "npm-asset-library",
             "extra": {
                 "npm-asset-bugs": {
@@ -1933,6 +2011,54 @@
             ],
             "time": "2015-06-14T21:17:01+00:00"
         },
+        {
+            "name": "hamcrest/hamcrest-php",
+            "version": "v2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/hamcrest/hamcrest-php.git",
+                "reference": "776503d3a8e85d4f9a1148614f95b7a608b046ad"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/hamcrest/hamcrest-php/zipball/776503d3a8e85d4f9a1148614f95b7a608b046ad",
+                "reference": "776503d3a8e85d4f9a1148614f95b7a608b046ad",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3|^7.0"
+            },
+            "replace": {
+                "cordoval/hamcrest-php": "*",
+                "davedevelopment/hamcrest-php": "*",
+                "kodova/hamcrest-php": "*"
+            },
+            "require-dev": {
+                "phpunit/php-file-iterator": "1.3.3",
+                "phpunit/phpunit": "~4.0",
+                "satooshi/php-coveralls": "^1.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "hamcrest"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD"
+            ],
+            "description": "This is the PHP port of Hamcrest Matchers",
+            "keywords": [
+                "test"
+            ],
+            "time": "2016-01-20T08:20:44+00:00"
+        },
         {
             "name": "mikey179/vfsStream",
             "version": "v1.6.5",
@@ -1979,6 +2105,71 @@
             "homepage": "http://vfs.bovigo.org/",
             "time": "2017-08-01T08:02:14+00:00"
         },
+        {
+            "name": "mockery/mockery",
+            "version": "1.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/mockery/mockery.git",
+                "reference": "100633629bf76d57430b86b7098cd6beb996a35a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/mockery/mockery/zipball/100633629bf76d57430b86b7098cd6beb996a35a",
+                "reference": "100633629bf76d57430b86b7098cd6beb996a35a",
+                "shasum": ""
+            },
+            "require": {
+                "hamcrest/hamcrest-php": "~2.0",
+                "lib-pcre": ">=7.0",
+                "php": ">=5.6.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~5.7.10|~6.5|~7.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Mockery": "library/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Pádraic Brady",
+                    "email": "padraic.brady@gmail.com",
+                    "homepage": "http://blog.astrumfutura.com"
+                },
+                {
+                    "name": "Dave Marshall",
+                    "email": "dave.marshall@atstsolutions.co.uk",
+                    "homepage": "http://davedevelopment.co.uk"
+                }
+            ],
+            "description": "Mockery is a simple yet flexible PHP mock object framework",
+            "homepage": "https://github.com/mockery/mockery",
+            "keywords": [
+                "BDD",
+                "TDD",
+                "library",
+                "mock",
+                "mock objects",
+                "mockery",
+                "stub",
+                "test",
+                "test double",
+                "testing"
+            ],
+            "time": "2018-10-02T21:52:37+00:00"
+        },
         {
             "name": "myclabs/deep-copy",
             "version": "1.7.0",
@@ -2779,7 +2970,7 @@
                 }
             ],
             "description": "Provides the functionality to compare PHP values for equality",
-            "homepage": "http://www.github.com/sebastianbergmann/comparator",
+            "homepage": "https://github.com/sebastianbergmann/comparator",
             "keywords": [
                 "comparator",
                 "compare",
@@ -2881,7 +3072,7 @@
                 }
             ],
             "description": "Provides functionality to handle HHVM/PHP environments",
-            "homepage": "http://www.github.com/sebastianbergmann/environment",
+            "homepage": "https://github.com/sebastianbergmann/environment",
             "keywords": [
                 "Xdebug",
                 "environment",
@@ -2949,7 +3140,7 @@
                 }
             ],
             "description": "Provides the functionality to export PHP variables for visualization",
-            "homepage": "http://www.github.com/sebastianbergmann/exporter",
+            "homepage": "https://github.com/sebastianbergmann/exporter",
             "keywords": [
                 "export",
                 "exporter"
@@ -3001,7 +3192,7 @@
                 }
             ],
             "description": "Snapshotting of global state",
-            "homepage": "http://www.github.com/sebastianbergmann/global-state",
+            "homepage": "https://github.com/sebastianbergmann/global-state",
             "keywords": [
                 "global state"
             ],
@@ -3103,7 +3294,7 @@
                 }
             ],
             "description": "Provides functionality to recursively process PHP variables",
-            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+            "homepage": "https://github.com/sebastianbergmann/recursion-context",
             "time": "2016-11-19T07:33:16+00:00"
         },
         {

diff --git a/index.php b/index.php
index f34b79867cd42d02f7a0a7deaaa13a6a3af231d5..19b85b935601077fe8ab8e1a6d0ad6fc3951d702 100644 (file)
--- a/index.php
+++ b/index.php
@@ -36,7 +36,7 @@ $a->backend = false;
 require_once "include/dba.php";
 
 // Missing DB connection: ERROR
-if (App\Mode::has(App\Mode::LOCALCONFIGPRESENT) && !App\Mode::has(App\Mode::DBAVAILABLE)) {
+if ($a->getMode()->has(App\Mode::LOCALCONFIGPRESENT) && !$a->getMode()->has(App\Mode::DBAVAILABLE)) {
        System::httpExit(500, ['title' => 'Error 500 - Internal Server Error', 'description' => 'Apologies but the website is unavailable at the moment.']);
 }
 
@@ -48,7 +48,7 @@ if ($a->isMaxProcessesReached() || $a->isMaxLoadReached()) {
        System::httpExit(503, ['title' => 'Error 503 - Service Temporarily Unavailable', 'description' => 'System is currently overloaded. Please try again later.']);
 }
 
-if (!App\Mode::isInstall()) {
+if (!$a->getMode()->isInstall()) {
        if (Config::get('system', 'force_ssl') && ($a->get_scheme() == "http")
                && (intval(Config::get('system', 'ssl_policy')) == SSL_POLICY_FULL)
                && (substr(System::baseUrl(), 0, 8) == "https://")
@@ -107,7 +107,7 @@ if (!empty($_SESSION['language']) && $_SESSION['language'] !== $lang) {
        L10n::loadTranslationTable($lang);
 }
 
-if (!empty($_GET['zrl']) && App\Mode::isNormal()) {
+if (!empty($_GET['zrl']) && $a->getMode()->isNormal()) {
        $a->query_string = Profile::stripZrls($a->query_string);
        if (!local_user()) {
                // Only continue when the given profile link seems valid
@@ -130,7 +130,7 @@ if (!empty($_GET['zrl']) && App\Mode::isNormal()) {
        }
 }
 
-if (!empty($_GET['owt']) && App\Mode::isNormal()) {
+if (!empty($_GET['owt']) && $a->getMode()->isNormal()) {
        $token = $_GET['owt'];
        $a->query_string = Profile::stripQueryParam($a->query_string, 'owt');
        Profile::openWebAuthInit($token);
@@ -165,9 +165,9 @@ $_SESSION['last_updated'] = defaults($_SESSION, 'last_updated', []);
 
 // in install mode, any url loads install module
 // but we need "view" module for stylesheet
-if (App\Mode::isInstall() && $a->module != 'view') {
+if ($a->getMode()->isInstall() && $a->module != 'view') {
        $a->module = 'install';
-} elseif (!App\Mode::has(App\Mode::MAINTENANCEDISABLED) && $a->module != 'view') {
+} elseif (!$a->getMode()->has(App\Mode::MAINTENANCEDISABLED) && $a->module != 'view') {
        $a->module = 'maintenance';
 } else {
        check_url($a);
@@ -320,7 +320,7 @@ if (file_exists($theme_info_file)) {
 
 /* initialise content region */
 
-if (App\Mode::isNormal()) {
+if ($a->getMode()->isNormal()) {
        Addon::callHooks('page_content_top', $a->page['content']);
 }
 

diff --git a/mod/contacts.php b/mod/contacts.php
index c33e9b620607ded477f2c6418bf8e827b6548494..7597fd6432ce7786800ce94cd9b01f5df2038afb 100644 (file)
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -22,6 +22,7 @@ use Friendica\Network\Probe;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Core\ACL;
+use Friendica\Module\Login;
 
 function contacts_init(App $a)
 {
@@ -375,7 +376,7 @@ function contacts_content(App $a, $update = 0)
 
        if (!local_user()) {
                notice(L10n::t('Permission denied.') . EOL);
-               return;
+               return Login::form();
        }
 
        if ($a->argc == 3) {

diff --git a/mod/events.php b/mod/events.php
index d04aac3761267d05515e61d7d1d5e51a16e7b4ea..e5ebf8646531cf1e2688966a6e6171dea7928d1f 100644 (file)
--- a/mod/events.php
+++ b/mod/events.php
@@ -17,6 +17,7 @@ use Friendica\Model\Item;
 use Friendica\Model\Profile;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Temporal;
+use Friendica\Module\Login;
 
 require_once 'include/items.php';
 
@@ -193,7 +194,7 @@ function events_content(App $a)
 {
        if (!local_user()) {
                notice(L10n::t('Permission denied.') . EOL);
-               return;
+               return Login::form();
        }
 
        if ($a->argc == 1) {

diff --git a/mod/message.php b/mod/message.php
index 13ae2f75120e009dc37a97f2d64022e2876f6bf1..bb3000736aac6f7721dfb4541f6c0a53b2313c77 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -16,6 +16,7 @@ use Friendica\Model\Mail;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Temporal;
+use Friendica\Module\Login;
 
 require_once 'include/conversation.php';
 
@@ -97,7 +98,7 @@ function message_content(App $a)
 
        if (!local_user()) {
                notice(L10n::t('Permission denied.') . EOL);
-               return;
+               return Login::form();
        }
 
        $myprofile = System::baseUrl() . '/profile/' . $a->user['nickname'];

diff --git a/mod/notifications.php b/mod/notifications.php
index 3934a32357b5c9989ab355bb9a237de758e53f6a..867c7260da5550b881b33da07c534122abc6511b 100644 (file)
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -12,6 +12,7 @@ use Friendica\Core\NotificationsManager;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
+use Friendica\Module\Login;
 
 function notifications_post(App $a)
 {
@@ -65,7 +66,7 @@ function notifications_content(App $a)
 {
        if (!local_user()) {
                notice(L10n::t('Permission denied.') . EOL);
-               return;
+               return Login::form();
        }
 
        $page = defaults($_REQUEST, 'page', 1);

diff --git a/mod/profiles.php b/mod/profiles.php
index 7d0c3178cf0600831055aed9b20d906d7f4a6208..f41cb72af4ce86f0d7f5018b727137913cf5cc8f 100644 (file)
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -20,6 +20,7 @@ use Friendica\Model\Profile;
 use Friendica\Network\Probe;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Temporal;
+use Friendica\Module\Login;
 
 function profiles_init(App $a) {
 
@@ -509,7 +510,7 @@ function profiles_content(App $a) {
 
        if (! local_user()) {
                notice(L10n::t('Permission denied.') . EOL);
-               return;
+               return Login::form();
        }
 
        $o = '';

diff --git a/mod/settings.php b/mod/settings.php
index 78fa446ce0372dd0fa65a419db4286e79fd1848b..1e6ce1354e6676c04b11e49e05d706299b9b5da2 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -22,6 +22,7 @@ use Friendica\Model\User;
 use Friendica\Protocol\Email;
 use Friendica\Util\Network;
 use Friendica\Util\Temporal;
+use Friendica\Module\Login;
 
 function get_theme_config_file($theme)
 {
@@ -658,7 +659,7 @@ function settings_content(App $a)
 
        if (!local_user()) {
                //notice(L10n::t('Permission denied.') . EOL);
-               return;
+               return Login::form();
        }
 
        if (x($_SESSION, 'submanage') && intval($_SESSION['submanage'])) {

diff --git a/src/App.php b/src/App.php
index 9a09bcfce0ba8d425599c7ff735d75daa3c788b0..61d7335f1ab9e09348055bdf3eb99240a1c36337 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -11,6 +11,7 @@ use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
+use Friendica\Network\HTTPException\InternalServerErrorException;
 
 require_once 'boot.php';
 require_once 'include/dba.php';
@@ -83,6 +84,11 @@ class App
        public $stylesheets = [];
        public $footerScripts = [];
 
+       /**
+        * @var App\Mode The Mode of the Application
+        */
+       private $mode;
+
        /**
         * Register a stylesheet file path to be included in the <head> tag of every page.
         * Inclusion is done in App->initHead().
@@ -193,6 +199,8 @@ class App
                $this->callstack['rendering'] = [];
                $this->callstack['parser'] = [];
 
+               $this->mode = new App\Mode($basepath);
+
                $this->reload();
 
                set_time_limit(0);
@@ -300,6 +308,22 @@ class App
                $this->register_template_engine('Friendica\Render\FriendicaSmartyEngine');
        }
 
+       /**
+        * Returns the Mode of the Application
+        *
+        * @return App\Mode The Application Mode
+        *
+        * @throws InternalServerErrorException when the mode isn't created
+        */
+       public function getMode()
+       {
+               if (empty($this->mode)) {
+                       throw new InternalServerErrorException('Mode of the Application is not defined');
+               }
+
+               return $this->mode;
+       }
+
        /**
         * Reloads the whole app instance
         */
@@ -310,13 +334,13 @@ class App
 
                $this->loadDatabase();
 
-               App\Mode::determine($this->basepath);
+               $this->getMode()->determine($this->basepath);
 
                $this->determineUrlPath();
 
                Config::load();
 
-               if (App\Mode::has(App\Mode::DBAVAILABLE)) {
+               if ($this->getMode()->has(App\Mode::DBAVAILABLE)) {
                        Core\Addon::loadHooks();
 
                        $this->loadAddonConfig();
@@ -1402,7 +1426,7 @@ class App
         */
        public function getCurrentTheme()
        {
-               if (App\Mode::isInstall()) {
+               if ($this->getMode()->isInstall()) {
                        return '';
                }
 

diff --git a/src/App/Mode.php b/src/App/Mode.php
index 189573e3782d994afe95d684619c23a5cc3b5a80..d9f5cdbd4c5b09f79cfa1f12c0dbd9f975e81e5e 100644 (file)
--- a/src/App/Mode.php
+++ b/src/App/Mode.php
@@ -20,9 +20,19 @@ class Mode
        /***
         * @var int the mode of this Application
         *
-        * Default is 0 (= not set)
         */
-       private static $mode = 0;
+       private $mode;
+
+       /**
+        * @var string the basepath of the application
+        */
+       private $basepath;
+
+       public function __construct($basepath = '')
+       {
+               $this->basepath = $basepath;
+               $this->mode = 0;
+       }
 
        /**
         * Sets the App mode
@@ -34,34 +44,38 @@ class Mode
         * @param string $basepath the Basepath of the Application
         *
         */
-       public static function determine($basepath)
+       public function determine($basepath = null)
        {
-               self::$mode = 0;
+               if (!empty($basepath)) {
+                       $this->basepath = $basepath;
+               }
+
+               $this->mode = 0;
 
-               if (!file_exists($basepath . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'local.ini.php')
-                       && !file_exists($basepath . DIRECTORY_SEPARATOR . '.htconfig.php')) {
+               if (!file_exists($this->basepath . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'local.ini.php')
+                       && !file_exists($this->basepath . DIRECTORY_SEPARATOR . '.htconfig.php')) {
                        return;
                }
 
-               self::$mode |= Mode::LOCALCONFIGPRESENT;
+               $this->mode |= Mode::LOCALCONFIGPRESENT;
 
                if (!DBA::connected()) {
                        return;
                }
 
-               self::$mode |= Mode::DBAVAILABLE;
+               $this->mode |= Mode::DBAVAILABLE;
 
                if (DBA::fetchFirst("SHOW TABLES LIKE 'config'") === false) {
                        return;
                }
 
-               self::$mode |= Mode::DBCONFIGAVAILABLE;
+               $this->mode |= Mode::DBCONFIGAVAILABLE;
 
                if (Config::get('system', 'maintenance')) {
                        return;
                }
 
-               self::$mode |= Mode::MAINTENANCEDISABLED;
+               $this->mode |= Mode::MAINTENANCEDISABLED;
        }
 
        /**
@@ -71,9 +85,9 @@ class Mode
         *
         * @return bool returns true, if the mode is set
         */
-       public static function has($mode)
+       public function has($mode)
        {
-               return self::$mode & $mode;
+               return ($this->mode & $mode) > 0;
        }
 
 
@@ -82,10 +96,10 @@ class Mode
         *
         * @return bool
         */
-       public static function isInstall()
+       public function isInstall()
        {
-               return !self::has(Mode::LOCALCONFIGPRESENT) ||
-                       !self::has(MODE::DBCONFIGAVAILABLE);
+               return !$this->has(Mode::LOCALCONFIGPRESENT) ||
+                       !$this->has(MODE::DBCONFIGAVAILABLE);
        }
 
        /**
@@ -93,11 +107,11 @@ class Mode
         *
         * @return bool
         */
-       public static function isNormal()
+       public function isNormal()
        {
-               return self::has(Mode::LOCALCONFIGPRESENT) &&
-                       self::has(Mode::DBAVAILABLE) &&
-                       self::has(Mode::DBCONFIGAVAILABLE) &&
-                       self::has(Mode::MAINTENANCEDISABLED);
+               return $this->has(Mode::LOCALCONFIGPRESENT) &&
+                       $this->has(Mode::DBAVAILABLE) &&
+                       $this->has(Mode::DBCONFIGAVAILABLE) &&
+                       $this->has(Mode::MAINTENANCEDISABLED);
        }
 }

diff --git a/src/Core/Config.php b/src/Core/Config.php
index f2b0d12ab02979d28d04ca0a423600ffb365bfc5..a07bbd31c9130fa76ad0bd9ae8dfe808ce191498 100644 (file)
--- a/src/Core/Config.php
+++ b/src/Core/Config.php
@@ -31,7 +31,7 @@ class Config extends BaseObject
        public static function init()
        {
                // Database isn't ready or populated yet
-               if (!App\Mode::has(App\Mode::DBCONFIGAVAILABLE)) {
+               if (!self::getApp()->getMode()->has(App\Mode::DBCONFIGAVAILABLE)) {
                        return;
                }
 
@@ -55,7 +55,7 @@ class Config extends BaseObject
        public static function load($family = "config")
        {
                // Database isn't ready or populated yet
-               if (!App\Mode::has(App\Mode::DBCONFIGAVAILABLE)) {
+               if (!self::getApp()->getMode()->has(App\Mode::DBCONFIGAVAILABLE)) {
                        return;
                }
 
@@ -88,7 +88,7 @@ class Config extends BaseObject
        public static function get($family, $key, $default_value = null, $refresh = false)
        {
                // Database isn't ready or populated yet, fallback to file config
-               if (!App\Mode::has(App\Mode::DBCONFIGAVAILABLE)) {
+               if (!self::getApp()->getMode()->has(App\Mode::DBCONFIGAVAILABLE)) {
                        return self::getApp()->getConfigValue($family, $key, $default_value);
                }
 
@@ -116,7 +116,7 @@ class Config extends BaseObject
        public static function set($family, $key, $value)
        {
                // Database isn't ready or populated yet
-               if (!App\Mode::has(App\Mode::DBCONFIGAVAILABLE)) {
+               if (!self::getApp()->getMode()->has(App\Mode::DBCONFIGAVAILABLE)) {
                        return false;
                }
 
@@ -141,7 +141,7 @@ class Config extends BaseObject
        public static function delete($family, $key)
        {
                // Database isn't ready or populated yet
-               if (!App\Mode::has(App\Mode::DBCONFIGAVAILABLE)) {
+               if (!self::getApp()->getMode()->has(App\Mode::DBCONFIGAVAILABLE)) {
                        return false;
                }
 

diff --git a/src/Core/Console/ArchiveContact.php b/src/Core/Console/ArchiveContact.php
index 8a6bc1f7bf5312733c6659c861546010d9f5af16..481037a5f6a2d6e6696461f0e85bb45400002964 100644 (file)
--- a/src/Core/Console/ArchiveContact.php
+++ b/src/Core/Console/ArchiveContact.php
@@ -39,7 +39,7 @@ HELP;
 
        protected function doExecute()
        {
-               $a = get_app();
+               $a = \Friendica\BaseObject::getApp();
 
                if ($this->getOption('v')) {
                        $this->out('Class: ' . __CLASS__);
@@ -56,7 +56,7 @@ HELP;
                        throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments');
                }
 
-               if (App\Mode::isInstall()) {
+               if ($a->getMode()->isInstall()) {
                        throw new RuntimeException('Friendica isn\'t properly installed yet.');
                }
 

diff --git a/src/Core/Console/Cache.php b/src/Core/Console/Cache.php
index 2d3508894a4007b91a1de13c44d8a5cb434d18b9..af0d771307ffd31bdf6496a72becf39e976feeb9 100644 (file)
--- a/src/Core/Console/Cache.php
+++ b/src/Core/Console/Cache.php
@@ -65,7 +65,7 @@ HELP;
                        $this->out('Options: ' . var_export($this->options, true));
                }
 
-               if (!App\Mode::has(App\Mode::DBCONFIGAVAILABLE)) {
+               if ($a->getMode()->has(App\Mode::DBCONFIGAVAILABLE)) {
                        $this->out('Database isn\'t ready or populated yet, database cache won\'t be available');
                }
 

diff --git a/src/Core/Console/Config.php b/src/Core/Console/Config.php
index d67f6cbb966dc42416fb1b31581b173ce64e9204..3b92d5a784a5e7aa69fb8842d94592fb3a054664 100644 (file)
--- a/src/Core/Console/Config.php
+++ b/src/Core/Console/Config.php
@@ -84,7 +84,7 @@ HELP;
                        throw new CommandArgsException('Too many arguments');
                }
 
-               if (!App\Mode::has(App\Mode::DBCONFIGAVAILABLE)) {
+               if (!$a->getMode()->has(App\Mode::DBCONFIGAVAILABLE)) {
                        $this->out('Database isn\'t ready or populated yet, showing file config only');
                }
 
@@ -143,7 +143,7 @@ HELP;
                if (count($this->args) == 0) {
                        Core\Config::load();
 
-                       if (Core\Config::get('system', 'config_adapter') == 'jit' && App\Mode::has(App\Mode::DBCONFIGAVAILABLE)) {
+                       if (Core\Config::get('system', 'config_adapter') == 'jit' && $a->getMode()->has(App\Mode::DBCONFIGAVAILABLE)) {
                                $this->out('Warning: The JIT (Just In Time) Config adapter doesn\'t support loading the entire configuration, showing file config only');
                        }
 

diff --git a/src/Core/Console/GlobalCommunityBlock.php b/src/Core/Console/GlobalCommunityBlock.php
index dbab4ff02c4dca1beeb9b0cab0690ac63d575d4a..2a19a9e7f3f0343a3b79da58ec189e65b0dbb0c3 100644 (file)
--- a/src/Core/Console/GlobalCommunityBlock.php
+++ b/src/Core/Console/GlobalCommunityBlock.php
@@ -56,7 +56,7 @@ HELP;
                        throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments');
                }
 
-               if (App\Mode::isInstall()) {
+               if ($a->getMode()->isInstall()) {
                        throw new \RuntimeException('Database isn\'t ready or populated yet');
                }
 

diff --git a/src/Core/Console/GlobalCommunitySilence.php b/src/Core/Console/GlobalCommunitySilence.php
index 0dce00a7b176de83684b6316b7964456e6b7f9c9..3ea6b415544b6a2f94105d5d15320d9ef43aa2c2 100644 (file)
--- a/src/Core/Console/GlobalCommunitySilence.php
+++ b/src/Core/Console/GlobalCommunitySilence.php
@@ -65,7 +65,7 @@ HELP;
                        throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments');
                }
 
-               if (App\Mode::isInstall()) {
+               if ($a->getMode()->isInstall()) {
                        throw new RuntimeException('Database isn\'t ready or populated yet');
                }
 

diff --git a/src/Core/Console/Maintenance.php b/src/Core/Console/Maintenance.php
index d693cb6e89213641abafcbcc37cfcabecd36510e..212edabcc1db21a9965203875fe9d76097fbf689 100644 (file)
--- a/src/Core/Console/Maintenance.php
+++ b/src/Core/Console/Maintenance.php
@@ -47,7 +47,7 @@ HELP;
 
        protected function doExecute()
        {
-               $a = get_app();
+               $a = \Friendica\BaseObject::getApp();
 
                if ($this->getOption('v')) {
                        $this->out('Class: ' . __CLASS__);
@@ -64,7 +64,7 @@ HELP;
                        throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments');
                }
 
-               if (App\Mode::isInstall()) {
+               if ($a->getMode()->isInstall()) {
                        throw new \RuntimeException('Database isn\'t ready or populated yet');
                }
 

diff --git a/src/Core/Console/NewPassword.php b/src/Core/Console/NewPassword.php
index 56f3ae7c98eb9757032b95ee88d50043e1759d3f..54d10af2077768edf4735a787efd3175ab6b9ef9 100644 (file)
--- a/src/Core/Console/NewPassword.php
+++ b/src/Core/Console/NewPassword.php
@@ -57,7 +57,7 @@ HELP;
                        throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments');
                }
 
-               if (App\Mode::isInstall()) {
+               if ($a->getMode()->isInstall()) {
                        throw new RuntimeException('Database isn\'t ready or populated yet');
                }
 

diff --git a/src/Core/Console/PostUpdate.php b/src/Core/Console/PostUpdate.php
index a77aae39de58a7891eab17de70e31ad01d66e8ff..1215591a20ebadf1ff66606889d04beee4b97149 100644 (file)
--- a/src/Core/Console/PostUpdate.php
+++ b/src/Core/Console/PostUpdate.php
@@ -33,7 +33,7 @@ HELP;
 
        protected function doExecute()
        {
-               $a = get_app();
+               $a = \Friendica\BaseObject::getApp();
 
                if ($this->getOption($this->helpOptions)) {
                        $this->out($this->getHelp());
@@ -50,7 +50,7 @@ HELP;
                        return 0;
                }
 
-               if (App\Mode::isInstall()) {
+               if ($a->getMode()->isInstall()) {
                        throw new \RuntimeException('Database isn\'t ready or populated yet');
                }
 

diff --git a/src/Core/PConfig.php b/src/Core/PConfig.php
index 3c48a568cb08de1d3d45d93fcc8ea123a712acc8..2080f716ceb5cfac2b329108cd004535210ecfa3 100644 (file)
--- a/src/Core/PConfig.php
+++ b/src/Core/PConfig.php
@@ -29,12 +29,14 @@ class PConfig extends BaseObject
 
        public static function init($uid)
        {
+               $a = self::getApp();
+
                // Database isn't ready or populated yet
-               if (!App\Mode::has(App\Mode::DBCONFIGAVAILABLE)) {
+               if (!$a->getMode()->has(App\Mode::DBCONFIGAVAILABLE)) {
                        return;
                }
 
-               if (self::getApp()->getConfigValue('system', 'config_adapter') == 'preload') {
+               if ($a->getConfigValue('system', 'config_adapter') == 'preload') {
                        self::$adapter = new Config\PreloadPConfigAdapter($uid);
                } else {
                        self::$adapter = new Config\JITPConfigAdapter($uid);
@@ -55,7 +57,7 @@ class PConfig extends BaseObject
        public static function load($uid, $family)
        {
                // Database isn't ready or populated yet
-               if (!App\Mode::has(App\Mode::DBCONFIGAVAILABLE)) {
+               if (!self::getApp()->getMode()->has(App\Mode::DBCONFIGAVAILABLE)) {
                        return;
                }
 
@@ -84,7 +86,7 @@ class PConfig extends BaseObject
        public static function get($uid, $family, $key, $default_value = null, $refresh = false)
        {
                // Database isn't ready or populated yet
-               if (!App\Mode::has(App\Mode::DBCONFIGAVAILABLE)) {
+               if (!self::getApp()->getMode()->has(App\Mode::DBCONFIGAVAILABLE)) {
                        return;
                }
 
@@ -113,7 +115,7 @@ class PConfig extends BaseObject
        public static function set($uid, $family, $key, $value)
        {
                // Database isn't ready or populated yet
-               if (!App\Mode::has(App\Mode::DBCONFIGAVAILABLE)) {
+               if (!self::getApp()->getMode()->has(App\Mode::DBCONFIGAVAILABLE)) {
                        return false;
                }
 
@@ -139,7 +141,7 @@ class PConfig extends BaseObject
        public static function delete($uid, $family, $key)
        {
                // Database isn't ready or populated yet
-               if (!App\Mode::has(App\Mode::DBCONFIGAVAILABLE)) {
+               if (!self::getApp()->getMode()->has(App\Mode::DBCONFIGAVAILABLE)) {
                        return false;
                }
 

diff --git a/src/Module/Login.php b/src/Module/Login.php
index ad5d5ad0b6acbc66d5e6d9eb6a2294a54d3010b4..f1f728ae900a0b197dae34419d59d4514db5e2b6 100644 (file)
--- a/src/Module/Login.php
+++ b/src/Module/Login.php
@@ -47,7 +47,10 @@ class Login extends BaseModule
 
        public static function post()
        {
+               $return_url = $_SESSION['return_url'];
                session_unset();
+               $_SESSION['return_url'] = $return_url;
+               
                // OpenId Login
                if (
                        empty($_POST['password'])

diff --git a/tests/ApiTest.php b/tests/ApiTest.php
index 941ed96bf8b6078ea00443c4138e83ed9f7984d1..cbc6f7e0b4412a0e196e78259bd2c2d56cb5d8a8 100644 (file)
--- a/tests/ApiTest.php
+++ b/tests/ApiTest.php
@@ -24,12 +24,11 @@ class ApiTest extends DatabaseTest
        /**
         * Create variables used by tests.
         */
-       protected function setUp()
+       public function setUp()
        {
                parent::setUp();
 
-               // Reusable App object
-               $this->app = BaseObject::getApp();
+               require_once __DIR__.'/../include/api.php';
 
                // User data that the test database is populated with
                $this->selfUser = [

diff --git a/tests/DatabaseTest.php b/tests/DatabaseTest.php
index 9844699b069e86b885a0f3eab393042956648adc..52ca3f68d37f098df050af42e878e6be6f563881 100644 (file)
--- a/tests/DatabaseTest.php
+++ b/tests/DatabaseTest.php
@@ -5,6 +5,8 @@
 
 namespace Friendica\Test;
 
+use Friendica\BaseObject;
+use Friendica\Core\Config;
 use Friendica\Database\DBA;
 use PHPUnit\DbUnit\DataSet\YamlDataSet;
 use PHPUnit\DbUnit\TestCaseTrait;
@@ -16,8 +18,15 @@ use PHPUnit_Extensions_Database_DB_IDatabaseConnection;
  */
 abstract class DatabaseTest extends TestCase
 {
+       public function setUp()
+       {
+               // Reusable App object
+               $this->app = BaseObject::getApp();
 
-       use TestCaseTrait;
+               Config::set('system', 'url', 'http://localhost');
+               Config::set('system', 'hostname', 'localhost');
+               Config::set('system', 'worker_dont_fork', true);
+       }
 
        /**
         * Get database connection.

diff --git a/tests/Util/VFSTrait.php b/tests/Util/VFSTrait.php
new file mode 100644 (file)
index 0000000..b0e7a3a
--- /dev/null
+++ b/tests/Util/VFSTrait.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace Friendica\Test\Util;
+
+
+use org\bovigo\vfs\vfsStream;
+use org\bovigo\vfs\vfsStreamDirectory;
+
+trait VFSTrait
+{
+       /**
+        * @var vfsStreamDirectory The Stream Directory
+        */
+       protected $root;
+
+       protected function setUpVfsDir() {
+               // the used directories inside the App class
+               $structure = [
+                       'config' => [],
+                       'bin' => []
+               ];
+
+               // create a virtual directory and copy all needed files and folders to it
+               $this->root = vfsStream::setup('friendica', null, $structure);
+
+               $this->setConfigFile('config.ini.php');
+               $this->setConfigFile('settings.ini.php');
+               $this->setConfigFile('local.ini.php');
+               $this->setConfigFile('dbstructure.json');
+       }
+
+       protected function setConfigFile($filename)
+       {
+               $file = dirname(__DIR__) . DIRECTORY_SEPARATOR .
+                       '..' . DIRECTORY_SEPARATOR .
+                       'config' . DIRECTORY_SEPARATOR .
+                       $filename;
+
+               if (file_exists($file)) {
+                       vfsStream::newFile($filename)
+                               ->at($this->root->getChild('config'))
+                               ->setContent(file_get_contents($file));
+               }
+       }
+
+       protected function delConfigFile($filename)
+       {
+               if ($this->root->hasChild('config/' . $filename)) {
+                       $this->root->removeChild('config/' . $filename);
+               }
+       }
+}

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 4bc3e932f0118529faae6ca0d3560985603d2ccf..ada2b1a0ec6852af6cc387841ef464ce51077e1d 100644 (file)
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -3,20 +3,10 @@
  * This file is loaded by PHPUnit before any test.
  */
 
-use Friendica\App;
 use PHPUnit\DbUnit\DataSet\YamlDataSet;
 use PHPUnit\DbUnit\TestCaseTrait;
 use PHPUnit\Framework\TestCase;
 
-require_once __DIR__.'/../boot.php';
-require_once __DIR__.'/../include/api.php';
-
-new App(dirname(__DIR__));
-
-\Friendica\Core\Config::set('system', 'url', 'http://localhost');
-\Friendica\Core\Config::set('system', 'hostname', 'localhost');
-\Friendica\Core\Config::set('system', 'worker_dont_fork', true);
-
 // Backward compatibility
 if (!class_exists(TestCase::class)) {
        class_alias(PHPUnit_Framework_TestCase::class, TestCase::class);

diff --git a/tests/src/App/ModeTest.php b/tests/src/App/ModeTest.php
new file mode 100644 (file)
index 0000000..bac553e
--- /dev/null
+++ b/tests/src/App/ModeTest.php
@@ -0,0 +1,139 @@
+<?php
+
+namespace Friendica\Test\src\App;
+
+use Friendica\App\Mode;
+use Friendica\Test\Util\VFSTrait;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ */
+class ModeTest extends TestCase
+{
+       use VFSTrait;
+
+       public function setUp()
+       {
+               parent::setUp(); // TODO: Change the autogenerated stub
+
+               $this->setUpVfsDir();
+       }
+
+       public function testItEmpty()
+       {
+               $mode = new Mode($this->root->url());
+               $this->assertTrue($mode->isInstall());
+               $this->assertFalse($mode->isNormal());
+       }
+
+       public function testWithoutConfig()
+       {
+               $mode = new Mode($this->root->url());
+
+               $this->assertTrue($this->root->hasChild('config/local.ini.php'));
+
+               $this->delConfigFile('local.ini.php');
+
+               $this->assertFalse($this->root->hasChild('config/local.ini.php'));
+
+               $mode->determine();
+
+               $this->assertTrue($mode->isInstall());
+               $this->assertFalse($mode->isNormal());
+
+               $this->assertFalse($mode->has(Mode::LOCALCONFIGPRESENT));
+       }
+
+       public function testWithoutDatabase()
+       {
+               $dba =  \Mockery::mock('alias:Friendica\Database\DBA');
+               $dba
+                       ->shouldReceive('connected')
+                       ->andReturn(false);
+
+               $mode = new Mode($this->root->url());
+               $mode->determine();
+
+               $this->assertFalse($mode->isNormal());
+               $this->assertTrue($mode->isInstall());
+
+               $this->assertTrue($mode->has(Mode::LOCALCONFIGPRESENT));
+               $this->assertFalse($mode->has(Mode::DBAVAILABLE));
+       }
+
+       public function testWithoutDatabaseSetup()
+       {
+               $dba =  \Mockery::mock('alias:Friendica\Database\DBA');
+               $dba
+                       ->shouldReceive('connected')
+                       ->andReturn(true);
+               $dba
+                       ->shouldReceive('fetchFirst')
+                       ->with('SHOW TABLES LIKE \'config\'')
+                       ->andReturn(false);
+
+               $mode = new Mode($this->root->url());
+               $mode->determine();
+
+               $this->assertFalse($mode->isNormal());
+               $this->assertTrue($mode->isInstall());
+
+               $this->assertTrue($mode->has(Mode::LOCALCONFIGPRESENT));
+       }
+
+       public function testWithMaintenanceMode()
+       {
+               $dba =  \Mockery::mock('alias:Friendica\Database\DBA');
+               $dba
+                       ->shouldReceive('connected')
+                       ->andReturn(true);
+               $dba
+                       ->shouldReceive('fetchFirst')
+                       ->with('SHOW TABLES LIKE \'config\'')
+                       ->andReturn(true);
+
+               $conf = \Mockery::mock('alias:Friendica\Core\Config');
+               $conf
+                       ->shouldReceive('get')
+                       ->with('system', 'maintenance')
+                       ->andReturn(true);
+
+               $mode = new Mode($this->root->url());
+               $mode->determine();
+
+               $this->assertFalse($mode->isNormal());
+               $this->assertFalse($mode->isInstall());
+
+               $this->assertTrue($mode->has(Mode::DBCONFIGAVAILABLE));
+               $this->assertFalse($mode->has(Mode::MAINTENANCEDISABLED));
+       }
+
+       public function testNormalMode()
+       {
+               $dba =  \Mockery::mock('alias:Friendica\Database\DBA');
+               $dba
+                       ->shouldReceive('connected')
+                       ->andReturn(true);
+               $dba
+                       ->shouldReceive('fetchFirst')
+                       ->with('SHOW TABLES LIKE \'config\'')
+                       ->andReturn(true);
+
+               $conf = \Mockery::mock('alias:Friendica\Core\Config');
+               $conf
+                       ->shouldReceive('get')
+                       ->with('system', 'maintenance')
+                       ->andReturn(false);
+
+               $mode = new Mode($this->root->url());
+               $mode->determine();
+
+               $this->assertTrue($mode->isNormal());
+               $this->assertFalse($mode->isInstall());
+
+               $this->assertTrue($mode->has(Mode::DBCONFIGAVAILABLE));
+               $this->assertTrue($mode->has(Mode::MAINTENANCEDISABLED));
+       }
+}

diff --git a/tests/src/Core/Console/ConsoleTest.php b/tests/src/Core/Console/ConsoleTest.php
index 0cc5c633591b1825f90872776bfa447b078ea522..40f864e3b97114e653abdaec17ff6c962bbfd1cd 100644 (file)
--- a/tests/src/Core/Console/ConsoleTest.php
+++ b/tests/src/Core/Console/ConsoleTest.php
@@ -6,12 +6,15 @@ use Friendica\App;
 use Friendica\BaseObject;
 use Friendica\Database\DBA;
 use Friendica\Test\Util\Intercept;
+use Friendica\Test\Util\VFSTrait;
 use org\bovigo\vfs\vfsStream;
 use org\bovigo\vfs\vfsStreamDirectory;
 use PHPUnit\Framework\TestCase;
 
 abstract class ConsoleTest extends TestCase
 {
+       use VFSTrait;
+
        /**
         * @var MultiUseConsole Extension of the basic Friendica Console for testing purpose
         */
@@ -21,11 +24,6 @@ abstract class ConsoleTest extends TestCase
         */
        protected $app;
 
-       /**
-        * @var vfsStreamDirectory The Stream Directory
-        */
-       protected $root;
-
        protected $stdout;
 
        protected function setUp()
@@ -40,6 +38,11 @@ abstract class ConsoleTest extends TestCase
 
                $this->setUpVfsDir();
 
+               // fake console.php for setting an executable
+               vfsStream::newFile('console.php')
+                       ->at($this->root->getChild('bin'))
+                       ->setContent('<? php');
+
                // Reusable App object
                $this->app = new App($this->root->url());
                BaseObject::setApp($this->app);
@@ -67,41 +70,4 @@ abstract class ConsoleTest extends TestCase
        protected function getExecutablePath() {
                return $this->root->getChild('bin' . DIRECTORY_SEPARATOR . 'console.php')->url();
        }
-
-       private function setUpVfsDir() {
-               // the used directories inside the App class
-               $structure = [
-                       'config' => [],
-                       'bin' => []
-               ];
-
-               // create a virtual directory and copy all needed files and folders to it
-               $this->root = vfsStream::setup('friendica', null, $structure);
-
-               $this->setConfigFile('config.ini.php');
-               $this->setConfigFile('settings.ini.php');
-               $this->setConfigFile('local.ini.php');
-               $this->setConfigFile('dbstructure.json');
-
-               // fake console.php for setting an executable
-               vfsStream::newFile('console.php')
-                       ->at($this->root->getChild('bin'))
-                       ->setContent('<? php');
-       }
-
-       private function setConfigFile($filename)
-       {
-               $file = dirname(__DIR__) . DIRECTORY_SEPARATOR .
-                       '..' . DIRECTORY_SEPARATOR .
-                       '..' . DIRECTORY_SEPARATOR .
-                       '..' . DIRECTORY_SEPARATOR .
-                       'config' . DIRECTORY_SEPARATOR .
-                       $filename;
-
-               if (file_exists($file)) {
-                       vfsStream::newFile($filename)
-                               ->at($this->root->getChild('config'))
-                               ->setContent(file_get_contents($file));
-               }
-       }
 }