Skip to content

Commit 3b95fb3

Browse files
committed
[ci] add job to check laravel rector with latest dev-main build
1 parent bf13528 commit 3b95fb3

File tree

4 files changed

+32
-12
lines changed

4 files changed

+32
-12
lines changed
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: Rector Laravel with dev-main
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
pull_request: null
8+
9+
env:
10+
# see https://github.com/composer/composer/issues/9368#issuecomment-718112361
11+
COMPOSER_ROOT_VERSION: "dev-main"
12+
13+
jobs:
14+
rector_laravel_rector_dev:
15+
runs-on: ubuntu-latest
16+
17+
steps:
18+
-
19+
uses: shivammathur/setup-php@v2
20+
with:
21+
php-version: 8.3
22+
coverage: none
23+
24+
# fixes https://github.com/rectorphp/rector/pull/4559/checks?check_run_id=1359814403, see https://github.com/shivammathur/setup-php#composer-github-oauth
25+
env:
26+
COMPOSER_TOKEN: ${{ secrets.ACCESS_TOKEN }}
27+
28+
- run: git clone https://github.com/driftingly/rector-laravel.git
29+
- run: composer require rector/rector:dev-main --working-dir rector-laravel
30+
- run: cd rector-laravel && vendor/bin/phpunit
31+

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,12 @@
33
namespace Rector\Tests\Privatization\Rector\ClassMethod\PrivatizeFinalClassMethodRector\Fixture;
44

55
use PhpParser\PrettyPrinter\Standard;
6-
<<<<<<< HEAD
7-
=======
86
use Rector\PhpParser\Node\FileNode;
9-
>>>>>>> fb58990e39 (extract LaravelClassName)
107

118
final class KeepMagicParentCalledMethod extends Standard
129
{
1310
// called from parent by $this->{'p'} method
14-
<<<<<<< HEAD
15-
protected function pFileNode($fileNode)
16-
=======
1711
protected function pFileNode(FileNode $fileNode)
18-
>>>>>>> fb58990e39 (extract LaravelClassName)
1912
{
2013
}
2114
}

rules/Privatization/Guard/ParentClassMagicCallGuard.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44

55
namespace Rector\Privatization\Guard;
66

7-
use PhpParser\PrettyPrinterAbstract;
87
use PhpParser\Node\Expr;
98
use PhpParser\Node\Expr\MethodCall;
109
use PhpParser\Node\Name;
1110
use PhpParser\Node\Stmt\Class_;
1211
use PhpParser\PrettyPrinter\Standard;
12+
use PhpParser\PrettyPrinterAbstract;
1313
use Rector\NodeNameResolver\NodeNameResolver;
1414
use Rector\PhpParser\AstResolver;
1515
use Rector\PhpParser\Node\BetterNodeFinder;

rules/Privatization/Rector/ClassMethod/PrivatizeFinalClassMethodRector.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,7 @@ public function __construct(
3131
private readonly OverrideByParentClassGuard $overrideByParentClassGuard,
3232
private readonly BetterNodeFinder $betterNodeFinder,
3333
private readonly LaravelModelGuard $laravelModelGuard,
34-
<<<<<<< HEAD
3534
private readonly ParentClassMagicCallGuard $parentClassMagicCallGuard,
36-
=======
37-
private readonly \Rector\Privatization\VisibilityGuard\ParentClassMagicCallGuard $parentClassMagicCallGuard
38-
>>>>>>> 4263eff61e (skip parent magic called method in PrivatizeFinalClassMethodRector)
3935
) {
4036
}
4137

0 commit comments

Comments
 (0)