amarkal / amarkal-ui

Form.php

Spacing +23 added lines, -23 removed lines

@@ -59,9 +59,9 @@ 
      * 
      * @param ComponentList $component_list
      */
-    public function __construct( ComponentList $component_list = null )
+    public function __construct(ComponentList $component_list = null)
     {
-        if(null === $component_list)
+        if (null === $component_list)
         {
             $component_list = new ComponentList();
         }
@@ -85,16 +85,16 @@ 
      * 
      * @return array The updated values array.
      */
-    public function update( array $new_instance = array(), array $old_instance = array() )
+    public function update(array $new_instance = array(), array $old_instance = array())
     {
-        $this->old_instance   = array_merge($this->get_defaults(),$old_instance);
-        $this->new_instance   = array_merge($this->old_instance,$new_instance);
+        $this->old_instance   = array_merge($this->get_defaults(), $old_instance);
+        $this->new_instance   = array_merge($this->old_instance, $new_instance);
         $this->final_instance = $this->new_instance;
         
-        foreach ( $this->component_list->get_value_components() as $component ) 
+        foreach ($this->component_list->get_value_components() as $component) 
         {
             // Update individual fields, as well as the composite parent field.
-            $this->update_component( $component );
+            $this->update_component($component);
         }
         
         return $this->final_instance;
@@ -118,9 +118,9 @@ 
      * @param array $components
      * @return void
      */
-    public function reset_components( array $components )
+    public function reset_components(array $components)
     {
-        foreach( $components as $component )
+        foreach ($components as $component)
         {
             $this->reset_component($component);
         }
@@ -133,7 +133,7 @@ 
      * @param AbstractComponent $component
      * @return void
      */
-    public function reset_component( $component )
+    public function reset_component($component)
     {
         $component->value = $component->default;
         $this->final_instance[$component->name] = $component->default;
@@ -168,21 +168,21 @@ 
      * 
      * @param ValueComponentInterface $component The component to validate.
      */
-    private function update_component( ValueComponentInterface $component )
+    private function update_component(ValueComponentInterface $component)
     {
         $component->value = $this->final_instance[$component->name];
         
         // Skip if this field is disabled
-        if( $this->is_disabled($component) )
+        if ($this->is_disabled($component))
         {
             return;
         }
 
         // Apply user-defined filter
-        $this->filter( $component );
+        $this->filter($component);
         
         // Validate value
-        $this->validate( $component );
+        $this->validate($component);
     }
     
     /**
@@ -191,7 +191,7 @@ 
      * @param UI\AbstractComponent $component
      * @return boolean
      */
-    private function is_disabled( $component )
+    private function is_disabled($component)
     {
         return 
             $component instanceof DisableableComponentInterface &&
@@ -206,13 +206,13 @@ 
      * 
      * @param UI\AbstractComponent $component
      */
-    private function filter( $component )
+    private function filter($component)
     {
-        if( $component instanceof FilterableComponentInterface )
+        if ($component instanceof FilterableComponentInterface)
         {
             $filter = $component->filter;
 
-            if( is_callable( $filter ) ) 
+            if (is_callable($filter)) 
             {
                 $component->value = \call_user_func_array($filter, array($this->final_instance[$component->name]));
                 $this->final_instance[$component->name] = $component->value;
@@ -228,22 +228,22 @@ 
      * 
      * @param UI\AbstractComponent $component The component to validate.
      */
-    private function validate( $component )
+    private function validate($component)
     {
-        if( !($component instanceof ValidatableComponentInterface) ) return;
+        if (!($component instanceof ValidatableComponentInterface)) return;
         
         $name     = $component->name;
         $validate = $component->validation;
         
         $component->validity = $component::VALID;
         
-        if(is_callable($validate))
+        if (is_callable($validate))
         {
             $error = '';
             $valid = \call_user_func_array($validate, array($this->final_instance[$name], &$error));
             
             // Invalid input, use old instance or default value
-            if ( true !== $valid ) 
+            if (true !== $valid) 
             {
                 $this->errors[$name]         = $error ? $error : ValidatableComponentInterface::DEFAULT_MESSAGE;
                 $component->value            = $this->old_instance[$name];
@@ -262,7 +262,7 @@ 
     {
         $defaults = array();
         
-        foreach( $this->component_list->get_value_components() as $component )
+        foreach ($this->component_list->get_value_components() as $component)
         {
             $defaults[$component->name] = $component->default;
         }