Added ScopeIndent sniff and adjust tests to pass with all sniffs

Author: michalbundyra

src/ZendCodingStandard/ruleset.xml

@@ -82,6 +82,12 @@
     <!-- Only one blank line allowed -->
     <rule ref="WebimpressCodingStandard.WhiteSpace.BlankLine"/>
 
+    <rule ref="WebimpressCodingStandard.WhiteSpace.ScopeIndent">
+        <properties>
+            <property name="alignObjectOperators" value="false"></property>
+        </properties>
+    </rule>
+
     <!-- Detects for-loops that can be simplified to a while-loop -->
     <rule ref="Generic.CodeAnalysis.ForLoopShouldBeWhileLoop"/>
     <!-- Detects unconditional if- and elseif-statements -->

test/expected-report.txt

@@ -4,17 +4,17 @@ PHP CODE SNIFFER REPORT SUMMARY
 FILE                                                  ERRORS  WARNINGS
 ----------------------------------------------------------------------
 test/fixable/anonymous-classes.php                    11      0
-test/fixable/array-indentation.php                    39      1
+test/fixable/array-indentation.php                    47      1
 test/fixable/class-name-resolution.php                15      0
 test/fixable/class-properties.php                     6       0
 test/fixable/classes-traits-interfaces.php            16      1
 test/fixable/closures.php                             19      0
 test/fixable/commenting.php                           26      0
-test/fixable/concatenation-spacing.php                17      0
+test/fixable/concatenation-spacing.php                21      0
 test/fixable/control-structures.php                   6       0
 test/fixable/example-class.php                        29      0
-test/fixable/extends-and-implements-multiline.php     10      0
-test/fixable/extends-and-implements.php               13      0
+test/fixable/extends-and-implements-multiline.php     13      0
+test/fixable/extends-and-implements.php               5       0
 test/fixable/forbidden-comments.php                   6       0
 test/fixable/forbidden-functions.php                  6       0
 test/fixable/heredoc-nowdoc.php                       6       0
@@ -25,21 +25,21 @@ test/fixable/namespaces-spacing.php                   7       0
 test/fixable/naming.php                               11      0
 test/fixable/new-with-parentheses.php                 19      0
 test/fixable/not-spacing.php                          20      1
-test/fixable/operators.php                            12      0
+test/fixable/operators.php                            17      0
 test/fixable/return-type-on-methods.php               17      0
-test/fixable/semicolon-spacing.php                    3       0
+test/fixable/semicolon-spacing.php                    5       0
 test/fixable/spacing.php                              18      1
 test/fixable/statement-alignment.php                  19      0
 test/fixable/test-case.php                            4       0
 test/fixable/traits-uses.php                          9       0
 test/fixable/UnusedVariables.php                      1       0
-test/fixable/useless-semicolon.php                    8       0
+test/fixable/useless-semicolon.php                    9       0
 test/fixable/variable-names.php                       5       2
 test/fixable/visibility-declaration.php               1       0
 ----------------------------------------------------------------------
-A TOTAL OF 407 ERRORS AND 6 WARNINGS WERE FOUND IN 33 FILES
+A TOTAL OF 427 ERRORS AND 6 WARNINGS WERE FOUND IN 33 FILES
 ----------------------------------------------------------------------
-PHPCBF CAN FIX 345 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
+PHPCBF CAN FIX 365 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
 ----------------------------------------------------------------------
 
 

test/fixed/array-indentation.php

@@ -59,7 +59,7 @@
             App\Http\Auth\LogoutHandler::class    => App\Http\Auth\LogoutHandlerFactory::class,
 
             App\Infrastructure\View\TemplateDefaultsMiddleware::class
-            => App\Infrastructure\View\TemplateDefaultsMiddlewareFactory::class,
+                => App\Infrastructure\View\TemplateDefaultsMiddlewareFactory::class,
             App\Http\HomePageHandler::class   => App\Http\HomePageHandlerFactory::class,
             App\Http\StaticPageHandler::class => App\Http\StaticPageHandlerFactory::class,
         ],

test/fixed/concatenation-spacing.php

@@ -17,9 +17,9 @@
 $string .= $foo;
 
 $string = '1'
-          . '2'
-      . '3';
+    . '2'
+    . '3';
 
 $string = '1'
-          . '2'
-          . '3';
+    . '2'
+    . '3';

test/fixed/operators.php

@@ -35,7 +35,8 @@
 echo Something::BAR;
 
 if ($a
-    && $b) {
+    && $b
+) {
     echo 1;
 }