@@ -46,7 +46,6 @@ |
||
| 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); |
@@ -77,7 +77,6 @@ |
||
| 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); |
@@ -91,7 +91,6 @@ |
||
| 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) { |
@@ -8,28 +8,28 @@ |
||
| 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 | } |