Skip to content

Commit 90a1ab7

Browse files
authored
chore: bump deps (#159)
* chore: bump deps * bump * fix
1 parent ebb4bd7 commit 90a1ab7

File tree

4 files changed

+25
-25
lines changed

4 files changed

+25
-25
lines changed

.github/workflows/tests.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,19 @@ jobs:
1515
- "8.2"
1616
- "8.3"
1717
- "8.4"
18+
- "8.5"
1819
dependencies:
1920
- highest
2021
include:
21-
- php-version: "8.4"
22+
- php-version: "8.5"
2223
dependencies: lowest
2324
fail-fast: false
2425
env:
2526
SYMFONY_DEPRECATIONS_HELPER: ${{ matrix.dependencies == 'lowest' && 'disabled=1' || 'max[direct]=0' }}
2627

2728
services:
2829
mysql:
29-
image: mysql:8
30+
image: mysql:9
3031
ports:
3132
- 3306:3306
3233
options: --health-cmd "mysqladmin ping" --health-interval 10s --health-timeout 5s --health-retries 10
@@ -35,7 +36,7 @@ jobs:
3536
MYSQL_DATABASE: odm
3637

3738
postgres:
38-
image: postgres:14
39+
image: postgres:16
3940
ports:
4041
- 5432:5432
4142
options: --health-cmd "/usr/bin/pg_isready" --health-interval 10s --health-timeout 5s --health-retries 10
@@ -45,7 +46,7 @@ jobs:
4546

4647
steps:
4748
- name: Checkout
48-
uses: actions/checkout@v4
49+
uses: actions/checkout@v6
4950

5051
- name: Setup PHP
5152
uses: shivammathur/setup-php@v2
@@ -63,10 +64,10 @@ jobs:
6364

6465
- name: Run tests (MySQL)
6566
env:
66-
DATABASE_URL: mysql://root:root@127.0.0.1:3306/odm?serverVersion=8.0
67+
DATABASE_URL: mysql://root:root@127.0.0.1:3306/odm?serverVersion=9
6768
run: php vendor/bin/simple-phpunit
6869

6970
- name: Run tests (PostgreSQL)
7071
env:
71-
DATABASE_URL: postgresql://postgres:postgres@127.0.0.1:5432/odm?serverVersion=14&charset=utf8
72+
DATABASE_URL: postgresql://postgres:postgres@127.0.0.1:5432/odm?serverVersion=16&charset=utf8
7273
run: php vendor/bin/simple-phpunit

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ The easiest way to get them up and running is using Docker:
1010

1111
Then run the test suite:
1212

13-
DATABASE_URL='mysql://root:root@127.0.0.1:3306/odm?serverVersion=8.0' ./vendor/bin/simple-phpunit
13+
DATABASE_URL='mysql://root:root@127.0.0.1:3306/odm?serverVersion=9' ./vendor/bin/simple-phpunit
1414

1515
## Postgres
1616

composer.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,31 @@
33
"type": "library",
44
"description": "An object document mapper for Doctrine ORM using JSON types of modern RDBMS.",
55
"keywords": ["ORM", "ODM", "JSON", "database", "RDBMS", "PostgreSQL", "MySQL"],
6-
"homepage": "https://dunglas.fr",
6+
"homepage": "https://dunglas.dev",
77
"license": "MIT",
88
"authors": [
99
{
1010
"name": "Kévin Dunglas",
11-
"email": "kevin@dunglas.fr",
12-
"homepage": "https://dunglas.fr"
11+
"email": "kevin@dunglas.dev",
12+
"homepage": "https://dunglas.dev"
1313
}
1414
],
1515
"require": {
1616
"php": ">=8.1",
17-
"doctrine/orm": "^2.6.3 || ^3.0.0",
18-
"symfony/property-access": "^5.4 || ^6.0 || ^7.0 || ^8.0",
19-
"symfony/property-info": "^5.4 || ^6.0 || ^7.0 || ^8.0",
20-
"symfony/serializer": "^5.4 || ^6.0 || ^7.0 || ^8.0"
17+
"doctrine/orm": "^2.6.3 || ^3.0",
18+
"symfony/property-access": "^5.4 || ^6.4 || ^7.4 || ^8.0",
19+
"symfony/property-info": "^5.4 || ^6.4 || ^7.4 || ^8.0",
20+
"symfony/serializer": "^5.4 || ^6.4 || ^7.4 || ^8.0"
2121
},
2222
"require-dev": {
23-
"doctrine/annotations": "^1.0 || ^2.0.0",
24-
"doctrine/doctrine-bundle": "^1.12.13 || ^2.2",
23+
"doctrine/annotations": "^1.0 || ^2.0",
24+
"doctrine/doctrine-bundle": "^1.12.13 || ^2.2 || ^3.0",
2525
"doctrine/dbal": "^2.7 || ^3.3 || ^4.0.0",
26-
"symfony/finder": "^5.4 || ^6.0 || ^7.0 || ^8.0",
27-
"symfony/framework-bundle": "^5.4 || ^6.0 || ^7.0 || ^8.0",
28-
"symfony/phpunit-bridge": "^6.0 || ^7.0 || ^8.0",
29-
"symfony/uid": "^5.4 || ^6.0 || ^7.0 || ^8.0",
30-
"symfony/validator": "^5.4 || ^6.0 || ^7.0 || ^8.0"
26+
"symfony/finder": "^5.4 || ^6.4 || ^7.4 || ^8.0",
27+
"symfony/framework-bundle": "^5.4 || ^6.4 || ^7.4 || ^8.0",
28+
"symfony/phpunit-bridge": "^8.0",
29+
"symfony/uid": "^5.4 || ^6.4 || ^7.4 || ^8.0",
30+
"symfony/validator": "^5.4 || ^6.4 || ^7.4 || ^8.0"
3131
},
3232
"suggest": {
3333
"symfony/framework-bundle": "To use the provided bundle.",

tests/Fixtures/AppKernel.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,12 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa
5050
'http_method_override' => false,
5151
]);
5252

53-
$orm = [
54-
'auto_generate_proxy_classes' => true,
55-
'auto_mapping' => true,
56-
];
53+
$orm = ['auto_mapping' => true];
5754

5855
if (\PHP_VERSION_ID >= 80400 && !interface_exists(Proxy::class)) {
5956
$orm['enable_native_lazy_objects'] = true;
57+
} else {
58+
$orm['auto_generate_proxy_classes'] = true;
6059
}
6160

6261
$container->loadFromExtension('doctrine', [

0 commit comments

Comments
 (0)