Skip to content

Commit

Permalink
Merge branch '3.1.x' into 4.0.x
Browse files Browse the repository at this point in the history
* 3.1.x:
  Bump dependencies in the "getting started" docs page (#11219)
  DoctrineSetup was renamed to ORMSetup (#11218)
  • Loading branch information
derrabus committed Feb 4, 2024
2 parents d734ab3 + 1051817 commit 615eb92
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions UPGRADE.md
Original file line number Diff line number Diff line change
Expand Up @@ -519,16 +519,16 @@ The methods have been replaced by PSR-6 compatible counterparts

## BC BREAK: Remove `Doctrine\ORM\Configuration::newDefaultAnnotationDriver`

This functionality has been moved to the new `DoctrineSetup` class. Call
`Doctrine\ORM\Tools\DoctrineSetup::createDefaultAnnotationDriver()` to create
This functionality has been moved to the new `ORMSetup` class. Call
`Doctrine\ORM\ORMSetup::createDefaultAnnotationDriver()` to create
a new annotation driver.

## BC BREAK: Remove `Doctrine\ORM\Tools\Setup`

In our effort to migrate from Doctrine Cache to PSR-6, the `Setup` class which
accepted a Doctrine Cache instance in each method has been removed.

The replacement is `Doctrine\ORM\Tools\DoctrineSetup` which accepts a PSR-6
The replacement is `Doctrine\ORM\ORMSetup` which accepts a PSR-6
cache instead.

## BC BREAK: Removed named queries
Expand Down
6 changes: 3 additions & 3 deletions docs/en/tutorials/getting-started.rst
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ that directory with the following contents:

{
"require": {
"doctrine/orm": "^2.11.0",
"doctrine/dbal": "^3.2",
"symfony/cache": "^5.4"
"doctrine/orm": "^3",
"doctrine/dbal": "^4",
"symfony/cache": "^7"
},
"autoload": {
"psr-0": {"": "src/"}
Expand Down

0 comments on commit 615eb92

Please sign in to comment.