[ci] add job to check laravel rector with latest dev-main build

Author: TomasVotruba

.github/workflows/rector_laravel_rector_dev.yaml

@@ -0,0 +1,31 @@
+name: Rector Laravel with dev-main
+
+on:
+    push:
+        branches:
+            - main
+    pull_request: null
+
+env:
+    # see https://github.com/composer/composer/issues/9368#issuecomment-718112361
+    COMPOSER_ROOT_VERSION: "dev-main"
+
+jobs:
+    rector_laravel_rector_dev:
+        runs-on: ubuntu-latest
+
+        steps:
+            -
+                uses: shivammathur/setup-php@v2
+                with:
+                    php-version: 8.3
+                    coverage: none
+
+                # fixes https://github.com/rectorphp/rector/pull/4559/checks?check_run_id=1359814403, see https://github.com/shivammathur/setup-php#composer-github-oauth
+                env:
+                    COMPOSER_TOKEN: ${{ secrets.ACCESS_TOKEN }}
+
+            -   run: git clone https://github.com/driftingly/rector-laravel.git
+            -   run: composer require rector/rector:dev-main --working-dir rector-laravel
+            -   run: cd rector-laravel && vendor/bin/phpunit
+

rules-tests/Privatization/Rector/ClassMethod/PrivatizeFinalClassMethodRector/Fixture/keep_magic_parent_called_method.php.inc

@@ -3,19 +3,12 @@
 namespace Rector\Tests\Privatization\Rector\ClassMethod\PrivatizeFinalClassMethodRector\Fixture;
 
 use PhpParser\PrettyPrinter\Standard;
-<<<<<<< HEAD
-=======
 use Rector\PhpParser\Node\FileNode;
->>>>>>> fb58990e39 (extract LaravelClassName)
 
 final class KeepMagicParentCalledMethod extends Standard
 {
     // called from parent by $this->{'p'} method
-<<<<<<< HEAD
-    protected function pFileNode($fileNode)
-=======
     protected function pFileNode(FileNode $fileNode)
->>>>>>> fb58990e39 (extract LaravelClassName)
     {
     }
 }

rules/Privatization/Rector/ClassMethod/PrivatizeFinalClassMethodRector.php

@@ -31,11 +31,7 @@ public function __construct(
         private readonly OverrideByParentClassGuard $overrideByParentClassGuard,
         private readonly BetterNodeFinder $betterNodeFinder,
         private readonly LaravelModelGuard $laravelModelGuard,
-<<<<<<< HEAD
         private readonly ParentClassMagicCallGuard $parentClassMagicCallGuard,
-=======
-        private readonly \Rector\Privatization\VisibilityGuard\ParentClassMagicCallGuard $parentClassMagicCallGuard
->>>>>>> 4263eff61e (skip parent magic called method in PrivatizeFinalClassMethodRector)
     ) {
     }
 

src/Testing/TestingParser/TestingParser.php

@@ -28,32 +28,7 @@ public function __construct(
 
     public function parseFilePathToFile(string $filePath): File
     {
-<<<<<<< HEAD
-<<<<<<< HEAD
         [$file, $stmts] = $this->parseToFileAndStmts($filePath);
-<<<<<<< HEAD
-=======
-        // needed for PHPStan reflection, as it caches the last processed file
-        $this->dynamicSourceLocatorProvider->setFilePath($filePath);
-
-        $fileContent = FileSystem::read($filePath);
-        $file = new File($filePath, $fileContent);
-        $stmts = $this->rectorParser->parseString($fileContent);
-
-        // wrap in FileNode to enable file-level rules
-        $stmts = [new FileNode($stmts)];
-
-        $stmts = $this->nodeScopeAndMetadataDecorator->decorateNodesFromFile($filePath, $stmts);
-
-        $file->hydrateStmtsAndTokens($stmts, $stmts, []);
-        $this->currentFileProvider->setFile($file);
->>>>>>> 2751658832 (introduce FileNode to handle file-level changes; deprecate IncreaseDeclareStrictTypesRector)
-=======
-        [$file, $stmts] = $this->parseToFileAndStmts($filePath);
->>>>>>> 8e51776f69 (cleanup phpstan errors)
-
-=======
->>>>>>> 90002f8aee (extract LaravelClassName)
         return $file;
     }
 
@@ -64,37 +39,10 @@ public function parseFileToDecoratedNodes(string $filePath): array
     {
         [$file, $stmts] = $this->parseToFileAndStmts($filePath);
         return $stmts;
-<<<<<<< HEAD
-<<<<<<< HEAD
     }
 
     /**
      * @return array{0: File, 1: Node[]}
-=======
-        //
-        //        // needed for PHPStan reflection, as it caches the last processed file
-        //        $this->dynamicSourceLocatorProvider->setFilePath($filePath);
-        //
-        //        $fileContent = FileSystem::read($filePath);
-        //        $stmts = $this->rectorParser->parseString($fileContent);
-        //        $file = new File($filePath, $fileContent);
-        //
-        //        // wrap in FileNode to enable file-level rules
-        //        $stmts = [new FileNode($stmts)];
-        //
-        //        $stmts = $this->nodeScopeAndMetadataDecorator->decorateNodesFromFile($filePath, $stmts);
-        //        $file->hydrateStmtsAndTokens($stmts, $stmts, []);
-        //
-        //        $this->currentFileProvider->setFile($file);
-        //
-        //        return $stmts;
-=======
->>>>>>> 90002f8aee (extract LaravelClassName)
-    }
-
-    /**
-     * @return array{0: File, 1: Node\Stmt[]}
->>>>>>> 8e51776f69 (cleanup phpstan errors)
      */
     private function parseToFileAndStmts(string $filePath): array
     {
@@ -105,16 +53,8 @@ private function parseToFileAndStmts(string $filePath): array
         $file = new File($filePath, $fileContent);
         $stmts = $this->rectorParser->parseString($fileContent);
 
-<<<<<<< HEAD
-        $stmts = $this->rectorParser->parseString($fileContent);
-=======
         // wrap in FileNode to enable file-level rules
         $stmts = [new FileNode($stmts)];
-<<<<<<< HEAD
-
->>>>>>> 2751658832 (introduce FileNode to handle file-level changes; deprecate IncreaseDeclareStrictTypesRector)
-=======
->>>>>>> 90002f8aee (extract LaravelClassName)
         $stmts = $this->nodeScopeAndMetadataDecorator->decorateNodesFromFile($filePath, $stmts);
 
         $file->hydrateStmtsAndTokens($stmts, $stmts, []);