Completed
Pull Request — master (#6)
by Guilh
04:05
created
src/collections/Definitions.php 1 patch
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -46,7 +46,6 @@
 block discarded – undo
46 46
 	 * Sets the field
47 47
 	 * 
48 48
 	 * @param string name
49
-	 * @param Schema $schame
50 49
 	 */
51 50
 	public function set($name, Schema $schema) {
52 51
 		$this->definitions->set($name, $schema);
Please login to merge, or discard this patch.
src/collections/Responses.php 1 patch
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -77,7 +77,6 @@
 block discarded – undo
77 77
 	/**
78 78
 	 * Sets the response
79 79
 	 * 
80
-	 * @param Response $code
81 80
 	 */
82 81
 	public function set(Response $response) {
83 82
 		$this->responses->set($response->getCode(), $response);
Please login to merge, or discard this patch.
src/collections/Parameters.php 1 patch
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -91,7 +91,6 @@
 block discarded – undo
91 91
 	 * Searches whether a parameter with the given unique combination exists
92 92
 	 *
93 93
 	 * @param string $name
94
-	 * @param string $id
95 94
 	 * @return boolean
96 95
 	 */
97 96
 	public function search($name, $in) {
Please login to merge, or discard this patch.
src/parts/TagsPart.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@
 block discarded – undo
20 20
 	private function mergeTags(static $model, $overwrite = false) {
21 21
 		$newTags = [];
22 22
 		foreach ($model->tags as $tag) {
23
-			$find = $this->tags->find(function(Tag $element) use ($tag) {
23
+			$find = $this->tags->find(function (Tag $element) use ($tag) {
24 24
 				return $tag->getName() === $element->getName();
25 25
 			});
26 26
 
Please login to merge, or discard this patch.
src/util/MergeHelper.php 2 patches
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.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,8 @@
 block discarded – undo
24 24
             foreach ($external as $value) {
25 25
                 $original->add($value);
26 26
             }
27
-        } else { // if scalar
27
+        } else {
28
+// if scalar
28 29
             if ($overwrite) {
29 30
                 $original = null !== $external ? $external : $original;
30 31
             } else {
Please login to merge, or discard this patch.