Bump minimal php-cs-fixer version to 2.15.0. Add additional rules.

CHANGELOG.md

@@ -5,8 +5,17 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Added
+- `simple_to_complex_string_variable` fixer.
+- `single_trait_insert_per_statement` fixer.
+- `native_function_type_declaration_casing` fixer.
+- `php_unit_mock_short_will_return` fixer.
+- `php_unit_dedicate_assert_internal_type` fixer.
+- `php_unit_no_expectation_annotation` fixer.
+
+### Changed
+- `friendsofphp/php-cs-fixer` version bumped to `^2.15.0`.
 
-## [0.3.1] - 2019-02-27
 ### Removed
 - `self_accessor` fixer because it leads to errors in interfaces, that returns self.
 

composer.json

@@ -17,7 +17,7 @@
     "type": "library",
     "require": {
         "php": "^7.0",
-        "friendsofphp/php-cs-fixer": "^2.13.0"
+        "friendsofphp/php-cs-fixer": "^2.15.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^6.5.1"

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "0d399f36e24f93c2b3ce717b19cfa1ac",
+    "content-hash": "6c0df4a63dfd9a488b270e7148447158",
     "packages": [
         {
             "name": "composer/semver",
@@ -236,16 +236,16 @@
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v2.14.2",
+            "version": "v2.15.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
-                "reference": "ff401e58261ffc5934a58f795b3f95b355e276cb"
+                "reference": "705490b0f282f21017d73561e9498d2b622ee34c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/ff401e58261ffc5934a58f795b3f95b355e276cb",
+                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/705490b0f282f21017d73561e9498d2b622ee34c",
-                "reference": "ff401e58261ffc5934a58f795b3f95b355e276cb",
+                "reference": "705490b0f282f21017d73561e9498d2b622ee34c",
                 "shasum": ""
             },
             "require": {
@@ -273,11 +273,12 @@
                 "mikey179/vfsstream": "^1.6",
                 "php-coveralls/php-coveralls": "^2.1",
                 "php-cs-fixer/accessible-object": "^1.0",
-                "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.0.1",
+                "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.1",
-                "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.0.1",
+                "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.1",
-                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.1",
-                "phpunitgoodpractices/traits": "^1.5.1",
+                "phpunitgoodpractices/traits": "^1.8",
-                "symfony/phpunit-bridge": "^4.0"
+                "symfony/phpunit-bridge": "^4.3",
+                "symfony/yaml": "^3.0 || ^4.0"
             },
             "suggest": {
                 "ext-mbstring": "For handling non-UTF8 characters in cache signature.",
@@ -310,17 +311,17 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Dariusz Rumiński",
-                    "email": "dariusz.ruminski@gmail.com"
-                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Dariusz Rumiński",
+                    "email": "dariusz.ruminski@gmail.com"
                 }
             ],
             "description": "A tool to automatically fix PHP code style",
-            "time": "2019-02-17T17:44:13+00:00"
+            "time": "2019-08-31T12:51:54+00:00"
         },
         {
             "name": "paragonie/random_compat",

src/Rules.php

@@ -53,6 +53,7 @@ class Rules {
             'strategy' => 'no_multi_line',
         ],
         'native_function_casing' => true,
+        'native_function_type_declaration_casing' => true,
         'no_alternative_syntax' => true,
         'no_homoglyph_names' => true,
         'no_leading_import_slash' => true,
@@ -81,10 +82,13 @@ class Rules {
             'imports_order' => ['class', 'function', 'const'],
         ],
         'php_unit_construct' => true,
+        'php_unit_dedicate_assert_internal_type' => true,
         'php_unit_expectation' => true,
         'php_unit_method_casing' => true,
         'php_unit_mock' => true,
+        'php_unit_mock_short_will_return' => true,
         'php_unit_namespaced' => true,
+        'php_unit_no_expectation_annotation' => true,
         'php_unit_set_up_tear_down_visibility' => true,
         'php_unit_strict' => true,
         'pow_to_exponentiation' => true,
@@ -102,6 +106,8 @@ class Rules {
         ],
         'set_type_to_cast' => true,
         'short_scalar_cast' => true,
+        'simple_to_complex_string_variable' => true,
+        'single_trait_insert_per_statement' => true,
         'single_quote' => true,
         'space_after_semicolon' => true,
         'standardize_increment' => true,