Merge pull request #6987 from tobiasd/20190408-dbupdateemail

[friendica.git] / src / BaseObject.php

diff --git a/src/BaseObject.php b/src/BaseObject.php
index 01957164c10bd664fbd536b2f6c0680b5af8e9c9..7e90478a9d613a378bf28dace96144a9b38f94b5 100644 (file)
--- a/src/BaseObject.php
+++ b/src/BaseObject.php
@@ -4,7 +4,9 @@
  */
 namespace Friendica;
 
-require_once 'boot.php';
+require_once __DIR__ . '/../boot.php';
+
+use Friendica\Network\HTTPException\InternalServerErrorException;
 
 /**
  * Basic object
@@ -20,27 +22,26 @@ class BaseObject
         *
         * Same as get_app from boot.php
         *
-        * @return object
+        * @return App
+        * @throws \Exception
         */
        public static function getApp()
        {
-               if (self::$app) {
-                       return self::$app;
+               if (empty(self::$app)) {
+                       throw new InternalServerErrorException('App isn\'t initialized.');
                }
 
-               self::$app = get_app();
-
                return self::$app;
        }
 
        /**
         * Set the app
         *
-        * @param object $app App
+        * @param App $app App
         *
         * @return void
         */
-       public static function setApp($app)
+       public static function setApp(App $app)
        {
                self::$app = $app;
        }