Fix and test for missing semicolons in shell hooks

A missing semicolon on the line `local IFS=` was breaking the hook after
it was collapsed to one line for eval. This fixes all missing semicolons
and adds a test to catch this in future.

Author: stecman

src/HookFactory.php

@@ -33,16 +33,16 @@ function %%function_name%% {
 
     # Copy BASH's completion variables to the ones the completion command expects
     # These line up exactly as the library was originally designed for BASH
-    local CMDLINE_CONTENTS="$COMP_LINE"
-    local CMDLINE_CURSOR_INDEX="$COMP_POINT"
+    local CMDLINE_CONTENTS="$COMP_LINE";
+    local CMDLINE_CURSOR_INDEX="$COMP_POINT";
     local CMDLINE_WORDBREAKS="$COMP_WORDBREAKS";
 
-    export CMDLINE_CONTENTS CMDLINE_CURSOR_INDEX CMDLINE_WORDBREAKS
+    export CMDLINE_CONTENTS CMDLINE_CURSOR_INDEX CMDLINE_WORDBREAKS;
 
     local RESULT STATUS;
 
     # Force splitting by newline instead of default delimiters
-    local IFS=$'\n'
+    local IFS=$'\n';
 
     RESULT="$(%%completion_command%% </dev/null)";
     STATUS=$?;
@@ -78,19 +78,19 @@ function %%function_name%% {
 else
     >&2 echo "Completion was not registered for %%program_name%%:";
     >&2 echo "The 'bash-completion' package is required but doesn't appear to be installed.";
-fi
+fi;
 END
 
         // ZSH Hook
         , 'zsh' => <<<'END'
 # ZSH completion for %%program_path%%
 function %%function_name%% {
-    local -x CMDLINE_CONTENTS="$words"
-    local -x CMDLINE_CURSOR_INDEX
-    (( CMDLINE_CURSOR_INDEX = ${#${(j. .)words[1,CURRENT]}} ))
+    local -x CMDLINE_CONTENTS="$words";
+    local -x CMDLINE_CURSOR_INDEX;
+    (( CMDLINE_CURSOR_INDEX = ${#${(j. .)words[1,CURRENT]}} ));
 
-    local RESULT STATUS
-    RESULT=("${(@f)$( %%completion_command%% )}")
+    local RESULT STATUS;
+    RESULT=("${(@f)$( %%completion_command%% )}");
     STATUS=$?;
 
     # Check if shell provided path completion is requested
@@ -105,7 +105,7 @@ function %%function_name%% {
         return $?;
     fi;
 
-    compadd -- $RESULT
+    compadd -- $RESULT;
 };
 
 compdef %%function_name%% "%%program_name%%";

tests/Stecman/Component/Symfony/Console/BashCompletion/HookFactoryTest.php

@@ -54,6 +54,59 @@ public function generateHookDataProvider()
         );
     }
 
+    public function testForMissingSemiColons()
+    {
+        $class = new \ReflectionClass('Stecman\Component\Symfony\Console\BashCompletion\HookFactory');
+        $properties = $class->getStaticProperties();
+        $hooks = $properties['hooks'];
+
+        // Check each line is commented or closed correctly to be collapsed for eval
+        foreach ($hooks as $shellType => $hook) {
+            $line = strtok($hook, "\n");
+            $lineNumber = 0;
+
+            while ($line !== false) {
+                $lineNumber++;
+
+                if (!$this->isScriptLineValid($line)) {
+                    $this->fail("$shellType hook appears to be missing a semicolon on line $lineNumber:\n> $line");
+                }
+
+                $line = strtok("\n");
+            }
+        }
+    }
+
+    /**
+     * Check if a line of shell script is safe to be collapsed to one line for eval
+     */
+    protected function isScriptLineValid($line)
+    {
+        if (preg_match('/^\s*#/', $line)) {
+            // Line is commented out
+            return true;
+        }
+
+        if (preg_match('/[;\{\}]\s*$/', $line)) {
+            // Line correctly ends with a semicolon or syntax
+            return true;
+        }
+
+        if (preg_match('
+                    /(
+                        ;\s*then |
+                        \s*else
+                    )
+                    \s*$
+                    /x', $line)
+        ) {
+            // Line ends with another permitted sequence
+            return true;
+        }
+
+        return false;
+    }
+
     protected function hasProgram($programName)
     {
         exec(sprintf(