Skip to content

Commit

Permalink
[BUGFIX] Run Rector and fix CGL (#289)
Browse files Browse the repository at this point in the history
Exclude rector from tests on action

Releases: main
  • Loading branch information
linawolf authored Aug 31, 2024
1 parent a1d9423 commit 6495215
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 15 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@ jobs:
- name: CGL
run: Build/Scripts/runTests.sh -n -p ${{ env.php }} -s cgl

- name: Rector
run: Build/Scripts/runTests.sh -n -p ${{ env.php }} -s rector

- name: PHPStan
run: Build/Scripts/runTests.sh -p ${{ env.php }} -s phpstan

Expand Down
4 changes: 0 additions & 4 deletions Build/rector/rector.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
*/

use Rector\Config\RectorConfig;
use Rector\Php74\Rector\LNumber\AddLiteralSeparatorToNumberRector;
use Rector\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector;
use Rector\TypeDeclaration\Rector\ClassMethod\ReturnNeverTypeRector;
use Ssch\TYPO3Rector\CodeQuality\General\ConvertImplicitVariablesToExplicitGlobalsRector;
Expand Down Expand Up @@ -52,9 +51,6 @@
ExtEmConfRector::ADDITIONAL_VALUES_TO_BE_REMOVED => [],
])
->withSkip([
// AddLiteralSeparatorToNumberRector would make the exception codes more readable.
// But as they are just timestamps this is not needed/wanted.
AddLiteralSeparatorToNumberRector::class,
ReturnNeverTypeRector::class => [
// We want to keep the ResponseInterface return type of indexAction() to be compatible
// with the specification, although we just throw an exception for demonstration purpose.
Expand Down
6 changes: 0 additions & 6 deletions Configuration/TCA/Overrides/tt_content.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,6 @@
'config' => [
'type' => 'check',
'renderType' => 'checkboxToggle',
'items' => [
[
'label' => '',
'value' => '',
],
],
],
],
'tx_examples_separator' => [
Expand Down
11 changes: 9 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,15 @@ test-docs: ## Test the documentation rendering
mkdir -p Documentation-GENERATED-temp
docker run --rm --pull always -v "$(shell pwd)":/project -t ghcr.io/typo3-documentation/render-guides:latest --config=Documentation --no-progress --fail-on-log

.PHONY: fix
fix: rector fix-cgl## Fix PHP coding styles

.PHONY: rector
rector: ## Run rector
Build/Scripts/runTests.sh -s rector

.PHONY: fix-cs
fix-cs: ## Fix PHP coding styles
.PHONY: fix-cgl
fix-cgl: ## Fix PHP coding styles
Build/Scripts/runTests.sh -s cgl

.PHONY: phpstan
Expand All @@ -28,3 +31,7 @@ phpstan: ## Run phpstan tests
.PHONY: phpstan-baseline
phpstan-baseline: ## Update the phpstan baseline
Build/Scripts/runTests.sh -s phpstanBaseline

.PHONY: composerUpdate
composerUpdate: ## Update composer dependencies
Build/Scripts/runTests.sh -s composerUpdate

0 comments on commit 6495215

Please sign in to comment.