Moved the Composer autoload to start.php

opulencephp · Oct 23, 2017 · f5dd19e · f5dd19e
1 parent c1afe22
commit f5dd19e
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 8 deletions.
diff --git a/bootstrap/console/start.php b/bootstrap/console/start.php
@@ -26,6 +26,13 @@
  */
 $paths = require_once __DIR__ . '/../../config/paths.php';
 
+/**
+ * ----------------------------------------------------------
+ * Autoload your dependencies
+ * ----------------------------------------------------------
+ */
+require "{$paths['vendor']}/autoload.php";
+
 /**
  * ----------------------------------------------------------
  * Set up the environment

diff --git a/bootstrap/http/start.php b/bootstrap/http/start.php
@@ -27,6 +27,13 @@
  */
 $paths = require_once __DIR__ . '/../../config/paths.php';
 
+/**
+ * ----------------------------------------------------------
+ * Autoload your dependencies
+ * ----------------------------------------------------------
+ */
+require "{$paths['vendor']}/autoload.php";
+
 /**
  * ----------------------------------------------------------
  * Set up the environment

diff --git a/config/paths.php b/config/paths.php
@@ -13,7 +13,7 @@
  * Define the list of paths needed by this application
  * ----------------------------------------------------------
  */
-$paths = [
+return [
     /**
      * ----------------------------------------------------------
      * Configs
@@ -149,8 +149,3 @@
     'views.compiled' => realpath(__DIR__ . '/../tmp/framework/http/views'),
     'views.raw' => realpath(__DIR__ . '/../resources/views')
 ];
-
-// Get the autoloader
-require "{$paths['vendor']}/autoload.php";
-
-return $paths;
diff --git a/tests/src/Application/Console/IntegrationTestCase.php b/tests/src/Application/Console/IntegrationTestCase.php
@@ -29,7 +29,7 @@ class IntegrationTestCase extends BaseIntegrationTestCase
      */
     public function setUp()
     {
-        require __DIR__ . '/../../../../config/paths.php';
+        $paths = require __DIR__ . '/../../../../config/paths.php';
         require __DIR__ . '/../../../../config/environment.php';
         require __DIR__ . '/../../../../config/application.php';
         /** @var IContainer $container */

diff --git a/tests/src/Application/Http/IntegrationTestCase.php b/tests/src/Application/Http/IntegrationTestCase.php
@@ -36,7 +36,7 @@ class IntegrationTestCase extends BaseIntegrationTestCase
      */
     public function setUp()
     {
-        require __DIR__ . '/../../../../config/paths.php';
+        $paths = require __DIR__ . '/../../../../config/paths.php';
         require __DIR__ . '/../../../../config/environment.php';
         /** @var LoggerInterface $logger */
         /** @var IExceptionRenderer $exceptionRenderer */