Skip to content

Commit 2d0d0a4

Browse files
committed
Allow for Psalm and ECS to run on all builds
1 parent 4dab7f8 commit 2d0d0a4

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

.github/workflows/build.yml

-5
Original file line numberDiff line numberDiff line change
@@ -39,18 +39,13 @@ jobs:
3939
- name: Validate composer.json
4040
run: composer validate --strict
4141

42-
- name: Remove analysis dependencies
43-
run: composer remove --dev --no-update sylius-labs/coding-standard
44-
if: matrix.symfony-version == '6.0.*'
45-
4642
- name: Install dependencies
4743
run: composer install --prefer-dist --no-progress
4844
env:
4945
SYMFONY_REQUIRE: "${{ matrix.symfony-version }}"
5046

5147
- name: Run coding standard
5248
run: vendor/bin/ecs check --ansi --no-progress-bar src tests
53-
if: matrix.symfony-version != '6.0.*'
5449

5550
- name: Run Psalm
5651
run: vendor/bin/psalm src --no-progress --php-version="${{ matrix.php-version }}"

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"friends-of-behat/mink-extension": "^2.5",
2525
"friends-of-behat/page-object-extension": "^0.3.2",
2626
"friends-of-behat/service-container-extension": "^1.1",
27-
"sylius-labs/coding-standard": "^3.2",
27+
"sylius-labs/coding-standard": "^4.1.1",
2828
"symfony/browser-kit": "^4.4 || ^5.1 || ^6.0",
2929
"symfony/framework-bundle": "^4.4 || ^5.1 || ^6.0",
3030
"symfony/process": "^4.4 || ^5.1 || ^6.0",

easy-coding-standard.yml

-2
This file was deleted.

ecs.php

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
6+
7+
return static function (ContainerConfigurator $containerConfigurator): void {
8+
$containerConfigurator->import(__DIR__ . '/vendor/sylius-labs/coding-standard/ecs.php');
9+
};

0 commit comments

Comments
 (0)