Move Composer autoload require out of boot.php

diff --git a/bin/auth_ejabberd.php b/bin/auth_ejabberd.php
index fc57a742047de72bb3c5df03e573c1eeffdfea8b..e8a7b4963f629b8b9c31c4ca09c5d5e866776171 100755 (executable)
--- a/bin/auth_ejabberd.php
+++ b/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__));
 

diff --git a/bin/console.php b/bin/console.php
index 9c25279d37222a77acb62a186b556761251dd6f6..c39df953f287b0873748816638cd09475b82c5da 100755 (executable)
--- a/bin/console.php
+++ b/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);

diff --git a/bin/daemon.php b/bin/daemon.php
index de76c99efdfe39ef0f40817c8eb96e5d660626ef..e60e32b19ec0900caf57450c0d7c09794d69d2d3 100755 (executable)
--- a/bin/daemon.php
+++ b/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__));
 

diff --git a/bin/worker.php b/bin/worker.php
index 9ae2f68b3e6ae8a0fbe994b6fe47bf834aee2bb2..78b6da5857343598d81ce0825196d40fc4004b44 100755 (executable)
--- a/bin/worker.php
+++ b/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__));
 

diff --git a/boot.php b/boot.php
index d44cf24bee20f3662b72c9158d466901fa038fe4..eb8176b83de8bb936ad51a87cee85212456438aa 100644 (file)
--- a/boot.php
+++ b/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;

diff --git a/index.php b/index.php
index 43bfd3800e684429dcf82196d3b5f76d9cf96220..a7f5e709c721e6bb036c3be8ddb4631cc768bb01 100644 (file)
--- a/index.php
+++ b/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();