Merge pull request #171 from phpeek/fix-multiple-switch

Handles multiple switch statements.

Author: kubawerlos

README.md

@@ -8,7 +8,7 @@
 
 [![Build status](https://img.shields.io/travis/kubawerlos/php-cs-fixer-custom-fixers/master.svg)](https://travis-ci.org/kubawerlos/php-cs-fixer-custom-fixers)
 [![Code coverage](https://img.shields.io/coveralls/github/kubawerlos/php-cs-fixer-custom-fixers/master.svg)](https://coveralls.io/github/kubawerlos/php-cs-fixer-custom-fixers?branch=master)
-![Tests](https://img.shields.io/badge/tests-1358-brightgreen.svg)
+![Tests](https://img.shields.io/badge/tests-1359-brightgreen.svg)
 [![Mutation testing badge](https://badge.stryker-mutator.io/github.com/kubawerlos/php-cs-fixer-custom-fixers/master)](https://stryker-mutator.github.io)
 [![Psalm type coverage](https://shepherd.dev/github/kubawerlos/php-cs-fixer-custom-fixers/coverage.svg)](https://shepherd.dev/github/kubawerlos/php-cs-fixer-custom-fixers)
 

src/Fixer/OperatorLinebreakFixer.php

@@ -135,7 +135,7 @@ private function getExcludedIndices(Tokens $tokens): array
         $indices = [];
         for ($index = $tokens->count() - 1; $index > 0; $index--) {
             if ($tokens[$index]->isGivenKind(T_SWITCH)) {
-                $indices += $this->getCasesColonsForSwitch($tokens, $index);
+                $indices = \array_merge($indices, $this->getCasesColonsForSwitch($tokens, $index));
             }
         }
 

tests/Fixer/OperatorLinebreakFixerTest.php

@@ -189,6 +189,22 @@ function foo(
             null,
             ['position' => 'end'],
         ];
+
+        yield 'multiple switches' => [
+            '<?php
+                switch ($foo) {
+                   case 1:
+                      break;
+                   case 2:
+                      break;
+                }
+                switch($bar) {
+                   case 1:
+                      break;
+                   case 2:
+                      break;
+                }',
+        ];
     }
 
     private function pairs(): iterable