CS fixes

padraic · Jan 12, 2015 · d0edff8 · d0edff8
1 parent 383718f
commit d0edff8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/library/Zend/Form/Annotation/ElementAnnotationsListener.php b/library/Zend/Form/Annotation/ElementAnnotationsListener.php
@@ -140,12 +140,9 @@ public function handleComposedObjectAnnotation($e)
             }
             unset($specification['input_filter']);
 
-            // Merge options of composed object with the ones of the target object:
-            $options = $this->mergeOptions($elementSpec, $annotation);
-
             $elementSpec['spec']['type'] = 'Zend\Form\Element\Collection';
             $elementSpec['spec']['name'] = $name;
-            $elementSpec['spec']['options'] = new ArrayObject($options);
+            $elementSpec['spec']['options'] = new ArrayObject($this->mergeOptions($elementSpec, $annotation));
             $elementSpec['spec']['options']['target_element'] = $specification;
             $elementSpec['spec']['options']['target_element']['options']['input_filter_spec'] = $inputFilter;
 
@@ -166,13 +163,10 @@ public function handleComposedObjectAnnotation($e)
                 $specification['type'] = 'Zend\Form\Fieldset';
             }
 
-            // Merge options of composed object with the ones of the target object:
-            $options = $this->mergeOptions($elementSpec, $annotation);
-
             // Add element spec:
             $elementSpec['spec'] = $specification;
             $elementSpec['spec']['name'] = $name;
-            $elementSpec['spec']['options'] = new ArrayObject($options);
+            $elementSpec['spec']['options'] = new ArrayObject($this->mergeOptions($elementSpec, $annotation));
         }
     }
 
@@ -326,8 +320,7 @@ public function handleOptionsAnnotation($e)
         }
 
         $elementSpec = $e->getParam('elementSpec');
-        $options = $this->mergeOptions($elementSpec, $annotation);
-        $elementSpec['spec']['options'] = $options;
+        $elementSpec['spec']['options'] = $this->mergeOptions($elementSpec, $annotation);
     }
 
     /**
@@ -405,7 +398,7 @@ public function handleValidatorAnnotation($e)
      * @param $annotation
      * @return array
      */
-    protected function mergeOptions($elementSpec, $annotation)
+    private function mergeOptions($elementSpec, $annotation)
     {
         $options  = array();
         if (isset($elementSpec['spec']['options'])) {
@@ -416,7 +409,6 @@ protected function mergeOptions($elementSpec, $annotation)
             }
         }
 
-        $options = array_merge($options, $annotation->getOptions());
-        return $options;
+        return array_merge($options, $annotation->getOptions());
     }
 }
diff --git a/tests/ZendTest/Form/Annotation/AnnotationBuilderTest.php b/tests/ZendTest/Form/Annotation/AnnotationBuilderTest.php
@@ -203,7 +203,7 @@ public function testOptionsAnnotationAndComposedObjectAnnotation($childName)
 
     public function provideOptionsAnnotationAndComposedObjectAnnotation()
     {
-        return [['child'], ['childTheSecond']];
+        return array(array('child'), array('childTheSecond'));
     }
 
     public function testCanHandleOptionsAnnotation()