Skip to content

Commit 4e0b912

Browse files
TomasVotrubaTomasVotruba
authored
[ci] add short class fixture names check to avoid node class names (#7548)
* move internal /bin files to /scripts, to separate from public /bin API * decouple script helpers * [ci] add short class fixture names check to avoid node class names * improve rector class finder return only non abstract non deprecated
1 parent e06efea commit 4e0b912

31 files changed

Lines changed: 220 additions & 193 deletions

File tree

‎.github/workflows/build_scoped_rector.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
# 1. copy files to $NESTED_DIRECTORY directory Exclude the scoped/nested directories to prevent rsync from copying in a loop
5959
- run: rsync --exclude rector-build -av * rector-build --quiet
6060

61-
- run: rm -rf rector-build/rules-tests rector-build/templates rector-build/tests rector-build/bin/generate-changelog.php rector-build/bin/validate-phpstan-version.php rector-build/vendor/tracy/tracy/examples rector-build/vendor/symfony/console/Tester rector-build/vendor/symfony/console/Event rector-build/vendor/symfony/console/EventListener rector-build/vendor/tracy/tracy/examples rector-build/vendor/tracy/tracy/src/Bridges rector-build/vendor/tracy/tracy/src/Tracy/Bar rector-build/vendor/tracy/tracy/src/Tracy/Session rector-build/vendor/symfony/service-contracts/Test
61+
- run: rm -rf rector-build/rules-tests rector-build/templates rector-build/tests rector-build/scripts/validate-phpstan-version.php rector-build/vendor/tracy/tracy/examples rector-build/vendor/symfony/console/Tester rector-build/vendor/symfony/console/Event rector-build/vendor/symfony/console/EventListener rector-build/vendor/tracy/tracy/examples rector-build/vendor/tracy/tracy/src/Bridges rector-build/vendor/tracy/tracy/src/Tracy/Bar rector-build/vendor/tracy/tracy/src/Tracy/Session rector-build/vendor/symfony/service-contracts/Test
6262

6363
# 2. downgrade rector
6464
- run: php -d memory_limit=-1 bin/rector process rector-build/bin rector-build/config rector-build/src rector-build/rules rector-build/vendor --config build/config/config-downgrade.php --ansi --no-diffs
@@ -95,7 +95,7 @@ jobs:
9595

9696
- run: cp -a rector-prefixed-downgraded/. remote-repository
9797

98-
- run: rm -rf remote-repository/bin/add-phpstan-self-replace.php remote-repository/bin/test-fixture-stats.php remote-repository/bin/check-before-after-same-fixtures.php remote-repository/bin/no-php-file-in-fixtures.php
98+
- run: rm -rf remote-repository/scripts/add-phpstan-self-replace.php remote-repository/scripts/test-fixture-stats.php remote-repository/scripts/check-before-after-same-fixtures.php remote-repository/scripts/no-php-file-in-fixtures.php
9999

100100
# 7. setup git
101101
-

‎.github/workflows/code_analysis.yaml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,19 +46,23 @@ jobs:
4646
4747
-
4848
name: 'Compatible PHPStan versions'
49-
run: php bin/validate-phpstan-version.php
49+
run: php scripts/validate-phpstan-version.php
5050

5151
-
5252
name: 'Finalize classes'
5353
run: vendor/bin/swiss-knife finalize-classes src tests --dry-run
5454

5555
-
5656
name: 'Check before/after test fixture on no-changes'
57-
run: php bin/check-before-after-same-fixtures.php
57+
run: php scripts/check-before-after-same-fixtures.php
58+
59+
-
60+
name: 'Check fixture classes are different to nodes'
61+
run: php scripts/avoid-short-node-names-in-fixtures.php
5862

5963
-
6064
name: 'Check no "*.php" files in rules Fixture directory'
61-
run: php bin/no-php-file-in-fixtures.php
65+
run: php scripts/no-php-file-in-fixtures.php
6266

6367
-
6468
name: 'Detect composer dependency issues'

‎build/build-rector-scoped.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ note "Starts"
3030
note "Downloading php-scoper.phar"
3131
wget https://github.com/humbug/php-scoper/releases/download/0.18.17/php-scoper.phar -N --no-verbose
3232

33-
php "$BUILD_DIRECTORY/bin/add-phpstan-self-replace.php"
33+
php "$BUILD_DIRECTORY/scripts/add-phpstan-self-replace.php"
3434

3535
note "Remove PHPStan to avoid duplicating it"
3636

‎composer-dependency-analyser.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
// ensure use version ^3.2.0
1818
->ignoreErrorsOnPackage('composer/pcre', [ErrorType::UNUSED_DEPENDENCY])
1919

20-
// use din /bin, but only local script
21-
->ignoreErrorsOnPackage('nette/robot-loader', [ErrorType::DEV_DEPENDENCY_IN_PROD])
22-
2320
->ignoreErrorsOnPaths([
2421
__DIR__ . '/stubs',
2522
__DIR__ . '/tests',

‎composer.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@
8686
"E2e\\Parallel\\Reflection\\Resolver\\": [
8787
"e2e/parallel-reflection-resolver/src/",
8888
"e2e/no-parallel-reflection-resolver/src"
89-
]
89+
],
90+
"Rector\\Scripts\\": "scripts/src"
9091
},
9192
"classmap": [
9293
"stubs",

‎ecs.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
__DIR__ . '/tests',
1818
__DIR__ . '/utils',
1919
__DIR__ . '/config',
20+
__DIR__ . '/scripts',
2021
__DIR__ . '/build/build-preload.php',
2122
])
2223
->withSkip([

‎full_build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ bin/rector process src/functions/node_helper.php -c build/config/config-downgrad
3131

3232
rsync --exclude rector-build -av * rector-build --quiet
3333

34-
rm -rf rector-build/rules-tests rector-build/templates rector-build/tests rector-build/bin/validate-phpstan-version.php rector-build/vendor/tracy/tracy/examples rector-build/vendor/symfony/console/Tester rector-build/vendor/symfony/console/Event rector-build/vendor/symfony/console/EventListener rector-build/vendor/tracy/tracy/examples rector-build/vendor/tracy/tracy/src/Bridges rector-build/vendor/tracy/tracy/src/Tracy/Bar rector-build/vendor/tracy/tracy/src/Tracy/Session rector-build/vendor/symfony/service-contracts/Test
34+
rm -rf rector-build/rules-tests rector-build/templates rector-build/tests rector-build/scripts/validate-phpstan-version.php rector-build/vendor/tracy/tracy/examples rector-build/vendor/symfony/console/Tester rector-build/vendor/symfony/console/Event rector-build/vendor/symfony/console/EventListener rector-build/vendor/tracy/tracy/examples rector-build/vendor/tracy/tracy/src/Bridges rector-build/vendor/tracy/tracy/src/Tracy/Bar rector-build/vendor/tracy/tracy/src/Tracy/Session rector-build/vendor/symfony/service-contracts/Test
3535

3636
php -d memory_limit=-1 bin/rector process rector-build/bin rector-build/config rector-build/src rector-build/rules rector-build/vendor --config build/config/config-downgrade.php --ansi --no-diffs
3737

‎phpstan.neon‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ parameters:
2626
- tests
2727
- rules-tests
2828
- utils
29+
- scripts
2930
- e2e/e2eTestRunnerWithCache.php
3031
- e2e/e2eTestRunner.php
3132

rules-tests/CodeQuality/Rector/Identical/FlipTypeControlToUseExclusiveTypeRector/Fixture/nullable_type.php.inc renamed to rules-tests/CodeQuality/Rector/Identical/FlipTypeControlToUseExclusiveTypeRector/Fixture/flip_instance_nullable_type.php.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ namespace Rector\Tests\CodeQuality\Rector\Identical\FlipTypeControlToUseExclusiv
44

55
use stdClass;
66

7-
class NullableType
7+
final class FlipInstanceNullableType
88
{
99
public function run()
1010
{
@@ -32,7 +32,7 @@ namespace Rector\Tests\CodeQuality\Rector\Identical\FlipTypeControlToUseExclusiv
3232

3333
use stdClass;
3434

35-
class NullableType
35+
final class FlipInstanceNullableType
3636
{
3737
public function run()
3838
{

rules-tests/DeadCode/Rector/For_/RemoveDeadContinueRector/Fixture/do_.php.inc renamed to rules-tests/DeadCode/Rector/For_/RemoveDeadContinueRector/Fixture/continue_inside_do.php.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace Rector\Tests\DeadCode\Rector\For_\RemoveDeadContinueRector\Fixture;
44

5-
class Do_
5+
final class ContinueInsideDo
66
{
77
public function run()
88
{
@@ -19,7 +19,7 @@ class Do_
1919

2020
namespace Rector\Tests\DeadCode\Rector\For_\RemoveDeadContinueRector\Fixture;
2121

22-
class Do_
22+
final class ContinueInsideDo
2323
{
2424
public function run()
2525
{

0 commit comments

Comments
 (0)