Merge pull request #3 from narrowspark/develop

Fix: Update fabpot/php-cs-fixer

Author: prisis

README.md

@@ -21,33 +21,6 @@ Via Composer
 $ composer require narrowspark/php-cs-fixer-config
 ```
 
-:exclamation: Since `fabpot/php-cs-fixer:2.0.x-dev` isn't stable, we're pinning the dependency to a known commit.
-
-There are two possibilities here
-
-* you require that same commit in your repository
-
-    ```
-    $ composer require fabpot/php-cs-fixer-config:dev-master#8c4c643.
-    ```
-
-* you configure `composer.json` in your root package with
-
-    ```json
-    {
-        "minimum-stability": "dev",
-        "prefer-stable": true
-    }
-    ```
-  and remove `fabpot/php-cs-fixer` with
-
-    ```
-    $ composer remove fabpot/php-cs-fixer
-    ```
-  trusting us to pull in a working version.
-
-For reference, see [`fabpot/php-cs-fixer-config:dev-master#8c4c643`](https://github.com/FriendsOfPHP/PHP-CS-Fixer/commit/8c4c643).
-
 ## Usage
 
 Create a configuration file '.php_cs' in the root of your project:

composer.json

@@ -25,7 +25,7 @@
     ],
     "require": {
         "php"                                 : "^5.6 || ^7.0",
-        "fabpot/php-cs-fixer"                 : "dev-master#8c4c643"
+        "fabpot/php-cs-fixer"                 : "2.0.0-alpha"
     },
     "require-dev": {
         "phpunit/phpunit"                     : "^5.3"

composer.lock

@@ -78,6 +78,7 @@ protected function getContribRules()
             'no_multiline_whitespaces_before_semicolon'  => false,
             'no_php4_constructor'                        => false,
             'no_short_echo_tag'                          => true,
+            'no_useless_else'                            => true,
             'no_useless_return'                          => true,
             'not_operators_with_space'                   => false,
             'not_operator_with_successor_space'          => true,
@@ -139,8 +140,6 @@ private function getSymfonyRules()
             'no_alias_functions'                          => true,
             'no_blank_lines_after_class_opening'          => true,
             'no_blank_lines_after_phpdoc'                 => true,
-            'no_blank_lines_between_uses'                 => true,
-            'no_duplicate_semicolons'                     => true,
             'no_empty_statement'                          => true,
             'no_extra_consecutive_blank_lines'            => true,
             'no_leading_import_slash'                     => true,

src/Config.php

@@ -175,8 +175,6 @@ private function getSymfonyRules()
             'no_alias_functions'                          => true,
             'no_blank_lines_after_class_opening'          => true,
             'no_blank_lines_after_phpdoc'                 => true,
-            'no_blank_lines_between_uses'                 => true,
-            'no_duplicate_semicolons'                     => true,
             'no_empty_statement'                          => true,
             'no_extra_consecutive_blank_lines'            => true,
             'no_leading_import_slash'                     => true,
@@ -247,6 +245,7 @@ protected function getContribRules()
             'no_multiline_whitespaces_before_semicolon'  => false,
             'no_php4_constructor'                        => false,
             'no_short_echo_tag'                          => true,
+            'no_useless_else'                            => true,
             'no_useless_return'                          => true,
             'not_operators_with_space'                   => false,
             'not_operator_with_successor_space'          => true,