Skip to content

Commit 060ce03

Browse files
committed
minor #874 [ci] set server version in dsn (jrushlow)
This PR was merged into the 1.0-dev branch. Discussion ---------- [ci] set server version in dsn `doctrine.dbal.server_version` is no longer available - set the server version explicitly in the dsn. symfony/recipes#939 - [x] `dev` stability testing failing until symfony/recipes#945 Commits ------- c9bb444 [ci] set server version in dsn
2 parents e59e0b6 + c9bb444 commit 060ce03

File tree

3 files changed

+2
-9
lines changed

3 files changed

+2
-9
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858

5959
services:
6060
mysql:
61-
image: mysql:5.7
61+
image: mysql:5.7 # Update server_version in phpunit.xml.dist if this changes.
6262
env:
6363
MYSQL_ROOT_PASSWORD: root
6464
MYSQL_DATABASE: test_maker

phpunit.xml.dist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
>
1212
<php>
1313
<ini name="error_reporting" value="-1" />
14-
<env name="TEST_DATABASE_DSN" value="mysql://root:root@127.0.0.1:3306/test_maker" />
14+
<env name="TEST_DATABASE_DSN" value="mysql://root:root@127.0.0.1:3306/test_maker?serverVersion=5.7" />
1515
<env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0"/>
1616
</php>
1717

src/Test/MakerTestDetails.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -144,13 +144,6 @@ public function configureDatabase(bool $createSchema = true): self
144144
)
145145
;
146146

147-
// use MySQL 5.6, which is what's currently available on Travis
148-
$this->addReplacement(
149-
'config/packages/doctrine.yaml',
150-
"#server_version: '13'",
151-
"server_version: '5.7'"
152-
);
153-
154147
// this looks silly, but it's the only way to drop the database *for sure*,
155148
// as doctrine:database:drop will error if there is no database
156149
// also, skip for SQLITE, as it does not support --if-not-exists

0 commit comments

Comments
 (0)