merged branch aerialls/check_cs_fix (PR #2975)

Commits
-------

0797564 [Check CS] don't replace 'else if' on twig files (closes #2961)

Discussion
----------

[Check CS] don't replace 'else if' on twig files (closes #2961)

check_cs

@@ -94,7 +94,9 @@ foreach ($finder as $file) {
     }
 
     // [Structure] elseif, not else if
-    $new = preg_replace('/} else if \(/', '} elseif (', $new);
+    if ('twig' !== $file->getExtension()) {
+        $new = preg_replace('/} else if \(/', '} elseif (', $new);
+    }
 
     if ($new != $old) {
         $count++;