Merge pull request #130 from ergebnis/fix/ternary

Fix: Avoid ternary statement
ergebnis · Mar 30, 2020 · c99e683 · c99e683
2 parents 117d686 + 4e3ca77
commit c99e683
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -38,9 +38,10 @@
       <code>$fieldDefinitions</code>
       <code>$fieldOverrides</code>
     </MixedArgumentTypeCoercion>
-    <MixedAssignment occurrences="5">
+    <MixedAssignment occurrences="6">
       <code>$defaultFieldValue</code>
       <code>$fieldValues[$fieldName]</code>
+      <code>$fieldValues[$fieldName]</code>
       <code>$fieldValue</code>
       <code>$inversedBy</code>
       <code>$collection</code>

diff --git a/src/FixtureFactory.php b/src/FixtureFactory.php
@@ -184,9 +184,13 @@ public function get(string $className, array $fieldOverrides = [])
         $fieldValues = [];
 
         foreach ($entityDefinition->fieldDefinitions() as $fieldName => $fieldDefinition) {
-            $fieldValues[$fieldName] = \array_key_exists($fieldName, $fieldOverrides)
-                ? $fieldOverrides[$fieldName]
-                : $fieldDefinition($this);
+            if (\array_key_exists($fieldName, $fieldOverrides)) {
+                $fieldValues[$fieldName] = $fieldOverrides[$fieldName];
+
+                continue;
+            }
+
+            $fieldValues[$fieldName] = $fieldDefinition($this);
         }
 
         foreach ($fieldValues as $fieldName => $fieldValue) {