Improvements #1819
Improvements #1819
Conversation
| @@ -750,7 +750,7 @@ private function loadReferenceManyCollectionOwningSide(PersistentCollectionInter | |||
| } | |||
|
|
|||
| // only query for the referenced object if it is not already initialized or the collection is sorted | |||
| if (! (($reference instanceof Proxy && ! $reference->__isInitialized__)) && ! $sorted) { | |||
| if (! $reference instanceof Proxy && ! $reference->__isInitialized__ && ! $sorted) { | |||
There was a problem hiding this comment.
This if-block has a different behaviour than before the changes.
| @@ -261,7 +261,7 @@ private function addManyReferences(PersistentCollectionInterface $persistentColl | |||
|
|
|||
| $document = $this->uow->tryGetById($id, $class); | |||
|
|
|||
| if ($document && ! (($document instanceof Proxy && ! $document->__isInitialized()))) { | |||
| if ($document && ! $document instanceof Proxy && ! $document->__isInitialized()) { | |||
There was a problem hiding this comment.
This if-block has a different behaviour than before the changes.
| @@ -1365,7 +1365,7 @@ private function getClassDiscriminatorValues(ClassMetadata $metadata) | |||
| } | |||
|
|
|||
| // If a defaultDiscriminatorValue is set and it is among the discriminators being queries, add NULL to the list | |||
| if ($metadata->defaultDiscriminatorValue && array_search($metadata->defaultDiscriminatorValue, $discriminatorValues) !== false) { | |||
| if ($metadata->defaultDiscriminatorValue && in_array($metadata->defaultDiscriminatorValue, $discriminatorValues)) { | |||
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
| @@ -12,12 +12,12 @@ class CustomIdType extends Type | |||
| { | |||
| public function convertToDatabaseValue($value) | |||
| { | |||
| return $value !== null ? $value : null; | |||
| return $value ?? null; | |||
There was a problem hiding this comment.
What's the actual point of this line anyways? Couldn't we just make it return $value? No point returning null if the value is already null.
There was a problem hiding this comment.
Non-null values were originally cast to a string in ac4ea20#diff-b229b91262ab7a824d0ea63ff9b11c3d; however, that cast was removed in 4645bab#diff-b229b91262ab7a824d0ea63ff9b11c3d.
There's no reason this cannot be changed to simply return the value as-is.
| } | ||
|
|
||
| public function convertToPHPValue($value) | ||
| { | ||
| return $value !== null ? $value : null; | ||
| return $value ?? null; |
There was a problem hiding this comment.
Likewise, this can be reduced to return $value;.
unnecessaries parentheses, casts; null coalesce operator usage; in_array instead of array_search + comparison, etc
|
@alcaeus @jmikola @SenseException Thanks for your feedback. I've amended the commit. Should be RTM. Sorry for the delay 😅 |
|
Thanks @carusogabriel! |
Summary
Together with PHPStorm and https://github.com/kalessil/phpinspectionsea, here are some improvements that we can make to MongoDB ODM, such as unnecessaries parentheses, casts; null coalesce operator usage; in_array instead of array_search + comparison, etc