MAGECLOUD-1452: Eliminate bootstrap class (#125)

Author: shiftedreality

bin/ece-tools

@@ -4,7 +4,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-require_once __DIR__ . '/../bootstrap.php';
+$container = require_once __DIR__ . '/../bootstrap.php';
 
-$application = \Magento\MagentoCloud\App\Bootstrap::create()->createApplication();
+$application = new \Magento\MagentoCloud\Application($container);
 $application->run();

bootstrap.php

@@ -10,3 +10,9 @@
 
 $handler = new \Magento\MagentoCloud\App\ErrorHandler();
 set_error_handler([$handler, 'handle']);
+
+$config = $_SERVER['DIRS_CONFIG'] ?? [];
+
+return new \Magento\MagentoCloud\App\Container(
+    new \Magento\MagentoCloud\Filesystem\DirectoryList(ECE_BP, BP, $config)
+);

m2-ece-build

@@ -4,8 +4,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-require_once __DIR__ . '/bootstrap.php';
+$container = require_once __DIR__ . '/bootstrap.php';
 
-$application = \Magento\MagentoCloud\App\Bootstrap::create()->createApplication();
-$application->setDefaultCommand('build');
+$application = new \Magento\MagentoCloud\Application($container);
+$application->setDefaultCommand(\Magento\MagentoCloud\Command\Build::NAME);
 $application->run();

m2-ece-deploy

@@ -4,9 +4,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-require_once __DIR__ . '/bootstrap.php';
+$container = require_once __DIR__ . '/bootstrap.php';
 
-$application = \Magento\MagentoCloud\App\Bootstrap::create()->createApplication();
-$application->setDefaultCommand('deploy');
+$application = new \Magento\MagentoCloud\Application($container);
+$application->setDefaultCommand(\Magento\MagentoCloud\Command\Deploy::NAME);
 $application->run();
 

m2-ece-scd-dump

@@ -4,8 +4,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-require_once __DIR__ . '/bootstrap.php';
+$container = require_once __DIR__ . '/bootstrap.php';
 
-$application = \Magento\MagentoCloud\App\Bootstrap::create()->createApplication();
-$application->setDefaultCommand('dump');
+$application = new \Magento\MagentoCloud\Application($container);
+$application->setDefaultCommand(\Magento\MagentoCloud\Command\ConfigDump::NAME);
 $application->run();

src/App/Bootstrap.php

@@ -20,6 +20,7 @@
 use Magento\MagentoCloud\DB\Data\ConnectionInterface;
 use Magento\MagentoCloud\DB\Data\ReadConnection;
 use Magento\MagentoCloud\Filesystem\DirectoryCopier;
+use Magento\MagentoCloud\Filesystem\DirectoryList;
 use Magento\MagentoCloud\Process\ProcessInterface;
 use Magento\MagentoCloud\Process\ProcessComposite;
 use Magento\MagentoCloud\Process\Build as BuildProcess;
@@ -44,12 +45,11 @@ class Container implements ContainerInterface
     private $container;
 
     /**
-     * @param string $root
-     * @param array $config
+     * @param DirectoryList $directoryList
      *
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
-    public function __construct(string $root, array $config)
+    public function __construct(DirectoryList $directoryList)
     {
         /**
          * Creating concrete container.
@@ -62,8 +62,8 @@ public function __construct(string $root, array $config)
         $this->container->instance(ContainerInterface::class, $this);
         $this->container->singleton(
             \Magento\MagentoCloud\Filesystem\DirectoryList::class,
-            function () use ($root, $config) {
-                return new \Magento\MagentoCloud\Filesystem\DirectoryList($root, $config);
+            function () use ($directoryList) {
+                return $directoryList;
             }
         );
         $this->container->singleton(\Magento\MagentoCloud\Filesystem\FileList::class);

src/App/Container.php

@@ -18,8 +18,6 @@ class DirectoryList
     /**
      * Directory codes.
      */
-    const DIR_ROOT = 'root';
-    const DIR_MAGENTO_ROOT = 'magento_root';
     const DIR_INIT = 'init';
     const DIR_VAR = 'var';
     const DIR_LOG = 'log';
@@ -29,18 +27,25 @@ class DirectoryList
      */
     private $root;
 
+    /**
+     * @var string
+     */
+    private $magentoRoot;
+
     /**
      * @var array
      */
     private $directories;
 
     /**
-     * @param string $root
-     * @param array $config
+     * @param string $root The ECE Tools root directory
+     * @param string $magentoRoot The Magento root directory
+     * @param array $config Directory configuration
      */
-    public function __construct(string $root, array $config = [])
+    public function __construct(string $root, string $magentoRoot, array $config = [])
     {
         $this->root = $root;
+        $this->magentoRoot = $magentoRoot;
         $this->directories = $config + static::getDefaultConfig();
     }
 
@@ -52,7 +57,7 @@ public function __construct(string $root, array $config = [])
      */
     public function getPath(string $code): string
     {
-        $root = $this->getRoot();
+        $magentoRoot = $this->getMagentoRoot();
         $directories = $this->getDirectories();
 
         if (!array_key_exists($code, $directories)) {
@@ -66,7 +71,7 @@ public function getPath(string $code): string
         }
 
         $path = $directories[$code][self::PATH];
-        $normalizedPath = $root . ($root && $path ? '/' : '') . $path;
+        $normalizedPath = $magentoRoot . ($magentoRoot && $path ? '/' : '') . $path;
 
         return $normalizedPath;
     }
@@ -92,7 +97,7 @@ public function getDirectories(): array
      */
     public function getMagentoRoot(): string
     {
-        return $this->getPath(static::DIR_MAGENTO_ROOT);
+        return $this->magentoRoot;
     }
 
     /**
@@ -125,14 +130,9 @@ public function getLog(): string
     public static function getDefaultConfig(): array
     {
         return [
-            static::DIR_ROOT => [static::PATH => ''],
-            /*
-             * Magento application's vendor folder.
-             */
-            static::DIR_MAGENTO_ROOT => [static::PATH => '../../..'],
-            static::DIR_INIT => [static::PATH => '../../../init'],
-            static::DIR_VAR => [static::PATH => '../../../var'],
-            static::DIR_LOG => [static::PATH => '../../../var/log'],
+            static::DIR_INIT => [static::PATH => 'init'],
+            static::DIR_VAR => [static::PATH => 'var'],
+            static::DIR_LOG => [static::PATH => 'var/log'],
         ];
     }
 }

src/Filesystem/DirectoryList.php

@@ -6,6 +6,7 @@
 namespace Magento\MagentoCloud\Test\Integration;
 
 use Illuminate\Config\Repository;
+use Magento\MagentoCloud\App\Container;
 use Magento\MagentoCloud\Application;
 use Magento\MagentoCloud\Filesystem\DirectoryList;
 
@@ -133,23 +134,13 @@ public function createApplication(array $environment): Application
             )),
         ]);
 
-        $server[\Magento\MagentoCloud\App\Bootstrap::INIT_PARAM_DIRS_CONFIG] = [
-            DirectoryList::DIR_MAGENTO_ROOT => [
-                DirectoryList::PATH => '',
-            ],
-            DirectoryList::DIR_INIT => [
-                DirectoryList::PATH => 'init',
-            ],
-            DirectoryList::DIR_VAR => [
-                DirectoryList::PATH => 'var',
-            ],
-            DirectoryList::DIR_LOG => [
-                DirectoryList::PATH => 'var/log',
-            ],
-        ];
-
-        return \Magento\MagentoCloud\App\Bootstrap::create($this->getSandboxDir(), $server)
-            ->createApplication();
+        $container = new Container(new DirectoryList(
+            $this->getSandboxDir(),
+            $this->getSandboxDir(),
+            []
+        ));
+
+        return new Application($container);
     }
 
     /**

src/Test/Integration/Bootstrap.php

@@ -24,6 +24,7 @@ class DirectoryListTest extends TestCase
     protected function setUp()
     {
         $this->directoryList = new DirectoryList(
+            __DIR__ . '/_files/bp',
             __DIR__,
             ['empty_path' => [], 'test_var' => [DirectoryList::PATH => '_files/test/var']]
         );
@@ -48,11 +49,6 @@ public function testGetPath(string $code, string $expected)
     public function getPathDataProvider(): array
     {
         return [
-            'root' => [DirectoryList::DIR_ROOT, __DIR__],
-            'magento root' => [
-                DirectoryList::DIR_MAGENTO_ROOT,
-                __DIR__ . '/../../..',
-            ],
             'test var' => [
                 'test_var',
                 __DIR__ . '/_files/test/var',
@@ -81,39 +77,39 @@ public function testGetPathWithEmptyPathException()
     public function testGetRoot()
     {
         $this->assertSame(
-            __DIR__,
+            __DIR__ . '/_files/bp',
             $this->directoryList->getRoot()
         );
     }
 
     public function testGetMagentoRoot()
     {
         $this->assertSame(
-            __DIR__ . '/../../..',
+            __DIR__,
             $this->directoryList->getMagentoRoot()
         );
     }
 
     public function testGetInit()
     {
         $this->assertSame(
-            __DIR__ . '/../../../init',
+            __DIR__ . '/init',
             $this->directoryList->getInit()
         );
     }
 
     public function testGetVar()
     {
         $this->assertSame(
-            __DIR__ . '/../../../var',
+            __DIR__ . '/var',
             $this->directoryList->getVar()
         );
     }
 
     public function testGetLog()
     {
         $this->assertSame(
-            __DIR__ . '/../../../var/log',
+            __DIR__ . '/var/log',
             $this->directoryList->getLog()
         );
     }