Updated Rector to commit c3ff0fd4328b603df30c7e7bb833cb1e641f410c

rectorphp/rector-src@c3ff0fd Upgrade to PHPUnit 10 🥳️ (#3332)

Author: TomasVotruba

config/config.php

@@ -45,7 +45,6 @@
 use Rector\PSR4\Composer\PSR4NamespaceMatcher;
 use Rector\PSR4\Contract\PSR4AutoloadNamespaceMatcherInterface;
 use Rector\Utils\Command\MissingInSetCommand;
-use RectorPrefix202302\SebastianBergmann\Diff\Differ;
 use RectorPrefix202302\Symfony\Component\Console\Application;
 use RectorPrefix202302\Symfony\Component\Console\Style\SymfonyStyle;
 use function RectorPrefix202302\Symfony\Component\DependencyInjection\Loader\Configurator\service;
@@ -144,6 +143,4 @@
     $services->set(\PHPStan\PhpDocParser\Lexer\Lexer::class);
     $services->set(TypeParser::class);
     $services->set(ConstExprParser::class);
-    // console color diff
-    $services->set(Differ::class);
 };

e2e/rector-prefixed-rule-test/utils/rector/tests/Rector/RenameSimpleRector/RenameSimpleRectorTest.php

@@ -20,9 +20,9 @@ public function test(string $filePath): void
     /**
      * @return Iterator<array<string>>
      */
-    public function provideData(): Iterator
+    public static function provideData(): Iterator
     {
-        return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
+        return self::yieldFilesFromDirectory(__DIR__ . '/Fixture');
     }
 
     public function provideConfigFilePath(): string

packages/Testing/PHPUnit/AbstractRectorTestCase.php

@@ -80,7 +80,7 @@ protected function tearDown() : void
     /**
      * @return Iterator<<string>>
      */
-    protected function yieldFilesFromDirectory(string $directory, string $suffix = '*.php.inc') : Iterator
+    protected static function yieldFilesFromDirectory(string $directory, string $suffix = '*.php.inc') : Iterator
     {
         return FixtureFileFinder::yieldDirectory($directory, $suffix);
     }
@@ -105,7 +105,7 @@ protected function doTestFile(string $fixtureFilePath) : void
         $this->originalTempFilePath = $inputFilePath;
         $this->doTestFileMatchesExpectedContent($inputFilePath, $expectedFilePath, $fixtureFilePath);
     }
-    protected function getFixtureTempDirectory() : string
+    protected static function getFixtureTempDirectory() : string
     {
         return FixtureTempFileDumper::getTempDirectory();
     }

rules/CodingStyle/Rector/ClassMethod/DataProviderArrayItemsNewlinedRector.php

@@ -41,7 +41,7 @@ public function testGetBytesSize(string $content, int $number): void
         // ...
     }
 
-    public function provideData(): array
+    public static function provideData(): array
     {
         return [['content', 8], ['content123', 11]];
     }
@@ -60,7 +60,7 @@ public function testGetBytesSize(string $content, int $number): void
         // ...
     }
 
-    public function provideData(): array
+    public static function provideData(): array
     {
         return [
             ['content', 8],

rules/TypeDeclaration/Rector/ClassMethod/AddParamTypeBasedOnPHPUnitDataProviderRector.php

@@ -69,7 +69,7 @@ public function test($value)
     {
     }
 
-    public function provideData()
+    public static function provideData()
     {
         yield ['name'];
     }
@@ -87,7 +87,7 @@ public function test(string $value)
     {
     }
 
-    public function provideData()
+    public static function provideData()
     {
         yield ['name'];
     }

src/Application/VersionResolver.php

@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '1fd38073d08dff31e7b6f5fecdfc0df8f6e897b0';
+    public const PACKAGE_VERSION = 'c3ff0fd4328b603df30c7e7bb833cb1e641f410c';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2023-02-02 17:49:56';
+    public const RELEASE_DATE = '2023-02-03 17:42:57';
     /**
      * @var int
      */

src/Console/Formatter/ConsoleDiffer.php

@@ -4,6 +4,8 @@
 namespace Rector\Core\Console\Formatter;
 
 use RectorPrefix202302\SebastianBergmann\Diff\Differ;
+use RectorPrefix202302\SebastianBergmann\Diff\Output\StrictUnifiedDiffOutputBuilder;
+use RectorPrefix202302\SebastianBergmann\Diff\Output\UnifiedDiffOutputBuilder;
 final class ConsoleDiffer
 {
     /**
@@ -16,10 +18,13 @@ final class ConsoleDiffer
      * @var \Rector\Core\Console\Formatter\ColorConsoleDiffFormatter
      */
     private $colorConsoleDiffFormatter;
-    public function __construct(Differ $differ, \Rector\Core\Console\Formatter\ColorConsoleDiffFormatter $colorConsoleDiffFormatter)
+    public function __construct(\Rector\Core\Console\Formatter\ColorConsoleDiffFormatter $colorConsoleDiffFormatter)
     {
-        $this->differ = $differ;
         $this->colorConsoleDiffFormatter = $colorConsoleDiffFormatter;
+        // @see https://github.com/sebastianbergmann/diff#strictunifieddiffoutputbuilder
+        // @see https://github.com/sebastianbergmann/diff/compare/4.0.4...5.0.0#diff-251edf56a6344c03fa264a4926b06c2cee43c25f66192d5f39ebee912b7442dc for upgrade
+        $unifiedDiffOutputBuilder = new UnifiedDiffOutputBuilder();
+        $this->differ = new Differ($unifiedDiffOutputBuilder);
     }
     public function diff(string $old, string $new) : string
     {

vendor/autoload.php

@@ -22,4 +22,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInita47dd119f87e03c2c15debfad792ecd7::getLoader();
+return ComposerAutoloaderInit3f38aa930f66abcbdeb033aa5b78a720::getLoader();

vendor/composer/autoload_classmap.php

@@ -2047,6 +2047,7 @@
     'Rector\\PHPUnit\\PhpDoc\\PhpDocValueToNodeMapper' => $vendorDir . '/rector/rector-phpunit/src/PhpDoc/PhpDocValueToNodeMapper.php',
     'Rector\\PHPUnit\\Rector\\ClassMethod\\AddDoesNotPerformAssertionToNonAssertingTestRector' => $vendorDir . '/rector/rector-phpunit/src/Rector/ClassMethod/AddDoesNotPerformAssertionToNonAssertingTestRector.php',
     'Rector\\PHPUnit\\Rector\\ClassMethod\\CreateMockToAnonymousClassRector' => $vendorDir . '/rector/rector-phpunit/src/Rector/ClassMethod/CreateMockToAnonymousClassRector.php',
+    'Rector\\PHPUnit\\Rector\\ClassMethod\\DataProviderAnnotationToAttributeRector' => $vendorDir . '/rector/rector-phpunit/src/Rector/ClassMethod/DataProviderAnnotationToAttributeRector.php',
     'Rector\\PHPUnit\\Rector\\ClassMethod\\DependsAnnotationWithValueToAttributeRector' => $vendorDir . '/rector/rector-phpunit/src/Rector/ClassMethod/DependsAnnotationWithValueToAttributeRector.php',
     'Rector\\PHPUnit\\Rector\\ClassMethod\\ExceptionAnnotationRector' => $vendorDir . '/rector/rector-phpunit/src/Rector/ClassMethod/ExceptionAnnotationRector.php',
     'Rector\\PHPUnit\\Rector\\ClassMethod\\RemoveEmptyTestMethodRector' => $vendorDir . '/rector/rector-phpunit/src/Rector/ClassMethod/RemoveEmptyTestMethodRector.php',

vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInita47dd119f87e03c2c15debfad792ecd7
+class ComposerAutoloaderInit3f38aa930f66abcbdeb033aa5b78a720
 {
     private static $loader;
 
@@ -22,17 +22,17 @@ public static function getLoader()
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInita47dd119f87e03c2c15debfad792ecd7', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit3f38aa930f66abcbdeb033aa5b78a720', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInita47dd119f87e03c2c15debfad792ecd7', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit3f38aa930f66abcbdeb033aa5b78a720', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInita47dd119f87e03c2c15debfad792ecd7::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInit3f38aa930f66abcbdeb033aa5b78a720::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);
 
-        $filesToLoad = \Composer\Autoload\ComposerStaticInita47dd119f87e03c2c15debfad792ecd7::$files;
+        $filesToLoad = \Composer\Autoload\ComposerStaticInit3f38aa930f66abcbdeb033aa5b78a720::$files;
         $requireFile = static function ($fileIdentifier, $file) {
             if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
                 $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;