Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 574a184

Browse filesBrowse files
committed
Require doctrine/persistence 2
This allows us to remove autoload calls that are necessary for the persistence 1 backwards-compatibility layer to work. The require-dev constraints on doctrine/orm are bumped to ^2.7.3 because lower versions are not compatible with doctrine/persistence 2.
1 parent c13d5b5 commit 574a184
Copy full SHA for 574a184

File tree

Expand file treeCollapse file tree

5 files changed

+4
-11
lines changed
Filter options
Expand file treeCollapse file tree

5 files changed

+4
-11
lines changed

‎composer.json

Copy file name to clipboardExpand all lines: composer.json
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"php": ">=7.2.5",
2020
"ext-xml": "*",
2121
"doctrine/event-manager": "~1.0",
22-
"doctrine/persistence": "^1.3|^2",
22+
"doctrine/persistence": "^2",
2323
"twig/twig": "^2.10|^3.0",
2424
"psr/cache": "~1.0",
2525
"psr/container": "^1.0",
@@ -116,7 +116,7 @@
116116
"doctrine/collections": "~1.0",
117117
"doctrine/data-fixtures": "^1.1",
118118
"doctrine/dbal": "^2.10|^3.0",
119-
"doctrine/orm": "~2.4,>=2.4.5",
119+
"doctrine/orm": "^2.7.3",
120120
"doctrine/doctrine-bundle": "^2.0",
121121
"guzzlehttp/promises": "^1.3.1",
122122
"masterminds/html5": "^2.6",

‎src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
-2Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,5 +269,3 @@ private function getCachedEntityLoader(ObjectManager $manager, $queryBuilder, st
269269
return $this->entityLoaders[$hash] ?? ($this->entityLoaders[$hash] = $this->getLoader($manager, $queryBuilder, $class));
270270
}
271271
}
272-
273-
interface_exists(ObjectManager::class);

‎src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php
-2Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,5 +96,3 @@ private function parameterToArray(Parameter $parameter): array
9696
return [$parameter->getName(), $parameter->getType(), $parameter->getValue()];
9797
}
9898
}
99-
100-
interface_exists(ObjectManager::class);

‎src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php
-3Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,3 @@ private function getClassMetadata(): ClassMetadata
153153
return $this->getObjectManager()->getClassMetadata($this->classOrAlias);
154154
}
155155
}
156-
157-
interface_exists(ObjectManager::class);
158-
interface_exists(ObjectRepository::class);

‎src/Symfony/Bridge/Doctrine/composer.json

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/composer.json
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"require": {
1919
"php": ">=7.2.5",
2020
"doctrine/event-manager": "~1.0",
21-
"doctrine/persistence": "^1.3|^2",
21+
"doctrine/persistence": "^2",
2222
"symfony/polyfill-ctype": "~1.8",
2323
"symfony/polyfill-mbstring": "~1.0",
2424
"symfony/polyfill-php80": "^1.15",
@@ -48,7 +48,7 @@
4848
"doctrine/collections": "~1.0",
4949
"doctrine/data-fixtures": "^1.1",
5050
"doctrine/dbal": "^2.10|^3.0",
51-
"doctrine/orm": "^2.6.3"
51+
"doctrine/orm": "^2.7.3"
5252
},
5353
"conflict": {
5454
"doctrine/dbal": "<2.10",

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.