Merge branch 'master' into 3.0

* master:
  fix RuleSet merge issues

doc/ruleSets/PHPUnit75MigrationRisky.rst

@@ -9,3 +9,5 @@ Rules
 
 - `@PHPUnit60Migration:risky <./PHPUnit60MigrationRisky.rst>`_
 - `php_unit_dedicate_assert_internal_type <./../rules/php_unit/php_unit_dedicate_assert_internal_type.rst>`_
+  config:
+  ``['target' => '7.5']``

doc/ruleSets/PHPUnit84MigrationRisky.rst

@@ -1,13 +0,0 @@
-======================================
-Rule set ``@PHPUnit84Migration:risky``
-======================================
-
-Rules to improve tests code for PHPUnit 8.4 compatibility This set contains rules that are risky.
-
-Rules
------
-
-- `@PHPUnit75Migration:risky <./PHPUnit75MigrationRisky.rst>`_
-- `php_unit_expectation <./../rules/php_unit/php_unit_expectation.rst>`_
-  config:
-  ``['target' => '8.4']``

doc/ruleSets/index.rst

@@ -25,7 +25,6 @@ List of Available Rule sets
 - `@PHPUnit57Migration:risky <./PHPUnit57MigrationRisky.rst>`_
 - `@PHPUnit60Migration:risky <./PHPUnit60MigrationRisky.rst>`_
 - `@PHPUnit75Migration:risky <./PHPUnit75MigrationRisky.rst>`_
-- `@PHPUnit84Migration:risky <./PHPUnit84MigrationRisky.rst>`_
 - `@PSR1 <./PSR1.rst>`_
 - `@PSR2 <./PSR2.rst>`_
 - `@PhpCsFixer <./PhpCsFixer.rst>`_

doc/rules/php_unit/php_unit_dedicate_assert.rst

@@ -127,8 +127,3 @@ The rule is part of the following rule sets:
   Using the `@PHPUnit75Migration:risky <./../../ruleSets/PHPUnit75MigrationRisky.rst>`_ rule set will enable the ``php_unit_dedicate_assert`` rule with the config below:
 
   ``['target' => '5.6']``
-
-@PHPUnit84Migration:risky
-  Using the `@PHPUnit84Migration:risky <./../../ruleSets/PHPUnit84MigrationRisky.rst>`_ rule set will enable the ``php_unit_dedicate_assert`` rule with the config below:
-
-  ``['target' => '5.6']``

doc/rules/php_unit/php_unit_dedicate_assert_internal_type.rst

@@ -50,10 +50,9 @@ Example #1
 Rule sets
 ---------
 
-The rule is part of the following rule sets:
+The rule is part of the following rule set:
 
 @PHPUnit75Migration:risky
-  Using the `@PHPUnit75Migration:risky <./../../ruleSets/PHPUnit75MigrationRisky.rst>`_ rule set will enable the ``php_unit_dedicate_assert_internal_type`` rule with the default config.
+  Using the `@PHPUnit75Migration:risky <./../../ruleSets/PHPUnit75MigrationRisky.rst>`_ rule set will enable the ``php_unit_dedicate_assert_internal_type`` rule with the config below:
 
-@PHPUnit84Migration:risky
-  Using the `@PHPUnit84Migration:risky <./../../ruleSets/PHPUnit84MigrationRisky.rst>`_ rule set will enable the ``php_unit_dedicate_assert_internal_type`` rule with the default config.
+  ``['target' => '7.5']``

doc/rules/php_unit/php_unit_expectation.rst

@@ -172,8 +172,3 @@ The rule is part of the following rule sets:
   Using the `@PHPUnit75Migration:risky <./../../ruleSets/PHPUnit75MigrationRisky.rst>`_ rule set will enable the ``php_unit_expectation`` rule with the config below:
 
   ``['target' => '5.6']``
-
-@PHPUnit84Migration:risky
-  Using the `@PHPUnit84Migration:risky <./../../ruleSets/PHPUnit84MigrationRisky.rst>`_ rule set will enable the ``php_unit_expectation`` rule with the config below:
-
-  ``['target' => '8.4']``

doc/rules/php_unit/php_unit_mock.rst

@@ -101,8 +101,3 @@ The rule is part of the following rule sets:
   Using the `@PHPUnit75Migration:risky <./../../ruleSets/PHPUnit75MigrationRisky.rst>`_ rule set will enable the ``php_unit_mock`` rule with the config below:
 
   ``['target' => '5.5']``
-
-@PHPUnit84Migration:risky
-  Using the `@PHPUnit84Migration:risky <./../../ruleSets/PHPUnit84MigrationRisky.rst>`_ rule set will enable the ``php_unit_mock`` rule with the config below:
-
-  ``['target' => '5.5']``

doc/rules/php_unit/php_unit_namespaced.rst

@@ -125,8 +125,3 @@ The rule is part of the following rule sets:
   Using the `@PHPUnit75Migration:risky <./../../ruleSets/PHPUnit75MigrationRisky.rst>`_ rule set will enable the ``php_unit_namespaced`` rule with the config below:
 
   ``['target' => '6.0']``
-
-@PHPUnit84Migration:risky
-  Using the `@PHPUnit84Migration:risky <./../../ruleSets/PHPUnit84MigrationRisky.rst>`_ rule set will enable the ``php_unit_namespaced`` rule with the config below:
-
-  ``['target' => '6.0']``

doc/rules/php_unit/php_unit_no_expectation_annotation.rst

@@ -146,8 +146,3 @@ The rule is part of the following rule sets:
   Using the `@PHPUnit75Migration:risky <./../../ruleSets/PHPUnit75MigrationRisky.rst>`_ rule set will enable the ``php_unit_no_expectation_annotation`` rule with the config below:
 
   ``['target' => '4.3']``
-
-@PHPUnit84Migration:risky
-  Using the `@PHPUnit84Migration:risky <./../../ruleSets/PHPUnit84MigrationRisky.rst>`_ rule set will enable the ``php_unit_no_expectation_annotation`` rule with the config below:
-
-  ``['target' => '4.3']``

src/RuleSet/Sets/PHPUnit75MigrationRiskySet.php

@@ -23,7 +23,9 @@ final class PHPUnit75MigrationRiskySet extends AbstractRuleSetDescription
     {
         return [
             '@PHPUnit60Migration:risky' => true,
-            'php_unit_dedicate_assert_internal_type' => true,
+            'php_unit_dedicate_assert_internal_type' => [
+                'target' => '7.5'
+            ],
         ];
     }