amarkal / amarkal-ui

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.");
             }

Form.php

Doc Comments +1 added lines, -1 removed lines

@@ -182,7 +182,7 @@
     /**
      * Filter the component's value using its filter function (if applicable)
      * 
-     * @param UI\FilterableComponentInterface $component
+     * @param FilterableComponentInterface $component
      */
     private function filter( FilterableComponentInterface $component )
     {

Spacing +26 added lines, -26 removed lines

@@ -63,12 +63,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");
             }
@@ -93,18 +93,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);
             }
         }
         
@@ -117,9 +117,9 @@ 
      * @param array $names List of component names to be set to their defaults. If no names are specified, all components will be reset
      * @return array The updated values array.
      */
-    public function reset( array $names = array() )
+    public function reset(array $names = array())
     {
-        if( array() === $names )
+        if (array() === $names)
         {
             // Unset new instance to force reset
             $this->new_instance = array();
@@ -127,9 +127,9 @@ 
         }
         else
         {
-            foreach( $this->components as $c )
+            foreach ($this->components as $c)
             {
-                if( in_array($c->name, $names) )
+                if (in_array($c->name, $names))
                 {
                     $this->new_instance[$c->name] = $c->default;
                 }
@@ -156,26 +156,26 @@ 
      * 
      * @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($component instanceof DisableableComponentInterface &&
+        if ($component instanceof DisableableComponentInterface &&
            true === $component->disabled) {
             return;
         }
         
         // Apply user-defined filter
-        if( $component instanceof FilterableComponentInterface )
+        if ($component instanceof FilterableComponentInterface)
         {
-            $this->filter( $component );
+            $this->filter($component);
         }
         
         // Validate value
-        if( $component instanceof ValidatableComponentInterface )
+        if ($component instanceof ValidatableComponentInterface)
         {
-            $this->validate( $component );
+            $this->validate($component);
         }
     }
     
@@ -184,13 +184,13 @@ 
      * 
      * @param UI\FilterableComponentInterface $component
      */
-    private function filter( FilterableComponentInterface $component )
+    private function filter(FilterableComponentInterface $component)
     {
         $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;
         }
     }
@@ -203,7 +203,7 @@ 
      * 
      * @param ValidatableComponentInterface $component The component to validate.
      */
-    private function validate( ValidatableComponentInterface $component )
+    private function validate(ValidatableComponentInterface $component)
     {
         $name     = $component->name;
         $validate = $component->validation;
@@ -211,12 +211,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];
@@ -230,7 +230,7 @@ 
     {
         $defaults = array();
         
-        foreach( $this->components as $component )
+        foreach ($this->components as $component)
         {
             $defaults[$component->name] = $component->default;
         }

Braces +1 added lines, -2 removed lines

@@ -124,8 +124,7 @@
             // Unset new instance to force reset
             $this->new_instance = array();
             return $this->update();
-        }
-        else
+        } else
         {
             foreach( $this->components as $c )
             {

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() 
     {

functions.php

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