Bug fix switch statement without default clause.

Author: prwater

src/PhpCodeStore.php

@@ -10,11 +10,11 @@ class PhpCodeStore extends CodeStore
 {
   //--------------------------------------------------------------------------------------------------------------------
   /**
-   * The levels of nested switch statements.
+   * The levels of nested default clauses.
    *
    * @var int[]
    */
-  private $switchLevel = [];
+  private $defaultLevel = [];
 
   //--------------------------------------------------------------------------------------------------------------------
   /**
@@ -48,6 +48,39 @@ protected function indentationMode(string $line): int
     return $mode;
   }
 
+  //--------------------------------------------------------------------------------------------------------------------
+  /**
+   * Decrements indent level of the current switch statement (if any).
+   */
+  private function defaultLevelDecrement(): void
+  {
+    if (!empty($this->defaultLevel) && $this->defaultLevel[sizeof($this->defaultLevel) - 1]>0)
+    {
+      $this->defaultLevel[sizeof($this->defaultLevel) - 1]--;
+    }
+  }
+
+  //--------------------------------------------------------------------------------------------------------------------
+  /**
+   * Increments indent level of the current switch statement (if any).
+   */
+  private function defaultLevelIncrement(): void
+  {
+    if (!empty($this->defaultLevel))
+    {
+      $this->defaultLevel[sizeof($this->defaultLevel) - 1]++;
+    }
+  }
+
+  //--------------------------------------------------------------------------------------------------------------------
+  /**
+   * Returns true if the indent level of the current switch statement (if any) is zero. Otherwise, returns false.
+   */
+  private function defaultLevelIsZero(): bool
+  {
+    return (!empty($this->defaultLevel) && $this->defaultLevel[sizeof($this->defaultLevel) - 1]==0);
+  }
+
   //--------------------------------------------------------------------------------------------------------------------
   /**
    * Returns the indentation mode based blocks of code.
@@ -56,26 +89,26 @@ protected function indentationMode(string $line): int
    *
    * @return int
    */
-  protected function indentationModeBlock(string $line): int
+  private function indentationModeBlock(string $line): int
   {
     $mode = 0;
 
     if (substr($line, -1, 1)=='{')
     {
       $mode |= self::C_INDENT_INCREMENT_AFTER;
 
-      $this->switchLevelIncrement();
+      $this->defaultLevelIncrement();
     }
 
     if (substr($line, 0, 1)=='}')
     {
-      $this->switchLevelDecrement();
+      $this->defaultLevelDecrement();
 
-      if ($this->switchLevelIsZero())
+      if ($this->defaultLevelIsZero())
       {
         $mode |= self::C_INDENT_DECREMENT_BEFORE_DOUBLE;
 
-        array_pop($this->switchLevel);
+        array_pop($this->defaultLevel);
       }
       else
       {
@@ -98,18 +131,15 @@ private function indentationModeSwitch(string $line): int
   {
     $mode = 0;
 
-    if (substr($line, 0, 7)=='switch ')
-    {
-      $this->switchLevel[] = 0;
-    }
-
     if (substr($line, 0, 5)=='case ')
     {
       $mode |= self::C_INDENT_INCREMENT_AFTER;
     }
 
     if (substr($line, 0, 8)=='default:')
     {
+      $this->defaultLevel[] = 0;
+
       $mode |= self::C_INDENT_INCREMENT_AFTER;
     }
 
@@ -121,39 +151,6 @@ private function indentationModeSwitch(string $line): int
     return $mode;
   }
 
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Decrements indent level of the current switch statement (if any).
-   */
-  private function switchLevelDecrement(): void
-  {
-    if (!empty($this->switchLevel) && $this->switchLevel[sizeof($this->switchLevel) - 1]>0)
-    {
-      $this->switchLevel[sizeof($this->switchLevel) - 1]--;
-    }
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Increments indent level of the current switch statement (if any).
-   */
-  private function switchLevelIncrement(): void
-  {
-    if (!empty($this->switchLevel))
-    {
-      $this->switchLevel[sizeof($this->switchLevel) - 1]++;
-    }
-  }
-
-  //--------------------------------------------------------------------------------------------------------------------
-  /**
-   * Returns true if the indent level of the current switch statement (if any) is zero. Otherwise, returns false.
-   */
-  private function switchLevelIsZero(): bool
-  {
-    return (!empty($this->switchLevel) && $this->switchLevel[sizeof($this->switchLevel) - 1]==0);
-  }
-
   //--------------------------------------------------------------------------------------------------------------------
 }
 

test/CodeStoreTest.php

@@ -40,7 +40,22 @@ public function testIndentationLevel(): void
     $store->append('}');
     $store->append('');
     $store->appendSeparator();
-    $store->append('public function testSwitch($i)');
+    $store->append('public function testSwitch1($i)');
+    $store->append('{');
+    $store->append('switch ($i)');
+    $store->append('{');
+    $store->append('case 1:');
+    $store->append("echo 'one';");
+    $store->append('break;');
+    $store->append('');
+    $store->append('case 2:');
+    $store->append("echo 'two';");
+    $store->append('break;');
+    $store->append('}');
+    $store->append('}');
+    $store->append('');
+    $store->appendSeparator();
+    $store->append('public function testSwitch2($i)');
     $store->append('{');
     $store->append('switch ($i)');
     $store->append('{');
@@ -97,7 +112,22 @@ public function testIndentationLevel()
   }
 
   //----------------------------------------------------------------------------
-  public function testSwitch(\$i)
+  public function testSwitch1(\$i)
+  {
+    switch (\$i)
+    {
+      case 1:
+        echo 'one';
+        break;
+
+      case 2:
+        echo 'two';
+        break;
+    }
+  }
+
+  //----------------------------------------------------------------------------
+  public function testSwitch2(\$i)
   {
     switch (\$i)
     {