Skip to content

Commit

Permalink
Fix deprecation messages version
Browse files Browse the repository at this point in the history
  • Loading branch information
lcobucci committed Nov 16, 2019
1 parent 8c47dcb commit 797bfc5
Show file tree
Hide file tree
Showing 21 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion UPGRADE.md
Expand Up @@ -36,7 +36,7 @@ These methods have been deprecated:

The `Doctrine\ORM\Version` class is now deprecated and will be removed in Doctrine 3.0:
please refrain from checking the ORM version at runtime or use
[Ocramius/PackageVersions](https://github.com/Ocramius/PackageVersions/).
[ocramius/package-versions](https://github.com/Ocramius/PackageVersions/).

## Deprecated `EntityManager#merge()` and `EntityManager#detach()` methods

Expand Down
6 changes: 3 additions & 3 deletions lib/Doctrine/ORM/Configuration.php
Expand Up @@ -71,7 +71,7 @@ public function setProxyDir($dir)
*
* @return string|null
*
* @deprecated 3.0 We're switch to `ocramius/proxy-manager` and this method isn't applicable any longer
* @deprecated 2.7 We're switch to `ocramius/proxy-manager` and this method isn't applicable any longer
* @see https://github.com/Ocramius/ProxyManager
*/
public function getProxyDir()
Expand All @@ -86,7 +86,7 @@ public function getProxyDir()
*
* @return int Possible values are constants of Doctrine\Common\Proxy\AbstractProxyFactory.
*
* @deprecated 3.0 We're switch to `ocramius/proxy-manager` and this method isn't applicable any longer
* @deprecated 2.7 We're switch to `ocramius/proxy-manager` and this method isn't applicable any longer
* @see https://github.com/Ocramius/ProxyManager
*/
public function getAutoGenerateProxyClasses()
Expand Down Expand Up @@ -114,7 +114,7 @@ public function setAutoGenerateProxyClasses($autoGenerate)
*
* @return string|null
*
* @deprecated 3.0 We're switch to `ocramius/proxy-manager` and this method isn't applicable any longer
* @deprecated 2.7 We're switch to `ocramius/proxy-manager` and this method isn't applicable any longer
* @see https://github.com/Ocramius/ProxyManager
*/
public function getProxyNamespace()
Expand Down
4 changes: 2 additions & 2 deletions lib/Doctrine/ORM/EntityManager.php
Expand Up @@ -658,7 +658,7 @@ public function refresh($entity)
*
* @throws ORMInvalidArgumentException
*
* @deprecated 3.0 This method is being removed from the ORM and won't have any replacement
* @deprecated 2.7 This method is being removed from the ORM and won't have any replacement
*/
public function detach($entity)
{
Expand All @@ -683,7 +683,7 @@ public function detach($entity)
* @throws ORMInvalidArgumentException
* @throws ORMException
*
* @deprecated 3.0 This method is being removed from the ORM and won't have any replacement
* @deprecated 2.7 This method is being removed from the ORM and won't have any replacement
*/
public function merge($entity)
{
Expand Down
2 changes: 1 addition & 1 deletion lib/Doctrine/ORM/EntityManagerInterface.php
Expand Up @@ -190,7 +190,7 @@ public function close();
/**
* Creates a copy of the given entity. Can create a shallow or a deep copy.
*
* @deprecated 3.0 This method is being removed from the ORM and won't have any replacement
* @deprecated 2.7 This method is being removed from the ORM and won't have any replacement
*
* @param object $entity The entity to copy.
* @param boolean $deep FALSE for a shallow copy, TRUE for a deep copy.
Expand Down
2 changes: 1 addition & 1 deletion lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php
Expand Up @@ -36,7 +36,7 @@
* @author Jonathan H. Wage <jonwage@gmail.com>
* @author Roman Borschel <roman@code-factory.org>
*
* @deprecated 3.0 This class is being removed from the ORM and won't have any replacement
* @deprecated 2.7 This class is being removed from the ORM and won't have any replacement
*/
class YamlDriver extends FileDriver
{
Expand Down
2 changes: 1 addition & 1 deletion lib/Doctrine/ORM/Proxy/Proxy.php
Expand Up @@ -27,7 +27,7 @@
* @author Roman Borschel <roman@code-factory.org>
* @since 2.0
*
* @deprecated 3.0 This interface is being removed from the ORM and won't have any replacement, proxies will no longer implement it.
* @deprecated 2.7 This interface is being removed from the ORM and won't have any replacement, proxies will no longer implement it.
*/
interface Proxy extends BaseProxy
{
Expand Down
2 changes: 1 addition & 1 deletion lib/Doctrine/ORM/Proxy/ProxyFactory.php
Expand Up @@ -38,7 +38,7 @@
* @author Marco Pivetta <ocramius@gmail.com>
* @since 2.0
*
* @deprecated 3.0 This class is being removed from the ORM and won't have any replacement
* @deprecated 2.7 This class is being removed from the ORM and won't have any replacement
*/
class ProxyFactory extends AbstractProxyFactory
{
Expand Down
Expand Up @@ -39,7 +39,7 @@
* @author Jonathan Wage <jonwage@gmail.com>
* @author Roman Borschel <roman@code-factory.org>
*
* @deprecated 3.0 This class is being removed from the ORM and won't have any replacement
* @deprecated 2.7 This class is being removed from the ORM and won't have any replacement
*/
class ConvertDoctrine1SchemaCommand extends Command
{
Expand Down
Expand Up @@ -39,7 +39,7 @@
* @author Jonathan Wage <jonwage@gmail.com>
* @author Roman Borschel <roman@code-factory.org>
*
* @deprecated 3.0 This class is being removed from the ORM and won't have any replacement
* @deprecated 2.7 This class is being removed from the ORM and won't have any replacement
*/
class GenerateEntitiesCommand extends Command
{
Expand Down
Expand Up @@ -38,7 +38,7 @@
* @author Jonathan Wage <jonwage@gmail.com>
* @author Roman Borschel <roman@code-factory.org>
*
* @deprecated 3.0 This class is being removed from the ORM and won't have any replacement
* @deprecated 2.7 This class is being removed from the ORM and won't have any replacement
*/
class GenerateRepositoriesCommand extends Command
{
Expand Down
2 changes: 1 addition & 1 deletion lib/Doctrine/ORM/Tools/EntityGenerator.php
Expand Up @@ -47,7 +47,7 @@
* @author Jonathan Wage <jonwage@gmail.com>
* @author Roman Borschel <roman@code-factory.org>
*
* @deprecated 3.0 This class is being removed from the ORM and won't have any replacement
* @deprecated 2.7 This class is being removed from the ORM and won't have any replacement
*/
class EntityGenerator
{
Expand Down
2 changes: 1 addition & 1 deletion lib/Doctrine/ORM/Tools/EntityRepositoryGenerator.php
Expand Up @@ -33,7 +33,7 @@
* @author Jonathan Wage <jonwage@gmail.com>
* @author Roman Borschel <roman@code-factory.org>
*
* @deprecated 3.0 This class is being removed from the ORM and won't have any replacement
* @deprecated 2.7 This class is being removed from the ORM and won't have any replacement
*/
class EntityRepositoryGenerator
{
Expand Down
2 changes: 1 addition & 1 deletion lib/Doctrine/ORM/Tools/Export/ClassMetadataExporter.php
Expand Up @@ -29,7 +29,7 @@
* @since 2.0
* @author Jonathan Wage <jonwage@gmail.com>
*
* @deprecated 3.0 This class is being removed from the ORM and won't have any replacement
* @deprecated 2.7 This class is being removed from the ORM and won't have any replacement
*/
class ClassMetadataExporter
{
Expand Down
2 changes: 1 addition & 1 deletion lib/Doctrine/ORM/Tools/Export/Driver/AbstractExporter.php
Expand Up @@ -31,7 +31,7 @@
* @since 2.0
* @author Jonathan Wage <jonwage@gmail.com>
*
* @deprecated 3.0 This class is being removed from the ORM and won't have any replacement
* @deprecated 2.7 This class is being removed from the ORM and won't have any replacement
*/
abstract class AbstractExporter
{
Expand Down
Expand Up @@ -29,7 +29,7 @@
* @since 2.0
* @author Jonathan Wage <jonwage@gmail.com>
*
* @deprecated 3.0 This class is being removed from the ORM and won't have any replacement
* @deprecated 2.7 This class is being removed from the ORM and won't have any replacement
*/
class AnnotationExporter extends AbstractExporter
{
Expand Down
2 changes: 1 addition & 1 deletion lib/Doctrine/ORM/Tools/Export/Driver/PhpExporter.php
Expand Up @@ -28,7 +28,7 @@
* @since 2.0
* @author Jonathan Wage <jonwage@gmail.com>
*
* @deprecated 3.0 This class is being removed from the ORM and won't have any replacement
* @deprecated 2.7 This class is being removed from the ORM and won't have any replacement
*/
class PhpExporter extends AbstractExporter
{
Expand Down
2 changes: 1 addition & 1 deletion lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php
Expand Up @@ -29,7 +29,7 @@
* @since 2.0
* @author Jonathan Wage <jonwage@gmail.com>
*
* @deprecated 3.0 This class is being removed from the ORM and won't have any replacement
* @deprecated 2.7 This class is being removed from the ORM and won't have any replacement
*/
class XmlExporter extends AbstractExporter
{
Expand Down
2 changes: 1 addition & 1 deletion lib/Doctrine/ORM/Tools/Export/Driver/YamlExporter.php
Expand Up @@ -29,7 +29,7 @@
* @since 2.0
* @author Jonathan Wage <jonwage@gmail.com>
*
* @deprecated 3.0 This class is being removed from the ORM and won't have any replacement
* @deprecated 2.7 This class is being removed from the ORM and won't have any replacement
*/
class YamlExporter extends AbstractExporter
{
Expand Down
2 changes: 1 addition & 1 deletion lib/Doctrine/ORM/Tools/Export/ExportException.php
Expand Up @@ -22,7 +22,7 @@
use Doctrine\ORM\ORMException;

/**
* @deprecated 3.0 This class is being removed from the ORM and won't have any replacement
* @deprecated 2.7 This class is being removed from the ORM and won't have any replacement
*/
class ExportException extends ORMException
{
Expand Down
4 changes: 2 additions & 2 deletions lib/Doctrine/ORM/UnitOfWork.php
Expand Up @@ -1878,7 +1878,7 @@ private function doRemove($entity, array &$visited)
* @throws OptimisticLockException If the entity uses optimistic locking through a version
* attribute and the version check against the managed copy fails.
*
* @deprecated 3.0 This method is being removed from the ORM and won't have any replacement
* @deprecated 2.7 This method is being removed from the ORM and won't have any replacement
*/
public function merge($entity)
{
Expand Down Expand Up @@ -2069,7 +2069,7 @@ private function updateAssociationWithMergedEntity($entity, array $association,
*
* @return void
*
* @deprecated 3.0 This method is being removed from the ORM and won't have any replacement
* @deprecated 2.7 This method is being removed from the ORM and won't have any replacement
*/
public function detach($entity)
{
Expand Down
2 changes: 1 addition & 1 deletion lib/Doctrine/ORM/Version.php
Expand Up @@ -30,7 +30,7 @@
* @author Jonathan Wage <jonwage@gmail.com>
* @author Roman Borschel <roman@code-factory.org>
*
* @deprecated 3.0 This class is being removed from the ORM and won't have any replacement
* @deprecated 2.7 This class is being removed from the ORM and won't have any replacement
*/
class Version
{
Expand Down

0 comments on commit 797bfc5

Please sign in to comment.