Browse Source

Move Composer autoload require out of boot.php

pull/6315/head
Hypolite Petovan 3 years ago
parent
commit
ed7bada71e
  1. 2
      bin/auth_ejabberd.php
  2. 2
      bin/console.php
  3. 2
      bin/daemon.php
  4. 2
      bin/worker.php
  5. 2
      boot.php
  6. 6
      index.php

2
bin/auth_ejabberd.php

@ -49,7 +49,7 @@ $directory = realpath($directory . DIRECTORY_SEPARATOR . "..");
chdir($directory);
require_once "boot.php";
require dirname(__DIR__) . '/vendor/autoload.php';
$a = new App(dirname(__DIR__));

2
bin/console.php

@ -1,7 +1,7 @@
#!/usr/bin/env php
<?php
include_once dirname(__DIR__) . '/boot.php';
require dirname(__DIR__) . '/vendor/autoload.php';
$a = new Friendica\App(dirname(__DIR__));
\Friendica\BaseObject::setApp($a);

2
bin/daemon.php

@ -30,7 +30,7 @@ if (!file_exists("boot.php") && (sizeof($_SERVER["argv"]) != 0)) {
chdir($directory);
}
require_once "boot.php";
require dirname(__DIR__) . '/vendor/autoload.php';
$a = new App(dirname(__DIR__));

2
bin/worker.php

@ -26,7 +26,7 @@ if (!file_exists("boot.php") && (sizeof($_SERVER["argv"]) != 0)) {
chdir($directory);
}
require_once "boot.php";
require dirname(__DIR__) . '/vendor/autoload.php';
$a = new App(dirname(__DIR__));

2
boot.php

@ -17,8 +17,6 @@
* easily as email does today.
*/
require_once __DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
use Friendica\App;
use Friendica\BaseObject;
use Friendica\Core\Addon;

6
index.php

@ -4,12 +4,10 @@
* Friendica
*/
use Friendica\App;
require_once 'boot.php';
require dirname(__DIR__) . '/vendor/autoload.php';
// We assume that the index.php is called by a frontend process
// The value is set to "true" by default in App
$a = new App(__DIR__, false);
$a = new Friendica\App(__DIR__, false);
$a->runFrontend();
Loading…
Cancel
Save