Skip to content

Commit 211eb09

Browse files
authored
merge CI jobs (#475)
* merge CI jobs * bump
1 parent 7740494 commit 211eb09

36 files changed

Lines changed: 144 additions & 277 deletions

File tree

.github/workflows/code_analysis.yaml

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,33 @@ jobs:
2020
name: 'Active Classes'
2121
run: vendor/bin/class-leak check config src rules --skip-suffix "Rector"
2222

23+
-
24+
name: 'Tests'
25+
run: vendor/bin/phpunit
26+
27+
-
28+
name: 'Finalise classes'
29+
run: vendor/bin/swiss-knife finalize-classes src rules tests
30+
31+
-
32+
name: 'Composer Validate'
33+
run: composer validate
34+
35+
-
36+
name: 'PHPStan'
37+
run: vendor/bin/phpstan
38+
2339
name: ${{ matrix.actions.name }}
2440
runs-on: ubuntu-latest
25-
timeout-minutes: 10
41+
timeout-minutes: 5
2642

2743
steps:
2844
- uses: actions/checkout@v4
2945

3046
-
3147
uses: shivammathur/setup-php@v2
3248
with:
33-
php-version: 8.2
49+
php-version: 8.3
3450
coverage: none
3551

3652
- uses: "ramsey/composer-install@v2"

.github/workflows/code_analysis_reusable.yaml

Lines changed: 0 additions & 19 deletions
This file was deleted.

.github/workflows/rector.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
-
2424
uses: shivammathur/setup-php@v2
2525
with:
26-
php-version: 8.2
26+
php-version: 8.3
2727
coverage: none
2828

2929
- uses: "ramsey/composer-install@v2"

.github/workflows/tests.yaml

Lines changed: 0 additions & 29 deletions
This file was deleted.

composer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"license": "MIT",
55
"description": "Rector upgrades rules for Doctrine",
66
"require": {
7-
"php": ">=8.2",
7+
"php": ">=8.3",
88
"symfony/yaml": "^7.4|8.0.*"
99
},
1010
"require-dev": {
@@ -16,8 +16,9 @@
1616
"phpstan/phpstan-deprecation-rules": "^2.0",
1717
"phpstan/phpstan-webmozart-assert": "^2.0",
1818
"phpunit/phpunit": "^11.5|^12.0",
19-
"rector/jack": "^0.4.0",
19+
"rector/jack": "^0.5.0",
2020
"rector/rector-src": "dev-main",
21+
"rector/swiss-knife": "^2.3",
2122
"rector/type-perfect": "^2.1",
2223
"symplify/phpstan-extensions": "^12.0",
2324
"symplify/phpstan-rules": "^14.9",

rules-tests/CodeQuality/Rector/Property/TypedPropertyFromToOneRelationTypeRector/Source/Company.php

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

55
namespace Rector\Doctrine\Tests\CodeQuality\Rector\Property\TypedPropertyFromToOneRelationTypeRector\Source;
66

7-
class Company
7+
final class Company
88
{
99
}

rules-tests/Dbal40/Rector/StmtsAwareInterface/ExecuteQueryParamsToBindValueRector/Source/Statement.php

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

55
namespace Rector\Doctrine\Tests\Dbal40\Rector\StmtsAwareInterface\ExecuteQueryParamsToBindValueRector\Source;
66

7-
class Statement
7+
final class Statement
88
{
99
}

rules-tests/DoctrineFixture/Rector/MethodCall/AddGetReferenceTypeRector/Source/SomePassedEntity.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
namespace Rector\Doctrine\Tests\DoctrineFixture\Rector\MethodCall\AddGetReferenceTypeRector\Source;
44

5-
class SomePassedEntity
5+
final class SomePassedEntity
66
{
77
}

rules-tests/TypedCollections/Rector/ClassMethod/CollectionDocblockGenericTypeRector/Source/RandomHouse.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
namespace Rector\Doctrine\Tests\TypedCollections\Rector\ClassMethod\CollectionDocblockGenericTypeRector\Source;
44

5-
class RandomHouse
5+
final class RandomHouse
66
{
77
}

rules-tests/TypedCollections/Rector/ClassMethod/NarrowParamUnionToCollectionRector/Source/AnyEntity.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
namespace Rector\Doctrine\Tests\TypedCollections\Rector\ClassMethod\NarrowParamUnionToCollectionRector\Source;
44

5-
class AnyEntity
5+
final class AnyEntity
66
{
77
}

0 commit comments

Comments
 (0)