Merge b2f5e0f into 2a3fecb

sonata-project · Apr 9, 2020 · 43bdb5b · 43bdb5b
2 parents 2a3fecb + b2f5e0f
commit 43bdb5b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/src/Filter/AbstractDateFilter.php b/src/Filter/AbstractDateFilter.php
@@ -55,29 +55,37 @@ public function filter(ProxyQueryInterface $queryBuilder, $alias, $field, $data)
 
         switch ($data['type']) {
             case DateType::TYPE_EQUAL:
-                return $this->applyTypeIsEqual($queryBuilder, $field, $data);
+                $this->applyTypeIsEqual($queryBuilder, $field, $data);
+
+                return;
 
             case DateType::TYPE_GREATER_THAN:
                 if (!\array_key_exists('value', $data) || !$data['value']) {
                     return;
                 }
 
-                return $this->applyTypeIsGreaterThan($queryBuilder, $field, $data);
+                $this->applyTypeIsGreaterThan($queryBuilder, $field, $data);
+
+                return;
 
             case DateType::TYPE_LESS_EQUAL:
                 if (!\array_key_exists('value', $data) || !$data['value']) {
                     return;
                 }
 
-                return $this->applyTypeIsLessEqual($queryBuilder, $field, $data);
+                $this->applyTypeIsLessEqual($queryBuilder, $field, $data);
+
+                return;
 
             case DateType::TYPE_NULL:
             case DateType::TYPE_NOT_NULL:
-                return $this->applyType($queryBuilder, $this->getOperator($data['type']), $field, null);
+                $this->applyType($queryBuilder, $this->getOperator($data['type']), $field, null);
+
+                return;
 
             case DateType::TYPE_GREATER_EQUAL:
             case DateType::TYPE_LESS_THAN:
-                return $this->applyType($queryBuilder, $this->getOperator($data['type']), $field, $data['value']);
+                $this->applyType($queryBuilder, $this->getOperator($data['type']), $field, $data['value']);
         }
     }
 

diff --git a/src/Guesser/AbstractTypeGuesser.php b/src/Guesser/AbstractTypeGuesser.php
@@ -31,7 +31,7 @@ protected function getParentMetadataForProperty($baseClass, $propertyFullName, M
             return $modelManager->getParentMetadataForProperty($baseClass, $propertyFullName);
         } catch (MappingException $e) {
             // no metadata not found.
-            return;
+            return null;
         }
     }
 }
diff --git a/src/Model/ModelManager.php b/src/Model/ModelManager.php
@@ -152,7 +152,7 @@ public function delete($object)
     public function find($class, $id)
     {
         if (!isset($id)) {
-            return;
+            return null;
         }
 
         $documentManager = $this->getDocumentManager($class);
@@ -281,7 +281,7 @@ public function getNormalizedIdentifier($document)
 
         // the document is not managed
         if (!$document || !$this->getDocumentManager($document)->getUnitOfWork()->isInIdentityMap($document)) {
-            return;
+            return null;
         }
 
         $values = $this->getIdentifierValues($document);