Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
/.ddev export-ignore
/.github export-ignore
/Tests export-ignore
/.editorconfig export-ignore
/.gitignore export-ignore
/captainhook.json export-ignore
/composer-dependency-analyser.php export-ignore
/composer-unused.php export-ignore
/eslint.config.mjs export-ignore
/package.json export-ignore
/php-cs-fixer.php export-ignore
/phpstan.neon export-ignore
/phpstan-baseline.neon export-ignore
/rector.php export-ignore
/version-bumper.yaml export-ignore
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,4 @@
/public
/var
/vendor
/.php-cs-fixer.cache
/package-lock.json
/php-cs-fixer.xml
/phpstan.xml
1 change: 1 addition & 0 deletions Classes/Page/AssetRenderer.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

readonly class AssetRenderer extends \TYPO3\CMS\Core\Page\AssetRenderer
{
#[\Override]
public function renderStyleSheets(bool $priority = false, string $endingSlash = '', ?ConsumableNonce $nonce = null): string
{
$inlineStyles = $this->assetCollector->getInlineStyleSheets();
Expand Down
4 changes: 1 addition & 3 deletions Classes/ViewHelpers/Asset/CssViewHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,10 @@
final class CssViewHelper extends AbstractTagBasedViewHelper
{
protected $escapeChildren = true;
protected AssetCollector $assetCollector;

public function __construct(\TYPO3\CMS\Core\Page\AssetCollector $assetCollector)
public function __construct(protected AssetCollector $assetCollector)
{
parent::__construct();
$this->assetCollector = $assetCollector;
}

#[\Override]
Expand Down
1 change: 1 addition & 0 deletions Tests/CGL/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
"lint:editorconfig": "ec --git-only",
"lint:language": "@composer validate-translations ./../../Resources/Private/Language",
"lint:php": "@fix:php --dry-run",
"lint:typoscript": "@php typoscript-lint",
Comment thread
Mainbird marked this conversation as resolved.
"lint:yaml": "find ./ ! -path './../../node_modules/*' ! -path './../../vendor/*' ! -path './vendor/*' ! -path './../../typo3_toolbox/*' \\( -name '*.yaml' -o -name '*.yml' \\) | xargs -r yaml-lint",
"migration": [
"@migration:rector"
Expand Down
5 changes: 0 additions & 5 deletions Tests/CGL/rector.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
use Rector\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector;
use Rector\ValueObject\PhpVersion;
use Ssch\TYPO3Rector\CodeQuality\General\{ConvertImplicitVariablesToExplicitGlobalsRector,
ExtEmConfRector,
GeneralUtilityMakeInstanceToConstructorPropertyRector};
use Ssch\TYPO3Rector\Configuration\Typo3Option;
use Ssch\TYPO3Rector\Set\{Typo3LevelSetList, Typo3SetList};
Expand All @@ -20,8 +19,6 @@
$rootPath.'/Classes',
$rootPath.'/Configuration',
])
// uncomment to reach your current PHP version
// ->withPhpSets()
->withPhpVersion(PhpVersion::PHP_84)
->withSets([
Typo3SetList::CODE_QUALITY,
Expand All @@ -40,8 +37,6 @@
// If you use withImportNames(), you should consider excluding some
// TYPO3 files.
->withSkip([
// @see https://github.com/sabbelasichon/typo3-rector/issues/2536
$rootPath.'/**/Configuration/ExtensionBuilder/*',
NameImportingPostRector::class => [
'ClassAliasMap.php',
],
Expand Down
15 changes: 15 additions & 0 deletions Tests/CGL/typoscript-lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
paths:
- ../../Configuration/
filePatterns:
- "*.typoscript"
- "*.tsconfig"
sniffs:
- class: Indentation
parameters:
useSpaces: false
indentPerLevel: 1
indentConditions: true
- class: NestingConsistency
disabled: true
- class: RepeatingRValue
disabled: true
Loading