Merge branch 'develop'

# Conflicts:
#	tests/ConfigTest.php

Author: prisis

src/Config.php

@@ -78,7 +78,7 @@ protected function getContribRules()
             'no_multiline_whitespace_before_semicolons'  => false,
             'no_php4_constructor'                        => false,
             'no_short_echo_tag'                          => true,
-            'no_useless_else'                            => true,
+            'no_useless_else'                            => false,
             'no_useless_return'                          => true,
             'not_operator_with_space'                    => false,
             'not_operator_with_successor_space'          => true,

tests/ConfigTest.php

@@ -115,6 +115,7 @@ public function providerDoesNotHaveFixerEnabled()
             'header_comment'                            => 'it is not enabled by default',
             'long_array_syntax'                         => 'it conflicts with short_array_syntax (which is enabled)',
             'modernize_types_casting'                   => 'it is a risky fixer',
+            'no_useless_else'                           => 'buggy',
             'no_multiline_whitespace_before_semicolons' => 'we have not decided to use this one (yet)',
             'no_php4_constructor'                       => 'it changes behaviour',
             'not_operator_with_space'                   => 'we do not need leading and trailing whitespace before !',
@@ -245,7 +246,7 @@ protected function getContribRules()
             'no_multiline_whitespace_before_semicolons'  => false,
             'no_php4_constructor'                        => false,
             'no_short_echo_tag'                          => true,
-            'no_useless_else'                            => true,
+            'no_useless_else'                            => false,
             'no_useless_return'                          => true,
             'not_operator_with_space'                    => false,
             'not_operator_with_successor_space'          => true,