Remove Startup class

odan · Oct 6, 2019 · e022b48 · e022b48
1 parent 1b8a82f
commit e022b48
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 36 deletions.
diff --git a/bin/console.php b/bin/console.php
@@ -8,9 +8,7 @@
     exit (1);
 }
 
-require_once __DIR__ . '/../vendor/autoload.php';
-
-$container = \App\Startup::boostrap()->getContainer();
+$container = (require __DIR__ . '/../config/bootstrap.php')->ge;
 
 $commands = (array)$container->get(Configuration::class)->get('commands');
 $application = new Application();

diff --git a/config/phinx.php b/config/phinx.php
@@ -1,9 +1,8 @@
 <?php
 
-use App\Startup;
 use App\Utility\Configuration;
 
-$app = Startup::boostrap();
+$app = require __DIR__ . '/../config/bootstrap.php';
 
 $container = $app->getContainer();
 $pdo = $container->get(PDO::class);

diff --git a/public/index.php b/public/index.php
@@ -1,7 +1,3 @@
 <?php
 
-use App\Startup;
-
-require_once __DIR__ . '/../vendor/autoload.php';
-
-Startup::boostrap()->run();
+(require __DIR__ . '/../config/bootstrap.php')->run();
diff --git a/src/Startup.php b/src/Startup.php
diff --git a/tests/TestCase/ContainerTestTrait.php b/tests/TestCase/ContainerTestTrait.php
@@ -2,7 +2,6 @@
 
 namespace App\Test\TestCase;
 
-use App\Startup;
 use League\Container\Container;
 use Psr\Container\ContainerInterface;
 use RuntimeException;
@@ -26,7 +25,7 @@ trait ContainerTestTrait
      */
     protected function bootApp(): void
     {
-        $this->app = Startup::boostrap();
+        $this->app = require __DIR__ . '/../../config/bootstrap.php';
         $this->container = $this->app->getContainer();
     }