Skip to content

Commit 389f7d6

Browse files
committed
Merge branch 'phpunit-lowest'
2 parents 77ea037 + c10c431 commit 389f7d6

4 files changed

Lines changed: 145 additions & 72 deletions

File tree

.github/workflows/tests.yaml

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,3 +130,67 @@ jobs:
130130

131131
- name: Run PHPUnit
132132
run: bin/phpunit --coverage-text ${{ env.PHPUNIT_FLAGS }}
133+
134+
phpunit-lowest:
135+
name: "PHPUnit (Lowest dependencies)"
136+
137+
runs-on: ubuntu-latest
138+
services:
139+
database:
140+
image: postgres:16-alpine
141+
ports:
142+
- "5432:5432"
143+
env:
144+
POSTGRES_DB: dirigent_test
145+
POSTGRES_PASSWORD: "!ChangeMe!"
146+
POSTGRES_USER: dirigent
147+
148+
steps:
149+
- name: Checkout code
150+
uses: actions/checkout@v4
151+
152+
- name: Install PHP with extensions
153+
uses: shivammathur/setup-php@v2
154+
with:
155+
php-version: 8.3
156+
tools: composer:v2
157+
158+
- name: Set Composer cache directory
159+
id: composer-cache
160+
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
161+
162+
- name: Cache Composer output
163+
uses: actions/cache@v4
164+
with:
165+
path: ${{ steps.composer-cache.outputs.dir }}
166+
key: ${{ runner.os }}-composer.lowest-${{ hashFiles('composer.lock') }}
167+
restore-keys: ${{ runner.os }}-composer.lowest-
168+
169+
- name: Install Composer dependencies (Lowest dependencies)
170+
run: composer update --ansi --no-interaction --no-progress --prefer-lowest
171+
172+
- name: Install Node
173+
uses: actions/setup-node@v4
174+
with:
175+
node-version: 23.x
176+
177+
- name: Install NPM dependencies
178+
run: npm ci
179+
180+
- name: Build assets
181+
run: npm run build
182+
183+
- name: Generate encryption keys
184+
run: bin/console encryption:generate-keys
185+
186+
- name: Create database schema
187+
run: bin/console doctrine:schema:create --env=test
188+
189+
- name: Load database fixtures
190+
run: bin/console doctrine:fixtures:load --env=test --no-interaction
191+
192+
- name: PHPUnit version
193+
run: bin/phpunit --version
194+
195+
- name: Run PHPUnit
196+
run: bin/phpunit --coverage-text ${{ env.PHPUNIT_FLAGS }}

composer.json

Lines changed: 48 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -12,59 +12,60 @@
1212
"ext-iconv": "*",
1313
"ext-sodium": "*",
1414
"cebe/markdown": "^1.2",
15-
"composer/composer": "^2.7",
16-
"doctrine/doctrine-bundle": "^2.11",
17-
"doctrine/doctrine-fixtures-bundle": "^4.0",
18-
"doctrine/doctrine-migrations-bundle": "^3.3",
15+
"composer/composer": "^2.8",
16+
"composer/pcre": "^3.3",
17+
"doctrine/doctrine-bundle": "^2.14",
18+
"doctrine/doctrine-fixtures-bundle": "^4.1",
19+
"doctrine/doctrine-migrations-bundle": "^3.4",
1920
"doctrine/orm": "^3.3",
20-
"easycorp/easyadmin-bundle": "^4.8",
21-
"league/commonmark": "^2.5",
22-
"phpdocumentor/reflection-docblock": "^5.3",
21+
"easycorp/easyadmin-bundle": "^4.24.7",
22+
"league/commonmark": "^2.7",
23+
"phpdocumentor/reflection-docblock": "^5.6",
2324
"phpstan/phpdoc-parser": "^2.1",
24-
"sentry/sentry-symfony": "^5.0",
25-
"symfony/asset": "^7.0",
26-
"symfony/console": "^7.0",
27-
"symfony/doctrine-messenger": "^7.0",
28-
"symfony/dotenv": "^7.0",
29-
"symfony/expression-language": "^7.0",
30-
"symfony/flex": "^2",
31-
"symfony/form": "^7.0",
32-
"symfony/framework-bundle": "^7.0",
33-
"symfony/http-client": "^7.0",
34-
"symfony/intl": "^7.0",
35-
"symfony/mailer": "^7.0",
36-
"symfony/mime": "^7.0",
37-
"symfony/monolog-bundle": "^3.0",
38-
"symfony/process": "^7.0",
39-
"symfony/property-access": "^7.0",
40-
"symfony/property-info": "^7.0",
41-
"symfony/runtime": "^7.0",
42-
"symfony/scheduler": "^7.0",
43-
"symfony/security-bundle": "^7.0",
44-
"symfony/serializer": "^7.0",
45-
"symfony/stimulus-bundle": "^2.22",
46-
"symfony/string": "^7.0",
47-
"symfony/twig-bundle": "^7.0",
48-
"symfony/validator": "^7.0",
49-
"symfony/web-link": "^7.0",
25+
"sentry/sentry-symfony": "^5.2",
26+
"symfony/asset": "^7.3",
27+
"symfony/console": "^7.3",
28+
"symfony/doctrine-messenger": "^7.3",
29+
"symfony/dotenv": "^7.3",
30+
"symfony/expression-language": "^7.3",
31+
"symfony/flex": "^2.7",
32+
"symfony/form": "^7.3",
33+
"symfony/framework-bundle": "^7.3",
34+
"symfony/http-client": "^7.3",
35+
"symfony/intl": "^7.3",
36+
"symfony/mailer": "^7.3",
37+
"symfony/mime": "^7.3",
38+
"symfony/monolog-bundle": "^3.10",
39+
"symfony/process": "^7.3",
40+
"symfony/property-access": "^7.3",
41+
"symfony/property-info": "^7.3",
42+
"symfony/runtime": "^7.3",
43+
"symfony/scheduler": "^7.3",
44+
"symfony/security-bundle": "^7.3",
45+
"symfony/serializer": "^7.3",
46+
"symfony/stimulus-bundle": "^2.26",
47+
"symfony/string": "^7.3",
48+
"symfony/twig-bundle": "^7.3",
49+
"symfony/validator": "^7.3",
50+
"symfony/web-link": "^7.3",
5051
"symfony/webpack-encore-bundle": "^2.2",
51-
"symfony/yaml": "^7.0",
52-
"symfonycasts/reset-password-bundle": "^1.22",
53-
"twig/extra-bundle": "^2.12|^3.0",
54-
"twig/markdown-extra": "^3.12",
55-
"twig/twig": "^2.12|^3.0"
52+
"symfony/yaml": "^7.3",
53+
"symfonycasts/reset-password-bundle": "^1.23",
54+
"twig/extra-bundle": "^3.21",
55+
"twig/markdown-extra": "^3.21",
56+
"twig/twig": "^3.21"
5657
},
5758
"require-dev": {
58-
"friendsofphp/php-cs-fixer": "^3.68",
59+
"friendsofphp/php-cs-fixer": "^3.75",
5960
"phpstan/phpstan": "^2.1",
60-
"phpunit/phpunit": "^11.4",
61-
"symfony/browser-kit": "^7.0",
62-
"symfony/css-selector": "^7.0",
63-
"symfony/debug-bundle": "^7.0",
64-
"symfony/maker-bundle": "^1.0",
65-
"symfony/phpunit-bridge": "^7.0",
66-
"symfony/stopwatch": "^7.0",
67-
"symfony/web-profiler-bundle": "^7.0",
61+
"phpunit/phpunit": "^11.5",
62+
"symfony/browser-kit": "^7.3",
63+
"symfony/css-selector": "^7.3",
64+
"symfony/debug-bundle": "^7.3",
65+
"symfony/maker-bundle": "^1.63",
66+
"symfony/phpunit-bridge": "^7.3",
67+
"symfony/stopwatch": "^7.3",
68+
"symfony/web-profiler-bundle": "^7.3",
6869
"testcontainers/testcontainers": "^1.0"
6970
},
7071
"conflict": {

composer.lock

Lines changed: 25 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Doctrine/Type/EncryptedTextType.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,14 @@ class EncryptedTextType extends Type
1212

1313
private ?Encryption $encryption = null;
1414

15+
/**
16+
* @override removed in doctrine/dbal 4.0
17+
*/
18+
public function getName(): string
19+
{
20+
return self::TYPE;
21+
}
22+
1523
public function setEncryptionUtility(Encryption $encryption): void
1624
{
1725
$this->encryption = $encryption;

0 commit comments

Comments
 (0)