Merge pull request #1812 from caciobanu/issue-1795

[2.0] Drop namespace property from ClassMetadata
doctrine · Jul 27, 2018 · f0fe3a6 · f0fe3a6
2 parents 22189c8 + f9ac944
commit f0fe3a6
Show file tree

Hide file tree

Showing 170 changed files with 423 additions and 453 deletions.
diff --git a/UPGRADE-1.2.md b/UPGRADE-1.2.md
@@ -170,7 +170,7 @@ to a regular document:
 /** @QueryResultDocument */
 class UserPurchases
 {
-    /** @ReferenceOne(targetDocument="User", name="_id") */
+    /** @ReferenceOne(targetDocument=User::class, name="_id") */
     private $user;
 
     /** @Field(type="int") */

diff --git a/docs/en/cookbook/simple-search-engine.rst b/docs/en/cookbook/simple-search-engine.rst
@@ -148,7 +148,7 @@ Now you can embed the ``Keyword`` document many times in the ``Product``:
     {
         // ...
 
-        /** @EmbedMany(targetDocument="Keyword") */
+        /** @EmbedMany(targetDocument=Keyword::class) */
         private $keywords;
 
         // ...

diff --git a/docs/en/reference/aggregation-builder.rst b/docs/en/reference/aggregation-builder.rst
@@ -134,7 +134,7 @@ they can't be persisted to the database.
         /** @QueryResultDocument */
         class UserPurchases
         {
-            /** @ReferenceOne(targetDocument="User", name="_id") */
+            /** @ReferenceOne(targetDocument=User::class, name="_id") */
             private $user;
 
             /** @Field(type="int") */

diff --git a/docs/en/reference/annotations-reference.rst b/docs/en/reference/annotations-reference.rst
@@ -306,7 +306,7 @@ to be stored within an `@EmbedOne`_ or `@EmbedMany`_ relationship.
     /** @Document(db="finance", collection="wallets") */
     class Wallet
     {
-        /** @EmbedOne(targetDocument="Money") */
+        /** @EmbedOne(targetDocument=Money::class) */
         private $money;
 
         public function setMoney(Money $money)

diff --git a/docs/en/reference/bidirectional-references.rst b/docs/en/reference/bidirectional-references.rst
@@ -14,7 +14,7 @@ and changes are tracked and persisted separately. Here is an example:
     {
         // ...
 
-        /** @ReferenceOne(targetDocument="User") */
+        /** @ReferenceOne(targetDocument=User::class) */
         private $user;
     }
 
@@ -23,7 +23,7 @@ and changes are tracked and persisted separately. Here is an example:
     {
         // ...
 
-        /** @ReferenceMany(targetDocument="BlogPost") */
+        /** @ReferenceMany(targetDocument=BlogPost::class) */
         private $posts;
     }
 
@@ -56,7 +56,7 @@ One to Many
     {
         // ...
 
-        /** @ReferenceOne(targetDocument="User", inversedBy="posts") */
+        /** @ReferenceOne(targetDocument=User::class, inversedBy="posts") */
         private $user;
     }
 
@@ -65,7 +65,7 @@ One to Many
     {
         // ...
 
-        /** @ReferenceMany(targetDocument="BlogPost", mappedBy="user") */
+        /** @ReferenceMany(targetDocument=BlogPost::class, mappedBy="user") */
         private $posts;
     }
 
@@ -136,7 +136,7 @@ Here is an example where we have a one to one relationship between ``Cart`` and
         // ...
 
         /**
-         * @ReferenceOne(targetDocument="Customer", inversedBy="cart")
+         * @ReferenceOne(targetDocument=Customer::class, inversedBy="cart")
          */
         public $customer;
     }
@@ -147,7 +147,7 @@ Here is an example where we have a one to one relationship between ``Cart`` and
         // ...
 
         /**
-         * @ReferenceOne(targetDocument="Cart", mappedBy="customer")
+         * @ReferenceOne(targetDocument=Cart::class, mappedBy="customer")
          */
         public $cart;
     }
@@ -192,12 +192,12 @@ Self-Referencing Many to Many
         // ...
 
         /**
-         * @ReferenceMany(targetDocument="User", mappedBy="myFriends")
+         * @ReferenceMany(targetDocument=User::class, mappedBy="myFriends")
          */
         public $friendsWithMe;
 
         /**
-         * @ReferenceMany(targetDocument="User", inversedBy="friendsWithMe")
+         * @ReferenceMany(targetDocument=User::class, inversedBy="friendsWithMe")
          */
         public $myFriends;
 

diff --git a/docs/en/reference/complex-references.rst b/docs/en/reference/complex-references.rst
@@ -35,12 +35,12 @@ querying by the BlogPost's ID.
     {
         // ...
 
-        /** @ReferenceMany(targetDocument="Comment", mappedBy="blogPost") */
+        /** @ReferenceMany(targetDocument=Comment::class, mappedBy="blogPost") */
         private $comments;
 
         /**
          * @ReferenceMany(
-         *      targetDocument="Comment",
+         *      targetDocument=Comment::class,
          *      mappedBy="blogPost",
          *      sort={"date"="desc"},
          *      limit=5
@@ -54,7 +54,7 @@ querying by the BlogPost's ID.
     {
         // ...
 
-        /** @ReferenceOne(targetDocument="BlogPost", inversedBy="comments") */
+        /** @ReferenceOne(targetDocument=BlogPost::class, inversedBy="comments") */
         private $blogPost;
     }
 
@@ -67,7 +67,7 @@ following example:
 
     /**
      * @ReferenceOne(
-     *      targetDocument="Comment",
+     *      targetDocument=Comment::class,
      *      mappedBy="blogPost",
      *      sort={"date"="desc"}
      * )
@@ -87,7 +87,7 @@ administrators:
 
     /**
      * @ReferenceMany(
-     *      targetDocument="Comment",
+     *      targetDocument=Comment::class,
      *      mappedBy="blogPost",
      *      criteria={"isByAdmin" : true}
      * )
@@ -106,7 +106,7 @@ call on the Comment repository class to populate the reference.
 
     /**
      * @ReferenceMany(
-     *      targetDocument="Comment",
+     *      targetDocument=Comment::class,
      *      mappedBy="blogPost",
      *      repositoryMethod="findSomeComments"
      * )

diff --git a/docs/en/reference/custom-collections.rst b/docs/en/reference/custom-collections.rst
@@ -23,7 +23,7 @@ persistence-related features.
         // ...
 
         /**
-         * @EmbedMany(targetDocument="Section")
+         * @EmbedMany(targetDocument=Section::class)
          */
         private $sections;
 
@@ -65,8 +65,8 @@ and ensuring that your custom class is initialized in the owning class' construc
 
         /**
          * @EmbedMany(
-         *  collectionClass="SectionCollection"
-         *  targetDocument="Section"
+         *  collectionClass=SectionCollection::class
+         *  targetDocument=Section::class
          * )
          */
         private $sections;

diff --git a/docs/en/reference/embedded-mapping.rst b/docs/en/reference/embedded-mapping.rst
@@ -22,7 +22,7 @@ Embed a single document:
         {
             // ...
 
-            /** @EmbedOne(targetDocument="Address") */
+            /** @EmbedOne(targetDocument=Address::class) */
             private $address;
 
             // ...
@@ -64,7 +64,7 @@ Embed many documents:
         {
             // ...
 
-            /** @EmbedMany(targetDocument="Phonenumber") */
+            /** @EmbedMany(targetDocument=Phonenumber::class) */
             private $phonenumbers = array();
 
             // ...

diff --git a/docs/en/reference/geospatial-queries.rst b/docs/en/reference/geospatial-queries.rst
@@ -27,7 +27,7 @@ First, setup some documents like the following:
             /** @Field(type="string") */
             public $name;
 
-            /** @EmbedOne(targetDocument="Coordinates") */
+            /** @EmbedOne(targetDocument=Coordinates::class) */
             public $coordinates;
         }
 

diff --git a/docs/en/reference/indexes.rst b/docs/en/reference/indexes.rst
@@ -253,7 +253,7 @@ Now if we had a ``BlogPost`` document with the ``Comment`` document embedded man
         /** @Field(type="string") @Index */
         private $slug;
 
-        /** @EmbedMany(targetDocument="Comment") */
+        /** @EmbedMany(targetDocument=Comment::class) */
         private $comments;
     }
 
@@ -308,7 +308,7 @@ options structures manually:
             /** @Id */
             public $id;
 
-            /** @EmbedOne(targetDocument="Coordinates") */
+            /** @EmbedOne(targetDocument=Coordinates::class) */
             public $coordinates;
         }
 

diff --git a/docs/en/reference/introduction.rst b/docs/en/reference/introduction.rst
@@ -52,7 +52,7 @@ Here is a quick example of some PHP object documents that demonstrates a few of
         /** @ODM\Field(type="date") */
         private $left;
 
-        /** @ODM\EmbedOne(targetDocument="Address") */
+        /** @ODM\EmbedOne(targetDocument=Address::class) */
         private $address;
 
         public function getId(): ?string { return $this->id; }
@@ -82,7 +82,7 @@ Here is a quick example of some PHP object documents that demonstrates a few of
     /** @ODM\Document */
     class Employee extends BaseEmployee
     {
-        /** @ODM\ReferenceOne(targetDocument="Documents\Manager") */
+        /** @ODM\ReferenceOne(targetDocument=Manager::class) */
         private $manager;
 
         public function getManager(): ?Manager { return $this->manager; }
@@ -92,7 +92,7 @@ Here is a quick example of some PHP object documents that demonstrates a few of
     /** @ODM\Document */
     class Manager extends BaseEmployee
     {
-        /** @ODM\ReferenceMany(targetDocument="Documents\Project") */
+        /** @ODM\ReferenceMany(targetDocument=Project::class) */
         private $projects;
 
         public __construct() { $this->projects = new ArrayCollection(); }

diff --git a/docs/en/reference/map-reduce.rst b/docs/en/reference/map-reduce.rst
@@ -29,7 +29,7 @@ named ``Event`` and it was related to a ``User`` document:
         /** @Id */
         private $id;
 
-        /** @ReferenceOne(targetDocument="Documents\User") */
+        /** @ReferenceOne(targetDocument=User::class) */
         private $user;
 
         /** @Field(type="string") */

diff --git a/docs/en/reference/migrating-schemas.rst b/docs/en/reference/migrating-schemas.rst
@@ -172,7 +172,7 @@ Later on, you may want to migrate this data into an embedded Address document:
         /** @NotSaved */
         public $city;
 
-        /** @EmbedOne(targetDocument="Address") */
+        /** @EmbedOne(targetDocument=Address::class) */
         public $address;
 
         /** @PostLoad */

diff --git a/docs/en/reference/priming-references.rst b/docs/en/reference/priming-references.rst
@@ -18,7 +18,7 @@ Consider the following abbreviated model:
     /** @Document */
     class User
     {
-        /** @ReferenceMany(targetDocument="Account") */
+        /** @ReferenceMany(targetDocument=Account::class) */
         private $accounts;
     }
 
@@ -111,7 +111,7 @@ specifying them in the mapping:
     /** @Document */
     class User
     {
-        /** @ReferenceMany(targetDocument="Account", prime={"user"}) */
+        /** @ReferenceMany(targetDocument=Account::class, prime={"user"}) */
         private $accounts;
     }
 

diff --git a/docs/en/reference/reference-mapping.rst b/docs/en/reference/reference-mapping.rst
@@ -53,7 +53,7 @@ Reference one document:
             // ...
 
             /**
-             * @ReferenceOne(targetDocument="Shipping")
+             * @ReferenceOne(targetDocument=Shipping::class)
              */
             private $shipping;
 
@@ -97,7 +97,7 @@ Reference many documents:
             // ...
 
             /**
-             * @ReferenceMany(targetDocument="Account")
+             * @ReferenceMany(targetDocument=Account::class)
              */
             private $accounts = array();
 
@@ -286,7 +286,7 @@ Example:
         <?php
 
         /**
-         * @ReferenceOne(targetDocument="Profile", storeAs="id")
+         * @ReferenceOne(targetDocument=Profile::class, storeAs="id")
          */
         private $profile;
 
@@ -334,7 +334,7 @@ referenced documents. You must explicitly enable this functionality:
         <?php
 
         /**
-         * @ReferenceOne(targetDocument="Profile", cascade={"persist"})
+         * @ReferenceOne(targetDocument=Profile::class, cascade={"persist"})
          */
         private $profile;
 
@@ -391,10 +391,10 @@ and StandingData:
         /** @Id */
         private $id;
 
-        /** @ReferenceOne(targetDocument="StandingData", orphanRemoval=true) */
+        /** @ReferenceOne(targetDocument=StandingData::class, orphanRemoval=true) */
         private $standingData;
 
-        /** @ReferenceMany(targetDocument="Address", mappedBy="contact", orphanRemoval=true) */
+        /** @ReferenceMany(targetDocument=Address::class, mappedBy="contact", orphanRemoval=true) */
         private $addresses;
 
         public function __construct()

diff --git a/docs/en/reference/trees.rst b/docs/en/reference/trees.rst
@@ -23,7 +23,7 @@ Full Tree in Single Document
         /** @Field(type="string") */
         private $body;
 
-        /** @EmbedMany(targetDocument="Comment") */
+        /** @EmbedMany(targetDocument=Comment::class) */
         private $comments = array();
 
         // ...
@@ -38,7 +38,7 @@ Full Tree in Single Document
         /** @Field(type="string") */
         private $text;
 
-        /** @EmbedMany(targetDocument="Comment") */
+        /** @EmbedMany(targetDocument=Comment::class) */
         private $replies = array();
 
         // ...
@@ -77,7 +77,7 @@ Parent Reference
         private $name;
 
         /**
-         * @ReferenceOne(targetDocument="Category")
+         * @ReferenceOne(targetDocument=Category::class)
          * @Index
          */
         private $parent;
@@ -116,7 +116,7 @@ Child Reference
         private $name;
 
         /**
-         * @ReferenceMany(targetDocument="Category")
+         * @ReferenceMany(targetDocument=Category::class)
          * @Index
          */
         private $children = array();
@@ -174,13 +174,13 @@ Array of Ancestors
         private $id;
 
         /**
-         * @ReferenceMany(targetDocument="Category")
+         * @ReferenceMany(targetDocument=Category::class)
          * @Index
          */
         private $ancestors = array();
 
         /**
-         * @ReferenceOne(targetDocument="Category")
+         * @ReferenceOne(targetDocument=Category::class)
          * @Index
          */
         private $parent;

diff --git a/docs/en/reference/working-with-objects.rst b/docs/en/reference/working-with-objects.rst
@@ -429,7 +429,7 @@ in the $addresses collection.
     {
         //...
         /**
-         * @ReferenceMany(targetDocument="Address", cascade={"persist", "remove"})
+         * @ReferenceMany(targetDocument=Address::class, cascade={"persist", "remove"})
          */
         private $addresses;
         //...
-Original file line number
+Diff line change
@@ Expand Up @@
         {
             // ...
-            /** @EmbedMany(targetDocument="Keyword") */
+            /** @EmbedMany(targetDocument=Keyword::class) */
             private $keywords;
             // ...
@@ Expand Down @@