MCLOUD-4077: Align ideal state wizard with scenario-based deployment (magento#715)

Author: shiftedreality

src/Config/Application/HookChecker.php

@@ -7,15 +7,14 @@
 
 namespace Magento\MagentoCloud\Config\Application;
 
-use Magento\MagentoCloud\Command\PostDeploy;
 use Magento\MagentoCloud\Config\Environment;
 
 /**
  * Checks hooks enabling in .magento.app.yaml
  */
 class HookChecker
 {
-    const HOOK_POST_DEPLOY = 'post_deploy';
+    private const HOOK_POST_DEPLOY = 'post_deploy';
 
     /**
      * @var Environment
@@ -39,14 +38,8 @@ public function isPostDeployHookEnabled(): bool
     {
         $appConfig = $this->environment->getApplication();
 
-        if (isset($appConfig['hooks'][self::HOOK_POST_DEPLOY])) {
-            $postDeployHooks = $appConfig['hooks'][self::HOOK_POST_DEPLOY];
+        $postDeployHooks = $appConfig['hooks'][self::HOOK_POST_DEPLOY] ?? '';
 
-            if (preg_match(sprintf('/ece-tools\s+%s/', PostDeploy::NAME), $postDeployHooks)) {
-                return true;
-            }
-        }
-
-        return false;
+        return false !== strpos($postDeployHooks, '/ece-tools');
     }
 }

src/Config/Validator/Deploy/PostDeploy.php

@@ -49,7 +49,7 @@ public function validate(): Validator\ResultInterface
                 'In order to minimize downtime, add the following to ".magento.app.yaml":' . PHP_EOL .
                 'hooks:' . PHP_EOL .
                 '    post_deploy: |' . PHP_EOL .
-                '        php ./vendor/bin/ece-tools post-deploy'
+                '        php ./vendor/bin/ece-tools run scenario/post-deploy.xml'
             );
         }
 

src/Test/Unit/Config/Application/HookCheckerTest.php

@@ -27,7 +27,10 @@ class HookCheckerTest extends TestCase
      */
     private $checker;
 
-    protected function setUp()
+    /**
+     * @inheritDoc
+     */
+    protected function setUp(): void
     {
         $this->environmentMock = $this->createMock(Environment::class);
 
@@ -37,9 +40,10 @@ protected function setUp()
     /**
      * @param array $hooks
      * @param bool $expectedResult
+     *
      * @dataProvider  isPostDeployEnabledDataProvider
      */
-    public function testIsPostDeployHookEnabled(array $hooks, bool $expectedResult)
+    public function testIsPostDeployHookEnabled(array $hooks, bool $expectedResult): void
     {
         $this->environmentMock->expects($this->once())
             ->method('getApplication')
@@ -59,8 +63,8 @@ public function isPostDeployEnabledDataProvider(): array
                 true,
             ],
             [
-                ['post_deploy' => 'php test\nphp test2\n'],
-                false,
+                ['post_deploy' => 'php ./vendor/bin/ece-tools run'],
+                true,
             ],
             [
                 ['deploy' => 'php test\nphp test2\n'],