@@ -56,6 +56,9 @@ |
||
56 | 56 | return $out; |
57 | 57 | } |
58 | 58 | |
59 | + /** |
|
60 | + * @param integer $strategy |
|
61 | + */ |
|
59 | 62 | protected function mergeFields(&$original, $external, $strategy) |
60 | 63 | { |
61 | 64 | if ($original instanceof self && method_exists($original, 'merge')) { |
@@ -56,8 +56,7 @@ |
||
56 | 56 | return $out; |
57 | 57 | } |
58 | 58 | |
59 | - protected function mergeFields(&$original, $external, $strategy) |
|
60 | - { |
|
59 | + protected function mergeFields(&$original, $external, $strategy) { |
|
61 | 60 | if ($original instanceof self && method_exists($original, 'merge')) { |
62 | 61 | $original->merge($external, $strategy); |
63 | 62 |
@@ -6,7 +6,6 @@ |
||
6 | 6 | use gossi\swagger\parts\ItemsPart; |
7 | 7 | use gossi\swagger\parts\TypePart; |
8 | 8 | use phootwork\collection\CollectionUtils; |
9 | -use phootwork\collection\Map; |
|
10 | 9 | use phootwork\lang\Arrayable; |
11 | 10 | |
12 | 11 | class Header extends AbstractModel implements Arrayable { |