amarkal / amarkal-ui

Form.php

Doc Comments +3 added lines, -3 removed lines

@@ -160,7 +160,7 @@ 
     /**
      * Check if the given component is disabled.
      * 
-     * @param UI\AbstractComponent $component
+     * @param ValueComponentInterface $component
      * @return boolean
      */
     private function is_disabled( $component )
@@ -176,7 +176,7 @@ 
     /**
      * Filter the component's value using its filter function (if applicable)
      * 
-     * @param UI\AbstractComponent $component
+     * @param ValueComponentInterface $component
      */
     private function filter( $component )
     {
@@ -198,7 +198,7 @@ 
      * If the value is invalid, the old value is used, and an error message is
      * saved into the errors array as component_name => error_message.
      * 
-     * @param UI\AbstractComponent $component The component to validate.
+     * @param ValueComponentInterface $component The component to validate.
      */
     private function validate( $component )
     {

Spacing +24 added lines, -24 removed lines

@@ -59,12 +59,12 @@ 
      * 
      * @param array $components An array of arrays of component arguments
      */
-    public function __construct( array $components = array() )
+    public function __construct(array $components = array())
     {
-        foreach( $components as $args )
+        foreach ($components as $args)
         {
             $name = $args['name'];
-            if(array_key_exists($name, $components))
+            if (array_key_exists($name, $components))
             {
                 throw new \RuntimeException("A component with the name <b>$name</b> has already been created");
             }
@@ -89,18 +89,18 @@ 
      * 
      * @return array The updated values array.
      */
-    public function update( array $new_instance, array $old_instance = array() )
+    public function update(array $new_instance, 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->components as $component ) 
+        foreach ($this->components as $component) 
         {
             // Update individual fields, as well as the composite parent field.
-            if ( $component instanceof ValueComponentInterface )
+            if ($component instanceof ValueComponentInterface)
             {
-                $this->update_component( $component );
+                $this->update_component($component);
             }
         }
         
@@ -114,7 +114,7 @@ 
      */
     public function reset()
     {
-        foreach( $this->components as $c )
+        foreach ($this->components as $c)
         {
             $c->value = $c->default;
             $this->final_instance[$c->name] = $c->default;
@@ -140,21 +140,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);
     }
     
     /**
@@ -163,7 +163,7 @@ 
      * @param UI\AbstractComponent $component
      * @return boolean
      */
-    private function is_disabled( $component )
+    private function is_disabled($component)
     {
         return 
             $component instanceof DisableableComponentInterface &&
@@ -178,15 +178,15 @@ 
      * 
      * @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 = $filter( $this->final_instance[$component->name] );
+                $component->value = $filter($this->final_instance[$component->name]);
                 $this->final_instance[$component->name] = $component->value;
             }
         }
@@ -200,9 +200,9 @@ 
      * 
      * @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;
@@ -210,12 +210,12 @@ 
         
         $component->validity = $component::VALID;
         
-        if(is_callable($validate))
+        if (is_callable($validate))
         {
             $valid = $validate($this->new_instance[$name]);
             
             // Invalid input, use old instance or default value
-            if ( true !== $valid ) 
+            if (true !== $valid) 
             {
                 $this->errors[$name]         = $valid;
                 $component->value            = $this->old_instance[$name];
@@ -234,7 +234,7 @@ 
     {
         $defaults = array();
         
-        foreach( $this->components as $component )
+        foreach ($this->components as $component)
         {
             $defaults[$component->name] = $component->default;
         }

Braces +3 added lines, -1 removed lines

@@ -202,7 +202,9 @@
      */
     private function validate( $component )
     {
-        if( !($component instanceof ValidatableComponentInterface) ) return;
+        if( !($component instanceof ValidatableComponentInterface) ) {
+            return;
+        }
         
         $name     = $component->name;
         $validate = $component->validation;