From 73bb0d90119b2c3fd755b3c9bce1c4bb2d01c610 Mon Sep 17 00:00:00 2001
From: Mateusz Bieniek <mateusz.bieniek@ez.no>
Date: Mon, 14 Oct 2019 11:11:06 +0200
Subject: [PATCH] Fixups after CR

---
 .../ContentDocumentNullFields.php                           | 6 +++---
 lib/Query/Common/CriterionVisitor/Field/FieldEmpty.php      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/FieldMapper/ContentTranslationFieldMapper/ContentDocumentNullFields.php b/lib/FieldMapper/ContentTranslationFieldMapper/ContentDocumentNullFields.php
index aa7ebf21a..8075d5394 100644
--- a/lib/FieldMapper/ContentTranslationFieldMapper/ContentDocumentNullFields.php
+++ b/lib/FieldMapper/ContentTranslationFieldMapper/ContentDocumentNullFields.php
@@ -68,10 +68,10 @@ public function mapFields(Content $content, $languageCode)
             }
 
             foreach ($contentType->fieldDefinitions as $fieldDefinition) {
-                if ($fieldDefinition->id !== $field->fieldDefinitionId) {
+                if ($fieldDefinition->isRequired) {
                     continue;
                 }
-                if ($fieldDefinition->isRequired) {
+                if ($fieldDefinition->id !== $field->fieldDefinitionId) {
                     continue;
                 }
 
@@ -80,7 +80,7 @@ public function mapFields(Content $content, $languageCode)
                         self::IS_NULL_NAME,
                         $fieldDefinition->identifier
                     ),
-                    (null == $field->value->data),
+                    (null === $field->value->data),
                     new FieldType\BooleanField()
                 );
             }
diff --git a/lib/Query/Common/CriterionVisitor/Field/FieldEmpty.php b/lib/Query/Common/CriterionVisitor/Field/FieldEmpty.php
index 351741e37..2acbdb39d 100644
--- a/lib/Query/Common/CriterionVisitor/Field/FieldEmpty.php
+++ b/lib/Query/Common/CriterionVisitor/Field/FieldEmpty.php
@@ -76,7 +76,7 @@ public function visit(Criterion $criterion, CriterionVisitor $subVisitor = null)
         }
 
         $criterion->value = (array)$criterion->value;
-        $queries = array();
+        $queries = [];
 
         foreach ($searchFields as $name => $fieldType) {
             foreach ($criterion->value as $value) {