remove obsolete annotation mapping

doctrine · Dec 4, 2023 · b6a69d2 · b6a69d2
1 parent 2619cc0
commit b6a69d2
Show file tree

Hide file tree

Showing 64 changed files with 116 additions and 866 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,7 +15,7 @@ Changelog
 * DocumentManager::flush no longer saves the PHPCR session if there are no changes
   on the ODM layer.
 
-* Removed deprecated annotations for fields. Use `@Field(type="...")` instead.
+* Removed annotation mappings. Use attributes (or XML or YAML) instead.
 
 ### New Features
 

diff --git a/cli-config.doctrine_dbal.php.dist b/cli-config.doctrine_dbal.php.dist
@@ -37,8 +37,7 @@ if (isset($argv[1])
 
     /* prepare the doctrine configuration */
     $config = new \Doctrine\ODM\PHPCR\Configuration();
-    $driver = new \Doctrine\ODM\PHPCR\Mapping\Driver\AnnotationDriver(
-        new \Doctrine\Common\Annotations\AnnotationReader(),
+    $driver = new \Doctrine\ODM\PHPCR\Mapping\Driver\AttributeDriver(
         __DIR__ . '/lib/Doctrine/ODM/PHPCR/Document'
     );
     $config->setMetadataDriverImpl($driver);

diff --git a/lib/Doctrine/ODM/PHPCR/Document/Generic.php b/lib/Doctrine/ODM/PHPCR/Document/Generic.php
@@ -11,8 +11,8 @@
 /**
  * This class represents an arbitrary node.
  *
- * It is used as a default document, for example with the ParentDocument annotation.
- * You can not use this to create nodes as it has no type annotation.
+ * It is used as a default document, for example with the ParentDocument mapping.
+ * You can not use this to create nodes as it has no type mapping.
  */
 #[PHPCR\Document]
 class Generic

diff --git a/lib/Doctrine/ODM/PHPCR/DocumentManager.php b/lib/Doctrine/ODM/PHPCR/DocumentManager.php
@@ -107,7 +107,7 @@ public function hasLocaleChooserStrategy(): bool
     public function getLocaleChooserStrategy(): LocaleChooserInterface
     {
         if (!isset($this->localeChooserStrategy)) {
-            throw new InvalidArgumentException('You must configure a language chooser strategy when having documents with the translatable annotation');
+            throw new InvalidArgumentException('You must configure a language chooser strategy when having documents with the translatable mapping');
         }
 
         return $this->localeChooserStrategy;

diff --git a/lib/Doctrine/ODM/PHPCR/Mapping/Annotations/Child.php b/lib/Doctrine/ODM/PHPCR/Mapping/Annotations/Child.php
diff --git a/lib/Doctrine/ODM/PHPCR/Mapping/Annotations/Children.php b/lib/Doctrine/ODM/PHPCR/Mapping/Annotations/Children.php
diff --git a/lib/Doctrine/ODM/PHPCR/Mapping/Annotations/Depth.php b/lib/Doctrine/ODM/PHPCR/Mapping/Annotations/Depth.php
diff --git a/lib/Doctrine/ODM/PHPCR/Mapping/Annotations/Document.php b/lib/Doctrine/ODM/PHPCR/Mapping/Annotations/Document.php
diff --git a/lib/Doctrine/ODM/PHPCR/Mapping/Annotations/Field.php b/lib/Doctrine/ODM/PHPCR/Mapping/Annotations/Field.php
diff --git a/lib/Doctrine/ODM/PHPCR/Mapping/Annotations/Id.php b/lib/Doctrine/ODM/PHPCR/Mapping/Annotations/Id.php
diff --git a/lib/Doctrine/ODM/PHPCR/Mapping/Annotations/Locale.php b/lib/Doctrine/ODM/PHPCR/Mapping/Annotations/Locale.php
diff --git a/lib/Doctrine/ODM/PHPCR/Mapping/Annotations/MappedSuperclass.php b/lib/Doctrine/ODM/PHPCR/Mapping/Annotations/MappedSuperclass.php
diff --git a/lib/Doctrine/ODM/PHPCR/Mapping/Annotations/MixedReferrers.php b/lib/Doctrine/ODM/PHPCR/Mapping/Annotations/MixedReferrers.php
diff --git a/lib/Doctrine/ODM/PHPCR/Mapping/Annotations/Node.php b/lib/Doctrine/ODM/PHPCR/Mapping/Annotations/Node.php
diff --git a/lib/Doctrine/ODM/PHPCR/Mapping/Annotations/Nodename.php b/lib/Doctrine/ODM/PHPCR/Mapping/Annotations/Nodename.php
diff --git a/lib/Doctrine/ODM/PHPCR/Mapping/Annotations/ParentDocument.php b/lib/Doctrine/ODM/PHPCR/Mapping/Annotations/ParentDocument.php
diff --git a/lib/Doctrine/ODM/PHPCR/Mapping/Annotations/PostLoad.php b/lib/Doctrine/ODM/PHPCR/Mapping/Annotations/PostLoad.php
diff --git a/lib/Doctrine/ODM/PHPCR/Mapping/Annotations/PostPersist.php b/lib/Doctrine/ODM/PHPCR/Mapping/Annotations/PostPersist.php
diff --git a/lib/Doctrine/ODM/PHPCR/Mapping/Annotations/PostRemove.php b/lib/Doctrine/ODM/PHPCR/Mapping/Annotations/PostRemove.php
diff --git a/lib/Doctrine/ODM/PHPCR/Mapping/Annotations/PostUpdate.php b/lib/Doctrine/ODM/PHPCR/Mapping/Annotations/PostUpdate.php
diff --git a/lib/Doctrine/ODM/PHPCR/Mapping/Annotations/PrePersist.php b/lib/Doctrine/ODM/PHPCR/Mapping/Annotations/PrePersist.php
diff --git a/lib/Doctrine/ODM/PHPCR/Mapping/Annotations/PreRemove.php b/lib/Doctrine/ODM/PHPCR/Mapping/Annotations/PreRemove.php
diff --git a/lib/Doctrine/ODM/PHPCR/Mapping/Annotations/PreUpdate.php b/lib/Doctrine/ODM/PHPCR/Mapping/Annotations/PreUpdate.php
diff --git a/lib/Doctrine/ODM/PHPCR/Mapping/Annotations/Property.php b/lib/Doctrine/ODM/PHPCR/Mapping/Annotations/Property.php
diff --git a/lib/Doctrine/ODM/PHPCR/Mapping/Annotations/Reference.php b/lib/Doctrine/ODM/PHPCR/Mapping/Annotations/Reference.php