Merge pull request #7288 from annando/fix-search

[friendica.git/.git] / src / BaseObject.php

diff --git a/src/BaseObject.php b/src/BaseObject.php
index 5adfe09..9a2d064 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
@@ -13,6 +15,9 @@ require_once 'boot.php';
  */
 class BaseObject
 {
+       /**
+        * @var App
+        */
        private static $app = null;
 
        /**
@@ -21,26 +26,25 @@ class BaseObject
         * Same as get_app from boot.php
         *
         * @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;
        }