gossi / swagger

src/AbstractModel.php

Doc Comments +3 added lines

@@ -56,6 +56,9 @@
 		return $out;
 	}
 
+	/**
+	 * @param integer $strategy
+	 */
 	protected function mergeFields(&$original, $external, $strategy)
 	{
 		if ($original instanceof self && method_exists($original, 'merge')) {

Braces +1 added lines, -2 removed lines

@@ -56,8 +56,7 @@
 		return $out;
 	}
 
-	protected function mergeFields(&$original, $external, $strategy)
-	{
+	protected function mergeFields(&$original, $external, $strategy) {
 		if ($original instanceof self && method_exists($original, 'merge')) {
 			$original->merge($external, $strategy);