Skip to content

Commit eccad2c

Browse files
SonataCISonataCI
authored
Merge 1.x into 2.x
2 parents c149164 + 6ae7979 commit eccad2c

File tree

6 files changed

+46
-34
lines changed

6 files changed

+46
-34
lines changed

‎.github/workflows/lint.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ jobs:
2424

2525
steps:
2626
- name: Checkout
27-
uses: actions/checkout@v3
27+
uses: actions/checkout@v4
2828

2929
- name: Install PHP with extensions
3030
uses: shivammathur/setup-php@v2
3131
with:
32-
php-version: '8.2'
32+
php-version: '8.3'
3333
coverage: none
3434
tools: composer:v2
3535

@@ -48,12 +48,12 @@ jobs:
4848

4949
steps:
5050
- name: Checkout
51-
uses: actions/checkout@v3
51+
uses: actions/checkout@v4
5252

5353
- name: Install PHP with extensions
5454
uses: shivammathur/setup-php@v2
5555
with:
56-
php-version: '8.2'
56+
php-version: '8.3'
5757
coverage: none
5858
tools: composer:v2, composer-normalize:2
5959
env:
@@ -69,7 +69,7 @@ jobs:
6969

7070
steps:
7171
- name: Checkout
72-
uses: actions/checkout@v3
72+
uses: actions/checkout@v4
7373

7474
- name: Install yamllint
7575
run: sudo apt-get install yamllint
@@ -84,7 +84,7 @@ jobs:
8484

8585
steps:
8686
- name: Checkout
87-
uses: actions/checkout@v3
87+
uses: actions/checkout@v4
8888

8989
- name: Install required dependencies
9090
run: sudo apt-get update && sudo apt-get install libxml2-utils

‎.github/workflows/qa.yaml

+7-7
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ jobs:
2424

2525
steps:
2626
- name: Checkout
27-
uses: actions/checkout@v3
27+
uses: actions/checkout@v4
2828

2929
- name: Install PHP with extensions
3030
uses: shivammathur/setup-php@v2
3131
with:
32-
php-version: '8.2'
32+
php-version: '8.3'
3333
coverage: none
3434
tools: composer:v2
3535

@@ -48,12 +48,12 @@ jobs:
4848

4949
steps:
5050
- name: Checkout code
51-
uses: actions/checkout@v3
51+
uses: actions/checkout@v4
5252

5353
- name: Install PHP with extensions
5454
uses: shivammathur/setup-php@v2
5555
with:
56-
php-version: '8.2'
56+
php-version: '8.3'
5757
coverage: none
5858
tools: composer:v2
5959

@@ -63,7 +63,7 @@ jobs:
6363
dependency-versions: highest
6464

6565
- name: Psalm
66-
run: vendor/bin/psalm --no-progress --show-info=false --stats --output-format=github --threads=$(nproc) --shepherd --php-version=8.2
66+
run: vendor/bin/psalm --no-progress --show-info=false --stats --output-format=github --threads=$(nproc) --shepherd --php-version=8.3
6767

6868
rector:
6969
name: Rector
@@ -72,12 +72,12 @@ jobs:
7272

7373
steps:
7474
- name: Checkout code
75-
uses: actions/checkout@v3
75+
uses: actions/checkout@v4
7676

7777
- name: Install PHP with extensions
7878
uses: shivammathur/setup-php@v2
7979
with:
80-
php-version: '8.2'
80+
php-version: '8.3'
8181
coverage: none
8282
tools: composer:v2
8383

‎.github/workflows/test-platforms.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
strategy:
3838
matrix:
3939
php-version:
40-
- '8.2'
40+
- '8.3'
4141
mysql-version:
4242
- '5.7'
4343
- '8.0'
@@ -46,7 +46,7 @@ jobs:
4646

4747
steps:
4848
- name: Checkout
49-
uses: actions/checkout@v3
49+
uses: actions/checkout@v4
5050

5151
- name: Install PHP with extensions
5252
uses: shivammathur/setup-php@v2
@@ -90,7 +90,7 @@ jobs:
9090
strategy:
9191
matrix:
9292
php-version:
93-
- '8.2'
93+
- '8.3'
9494
postgres-version:
9595
- '13'
9696
- '14'
@@ -100,7 +100,7 @@ jobs:
100100

101101
steps:
102102
- name: Checkout
103-
uses: actions/checkout@v3
103+
uses: actions/checkout@v4
104104

105105
- name: Install PHP with extensions
106106
uses: shivammathur/setup-php@v2

‎.github/workflows/test.yaml

+7-12
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ jobs:
3333
- '8.0'
3434
- '8.1'
3535
- '8.2'
36+
- '8.3'
3637
dependencies: [highest]
3738
allowed-to-fail: [false]
3839
symfony-require: ['']
@@ -42,47 +43,41 @@ jobs:
4243
dependencies: lowest
4344
allowed-to-fail: false
4445
variant: normal
45-
- php-version: '8.2'
46+
- php-version: '8.3'
4647
dependencies: highest
4748
allowed-to-fail: false
4849
symfony-require: 5.4.*
4950
variant: symfony/symfony:"5.4.*"
50-
- php-version: '8.2'
51+
- php-version: '8.3'
5152
dependencies: highest
5253
allowed-to-fail: false
5354
symfony-require: 6.3.*
5455
variant: symfony/symfony:"6.3.*"
55-
- php-version: '8.2'
56+
- php-version: '8.3'
5657
dependencies: highest
5758
allowed-to-fail: false
5859
symfony-require: 6.4.*
5960
variant: symfony/symfony:"6.4.*"
60-
- php-version: '8.2'
61+
- php-version: '8.3'
6162
dependencies: highest
6263
allowed-to-fail: false
6364
symfony-require: 7.0.*
6465
variant: symfony/symfony:"7.0.*"
6566

6667
steps:
6768
- name: Checkout
68-
uses: actions/checkout@v3
69+
uses: actions/checkout@v4
6970

7071
- name: Install PHP with extensions
7172
uses: shivammathur/setup-php@v2
7273
with:
7374
php-version: ${{ matrix.php-version }}
7475
coverage: pcov
75-
tools: composer:v2
76+
tools: composer:v2, flex
7677

7778
- name: Add PHPUnit matcher
7879
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
7980

80-
- name: Globally install symfony/flex
81-
if: matrix.symfony-require != ''
82-
run: |
83-
composer global config --no-plugins allow-plugins.symfony/flex true
84-
composer global require --no-progress --no-scripts --no-plugins symfony/flex
85-
8681
- name: Install variant
8782
if: matrix.variant != 'normal' && !startsWith(matrix.variant, 'symfony/symfony')
8883
run: composer require ${{ matrix.variant }} --no-update

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ phpstan:
9494
.PHONY: phpstan
9595

9696
psalm:
97-
vendor/bin/psalm --php-version=8.2
97+
vendor/bin/psalm --php-version=8.3
9898
.PHONY: psalm
9999

100100
rector:

‎tests/DependencyInjection/SimpleThingsEntityAuditExtensionTest.php

+21-4
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
use SimpleThings\EntityAudit\EventListener\CreateSchemaListener;
2525
use SimpleThings\EntityAudit\EventListener\LogRevisionsListener;
2626
use SimpleThings\EntityAudit\User\TokenStorageUsernameCallable;
27+
use Symfony\Component\DependencyInjection\Reference;
2728

2829
final class SimpleThingsEntityAuditExtensionTest extends AbstractExtensionTestCase
2930
{
@@ -32,25 +33,41 @@ public function testItRegistersDefaultServices(): void
3233
$this->load([]);
3334

3435
$this->assertContainerBuilderHasService('simplethings_entityaudit.manager', AuditManager::class);
35-
$this->assertContainerBuilderHasServiceDefinitionWithArgument('simplethings_entityaudit.manager', 0, 'simplethings_entityaudit.config');
36+
$this->assertContainerBuilderHasServiceDefinitionWithArgument(
37+
'simplethings_entityaudit.manager',
38+
0,
39+
new Reference('simplethings_entityaudit.config')
40+
);
3641

3742
$this->assertContainerBuilderHasService('simplethings_entityaudit.reader', AuditReader::class);
3843
$this->assertContainerBuilderHasServiceDefinitionWithArgument('simplethings_entityaudit.reader', 0);
3944

4045
$this->assertContainerBuilderHasService('simplethings_entityaudit.log_revisions_listener', LogRevisionsListener::class);
41-
$this->assertContainerBuilderHasServiceDefinitionWithArgument('simplethings_entityaudit.log_revisions_listener', 0, 'simplethings_entityaudit.manager');
46+
$this->assertContainerBuilderHasServiceDefinitionWithArgument(
47+
'simplethings_entityaudit.log_revisions_listener',
48+
0,
49+
new Reference('simplethings_entityaudit.manager')
50+
);
4251

4352
foreach ([Events::onFlush, Events::postPersist, Events::postUpdate, Events::postFlush, Events::onClear] as $event) {
4453
$this->assertContainerBuilderHasServiceDefinitionWithTag('simplethings_entityaudit.log_revisions_listener', 'doctrine.event_listener', ['event' => $event, 'connection' => 'default']);
4554
}
4655
$this->assertContainerBuilderHasService('simplethings_entityaudit.create_schema_listener', CreateSchemaListener::class);
47-
$this->assertContainerBuilderHasServiceDefinitionWithArgument('simplethings_entityaudit.create_schema_listener', 0, 'simplethings_entityaudit.manager');
56+
$this->assertContainerBuilderHasServiceDefinitionWithArgument(
57+
'simplethings_entityaudit.create_schema_listener',
58+
0,
59+
new Reference('simplethings_entityaudit.manager')
60+
);
4861
foreach ([ToolEvents::postGenerateSchemaTable, ToolEvents::postGenerateSchema] as $event) {
4962
$this->assertContainerBuilderHasServiceDefinitionWithTag('simplethings_entityaudit.create_schema_listener', 'doctrine.event_listener', ['event' => $event, 'connection' => 'default']);
5063
}
5164

5265
$this->assertContainerBuilderHasService('simplethings_entityaudit.username_callable.token_storage', TokenStorageUsernameCallable::class);
53-
$this->assertContainerBuilderHasServiceDefinitionWithArgument('simplethings_entityaudit.username_callable.token_storage', 0, 'security.token_storage');
66+
$this->assertContainerBuilderHasServiceDefinitionWithArgument(
67+
'simplethings_entityaudit.username_callable.token_storage',
68+
0,
69+
new Reference('security.token_storage')
70+
);
5471

5572
$this->assertContainerBuilderHasService('simplethings_entityaudit.config', AuditConfiguration::class);
5673
$this->assertContainerBuilderHasServiceDefinitionWithMethodCall('simplethings_entityaudit.config', 'setAuditedEntityClasses', ['%simplethings.entityaudit.audited_entities%']);

0 commit comments

Comments
 (0)