Skip to content

Commit fa893e2

Browse files
committed
Update ecs config
1 parent f85a371 commit fa893e2

File tree

2 files changed

+16
-24
lines changed

2 files changed

+16
-24
lines changed

.github/workflows/test-extension-compatibility.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ jobs:
9898
9999
- name: Install php-rdkafka ${{ matrix.rdkafka }}
100100
run: |
101-
echo "extension=$HOME/build-cache/php-rdkafka/rdkafka.so"|sudo tee /etc/php/7.4/cli/conf.d/99-rdkafka.ini >/dev/null
101+
echo "extension=$HOME/build-cache/php-rdkafka/rdkafka.so"|sudo tee /etc/php/${{ matrix.php }}/cli/conf.d/99-rdkafka.ini >/dev/null
102102
103103
- name: Install dependencies
104104
uses: ramsey/composer-install@v2

ecs.php

+15-23
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,17 @@
66
use PhpCsFixer\Fixer\ClassNotation\OrderedClassElementsFixer;
77
use PhpCsFixer\Fixer\Import\OrderedImportsFixer;
88
use PhpCsFixer\Fixer\Strict\StrictComparisonFixer;
9-
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
10-
use Symplify\EasyCodingStandard\ValueObject\Option;
9+
use Symplify\EasyCodingStandard\Config\ECSConfig;
1110
use Symplify\EasyCodingStandard\ValueObject\Set\SetList;
1211

13-
return static function (ContainerConfigurator $containerConfigurator): void {
14-
$containerConfigurator->import(SetList::PSR_12);
15-
$containerConfigurator->import(SetList::COMMON);
16-
$containerConfigurator->import(SetList::CLEAN_CODE);
12+
return static function (ECSConfig $config): void {
13+
$config->sets([
14+
SetList::PSR_12,
15+
SetList::COMMON,
16+
SetList::CLEAN_CODE,
17+
]);
1718

18-
$parameters = $containerConfigurator->parameters();
19-
$parameters->set(
20-
Option::SKIP,
19+
$config->skip(
2120
[
2221
'src/constants.php',
2322
'src/RdKafka/FFI/Methods.php',
@@ -30,18 +29,11 @@
3029
]
3130
);
3231

33-
$services = $containerConfigurator->services();
34-
$services->set(OrderedImportsFixer::class)
35-
->call(
36-
'configure',
37-
[
38-
[
39-
'imports_order' => [
40-
'class',
41-
'const',
42-
'function',
43-
],
44-
],
45-
]
46-
);
32+
$config->ruleWithConfiguration(OrderedImportsFixer::class, [
33+
'imports_order' => [
34+
'class',
35+
'const',
36+
'function',
37+
],
38+
]);
4739
};

0 commit comments

Comments
 (0)