amarkal / amarkal-ui

Form.php

Spacing +21 added lines, -21 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;
@@ -107,7 +107,7 @@ 
      */
     public function reset()
     {
-        foreach( $this->component_list->get_value_components() as $c )
+        foreach ($this->component_list->get_value_components() as $c)
         {
             $c->value = $c->default;
             $this->final_instance[$c->name] = $c->default;
@@ -143,21 +143,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);
     }
     
     /**
@@ -166,7 +166,7 @@ 
      * @param UI\AbstractComponent $component
      * @return boolean
      */
-    private function is_disabled( $component )
+    private function is_disabled($component)
     {
         return 
             $component instanceof DisableableComponentInterface &&
@@ -181,13 +181,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;
@@ -203,22 +203,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];
@@ -237,7 +237,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;
         }

AbstractComponent.php

Spacing +16 added lines, -16 removed lines

@@ -38,7 +38,7 @@ 
      * 
      * @param array $model
      */
-    public function __construct( array $model = array() ) 
+    public function __construct(array $model = array()) 
     {
         parent::__construct($model);
         
@@ -79,24 +79,24 @@ 
      * 
      * @return array
      */
-    public function set_model( $model )
+    public function set_model($model)
     {
         // Check that the required arguments are provided.
-        foreach( $this->required_arguments() as $key )
+        foreach ($this->required_arguments() as $key)
         {
-            if ( !isset($model[$key]) )
+            if (!isset($model[$key]))
             {
                 throw new \RuntimeException('The required argument "'.$key.'" was not provided for '.get_called_class());
             }
         }
         
         // Assign the name of the component as the id if no id was specified
-        if( !isset($model['id']) && isset($model['name']) )
+        if (!isset($model['id']) && isset($model['name']))
         {
             $model['id'] = $model['name'];
         }
         
-        $this->model = array_merge( $this->default_model(), $model );
+        $this->model = array_merge($this->default_model(), $model);
     }
     
     /**
@@ -115,9 +115,9 @@ 
      * 
      * @param string $class
      */
-    public function add_html_class( $class )
+    public function add_html_class($class)
     {
-        if( !in_array($class, $this->html_classes) )
+        if (!in_array($class, $this->html_classes))
         {
             $this->html_classes[] = $class;
         }
@@ -129,14 +129,14 @@ 
      * 
      * @param string $class
      */
-    public function remove_html_class( $class )
+    public function remove_html_class($class)
     {
         $i = 0;
-        foreach( $this->html_classes as $c )
+        foreach ($this->html_classes as $c)
         {
-            if( $c === $class )
+            if ($c === $class)
             {
-                array_splice($this->html_classes,$i,1);
+                array_splice($this->html_classes, $i, 1);
                 break;
             }
             $i++;
@@ -148,10 +148,10 @@ 
      * 
      * @param type $validity
      */
-    Public function set_validity( $validity )
+    Public function set_validity($validity)
     {
         $this->validity = $validity;
-        if($validity === $this::INVALID)
+        if ($validity === $this::INVALID)
         {
             $this->add_html_class('amarkal-ui-component-error');
         }
@@ -174,7 +174,7 @@ 
      * 
      * {@inheritdoc}
      */
-    public function render( $echo = false )
+    public function render($echo = false)
     {
         $this->enqueue_scripts();
         
@@ -182,7 +182,7 @@ 
         include dirname(__FILE__).'/AbstractComponent.phtml';
         $html = ob_get_clean();
 
-        if( !$echo )
+        if (!$echo)
         {
             return $html;
         }

components/switch/controller.php

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
             'disabled'      => false,
             'readonly'      => false,
             'default'       => null,
-            'filter'        => array( $this, 'filter' )
+            'filter'        => array($this, 'filter')
         );
     }
     
@@ -46,7 +46,7 @@ 
      */
     public function filter($v)
     {
-        if($v !== 'on') return 'off';
+        if ($v !== 'on') return 'off';
         return 'on';
     }
 }
\ No newline at end of file

components/composite/controller.php

Spacing +22 added lines, -22 removed lines

@@ -25,16 +25,16 @@ 
      * The __set magic method is overridden here to apply value & name changes to 
      * child components.
      */
-    public function __set( $name, $value )
+    public function __set($name, $value)
     {
         parent::__set($name, $value);
         
-        if( 'value' === $name )
+        if ('value' === $name)
         {
             $this->set_value($value);
         }
 
-        if( 'name' === $name )
+        if ('name' === $name)
         {
             $this->set_name($value);
         }
@@ -46,9 +46,9 @@ 
      * @param array $value
      * @return void
      */
-    public function set_value( array $value )
+    public function set_value(array $value)
     {
-        foreach($value as $n => $v)
+        foreach ($value as $n => $v)
         {
             $component = $this->get_component($n);
             $component->value = $v;
@@ -61,9 +61,9 @@ 
      * @param string $name
      * @return void
      */
-    public function set_name( $name )
+    public function set_name($name)
     {
-        foreach($this->components as $c)
+        foreach ($this->components as $c)
         {
             $c->name_template = str_replace('{{parent_name}}', $this->get_name(), $c->composite_name_template);
         }
@@ -91,7 +91,7 @@ 
      */
     public function required_arguments()
     {
-        return array('name','components','template');
+        return array('name', 'components', 'template');
     }
     
     /**
@@ -109,7 +109,7 @@ 
      */
     public function parse_template()
     {
-        return preg_replace_callback('/\{\{([a-zA-Z\d-_]+)\}\}/', function($a){
+        return preg_replace_callback('/\{\{([a-zA-Z\d-_]+)\}\}/', function($a) {
             $component = $this->get_component($a[1]);
             return $component->render();
         }, $this->model['template']);
@@ -124,7 +124,7 @@ 
      */
     public function get_name()
     {
-        if('' !== $this->parent_name)
+        if ('' !== $this->parent_name)
         {
             return "{$this->parent_name}[{$this->name}]";
         }
@@ -133,9 +133,9 @@ 
 
     public function filter($v)
     {
-        foreach($this->components as $component)
+        foreach ($this->components as $component)
         {
-            if($component instanceof FilterableComponentInterface &&
+            if ($component instanceof FilterableComponentInterface &&
                \is_callable($component->filter))
             {
                 $n = $component->name;
@@ -146,15 +146,15 @@ 
         return $v;
     }
 
-    public function validation($v,&$e)
+    public function validation($v, &$e)
     {
-        foreach($this->components as $component)
+        foreach ($this->components as $component)
         {
-            if($component instanceof ValidatableComponentInterface &&
+            if ($component instanceof ValidatableComponentInterface &&
                \is_callable($component->validation))
             {
                 $n = $component->name;
-                if(!$component->validation($v[$n],$e))
+                if (!$component->validation($v[$n], $e))
                 {
                     return false;
                 }
@@ -168,7 +168,7 @@ 
      */
     protected function on_created()
     {
-        foreach( $this->model['components'] as $args )
+        foreach ($this->model['components'] as $args)
         {
             $this->components[$args['name']] = $this->create_component($args);
         }
@@ -179,16 +179,16 @@ 
      * @param type $args
      * @return type
      */
-    private function create_component( $args )
+    private function create_component($args)
     {
         $type = $args['type'];
         
-        if('composite' === $type)
+        if ('composite' === $type)
         {
             $args['parent_name'] = $this->get_name();
         }
         
-        $c = \Amarkal\UI\ComponentFactory::create( $type, $args );
+        $c = \Amarkal\UI\ComponentFactory::create($type, $args);
         
         // Apply the composite name template
         $c->name_template = str_replace('{{parent_name}}', $this->get_name(), $c->composite_name_template);
@@ -203,9 +203,9 @@ 
      * @return UI\AbstractComponent
      * @throws \RuntimeException If there's no child component corresponding to the given name
      */
-    private function get_component( $name )
+    private function get_component($name)
     {
-        if(!array_key_exists($name, $this->components))
+        if (!array_key_exists($name, $this->components))
         {
             throw new \RuntimeException("Composite sub-component not found with name $name");
         }

components/toggle/controller.php

Spacing +5 added lines, -5 removed lines

@@ -24,13 +24,13 @@ 
             'multi'         => false,
             'data'          => array(),
             'default'       => array(),
-            'filter'        => array( $this, 'filter' )
+            'filter'        => array($this, 'filter')
         );
     }
     
     public function required_arguments()
     {
-        return array('name','data');
+        return array('name', 'data');
     }
     
     public function get_template_path() 
@@ -49,16 +49,16 @@ 
      */
     public function filter($v)
     {
-        if($this->multi && !\is_array($v)) 
+        if ($this->multi && !\is_array($v)) 
         {
             return \explode(',', $v);
         }
         return $v;
     }
 
-    protected function is_selected( $value )
+    protected function is_selected($value)
     {
-        if($this->multi) 
+        if ($this->multi) 
         {
             return \in_array($value, $this->value);
         }