gossi / swagger

src/parts/TagsPart.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 	private function mergeTags(static $model, $overwrite = false) {
 		$newTags = [];
 		foreach ($model->tags as $tag) {
-			$find = $this->tags->find(function(Tag $element) use ($tag) {
+			$find = $this->tags->find(function (Tag $element) use ($tag) {
 				return $tag->getName() === $element->getName();
 			});
 

src/util/MergeHelper.php

Indentation +24 added lines, -24 removed lines

@@ -8,28 +8,28 @@
  * @internal
  */
 class MergeHelper {
-    /**
-     * @param string|integer|null|Map|Set $original
-     * @param string|integer|null|Map|Set $external
-     * @param bool                $overwrite
-     */
-    public static function mergeFields(&$original, $external, $overwrite) {
-        if ($original instanceof Map) {
-            foreach ($external as $key => $value) {
-                if ($overwrite || !$original->has($key)) {
-                    $original->set($key, $value);
-                }
-            }
-        } elseif ($original instanceof Set) {
-            foreach ($external as $value) {
-                $original->add($value);
-            }
-        } else { // if scalar
-            if ($overwrite) {
-                $original = null !== $external ? $external : $original;
-            } else {
-                $original = null === $original ? $external : $original;
-            }
-        }
-    }
+	/**
+	 * @param string|integer|null|Map|Set $original
+	 * @param string|integer|null|Map|Set $external
+	 * @param bool                $overwrite
+	 */
+	public static function mergeFields(&$original, $external, $overwrite) {
+		if ($original instanceof Map) {
+			foreach ($external as $key => $value) {
+				if ($overwrite || !$original->has($key)) {
+					$original->set($key, $value);
+				}
+			}
+		} elseif ($original instanceof Set) {
+			foreach ($external as $value) {
+				$original->add($value);
+			}
+		} else { // if scalar
+			if ($overwrite) {
+				$original = null !== $external ? $external : $original;
+			} else {
+				$original = null === $original ? $external : $original;
+			}
+		}
+	}
 }

Braces +2 added lines, -1 removed lines

@@ -24,7 +24,8 @@
             foreach ($external as $value) {
                 $original->add($value);
             }
-        } else { // if scalar
+        } else {
+// if scalar
             if ($overwrite) {
                 $original = null !== $external ? $external : $original;
             } else {