Merge 2.13.x into 2.14.x (doctrine#10181)

derrabus · web-flow · commit 1edfa91714ca · 2022-10-26T11:53:28.000+02:00
diff --git a/composer.json b/composer.json
@@ -42,7 +42,7 @@
         "doctrine/annotations": "^1.13",
         "doctrine/coding-standard": "^9.0.2 || ^10.0",
         "phpbench/phpbench": "^0.16.10 || ^1.0",
-        "phpstan/phpstan": "~1.4.10 || 1.8.8",
+        "phpstan/phpstan": "~1.4.10 || 1.8.11",
         "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
         "psr/log": "^1 || ^2 || ^3",
         "squizlabs/php_codesniffer": "3.7.1",
diff --git a/docs/en/reference/advanced-configuration.rst b/docs/en/reference/advanced-configuration.rst
@@ -132,7 +132,7 @@ The attribute driver can be injected in the ``Doctrine\ORM\Configuration``:
 .. code-block:: php
 
     <?php
-    use Doctrine\ORM\ORMSetup;
+    use Doctrine\ORM\Mapping\Driver\AttributeDriver;
 
     $driverImpl = new AttributeDriver(['/path/to/lib/MyProject/Entities']);
     $config->setMetadataDriverImpl($driverImpl);
diff --git a/docs/en/reference/query-builder.rst b/docs/en/reference/query-builder.rst
@@ -434,6 +434,12 @@ complete list of supported helper methods available:
         // Example - $qb->expr()->isNotNull('u.id') => u.id IS NOT NULL
         public function isNotNull($x); // Returns string
 
+        // Example - $qb->expr()->isMemberOf('?1', 'u.groups') => ?1 MEMBER OF u.groups
+        public function isMemberOf($x, $y); // Returns Expr\Comparison instance
+
+        // Example - $qb->expr()->isInstanceOf('u', Employee::class) => u INSTANCE OF Employee
+        public function isInstanceOf($x, $y); // Returns Expr\Comparison instance
+
 
         /** Arithmetic objects **/
 
diff --git a/docs/en/reference/working-with-objects.rst b/docs/en/reference/working-with-objects.rst
@@ -305,7 +305,7 @@ as follows:
 -  A removed entity X will be removed from the database as a result
    of the flush operation.
 
-After an entity has been removed its in-memory state is the same as
+After an entity has been removed, its in-memory state is the same as
 before the removal, except for generated identifiers.
 
 Removing an entity will also automatically delete any existing
diff --git a/docs/en/tutorials/ordered-associations.rst b/docs/en/tutorials/ordered-associations.rst
@@ -76,7 +76,7 @@ The DQL Snippet in OrderBy is only allowed to consist of
 unqualified, unquoted field names and of an optional ASC/DESC
 positional statement. Multiple Fields are separated by a comma (,).
 The referenced field names have to exist on the ``targetEntity``
-class of the ``#[ManyToMany]`` or ``#[OneToMany]`` annotation.
+class of the ``#[ManyToMany]`` or ``#[OneToMany]`` attribute.
 
 The semantics of this feature can be described as follows:
 
diff --git a/lib/Doctrine/ORM/Events.php b/lib/Doctrine/ORM/Events.php
@@ -82,7 +82,7 @@ private function __construct()
 
     /**
      * The loadClassMetadata event occurs after the mapping metadata for a class
-     * has been loaded from a mapping source (annotations/xml/yaml).
+     * has been loaded from a mapping source (attributes/xml/yaml).
      */
     public const loadClassMetadata = 'loadClassMetadata';
 
