diff --git a/UPGRADE.md b/UPGRADE.md index 9a54315bba3..eb068cd39e9 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -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 diff --git a/lib/Doctrine/ORM/Configuration.php b/lib/Doctrine/ORM/Configuration.php index f4ba5df066b..c036d67fa5f 100644 --- a/lib/Doctrine/ORM/Configuration.php +++ b/lib/Doctrine/ORM/Configuration.php @@ -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() @@ -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() @@ -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() diff --git a/lib/Doctrine/ORM/EntityManager.php b/lib/Doctrine/ORM/EntityManager.php index f003c089811..a90dd9e6a92 100644 --- a/lib/Doctrine/ORM/EntityManager.php +++ b/lib/Doctrine/ORM/EntityManager.php @@ -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) { @@ -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) { diff --git a/lib/Doctrine/ORM/EntityManagerInterface.php b/lib/Doctrine/ORM/EntityManagerInterface.php index 16b7068b93d..c96aa6720fe 100644 --- a/lib/Doctrine/ORM/EntityManagerInterface.php +++ b/lib/Doctrine/ORM/EntityManagerInterface.php @@ -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. diff --git a/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php b/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php index aa99f4bfeec..723c7b15c15 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php +++ b/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php @@ -36,7 +36,7 @@ * @author Jonathan H. Wage * @author Roman Borschel * - * @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 { diff --git a/lib/Doctrine/ORM/Proxy/Proxy.php b/lib/Doctrine/ORM/Proxy/Proxy.php index 72463d121e3..75a61a75604 100644 --- a/lib/Doctrine/ORM/Proxy/Proxy.php +++ b/lib/Doctrine/ORM/Proxy/Proxy.php @@ -27,7 +27,7 @@ * @author Roman Borschel * @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 { diff --git a/lib/Doctrine/ORM/Proxy/ProxyFactory.php b/lib/Doctrine/ORM/Proxy/ProxyFactory.php index 7648a14a5f8..31fac18a208 100644 --- a/lib/Doctrine/ORM/Proxy/ProxyFactory.php +++ b/lib/Doctrine/ORM/Proxy/ProxyFactory.php @@ -38,7 +38,7 @@ * @author Marco Pivetta * @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 { diff --git a/lib/Doctrine/ORM/Tools/Console/Command/ConvertDoctrine1SchemaCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/ConvertDoctrine1SchemaCommand.php index 1fac2497be9..4f316aca432 100644 --- a/lib/Doctrine/ORM/Tools/Console/Command/ConvertDoctrine1SchemaCommand.php +++ b/lib/Doctrine/ORM/Tools/Console/Command/ConvertDoctrine1SchemaCommand.php @@ -39,7 +39,7 @@ * @author Jonathan Wage * @author Roman Borschel * - * @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 { diff --git a/lib/Doctrine/ORM/Tools/Console/Command/GenerateEntitiesCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/GenerateEntitiesCommand.php index 3aff45b7c73..0d3a8daadcd 100644 --- a/lib/Doctrine/ORM/Tools/Console/Command/GenerateEntitiesCommand.php +++ b/lib/Doctrine/ORM/Tools/Console/Command/GenerateEntitiesCommand.php @@ -39,7 +39,7 @@ * @author Jonathan Wage * @author Roman Borschel * - * @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 { diff --git a/lib/Doctrine/ORM/Tools/Console/Command/GenerateRepositoriesCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/GenerateRepositoriesCommand.php index c09f10fdf25..82b7da6b46f 100644 --- a/lib/Doctrine/ORM/Tools/Console/Command/GenerateRepositoriesCommand.php +++ b/lib/Doctrine/ORM/Tools/Console/Command/GenerateRepositoriesCommand.php @@ -38,7 +38,7 @@ * @author Jonathan Wage * @author Roman Borschel * - * @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 { diff --git a/lib/Doctrine/ORM/Tools/EntityGenerator.php b/lib/Doctrine/ORM/Tools/EntityGenerator.php index 5143f637a87..0accfaeaecf 100644 --- a/lib/Doctrine/ORM/Tools/EntityGenerator.php +++ b/lib/Doctrine/ORM/Tools/EntityGenerator.php @@ -47,7 +47,7 @@ * @author Jonathan Wage * @author Roman Borschel * - * @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 { diff --git a/lib/Doctrine/ORM/Tools/EntityRepositoryGenerator.php b/lib/Doctrine/ORM/Tools/EntityRepositoryGenerator.php index 7dffe97eaa5..07c7aaca0c9 100644 --- a/lib/Doctrine/ORM/Tools/EntityRepositoryGenerator.php +++ b/lib/Doctrine/ORM/Tools/EntityRepositoryGenerator.php @@ -33,7 +33,7 @@ * @author Jonathan Wage * @author Roman Borschel * - * @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 { diff --git a/lib/Doctrine/ORM/Tools/Export/ClassMetadataExporter.php b/lib/Doctrine/ORM/Tools/Export/ClassMetadataExporter.php index fcb11cc2d9b..bf0bbada769 100644 --- a/lib/Doctrine/ORM/Tools/Export/ClassMetadataExporter.php +++ b/lib/Doctrine/ORM/Tools/Export/ClassMetadataExporter.php @@ -29,7 +29,7 @@ * @since 2.0 * @author Jonathan Wage * - * @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 { diff --git a/lib/Doctrine/ORM/Tools/Export/Driver/AbstractExporter.php b/lib/Doctrine/ORM/Tools/Export/Driver/AbstractExporter.php index 96cb88b36cb..02cef5238bd 100644 --- a/lib/Doctrine/ORM/Tools/Export/Driver/AbstractExporter.php +++ b/lib/Doctrine/ORM/Tools/Export/Driver/AbstractExporter.php @@ -31,7 +31,7 @@ * @since 2.0 * @author Jonathan Wage * - * @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 { diff --git a/lib/Doctrine/ORM/Tools/Export/Driver/AnnotationExporter.php b/lib/Doctrine/ORM/Tools/Export/Driver/AnnotationExporter.php index 2e7e4cbfd14..29cb8df3633 100644 --- a/lib/Doctrine/ORM/Tools/Export/Driver/AnnotationExporter.php +++ b/lib/Doctrine/ORM/Tools/Export/Driver/AnnotationExporter.php @@ -29,7 +29,7 @@ * @since 2.0 * @author Jonathan Wage * - * @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 { diff --git a/lib/Doctrine/ORM/Tools/Export/Driver/PhpExporter.php b/lib/Doctrine/ORM/Tools/Export/Driver/PhpExporter.php index 3e92dfe5773..c0cd1767bca 100644 --- a/lib/Doctrine/ORM/Tools/Export/Driver/PhpExporter.php +++ b/lib/Doctrine/ORM/Tools/Export/Driver/PhpExporter.php @@ -28,7 +28,7 @@ * @since 2.0 * @author Jonathan Wage * - * @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 { diff --git a/lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php b/lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php index 7ea41f0da49..65036493799 100644 --- a/lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php +++ b/lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php @@ -29,7 +29,7 @@ * @since 2.0 * @author Jonathan Wage * - * @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 { diff --git a/lib/Doctrine/ORM/Tools/Export/Driver/YamlExporter.php b/lib/Doctrine/ORM/Tools/Export/Driver/YamlExporter.php index 7043e0a3716..1fb960b3333 100644 --- a/lib/Doctrine/ORM/Tools/Export/Driver/YamlExporter.php +++ b/lib/Doctrine/ORM/Tools/Export/Driver/YamlExporter.php @@ -29,7 +29,7 @@ * @since 2.0 * @author Jonathan Wage * - * @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 { diff --git a/lib/Doctrine/ORM/Tools/Export/ExportException.php b/lib/Doctrine/ORM/Tools/Export/ExportException.php index c9689d0a519..725ea2137c8 100644 --- a/lib/Doctrine/ORM/Tools/Export/ExportException.php +++ b/lib/Doctrine/ORM/Tools/Export/ExportException.php @@ -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 { diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php index 7660dc1144a..f7b32b3809f 100644 --- a/lib/Doctrine/ORM/UnitOfWork.php +++ b/lib/Doctrine/ORM/UnitOfWork.php @@ -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) { @@ -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) { diff --git a/lib/Doctrine/ORM/Version.php b/lib/Doctrine/ORM/Version.php index b0f070a4e24..9a91b42ac24 100644 --- a/lib/Doctrine/ORM/Version.php +++ b/lib/Doctrine/ORM/Version.php @@ -30,7 +30,7 @@ * @author Jonathan Wage * @author Roman Borschel * - * @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 {