Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions UPGRADE.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
# Upgrade to 3.5

## Deprecate methods for configuring no longer configurable features

Since 3.0, lazy ghosts are enabled unconditionally, and so is rejecting ID
collisions in the identity map.

As a consequence, the following methods are deprecated and will be removed in 4.0:
* `Doctrine\ORM\Configuration::setLazyGhostObjectEnabled()`
* `Doctrine\ORM\Configuration::isLazyGhostObjectEnabled()`
* `Doctrine\ORM\Configuration::setRejectIdCollisionInIdentityMap()`
* `Doctrine\ORM\Configuration::isRejectIdCollisionInIdentityMapEnabled()`

# Upgrade to 3.4

## Discriminator Map class duplicates
Expand Down Expand Up @@ -26,7 +39,7 @@ The class `Doctrine\ORM\Mapping\Driver\DatabaseDriver` is deprecated without rep

Output walkers should implement the new `\Doctrine\ORM\Query\OutputWalker` interface and create
`Doctrine\ORM\Query\Exec\SqlFinalizer` instances instead of `Doctrine\ORM\Query\Exec\AbstractSqlExecutor`s.
The output walker must not base its workings on the query `firstResult`/`maxResult` values, so that the
The output walker must not base its workings on the query `firstResult`/`maxResult` values, so that the
`SqlFinalizer` can be kept in the query cache and used regardless of the actual `firstResult`/`maxResult` values.
Any operation dependent on `firstResult`/`maxResult` should take place within the `SqlFinalizer::createExecutor()`
method. Details can be found at https://github.com/doctrine/orm/pull/11188.
Expand Down Expand Up @@ -137,7 +150,7 @@ WARNING: This was relaxed in ORM 3.2 when partial was re-allowed for array-hydra
`Doctrine\ORM\Query::HINT_FORCE_PARTIAL_LOAD` are removed.
- `Doctrine\ORM\EntityManager*::getPartialReference()` is removed.

## BC BREAK: Enforce ArrayCollection Type on `\Doctrine\ORM\QueryBuilder::setParameters(ArrayCollection $parameters)`
## BC BREAK: Enforce ArrayCollection Type on `\Doctrine\ORM\QueryBuilder::setParameters(ArrayCollection $parameters)`

The argument $parameters can no longer be a key=>value array. Only ArrayCollection types are allowed.

Expand Down
8 changes: 4 additions & 4 deletions src/Configuration.php
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,7 @@ public function enableNativeLazyObjects(bool $nativeLazyObjects): void
}

/**
* To be deprecated in 3.1.0
* @deprecated lazy ghost objects are always enabled
*
* @return true
*/
Expand All @@ -619,7 +619,7 @@ public function isLazyGhostObjectEnabled(): bool
return true;
}

/** To be deprecated in 3.1.0 */
/** @deprecated lazy ghost objects cannot be disabled */
public function setLazyGhostObjectEnabled(bool $flag): void
{
if (! $flag) {
Expand All @@ -630,7 +630,7 @@ public function setLazyGhostObjectEnabled(bool $flag): void
}
}

/** To be deprecated in 3.1.0 */
/** @deprecated rejecting ID collisions in the identity map cannot be disabled */
public function setRejectIdCollisionInIdentityMap(bool $flag): void
{
if (! $flag) {
Expand All @@ -642,7 +642,7 @@ public function setRejectIdCollisionInIdentityMap(bool $flag): void
}

/**
* To be deprecated in 3.1.0
* @deprecated rejecting ID collisions in the identity map is always enabled
*
* @return true
*/
Expand Down