Fix docblocks on nullable EM properties (#9273)

Author: derrabus

lib/Doctrine/ORM/EntityManager.php

@@ -120,7 +120,7 @@
     /**
      * The expression builder instance used to generate query expressions.
      *
-     * @var Expr
+     * @var Expr|null
      */
     private $expressionBuilder;
 
@@ -134,11 +134,15 @@
     /**
      * Collection of query filters.
      *
-     * @var FilterCollection
+     * @var FilterCollection|null
      */
     private $filterCollection;
 
-    /** @var Cache The second level cache regions API. */
+    /**
+     * The second level cache regions API.
+     *
+     * @var Cache|null
+     */
     private $cache;
 
     /**

psalm-baseline.xml

@@ -447,11 +447,8 @@
       <code>getProxyNamespace</code>
       <code>merge</code>
     </DeprecatedMethod>
-    <DocblockTypeContradiction occurrences="9">
+    <DocblockTypeContradiction occurrences="6">
       <code>$entityName !== null &amp;&amp; ! is_string($entityName)</code>
-      <code>$this-&gt;expressionBuilder === null</code>
-      <code>$this-&gt;filterCollection === null</code>
-      <code>$this-&gt;filterCollection === null</code>
       <code>is_object($entity)</code>
       <code>is_object($entity)</code>
       <code>is_object($entity)</code>
@@ -507,21 +504,13 @@
       <code>createCache</code>
       <code>getCacheFactory</code>
     </PossiblyNullReference>
-    <PropertyNotSetInConstructor occurrences="3">
-      <code>$cache</code>
-      <code>$expressionBuilder</code>
-      <code>$filterCollection</code>
-    </PropertyNotSetInConstructor>
     <PropertyTypeCoercion occurrences="1">
       <code>new $metadataFactoryClassName()</code>
     </PropertyTypeCoercion>
     <RedundantCondition occurrences="2">
       <code>is_object($connection)</code>
       <code>is_object($connection)</code>
     </RedundantCondition>
-    <RedundantConditionGivenDocblockType occurrences="1">
-      <code>$this-&gt;filterCollection !== null</code>
-    </RedundantConditionGivenDocblockType>
     <TypeDoesNotContainType occurrences="2">
       <code>': "' . $connection . '"'</code>
       <code>gettype($connection)</code>