@@ -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')) { |