MAGECLOUD-4392: Clean-up ECE-Tools (#621)

magento · Oct 9, 2019 · 910c586 · 910c586
1 parent d7c47a7
commit 910c586
Show file tree

Hide file tree

Showing 18 changed files with 21 additions and 266 deletions.
diff --git a/autoload.php b/autoload.php
@@ -35,4 +35,4 @@
     }
 }
 
-throw new \RuntimeException('Required file \'autoload.php\' was not found.');
+throw new RuntimeException('Required file \'autoload.php\' was not found.');
diff --git a/bootstrap.php b/bootstrap.php
@@ -8,7 +8,10 @@
 
 require_once __DIR__ . '/autoload.php';
 
-$handler = new \Magento\MagentoCloud\App\ErrorHandler();
+use Magento\MagentoCloud\App\Container;
+use Magento\MagentoCloud\App\ErrorHandler;
+
+$handler = new ErrorHandler();
 set_error_handler([$handler, 'handle']);
 
-return new \Magento\MagentoCloud\App\Container(ECE_BP, BP);
+return new Container(ECE_BP, BP);
diff --git a/composer.json b/composer.json
@@ -52,10 +52,7 @@
     "magento/magento-cloud-configuration": "*"
   },
   "bin": [
-    "bin/ece-tools",
-    "m2-ece-build",
-    "m2-ece-deploy",
-    "m2-ece-scd-dump"
+    "bin/ece-tools"
   ],
   "autoload": {
     "psr-4": {

diff --git a/config/README.md b/config/README.md
@@ -0,0 +1,4 @@
+# Configuring .XSD schema integration into PhpStorm
+
+1. Open `Config -> Languages & Frameworks -> Schemas and DTDs`
+2. Add new item pointing `urn:magento:ece-tools:config/scenario.xsd` to the correct file in ECE-Tools codebase
diff --git a/m2-ece-build b/m2-ece-build
diff --git a/m2-ece-deploy b/m2-ece-deploy
diff --git a/m2-ece-scd-dump b/m2-ece-scd-dump
diff --git a/scenario/build/generate.xml b/scenario/build/generate.xml
@@ -5,7 +5,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<scenario xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../config/scenario.xsd" >
+<scenario xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:ece-tools:config/scenario.xsd">
     <step name="pre-build" type="Magento\MagentoCloud\Step\Build\PreBuild"/>
     <step name="set-production-mode" type="Magento\MagentoCloud\Step\SetProductionMode"/>
     <step name="validate-configuration" type="Magento\MagentoCloud\Step\ValidateConfiguration">

diff --git a/scenario/build/transfer.xml b/scenario/build/transfer.xml
@@ -5,7 +5,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<scenario xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../config/scenario.xsd">
+<scenario xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:ece-tools:config/scenario.xsd">
     <step name="compress-static-content" type="Magento\MagentoCloud\Step\Build\CompressStaticContent"/>
     <step name="clear-init-directory" type="Magento\MagentoCloud\Step\Build\ClearInitDirectory"/>
     <step name="backup-data" type="Magento\MagentoCloud\Step\Build\BackupData">

diff --git a/scenario/deploy.xml b/scenario/deploy.xml
@@ -5,7 +5,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<scenario xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../config/scenario.xsd">
+<scenario xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:ece-tools:config/scenario.xsd">
     <step name="remove-deploy-failed-flag" type="Magento\MagentoCloud\Step\Deploy\RemoveDeployFailedFlag"/>
     <step name="pre-deploy" type="Magento\MagentoCloud\Step\Deploy\PreDeploy">
         <arguments>

diff --git a/scenario/post-deploy.xml b/scenario/post-deploy.xml
@@ -5,7 +5,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<scenario xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../config/scenario.xsd">
+<scenario xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:ece-tools:config/scenario.xsd">
     <step name="is-deploy-failed" type="Magento\MagentoCloud\Step\PostDeploy\DeployFailed"/>
     <step name="validate-config" type="Magento\MagentoCloud\Step\ValidateConfiguration">
         <arguments>

diff --git a/src/Application.php b/src/Application.php
@@ -69,8 +69,6 @@ protected function getDefaultCommands()
             $this->container->create(Command\ModuleRefresh::class),
             $this->container->create(Command\Wizard\IdealState::class),
             $this->container->create(Command\Wizard\MasterSlave::class),
-            $this->container->create(Command\Docker\Build::class),
-            $this->container->create(Command\Docker\GenerateDist::class),
             $this->container->create(Command\CronKill::class),
             $this->container->create(Command\ConfigShow::class),
             $this->container->create(Command\RunCommand::class),

diff --git a/src/Command/Docker/Build.php b/src/Command/Docker/Build.php
diff --git a/src/Command/Docker/GenerateDist.php b/src/Command/Docker/GenerateDist.php
diff --git a/src/Filesystem/FileList.php b/src/Filesystem/FileList.php
@@ -7,6 +7,8 @@
 
 namespace Magento\MagentoCloud\Filesystem;
 
+use Magento\MagentoCloud\Package\UndefinedPackageException;
+
 /**
  * Resolver of file configurations.
  */
@@ -30,6 +32,7 @@ public function __construct(DirectoryList $directoryList, SystemList $systemList
 
     /**
      * @return string
+     * @throws UndefinedPackageException
      */
     public function getCloudLog(): string
     {
@@ -38,6 +41,7 @@ public function getCloudLog(): string
 
     /**
      * @return string
+     * @throws UndefinedPackageException
      */
     public function getTtfbLog(): string
     {
@@ -46,6 +50,7 @@ public function getTtfbLog(): string
 
     /**
      * @return string
+     * @throws UndefinedPackageException
      */
     public function getInitCloudLog(): string
     {
@@ -54,6 +59,7 @@ public function getInitCloudLog(): string
 
     /**
      * @return string
+     * @throws UndefinedPackageException
      */
     public function getInstallUpgradeLog(): string
     {

diff --git a/src/Test/Unit/ApplicationTest.php b/src/Test/Unit/ApplicationTest.php
@@ -74,8 +74,6 @@ class ApplicationTest extends TestCase
         Command\ModuleRefresh::NAME => Command\ModuleRefresh::class,
         Command\Wizard\IdealState::NAME => Command\Wizard\IdealState::class,
         Command\Wizard\MasterSlave::NAME => Command\Wizard\MasterSlave::class,
-        Command\Docker\Build::NAME => Command\Docker\Build::class,
-        Command\Docker\GenerateDist::NAME => Command\Docker\GenerateDist::class,
         Command\CronKill::NAME => Command\CronKill::class,
         Command\ConfigShow::NAME => Command\ConfigShow::class,
         Command\RunCommand::NAME => Command\RunCommand::class,
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,4 +35,4 @@ @@
         }
     }
-    throw new \RuntimeException('Required file \'autoload.php\' was not found.');
+    throw new RuntimeException('Required file \'autoload.php\' was not found.');