amarkal / amarkal-ui

components/select/controller.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
     
     public function required_arguments()
     {
-        return array('name','data');
+        return array('name', 'data');
     }
     
     public function get_template_path() 

AbstractComponent.php

Spacing +6 added lines, -6 removed lines

@@ -13,7 +13,7 @@ 
      * 
      * @param array $model
      */
-    public function __construct( array $model = array() ) 
+    public function __construct(array $model = array()) 
     {
         parent::__construct($model);
         $this->on_created();
@@ -48,24 +48,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']) )
+        if (!isset($model['id']))
         {
             $model['id'] = $model['name'];
         }
         
-        $this->model = array_merge( $this->default_model(), $model );
+        $this->model = array_merge($this->default_model(), $model);
     }
     
     /**

AbstractController.php

Spacing +11 added lines, -11 removed lines

@@ -15,9 +15,9 @@ 
      * 
      * @param array $model
      */
-    public function __construct( array $model = array() ) 
+    public function __construct(array $model = array()) 
     {
-        $this->set_model( $model );
+        $this->set_model($model);
     }
     
     /**
@@ -27,9 +27,9 @@ 
      * 
      * @return mixed the argument's value.
      */
-    public function __get( $name ) 
+    public function __get($name) 
     {
-        if( isset( $this->model[$name] ) )
+        if (isset($this->model[$name]))
         {
             return $this->model[$name];
         }
@@ -43,7 +43,7 @@ 
      * 
      * @return mixed the settings' argument value.
      */
-    public function __set( $name, $value )
+    public function __set($name, $value)
     {
         $this->model[$name] = $value;
     }
@@ -63,7 +63,7 @@ 
      * 
      * @return array
      */
-    public function set_model( $model )
+    public function set_model($model)
     {
         $this->model = $model;
     }
@@ -81,22 +81,22 @@ 
      * @return string The rendered template.
      * @throws TemplateNotFoundException Thrown if the template file cannot be found.
      */
-    public function render( $echo = false ){
+    public function render($echo = false) {
         
         $rendered_html = '';
         
-        if( file_exists( $this->get_template_path() ) ) 
+        if (file_exists($this->get_template_path())) 
         {
             ob_start();
-            include( $this->get_template_path() );
+            include($this->get_template_path());
             $rendered_html = ob_get_clean();
         } 
         else 
         {
-            throw new \RuntimeException( "Error: cannot render HTML, template file not found at " . $this->get_template_path() );
+            throw new \RuntimeException("Error: cannot render HTML, template file not found at ".$this->get_template_path());
         }
         
-        if( !$echo )
+        if (!$echo)
         {
             return $rendered_html;
         }

Braces +1 added lines, -2 removed lines

@@ -90,8 +90,7 @@
             ob_start();
             include( $this->get_template_path() );
             $rendered_html = ob_get_clean();
-        } 
-        else 
+        } else 
         {
             throw new \RuntimeException( "Error: cannot render HTML, template file not found at " . $this->get_template_path() );
         }

functions.php

Braces +3 added lines, -1 removed lines

@@ -17,7 +17,9 @@
 /**
  * Prevent loading the library more than once
  */
-if( defined( 'AMARKAL_UI' ) ) return false;
+if( defined( 'AMARKAL_UI' ) ) {
+    return false;
+}
 define( 'AMARKAL_UI', true );
 
 if(!function_exists('amarkal_ui_render'))

Spacing +9 added lines, -9 removed lines

@@ -12,15 +12,15 @@ 
  */
 
 // Prevent direct file access
-defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
+defined('ABSPATH') or die('No script kiddies please!');
 
 /**
  * Prevent loading the library more than once
  */
-if( defined( 'AMARKAL_UI' ) ) return false;
-define( 'AMARKAL_UI', true );
+if (defined('AMARKAL_UI')) return false;
+define('AMARKAL_UI', true);
 
-if(!function_exists('amarkal_ui_render'))
+if (!function_exists('amarkal_ui_render'))
 {
     /**
      * Render a UI component.
@@ -30,14 +30,14 @@ 
      * @param array $props The component's properties
      * @return string The rendered HTML
      */
-    function amarkal_ui_render( $type, array $props = array() )
+    function amarkal_ui_render($type, array $props = array())
     {
-        $component = Amarkal\UI\ComponentFactory::create( $type, $props );
+        $component = Amarkal\UI\ComponentFactory::create($type, $props);
         return $component->render();
     }
 }
 
-if(!function_exists('amarkal_ui_register_component'))
+if (!function_exists('amarkal_ui_register_component'))
 {
     /**
      * Register a custom UI component. The registered component's class should
@@ -47,8 +47,8 @@ 
      * to one of the core component's type, it will override the core component.
      * @param string $class_name The component's class name.
      */
-    function amarkal_ui_register_component( $type, $class_name )
+    function amarkal_ui_register_component($type, $class_name)
     {
-        Amarkal\UI\ComponentFactory::register( $type, $class_name );
+        Amarkal\UI\ComponentFactory::register($type, $class_name);
     }
 }
\ No newline at end of file

composer.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
  */
 
 // Prevent direct file access
-defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
+defined('ABSPATH') or die('No script kiddies please!');
 
 // Load module functions
 require_once 'functions.php';
\ No newline at end of file

bootstrap.php

Spacing +2 added lines, -2 removed lines

@@ -6,13 +6,13 @@
  */
 
 // Prevent direct file access
-defined( 'ABSPATH' ) or die( 'No script kiddies please!' );
+defined('ABSPATH') or die('No script kiddies please!');
 
 /**
  * Load module functions. If this amarkal module has not been loaded, 
  * functions.php will not return false.
  */
-if(false !== (require_once 'functions.php'))
+if (false !== (require_once 'functions.php'))
 {
     // Load required classes if not using composer
     require_once 'Renderer.php';

ComponentFactory.php

Doc Comments +4 added lines, -4 removed lines

@@ -52,8 +52,8 @@ 
     
     /**
      * 
-     * @param type $type
-     * @param type $props
+     * @param string $type
+     * @param type string
      * @throws \RuntimeException
      */
     private static function create_core_component( $type, $props )
@@ -79,8 +79,8 @@ 
     
     /**
      * 
-     * @param type $type
-     * @param type $props
+     * @param string $type
+     * @param type string
      * @throws \RuntimeException
      */
     private static function create_registered_component( $type, $props )

Spacing +8 added lines, -8 removed lines

@@ -20,7 +20,7 @@ 
      * @param array $props
      * @return AbstractComponent
      */
-    public static function create( $type, array $props )
+    public static function create($type, array $props)
     {
         try {
             $component = self::create_registered_component($type, $props);
@@ -41,9 +41,9 @@ 
      * @param string $class_name
      * @throws \RuntimeException
      */
-    public static function register( $type, $class_name )
+    public static function register($type, $class_name)
     {
-        if( !in_array($type, self::$registered_components) )
+        if (!in_array($type, self::$registered_components))
         {
             self::$registered_components[$type] = $class_name;
         }
@@ -56,15 +56,15 @@ 
      * @param type $props
      * @throws \RuntimeException
      */
-    private static function create_core_component( $type, $props )
+    private static function create_core_component($type, $props)
     {
         $file_name  = __DIR__."/components/$type/controller.php";
         $class_name = 'Amarkal\\UI\\Component_'.$type;
         
         // Load one of the core components
-        if(!class_exists($class_name))
+        if (!class_exists($class_name))
         {
-            if( file_exists( $file_name ) ) 
+            if (file_exists($file_name)) 
             {
                 require_once $file_name;
             }
@@ -83,9 +83,9 @@ 
      * @param type $props
      * @throws \RuntimeException
      */
-    private static function create_registered_component( $type, $props )
+    private static function create_registered_component($type, $props)
     {
-        if(in_array($type, self::$registered_components))
+        if (in_array($type, self::$registered_components))
         {
             $class_name = self::$registered_components[$type];
             return new $class_name($props);

Braces +3 added lines, -3 removed lines

@@ -46,8 +46,9 @@ 
         if( !in_array($type, self::$registered_components) )
         {
             self::$registered_components[$type] = $class_name;
+        } else {
+            throw new \RuntimeException("A component of type '$type' has already been registered.");
         }
-        else throw new \RuntimeException("A component of type '$type' has already been registered.");
     }
     
     /**
@@ -67,8 +68,7 @@ 
             if( file_exists( $file_name ) ) 
             {
                 require_once $file_name;
-            }
-            else 
+            } else 
             {
                 throw new \RuntimeException("A component of type '$type' does not exist.");
             }

components/text/controller.php

Indentation +3 added lines, -3 removed lines

@@ -8,9 +8,9 @@
 class Component_text
 extends AbstractComponent
 implements ValueComponentInterface, 
-           DisableableComponentInterface,
-           FilterableComponentInterface,
-           ValidatableComponentInterface
+            DisableableComponentInterface,
+            FilterableComponentInterface,
+            ValidatableComponentInterface
 {
     public function default_model() 
     {

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;