Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix docblocks on nullable EM properties #9273

Merged
merged 1 commit into from
Dec 20, 2021
Merged

Fix docblocks on nullable EM properties #9273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions lib/Doctrine/ORM/EntityManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
/**
* The expression builder instance used to generate query expressions.
*
* @var Expr
* @var Expr|null
*/
private $expressionBuilder;

Expand All @@ -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;

/**
Expand Down
13 changes: 1 addition & 12 deletions psalm-baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down