DQA-5456: Hook pre-push replace lint-yaml with test-phpmd.

config/default.yml

@@ -202,7 +202,7 @@ toolkit:
     pre-push:
       commands:
         - toolkit:test-phpcs
-        - toolkit:lint-yaml
+        - toolkit:test-phpmd
         - toolkit:lint-php
         - toolkit:opts-review
 commands: [ ]

src/TaskRunner/Commands/ToolCommands.php

@@ -86,47 +86,50 @@ public function composerLockCheck(): int
     public function optsReview()
     {
         $reviewOk = true;
-        if (file_exists('.opts.yml')) {
-            $project_id = $this->getConfig()->get('toolkit.project_id');
-            $forbiddenCommands = Website::projectConstraints($project_id);
-            if (empty($forbiddenCommands)) {
-                $this->io()->error('Failed to get constraints from the endpoint.');
-                return 1;
-            }
+        if (!file_exists('.opts.yml')) {
+            $this->say("The file 'opts.yml' was not found, skipping.");
+            return 0;
+        }
+        $project_id = $this->getConfig()->get('toolkit.project_id');
+        $forbiddenCommands = Website::projectConstraints($project_id);
+        if (empty($forbiddenCommands)) {
+            $this->io()->error('Failed to get constraints from the endpoint.');
+            return 1;
+        }
 
-            $parseOptsFile = Yaml::parseFile('.opts.yml');
-            if (empty($parseOptsFile['upgrade_commands'])) {
-                $this->say('The project is using default deploy instructions.');
-                return 0;
-            }
-            if (empty($parseOptsFile['upgrade_commands']['default']) && empty($parseOptsFile['upgrade_commands']['append'])) {
-                $this->say("Your structure for the 'upgrade_commands' is invalid.\nSee the documentation at https://webgate.ec.europa.eu/fpfis/wikis/display/MULTISITE/Pipeline+configuration+and+override");
-                return 1;
-            }
+        $parseOptsFile = Yaml::parseFile('.opts.yml');
+        if (empty($parseOptsFile['upgrade_commands'])) {
+            $this->say('The project is using default deploy instructions.');
+            return 0;
+        }
+        if (empty($parseOptsFile['upgrade_commands']['default']) && empty($parseOptsFile['upgrade_commands']['append'])) {
+            $this->say("Your structure for the 'upgrade_commands' is invalid.\nSee the documentation at https://webgate.ec.europa.eu/fpfis/wikis/display/MULTISITE/Pipeline+configuration+and+override");
+            return 1;
+        }
 
-            foreach ($parseOptsFile['upgrade_commands'] as $key => $commands) {
-                foreach ($commands as $command) {
-                    $command = str_replace('\\', '', $command);
-                    $parsedCommand = preg_split("/[\s;&|]/", $command, 0, PREG_SPLIT_NO_EMPTY);
-                    foreach ($forbiddenCommands as $forbiddenCommand) {
-                        if ($key == 'default') {
+        foreach ($parseOptsFile['upgrade_commands'] as $key => $commands) {
+            foreach ($commands as $command) {
+                $command = str_replace('\\', '', $command);
+                $parsedCommand = preg_split("/[\s;&|]/", $command, 0, PREG_SPLIT_NO_EMPTY);
+                foreach ($forbiddenCommands as $forbiddenCommand) {
+                    if ($key == 'default') {
+                        if (in_array($forbiddenCommand, $parsedCommand)) {
+                            $this->say("The command '$command' is not allowed. Please remove it from 'upgrade_commands' section.");
+                            $reviewOk = false;
+                        }
+                    } else {
+                        foreach ($command as $subCommand) {
+                            $parsedCommand = preg_split("/[\s;&|]/", $subCommand, 0, PREG_SPLIT_NO_EMPTY);
                             if (in_array($forbiddenCommand, $parsedCommand)) {
-                                $this->say("The command '$command' is not allowed. Please remove it from 'upgrade_commands' section.");
+                                $this->say("The command '$subCommand' is not allowed. Please remove it from 'upgrade_commands' section.");
                                 $reviewOk = false;
                             }
-                        } else {
-                            foreach ($command as $subCommand) {
-                                $parsedCommand = preg_split("/[\s;&|]/", $subCommand, 0, PREG_SPLIT_NO_EMPTY);
-                                if (in_array($forbiddenCommand, $parsedCommand)) {
-                                    $this->say("The command '$subCommand' is not allowed. Please remove it from 'upgrade_commands' section.");
-                                    $reviewOk = false;
-                                }
-                            }
                         }
                     }
                 }
             }
         }
+
         if (!$reviewOk) {
             $this->io()->error("Failed the '.opts.yml' file review. Please contact the QA team.");
             return 1;

tests/fixtures/commands/git-hooks.yml

@@ -92,8 +92,8 @@
     - contains: |
         [Simulator] Simulating Exec('./vendor/bin/run toolkit:test-phpcs')
         [Simulator] Running ./vendor/bin/run toolkit:test-phpcs
-        [Simulator] Simulating Exec('./vendor/bin/run toolkit:lint-yaml')
-        [Simulator] Running ./vendor/bin/run toolkit:lint-yaml
+        [Simulator] Simulating Exec('./vendor/bin/run toolkit:test-phpmd')
+        [Simulator] Running ./vendor/bin/run toolkit:test-phpmd
         [Simulator] Simulating Exec('./vendor/bin/run toolkit:lint-php')
         [Simulator] Running ./vendor/bin/run toolkit:lint-php
         [Simulator] Simulating Exec('./vendor/bin/run toolkit:opts-review')

tests/fixtures/commands/opts-review.yml

@@ -4,17 +4,33 @@
     toolkit:
       project_id: toolkit
   expectations:
-    - contains: |
-        >  Review 'opts.yml' file - Ok.
+    - contains: ">  The file 'opts.yml' was not found, skipping."
 
 - command: 'toolkit:opts-review'
   sample: opts.yml
+  configuration:
+    toolkit:
+      project_id: toolkit
+  expectations:
+    - contains: ">  Review 'opts.yml' file - Ok."
+
+- command: 'toolkit:opts-review'
+  sample: config.yml
+  configuration:
+    toolkit:
+      project_id: toolkit
+  expectations:
+    - contains: ">  The project is using default deploy instructions."
+
+- command: 'toolkit:opts-review'
+  sample: opts-broken-structure.yml
   configuration:
     toolkit:
       project_id: toolkit
   expectations:
     - contains: |
-        >  Review 'opts.yml' file - Ok.
+        >  Your structure for the 'upgrade_commands' is invalid.
+        See the documentation at https://webgate.ec.europa.eu/fpfis/wikis/display/MULTISITE/Pipeline+configuration+and+override
 
 - command: 'toolkit:opts-review'
   sample: opts-broken.yml

tests/fixtures/samples/sample-opts-broken-structure.yml

@@ -0,0 +1,2 @@
+upgrade_commands:
+  - ./vendor/bin/drush cache-rebuild