fixed null behaviour for fields and filters

Author: mdiyakov

Filter/Field/EntityFieldEqualFilter.php

@@ -9,7 +9,7 @@ class EntityFieldEqualFilter extends EntityFieldFilter
      * @param mixed $value
      * @return bool
      */
-    public function validate($value)
+    protected function validate($value)
     {
         return $value === $this->getEntityFieldValue();
     }

Filter/Field/EntityFieldFilter.php

@@ -46,7 +46,7 @@ public function isFilterValid($entity)
         }
 
         $value = PropertyAccess::createPropertyAccessor()->getValue($entity, $this->getEntityFieldName());
-        if (!is_scalar($value)) {
+        if (!empty($value) && !is_scalar($value)) {
             if (method_exists($value, '__toString')) {
                 $value = call_user_func([$value, '__toString']);
             } else {

Schema/Field/Entity/ArrayField.php

@@ -12,19 +12,21 @@ class ArrayField extends Field
      */
     public function getDocumentFieldValue($entity)
     {
+        $result = [];
         $entityValue = $this->getEntityFieldValue($entity);
-        if (is_scalar($entityValue)) {
-            $entityValue =  [ $entityValue ];
-        } elseif (
-            !is_array($entityValue) &&
-            ((!$entityValue instanceof \Iterator) && (!$entityValue instanceof \IteratorAggregate))
-        ) {
-            throw new InvalidFieldValueException('Field value must be \Iterator or \IteratorAggregate instance');
-        }
+        if (!is_null($entityValue)) {
+            if (is_scalar($entityValue)) {
+                $entityValue =  [ $entityValue ];
+            } elseif (
+                !is_array($entityValue) &&
+                ((!$entityValue instanceof \Iterator) && (!$entityValue instanceof \IteratorAggregate))
+            ) {
+                throw new InvalidFieldValueException('Field value must be \Iterator or \IteratorAggregate instance');
+            }
 
-        $result = [];
-        foreach ($entityValue as $value) {
-            $result[] = strval($value);
+            foreach ($entityValue as $value) {
+                $result[] = strval($value);
+            }
         }
 
         return $result;

Schema/Field/Entity/DateField.php

@@ -10,22 +10,25 @@ class DateField extends Field
 
     /**
      * @param object $entity
-     * @return string
+     * @return string|null
      */
     public function getDocumentFieldValue($entity)
     {
+        $result = null;
         $entityValue = $this->getEntityFieldValue($entity);
-
-        if (!$entityValue instanceof \DateTime) {
-            throw new InvalidFieldValueException(
-                sprintf(
-                    '"%s" field value of "%s" must be a DateTime instance',
-                    $this->getEntityFieldName(),
-                    get_class($entity)
-                )
-            );
+        if (!is_null($entityValue)) {
+            if (!$entityValue instanceof \DateTime) {
+                throw new InvalidFieldValueException(
+                    sprintf(
+                        '"%s" field value of "%s" must be a DateTime instance',
+                        $this->getEntityFieldName(),
+                        get_class($entity)
+                    )
+                );
+            }
+            $result = $entityValue->format(self::FORMAT);
         }
 
-        return $entityValue->format(self::FORMAT);
+        return $result;
     }
 }

Schema/Field/Entity/StringField.php

@@ -13,7 +13,7 @@ public function getDocumentFieldValue($entity)
         $entityValue = $this->getEntityFieldValue($entity);
         $documentValue = '';
         if (is_scalar($entityValue)) {
-            $documentValue = $entityValue;
+            $documentValue = strval($entityValue);
         } elseif (is_array($entityValue) || $entityValue instanceof \Iterator || $entityValue instanceof \IteratorAggregate) {
             $documentValue = [];
             foreach ($entityValue as $value) {