fix: Adjust wording related to deprecations (#7332)

PHP-CS-Fixer · Sep 27, 2023 · 656defb · 656defb
1 parent f1abe95
commit 656defb
Show file tree

Hide file tree

Showing 15 changed files with 31 additions and 31 deletions.
diff --git a/doc/list.rst b/doc/list.rst
@@ -773,12 +773,12 @@ List of Available Rules
 
    - | ``annotation_include``
      | Class level attribute or annotation tags that must be set in order to fix the class (case insensitive).
-     | warning:: This option is deprecated and will be removed on next major version. Use ``include`` to configure PHPDoc annotations tags and attributes.
+     | warning:: This option is deprecated and will be removed in the next major version. Use ``include`` to configure PHPDoc annotations tags and attributes.
      | Allowed types: ``array``
      | Default value: ``['@internal']``
    - | ``annotation_exclude``
      | Class level attribute or annotation tags that must be omitted to fix the class, even if all of the white list ones are used as well (case insensitive).
-     | warning:: This option is deprecated and will be removed on next major version. Use ``exclude`` to configure PHPDoc annotations tags and attributes.
+     | warning:: This option is deprecated and will be removed in the next major version. Use ``exclude`` to configure PHPDoc annotations tags and attributes.
      | Allowed types: ``array``
      | Default value: ``['@final', '@Entity', '@ORM\\Entity', '@ORM\\Mapping\\Entity', '@Mapping\\Entity', '@Document', '@ODM\\Document']``
    - | ``include``

diff --git a/doc/rules/array_notation/no_trailing_comma_in_singleline_array.rst b/doc/rules/array_notation/no_trailing_comma_in_singleline_array.rst
@@ -7,8 +7,8 @@ PHP single-line arrays should not have trailing comma.
 Warning
 -------
 
-This rule is deprecated and will be removed on next major version
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+This rule is deprecated and will be removed in the next major version
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 You should use ``no_trailing_comma_in_singleline`` instead.
 

diff --git a/doc/rules/basic/braces.rst b/doc/rules/basic/braces.rst
@@ -8,8 +8,8 @@ placed. Body of braces should be properly indented.
 Warning
 -------
 
-This rule is deprecated and will be removed on next major version
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+This rule is deprecated and will be removed in the next major version
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 You should use ``single_space_around_construct``, ``control_structure_braces``,
 ``control_structure_continuation_position``, ``declare_parentheses``,

diff --git a/doc/rules/class_notation/final_internal_class.rst b/doc/rules/class_notation/final_internal_class.rst
@@ -18,7 +18,7 @@ Configuration
 ``annotation_include``
 ~~~~~~~~~~~~~~~~~~~~~~
 
-.. warning:: This option is deprecated and will be removed on next major version. Use ``include`` to configure PHPDoc annotations tags and attributes.
+.. warning:: This option is deprecated and will be removed in the next major version. Use ``include`` to configure PHPDoc annotations tags and attributes.
 
 Class level attribute or annotation tags that must be set in order to fix the
 class (case insensitive).
@@ -30,7 +30,7 @@ Default value: ``['@internal']``
 ``annotation_exclude``
 ~~~~~~~~~~~~~~~~~~~~~~
 
-.. warning:: This option is deprecated and will be removed on next major version. Use ``exclude`` to configure PHPDoc annotations tags and attributes.
+.. warning:: This option is deprecated and will be removed in the next major version. Use ``exclude`` to configure PHPDoc annotations tags and attributes.
 
 Class level attribute or annotation tags that must be omitted to fix the class,
 even if all of the white list ones are used as well (case insensitive).

diff --git a/doc/rules/control_structure/no_trailing_comma_in_list_call.rst b/doc/rules/control_structure/no_trailing_comma_in_list_call.rst
@@ -7,8 +7,8 @@ Remove trailing commas in list function calls.
 Warning
 -------
 
-This rule is deprecated and will be removed on next major version
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+This rule is deprecated and will be removed in the next major version
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 You should use ``no_trailing_comma_in_singleline`` instead.
 

diff --git a/doc/rules/function_notation/function_typehint_space.rst b/doc/rules/function_notation/function_typehint_space.rst
@@ -7,8 +7,8 @@ Ensure single space between function's argument and its typehint.
 Warning
 -------
 
-This rule is deprecated and will be removed on next major version
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+This rule is deprecated and will be removed in the next major version
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 You should use ``type_declaration_spaces`` instead.
 

diff --git a/doc/rules/function_notation/no_trailing_comma_in_singleline_function_call.rst b/doc/rules/function_notation/no_trailing_comma_in_singleline_function_call.rst
@@ -8,8 +8,8 @@ trailing comma after the last argument.
 Warning
 -------
 
-This rule is deprecated and will be removed on next major version
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+This rule is deprecated and will be removed in the next major version
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 You should use ``no_trailing_comma_in_singleline`` instead.
 

diff --git a/doc/rules/language_construct/class_keyword_remove.rst b/doc/rules/language_construct/class_keyword_remove.rst
@@ -7,8 +7,8 @@ Converts ``::class`` keywords to FQCN strings.
 Warning
 -------
 
-This rule is deprecated and will be removed on next major version
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+This rule is deprecated and will be removed in the next major version
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Examples
 --------

diff --git a/doc/rules/language_construct/single_space_after_construct.rst b/doc/rules/language_construct/single_space_after_construct.rst
@@ -7,8 +7,8 @@ Ensures a single space after language constructs.
 Warning
 -------
 
-This rule is deprecated and will be removed on next major version
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+This rule is deprecated and will be removed in the next major version
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 You should use ``single_space_around_construct`` instead.
 

diff --git a/doc/rules/namespace_notation/no_blank_lines_before_namespace.rst b/doc/rules/namespace_notation/no_blank_lines_before_namespace.rst
@@ -7,8 +7,8 @@ There should be no blank lines before a namespace declaration.
 Warning
 -------
 
-This rule is deprecated and will be removed on next major version
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+This rule is deprecated and will be removed in the next major version
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 You should use ``blank_lines_before_namespace`` instead.
 

diff --git a/doc/rules/namespace_notation/single_blank_line_before_namespace.rst b/doc/rules/namespace_notation/single_blank_line_before_namespace.rst
@@ -7,8 +7,8 @@ There should be exactly one blank line before a namespace declaration.
 Warning
 -------
 
-This rule is deprecated and will be removed on next major version
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+This rule is deprecated and will be removed in the next major version
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 You should use ``blank_lines_before_namespace`` instead.
 

diff --git a/doc/rules/whitespace/no_spaces_inside_parenthesis.rst b/doc/rules/whitespace/no_spaces_inside_parenthesis.rst
@@ -8,8 +8,8 @@ space before the closing parenthesis.
 Warning
 -------
 
-This rule is deprecated and will be removed on next major version
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+This rule is deprecated and will be removed in the next major version
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 You should use ``spaces_inside_parentheses`` instead.
 

diff --git a/src/Console/Command/DescribeCommand.php b/src/Console/Command/DescribeCommand.php
@@ -155,7 +155,7 @@ private function describeRule(OutputInterface $output, string $name): void
         if ($fixer instanceof DeprecatedFixerInterface) {
             $successors = $fixer->getSuccessorsNames();
             $message = [] === $successors
-                ? 'will be removed on next major version'
+                ? 'will be removed in the next major version'
                 : sprintf('use %s instead', Utils::naturalLanguageJoinWithBackticks($successors));
             $message = Preg::replace('/(`.+?`)/', '<info>$1</info>', $message);
             $summary .= sprintf(' <error>DEPRECATED</error>: %s.', $message);

diff --git a/src/Documentation/FixerDocumentGenerator.php b/src/Documentation/FixerDocumentGenerator.php
@@ -76,8 +76,8 @@ public function generateFixerDocumentation(FixerInterface $fixer): string
         if ($fixer instanceof DeprecatedFixerInterface) {
             $deprecationDescription = <<<'RST'
 
-                This rule is deprecated and will be removed on next major version
-                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                This rule is deprecated and will be removed in the next major version
+                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                 RST;
             $alternatives = $fixer->getSuccessorsNames();
 
@@ -135,13 +135,13 @@ public function generateFixerDocumentation(FixerInterface $fixer): string
 
                 if ($option instanceof DeprecatedFixerOptionInterface) {
                     $deprecationMessage = RstUtils::toRst($option->getDeprecationMessage());
-                    $optionInfo .= "\n\n.. warning:: This option is deprecated and will be removed on next major version. {$deprecationMessage}";
+                    $optionInfo .= "\n\n.. warning:: This option is deprecated and will be removed in the next major version. {$deprecationMessage}";
                 }
 
                 $optionInfo .= "\n\n".RstUtils::toRst($option->getDescription());
 
                 if ($option instanceof AliasedFixerOption) {
-                    $optionInfo .= "\n\n.. note:: The previous name of this option was ``{$option->getAlias()}`` but it is now deprecated and will be removed on next major version.";
+                    $optionInfo .= "\n\n.. note:: The previous name of this option was ``{$option->getAlias()}`` but it is now deprecated and will be removed in the next major version.";
                 }
 
                 $allowed = HelpCommand::getDisplayableAllowedValues($option);

diff --git a/src/Documentation/ListDocumentGenerator.php b/src/Documentation/ListDocumentGenerator.php
@@ -95,11 +95,11 @@ public function generateListingDocumentation(array $fixers): string
 
                     if ($option instanceof DeprecatedFixerOptionInterface) {
                         $deprecationMessage = RstUtils::toRst($option->getDeprecationMessage(), 3);
-                        $documentation .= "\n     | warning:: This option is deprecated and will be removed on next major version. {$deprecationMessage}";
+                        $documentation .= "\n     | warning:: This option is deprecated and will be removed in the next major version. {$deprecationMessage}";
                     }
 
                     if ($option instanceof AliasedFixerOption) {
-                        $documentation .= "\n     | note:: The previous name of this option was ``{$option->getAlias()}`` but it is now deprecated and will be removed on next major version.";
+                        $documentation .= "\n     | note:: The previous name of this option was ``{$option->getAlias()}`` but it is now deprecated and will be removed in the next major version.";
                     }
 
                     $allowed = HelpCommand::getDisplayableAllowedValues($option);