Skip to content

Commit cb29fac

Browse files
authored
Merge pull request #787 from snapshotpl/doctrine-persistence-3
Allow doctrine/persistence 3
2 parents bd59507 + c7cba93 commit cb29fac

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

.github/workflows/continuous-integration.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@ jobs:
2020
- "8.1"
2121
dependencies:
2222
- "highest"
23-
include:
24-
- php-version: "7.4"
25-
dependencies: "lowest"
23+
- "lowest"
2624

2725
steps:
2826
- name: "Checkout"

composer.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"doctrine/doctrine-laminas-hydrator": "^3.0.0",
5151
"doctrine/event-manager": "^1.1.1",
5252
"doctrine/inflector": "^2.0.4",
53-
"doctrine/persistence": "^2.3.0",
53+
"doctrine/persistence": "^2.3.0 || ^3.0.0",
5454
"laminas/laminas-authentication": "^2.9.0",
5555
"laminas/laminas-cache": "^3.1.2",
5656
"laminas/laminas-eventmanager": "^3.4.0",
@@ -103,7 +103,10 @@
103103
"bin/doctrine-module"
104104
],
105105
"config": {
106-
"sort-packages": true
106+
"sort-packages": true,
107+
"allow-plugins": {
108+
"dealerdirect/phpcodesniffer-composer-installer": true
109+
}
107110
},
108111
"scripts": {
109112
"check": [

src/Service/DriverFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
namespace DoctrineModule\Service;
66

77
use Doctrine\Common\Annotations;
8+
use Doctrine\ORM\Mapping\Driver\AnnotationDriver;
89
use Doctrine\ORM\Mapping\Driver\AttributeDriver;
9-
use Doctrine\Persistence\Mapping\Driver\AnnotationDriver;
1010
use Doctrine\Persistence\Mapping\Driver\DefaultFileLocator;
1111
use Doctrine\Persistence\Mapping\Driver\FileDriver;
1212
use Doctrine\Persistence\Mapping\Driver\MappingDriver;

0 commit comments

Comments
 (0)