Skip to content

Commit b854270

Browse files
authored
Merge pull request #147 from Coderberg/2.x
Release v2.11.
2 parents 68cc9e7 + d166baf commit b854270

20 files changed

+842
-834
lines changed

.github/workflows/lint.yml

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,15 @@ jobs:
3232
tools: composer:v2
3333

3434
- name: "Set composer cache directory"
35-
id: composer-cache
36-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
37-
38-
- name: "Cache composer"
39-
uses: actions/cache@v4
35+
id: cache-vendor
36+
uses: actions/cache@v3
4037
with:
41-
path: ${{ steps.composer-cache.outputs.dir }}
42-
key: ${{ runner.os }}-${{ matrix.php-version }}-composer-${{ hashFiles('composer.lock') }}
43-
restore-keys: ${{ runner.os }}-${{ matrix.php-version }}-composer-
38+
path: vendor
39+
key: ${{ runner.os }}-vendor-${{ hashFiles('**/composer.lock') }}
4440

4541
- name: "Composer install"
46-
run: composer install --no-interaction --no-progress
42+
if: steps.cache-vendor.outputs.cache-hit != 'true'
43+
run: composer install --no-interaction --no-scripts --no-progress --prefer-dist
4744

4845
- name: Install PHPUnit
4946
id: install
@@ -55,40 +52,36 @@ jobs:
5552

5653
- name: PHPStan
5754
if: always() && steps.install.outcome == 'success'
58-
run: vendor/bin/phpstan analyse
55+
run: vendor/bin/phpstan analyse --ansi
5956

6057
- name: Rector
6158
if: always() && steps.install.outcome == 'success'
62-
run: vendor/bin/rector process
59+
run: vendor/bin/rector process --ansi
6360

6461
- name: Lint YAML files
6562
if: always() && steps.install.outcome == 'success'
66-
run: ./bin/console lint:yaml config --parse-tags
63+
run: ./bin/console lint:yaml config --parse-tags --ansi
6764

6865
- name: Lint Twig templates
6966
if: always() && steps.install.outcome == 'success'
70-
run: ./bin/console lint:twig templates --env=prod
67+
run: ./bin/console lint:twig templates --env=prod --ansi
7168

7269
- name: Lint XLIFF translations
7370
if: always() && steps.install.outcome == 'success'
74-
run: ./bin/console lint:xliff translations
71+
run: ./bin/console lint:xliff translations --ansi
7572

7673
- name: Lint Parameters and Services
7774
if: always() && steps.install.outcome == 'success'
78-
run: ./bin/console lint:container --no-debug
75+
run: ./bin/console lint:container --no-debug --ansi
7976

8077
- name: Lint Doctrine entities
8178
if: always() && steps.install.outcome == 'success'
82-
run: ./bin/console doctrine:schema:validate --skip-sync -vvv --no-interaction
79+
run: ./bin/console doctrine:schema:validate --skip-sync -vvv --no-interaction --ansi
8380

8481
- name: Lint Composer config
8582
if: always() && steps.install.outcome == 'success'
86-
run: composer validate --strict
87-
88-
- name: Download Symfony CLI
89-
if: always() && steps.install.outcome == 'success'
90-
run: wget https://get.symfony.com/cli/installer -O - | bash
83+
run: composer validate --strict --ansi
9184

9285
- name: Check if any dependencies are compromised
9386
if: always() && steps.install.outcome == 'success'
94-
run: /home/runner/.symfony5/bin/symfony check:security
87+
run: composer audit --ansi

.php-cs-fixer.dist.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
;
1515

1616
return (new PhpCsFixer\Config())
17+
->setParallelConfig(PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect())
1718
->setRiskyAllowed(true)
1819
->setRules([
1920
'@PHP80Migration:risky' => true,
@@ -37,5 +38,5 @@
3738
'declare_strict_types' => true,
3839
])
3940
->setFinder($finder)
40-
->setCacheFile(__DIR__.'/var/.php-cs-fixer.cache') // forward compatibility with 3.x line
41+
->setCacheFile(__DIR__.'/var/.php-cs-fixer.cache')
4142
;

0 commit comments

Comments
 (0)