Completed
Pull Request — master (#6)
by Guilh
04:05
created
src/util/MergeHelper.php 1 patch
Indentation   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -8,28 +8,28 @@
 block discarded – undo
8 8
  * @internal
9 9
  */
10 10
 class MergeHelper {
11
-    /**
12
-     * @param string|integer|null|Map|Set $original
13
-     * @param string|integer|null|Map|Set $external
14
-     * @param bool                $overwrite
15
-     */
16
-    public static function mergeFields(&$original, $external, $overwrite) {
17
-        if ($original instanceof Map) {
18
-            foreach ($external as $key => $value) {
19
-                if ($overwrite || !$original->has($key)) {
20
-                    $original->set($key, $value);
21
-                }
22
-            }
23
-        } elseif ($original instanceof Set) {
24
-            foreach ($external as $value) {
25
-                $original->add($value);
26
-            }
27
-        } else { // if scalar
28
-            if ($overwrite) {
29
-                $original = null !== $external ? $external : $original;
30
-            } else {
31
-                $original = null === $original ? $external : $original;
32
-            }
33
-        }
34
-    }
11
+	/**
12
+	 * @param string|integer|null|Map|Set $original
13
+	 * @param string|integer|null|Map|Set $external
14
+	 * @param bool                $overwrite
15
+	 */
16
+	public static function mergeFields(&$original, $external, $overwrite) {
17
+		if ($original instanceof Map) {
18
+			foreach ($external as $key => $value) {
19
+				if ($overwrite || !$original->has($key)) {
20
+					$original->set($key, $value);
21
+				}
22
+			}
23
+		} elseif ($original instanceof Set) {
24
+			foreach ($external as $value) {
25
+				$original->add($value);
26
+			}
27
+		} else { // if scalar
28
+			if ($overwrite) {
29
+				$original = null !== $external ? $external : $original;
30
+			} else {
31
+				$original = null === $original ? $external : $original;
32
+			}
33
+		}
34
+	}
35 35
 }
Please login to merge, or discard this patch.