Browse Source

Set BaseObject::setApp in App

tags/2018.09
Hypolite Petovan 2 years ago
parent
commit
decfc553f7
7 changed files with 7 additions and 21 deletions
  1. +1
    -3
      bin/auth_ejabberd.php
  2. +0
    -2
      bin/daemon.php
  3. +0
    -1
      bin/worker.php
  4. +1
    -8
      boot.php
  5. +0
    -2
      index.php
  6. +2
    -0
      src/App.php
  7. +3
    -5
      src/BaseObject.php

+ 1
- 3
bin/auth_ejabberd.php View File

@@ -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();

+ 0
- 2
bin/daemon.php View File

@@ -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);


+ 0
- 1
bin/worker.php View File

@@ -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);


+ 1
- 8
boot.php View File

@@ -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();
}

/**


+ 0
- 2
index.php View File

@@ -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


+ 2
- 0
src/App.php View File

@@ -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();


+ 3
- 5
src/BaseObject.php View File

@@ -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;
}


Loading…
Cancel
Save