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
20 changes: 13 additions & 7 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,16 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 8.3
tools: php-cs-fixer
php-version: 8.5

- name: Install Composer dependencies
run: composer install --no-progress --prefer-dist --optimize-autoloader

- name: Install PHP-CS-Fixer dependencies
run: composer install --no-progress --prefer-dist --optimize-autoloader --working-dir=tools/php-cs-fixer

- name: Run PHP-CS-Fixer
run:
php-cs-fixer fix --dry-run --diff
run: tools/php-cs-fixer/vendor/bin/php-cs-fixer fix --diff --dry-run

phpstan:
name: PHPStan
Expand All @@ -94,11 +98,13 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 8.3
tools: phpstan
php-version: 8.5

- name: Install Composer dependencies
run: composer install --no-progress --prefer-dist --optimize-autoloader

- name: Install PHPStan dependencies
run: composer install --no-progress --prefer-dist --optimize-autoloader --working-dir=tools/phpstan

- name: Run PHPStan
run: vendor/bin/phpstan analyse
run: tools/phpstan/vendor/bin/phpstan analyse
16 changes: 14 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
"require-dev": {
"symfony/filesystem": "^6.3|^7.0|^8.0",
"symfony/framework-bundle": "^6.3|^7.0|^8.0",
"phpstan/phpstan": "^1",
"phpstan/phpstan-symfony": "^1.3",
"phpunit/phpunit": "^10.5"
},
"autoload": {
Expand All @@ -34,5 +32,19 @@
"psr-4": {
"Sensiolabs\\TypeScriptBundle\\Tests\\": "tests/"
}
},
"scripts": {
"tools:upgrade": [
"@tools:upgrade:php-cs-fixer",
"@tools:upgrade:phpstan"
],
"tools:upgrade:php-cs-fixer": "composer upgrade -W -d tools/php-cs-fixer",
"tools:upgrade:phpstan": "composer upgrade -W -d tools/phpstan",
"tools:run": [
"@tools:run:php-cs-fixer",
"@tools:run:phpstan"
],
"tools:run:php-cs-fixer": "tools/php-cs-fixer/vendor/bin/php-cs-fixer fix",
"tools:run:phpstan": "tools/phpstan/vendor/bin/phpstan --memory-limit=1G"
}
}
2 changes: 1 addition & 1 deletion phpstan.dist.neon
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ parameters:
- src/
- tests/
includes:
- vendor/phpstan/phpstan-symfony/extension.neon
- tools/phpstan/vendor/phpstan/phpstan-symfony/extension.neon
5 changes: 3 additions & 2 deletions src/DependencyInjection/SensiolabsTypeScriptExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

namespace Sensiolabs\TypeScriptBundle\DependencyInjection;

use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
use Symfony\Component\Config\Definition\Builder\TreeBuilder;
use Symfony\Component\Config\Definition\ConfigurationInterface;
use Symfony\Component\Config\FileLocator;
Expand Down Expand Up @@ -48,12 +47,14 @@ public function getConfiguration(array $configs, ContainerBuilder $container): C
return $this;
}

/**
* @return TreeBuilder<'array'>
*/
public function getConfigTreeBuilder(): TreeBuilder
{
$treeBuilder = new TreeBuilder('sensiolabs_typescript');

$rootNode = $treeBuilder->getRootNode();
\assert($rootNode instanceof ArrayNodeDefinition);

$rootNode
->children()
Expand Down
2 changes: 2 additions & 0 deletions tools/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
**/vendor
**/composer.lock
5 changes: 5 additions & 0 deletions tools/php-cs-fixer/composer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"require": {
"friendsofphp/php-cs-fixer": "^3"
}
}
6 changes: 6 additions & 0 deletions tools/phpstan/composer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"require": {
"phpstan/phpstan": "^2",
"phpstan/phpstan-symfony": "^2"
}
}