Merge branch '2.19'

# Conflicts: # src/Console/WarningsDetector.php # tests/Smoke/CiIntegrationTest.php
PHP-CS-Fixer · Nov 15, 2021 · fdc3616 · fdc3616
2 parents b93ee4b + 29691a1
commit fdc3616
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/src/Console/WarningsDetector.php b/src/Console/WarningsDetector.php
@@ -45,6 +45,7 @@ public function detectOldMajor(): void
         // $currentMajorVersion = \intval(explode('.', Application::VERSION)[0], 10);
         // $nextMajorVersion = $currentMajorVersion + 1;
         // $this->warnings[] = "You are running PHP CS Fixer v{$currentMajorVersion}, which is not maintained anymore. Please update to v{$nextMajorVersion}.";
+        // $this->warnings[] = "You may find an UPGRADE guide at https://github.com/FriendsOfPHP/PHP-CS-Fixer/blob/v{$nextMajorVersion}.0.0/UPGRADE-v{$nextMajorVersion}.md .";
     }
 
     public function detectOldVendor(): void

diff --git a/tests/Smoke/CiIntegrationTest.php b/tests/Smoke/CiIntegrationTest.php
@@ -145,6 +145,7 @@ public function testIntegration(
         ]);
 
         $optionalDeprecatedVersionWarning = 'You are running PHP CS Fixer v3, which is not maintained anymore. Please update to v4.
+You may find an UPGRADE guide at https://github.com/FriendsOfPHP/PHP-CS-Fixer/blob/v4.0.0/UPGRADE-v4.md .
 ';
 
         $optionalIncompatibilityWarning = 'PHP needs to be a minimum version of PHP 7.1.3 and maximum version of PHP 8.0.*.
-Original file line number
+Diff line change
@@ Expand Up / @@ -145,6 +145,7 @@ public function testIntegration( @@
             ]);
             $optionalDeprecatedVersionWarning = 'You are running PHP CS Fixer v3, which is not maintained anymore. Please update to v4.
+    You may find an UPGRADE guide at https://github.com/FriendsOfPHP/PHP-CS-Fixer/blob/v4.0.0/UPGRADE-v4.md .
     ';
             $optionalIncompatibilityWarning = 'PHP needs to be a minimum version of PHP 7.1.3 and maximum version of PHP 8.0.*.
@@ Expand Down @@