Set BaseObject::setApp in App

diff --git a/bin/auth_ejabberd.php b/bin/auth_ejabberd.php
index 06d8488df84d82d64813deb2037b247bf5a0d2e1..10b9d874f1f1825b7a242c107728bd9d218df2ba 100755 (executable)
--- a/bin/auth_ejabberd.php
+++ b/bin/auth_ejabberd.php
@@ -33,7 +33,6 @@
  */
 
 use Friendica\App;
-use Friendica\BaseObject;
 use Friendica\Core\Config;
 use Friendica\Util\ExAuth;
 
@@ -55,7 +54,6 @@ require_once "boot.php";
 require_once "include/dba.php";
 
 $a = new App(dirname(__DIR__));
-BaseObject::setApp($a);
 
 @include ".htconfig.php";
 dba::connect($db_host, $db_user, $db_pass, $db_data);
@@ -63,4 +61,4 @@ unset($db_host, $db_user, $db_pass, $db_data);
 
 $oAuth = new ExAuth();
 
-$oAuth->readStdin();
+$oAuth->readStdin();
\ No newline at end of file

diff --git a/bin/daemon.php b/bin/daemon.php
index 1abb70146207e9c1d53b99756244068b055adb5f..acb4a2c68286296c2f4d6263cb8193e55af15c82 100755 (executable)
--- a/bin/daemon.php
+++ b/bin/daemon.php
@@ -8,7 +8,6 @@
  */
 
 use Friendica\App;
-use Friendica\BaseObject;
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
 
@@ -28,7 +27,6 @@ require_once "boot.php";
 require_once "include/dba.php";
 
 $a = new App(dirname(__DIR__));
-BaseObject::setApp($a);
 
 require_once ".htconfig.php";
 dba::connect($db_host, $db_user, $db_pass, $db_data);

diff --git a/bin/worker.php b/bin/worker.php
index 44980961cf0d64aab87d4d155abcfcbb8d33fefe..77c85b1d58693653ab2e2f84c4b0e9479d85c91c 100755 (executable)
--- a/bin/worker.php
+++ b/bin/worker.php
@@ -27,7 +27,6 @@ require_once "boot.php";
 require_once "include/dba.php";
 
 $a = new App(dirname(__DIR__));
-BaseObject::setApp($a);
 
 require_once ".htconfig.php";
 dba::connect($db_host, $db_user, $db_pass, $db_data);

diff --git a/boot.php b/boot.php
index bececa9470f19a2a6601c91339b8629d70d7b0c9..728f36b16e56581ca7e0adb32a61733cfba07aed 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -508,14 +508,7 @@ if (!defined('CURLE_OPERATION_TIMEDOUT')) {
  */
 function get_app()
 {
-       global $a;
-
-       if (empty($a)) {
-               $a = new App(dirname(__DIR__));
-               BaseObject::setApp($a);
-       }
-
-       return $a;
+       return BaseObject::getApp();
 }
 
 /**

diff --git a/index.php b/index.php
index d4e263bcc0ae9db7672b747b9720a45628b8fb4f..d83e202d2ac6f125498c1973520aef9340237bf3 100644 (file)
--- a/index.php
+++ b/index.php
@@ -9,7 +9,6 @@
  */
 
 use Friendica\App;
-use Friendica\BaseObject;
 use Friendica\Content\Nav;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
@@ -25,7 +24,6 @@ use Friendica\Module\Login;
 require_once 'boot.php';
 
 $a = new App(__DIR__);
-BaseObject::setApp($a);
 
 // We assume that the index.php is called by a frontend process
 // The value is set to "true" by default in boot.php

diff --git a/src/App.php b/src/App.php
index 652b048260bf835e0006e076c96ead8e17e8f27b..17cfd3eefcc88c79aa86f72d5cac7db0f6f8ce03 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -139,6 +139,8 @@ class App
                        throw new Exception('Basepath ' . $basepath . ' isn\'t usable.');
                }
 
+               BaseObject::setApp($this);
+
                $this->basepath = rtrim($basepath, DIRECTORY_SEPARATOR);
 
                $this->determineUrlPath();

diff --git a/src/BaseObject.php b/src/BaseObject.php
index 5adfe096d7dac1df67b1c1b481e1cb90e8071533..6b64daccf0d8dbbd3bc47d75cd7964db0fbc8e28 100644 (file)
--- a/src/BaseObject.php
+++ b/src/BaseObject.php
@@ -24,12 +24,10 @@ class BaseObject
         */
        public static function getApp()
        {
-               if (self::$app) {
-                       return self::$app;
+               if (empty(self::$app)) {
+                       self::$app = new App(dirname(__DIR__));
                }
 
-               self::$app = get_app();
-
                return self::$app;
        }
 
@@ -40,7 +38,7 @@ class BaseObject
         *
         * @return void
         */
-       public static function setApp($app)
+       public static function setApp(App $app)
        {
                self::$app = $app;
        }