@@ -21,7 +21,7 @@ |
||
21 | 21 | |
22 | 22 | public function required_arguments() |
23 | 23 | { |
24 | - return array('name','data'); |
|
24 | + return array('name', 'data'); |
|
25 | 25 | } |
26 | 26 | |
27 | 27 | public function get_template_path() |
@@ -6,7 +6,7 @@ |
||
6 | 6 | */ |
7 | 7 | |
8 | 8 | // Prevent direct file access |
9 | -defined( 'ABSPATH' ) or die( 'No script kiddies please!' ); |
|
9 | +defined('ABSPATH') or die('No script kiddies please!'); |
|
10 | 10 | |
11 | 11 | // Load module functions |
12 | 12 | require_once 'functions.php'; |
13 | 13 | \ No newline at end of file |
@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | * @param array $props |
21 | 21 | * @return AbstractComponent |
22 | 22 | */ |
23 | - public static function create( $type, array $props ) |
|
23 | + public static function create($type, array $props) |
|
24 | 24 | { |
25 | 25 | try { |
26 | 26 | $component = self::create_registered_component($type, $props); |
@@ -41,9 +41,9 @@ discard block |
||
41 | 41 | * @param string $class_name |
42 | 42 | * @throws \RuntimeException |
43 | 43 | */ |
44 | - public static function register( $type, $class_name ) |
|
44 | + public static function register($type, $class_name) |
|
45 | 45 | { |
46 | - if( !in_array($type, self::$registered_components) ) |
|
46 | + if (!in_array($type, self::$registered_components)) |
|
47 | 47 | { |
48 | 48 | self::$registered_components[$type] = $class_name; |
49 | 49 | } |
@@ -56,15 +56,15 @@ discard block |
||
56 | 56 | * @param type $props |
57 | 57 | * @throws \RuntimeException |
58 | 58 | */ |
59 | - private static function create_core_component( $type, $props ) |
|
59 | + private static function create_core_component($type, $props) |
|
60 | 60 | { |
61 | 61 | $file_name = __DIR__."/components/$type/controller.php"; |
62 | 62 | $class_name = 'Amarkal\\UI\\Component_'.$type; |
63 | 63 | |
64 | 64 | // Load one of the core components |
65 | - if(!class_exists($class_name)) |
|
65 | + if (!class_exists($class_name)) |
|
66 | 66 | { |
67 | - if( file_exists( $file_name ) ) |
|
67 | + if (file_exists($file_name)) |
|
68 | 68 | { |
69 | 69 | require_once $file_name; |
70 | 70 | } |
@@ -83,9 +83,9 @@ discard block |
||
83 | 83 | * @param type $props |
84 | 84 | * @throws \RuntimeException |
85 | 85 | */ |
86 | - private static function create_registered_component( $type, $props ) |
|
86 | + private static function create_registered_component($type, $props) |
|
87 | 87 | { |
88 | - if(in_array($type, self::$registered_components)) |
|
88 | + if (in_array($type, self::$registered_components)) |
|
89 | 89 | { |
90 | 90 | $class_name = self::$registered_components[$type]; |
91 | 91 | return new $class_name($props); |
@@ -25,9 +25,9 @@ discard block |
||
25 | 25 | * @param array $model |
26 | 26 | * @param string $template_path |
27 | 27 | */ |
28 | - public function __construct( array $model = array(), $template_path = null ) |
|
28 | + public function __construct(array $model = array(), $template_path = null) |
|
29 | 29 | { |
30 | - $this->set_model( $model ); |
|
30 | + $this->set_model($model); |
|
31 | 31 | $this->template = $template_path; |
32 | 32 | } |
33 | 33 | |
@@ -38,9 +38,9 @@ discard block |
||
38 | 38 | * |
39 | 39 | * @return mixed the argument's value. |
40 | 40 | */ |
41 | - public function __get( $name ) |
|
41 | + public function __get($name) |
|
42 | 42 | { |
43 | - if( isset( $this->model[$name] ) ) |
|
43 | + if (isset($this->model[$name])) |
|
44 | 44 | { |
45 | 45 | return $this->model[$name]; |
46 | 46 | } |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | * |
55 | 55 | * @return mixed the settings' argument value. |
56 | 56 | */ |
57 | - public function __set( $name, $value ) |
|
57 | + public function __set($name, $value) |
|
58 | 58 | { |
59 | 59 | $this->model[$name] = $value; |
60 | 60 | } |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | * |
75 | 75 | * @return array |
76 | 76 | */ |
77 | - public function set_model( $model ) |
|
77 | + public function set_model($model) |
|
78 | 78 | { |
79 | 79 | $this->model = $model; |
80 | 80 | } |
@@ -95,22 +95,22 @@ discard block |
||
95 | 95 | * @return string The rendered template. |
96 | 96 | * @throws TemplateNotFoundException Thrown if the template file cannot be found. |
97 | 97 | */ |
98 | - public function render( $echo = false ) |
|
98 | + public function render($echo = false) |
|
99 | 99 | { |
100 | 100 | $rendered_html = ''; |
101 | 101 | |
102 | - if( file_exists( $this->get_template_path() ) ) |
|
102 | + if (file_exists($this->get_template_path())) |
|
103 | 103 | { |
104 | 104 | ob_start(); |
105 | - include( $this->get_template_path() ); |
|
105 | + include($this->get_template_path()); |
|
106 | 106 | $rendered_html = ob_get_clean(); |
107 | 107 | } |
108 | 108 | else |
109 | 109 | { |
110 | - throw new \RuntimeException( "Error: cannot render HTML, template file not found at " . $this->get_template_path() ); |
|
110 | + throw new \RuntimeException("Error: cannot render HTML, template file not found at ".$this->get_template_path()); |
|
111 | 111 | } |
112 | 112 | |
113 | - if( !$echo ) |
|
113 | + if (!$echo) |
|
114 | 114 | { |
115 | 115 | return $rendered_html; |
116 | 116 | } |
@@ -6,13 +6,13 @@ |
||
6 | 6 | */ |
7 | 7 | |
8 | 8 | // Prevent direct file access |
9 | -defined( 'ABSPATH' ) or die( 'No script kiddies please!' ); |
|
9 | +defined('ABSPATH') or die('No script kiddies please!'); |
|
10 | 10 | |
11 | 11 | /** |
12 | 12 | * Load module functions. If this amarkal module has not been loaded, |
13 | 13 | * functions.php will not return false. |
14 | 14 | */ |
15 | -if(false !== (require_once 'functions.php')) |
|
15 | +if (false !== (require_once 'functions.php')) |
|
16 | 16 | { |
17 | 17 | // Load required classes if not using composer |
18 | 18 | require_once 'AbstractComponent.php'; |
@@ -27,8 +27,8 @@ discard block |
||
27 | 27 | 'required' => false, |
28 | 28 | 'readonly' => false, |
29 | 29 | 'default' => null, |
30 | - 'filter' => array( $this, 'filter' ), |
|
31 | - 'validation' => array( $this, 'validation' ) |
|
30 | + 'filter' => array($this, 'filter'), |
|
31 | + 'validation' => array($this, 'validation') |
|
32 | 32 | ); |
33 | 33 | } |
34 | 34 | |
@@ -37,19 +37,19 @@ discard block |
||
37 | 37 | return floatval($v); |
38 | 38 | } |
39 | 39 | |
40 | - public function validation($v,&$e) |
|
40 | + public function validation($v, &$e) |
|
41 | 41 | { |
42 | 42 | $max = $this->max; |
43 | 43 | $min = $this->min; |
44 | 44 | |
45 | - if(null !== $max && $v > $max) |
|
45 | + if (null !== $max && $v > $max) |
|
46 | 46 | { |
47 | - $e = sprintf( __("Value must be less than %d",'amarkal'), $max); |
|
47 | + $e = sprintf(__("Value must be less than %d", 'amarkal'), $max); |
|
48 | 48 | } |
49 | 49 | |
50 | - if(null !== $min && $v < $min) |
|
50 | + if (null !== $min && $v < $min) |
|
51 | 51 | { |
52 | - $e = sprintf( __("Value must be greater than %d",'amarkal'), $min); |
|
52 | + $e = sprintf(__("Value must be greater than %d", 'amarkal'), $min); |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | return $e ? false : true; |
@@ -12,15 +12,15 @@ discard block |
||
12 | 12 | */ |
13 | 13 | |
14 | 14 | // Prevent direct file access |
15 | -defined( 'ABSPATH' ) or die( 'No script kiddies please!' ); |
|
15 | +defined('ABSPATH') or die('No script kiddies please!'); |
|
16 | 16 | |
17 | 17 | /** |
18 | 18 | * Prevent loading the library more than once |
19 | 19 | */ |
20 | -if( defined( 'AMARKAL_UI' ) ) return false; |
|
21 | -define( 'AMARKAL_UI', true ); |
|
20 | +if (defined('AMARKAL_UI')) return false; |
|
21 | +define('AMARKAL_UI', true); |
|
22 | 22 | |
23 | -if(!function_exists('amarkal_ui_render')) |
|
23 | +if (!function_exists('amarkal_ui_render')) |
|
24 | 24 | { |
25 | 25 | /** |
26 | 26 | * Render a UI component. |
@@ -30,14 +30,14 @@ discard block |
||
30 | 30 | * @param array $props The component's properties |
31 | 31 | * @return string The rendered HTML |
32 | 32 | */ |
33 | - function amarkal_ui_render( $type, array $props = array() ) |
|
33 | + function amarkal_ui_render($type, array $props = array()) |
|
34 | 34 | { |
35 | - $component = Amarkal\UI\ComponentFactory::create( $type, $props ); |
|
35 | + $component = Amarkal\UI\ComponentFactory::create($type, $props); |
|
36 | 36 | return $component->render(); |
37 | 37 | } |
38 | 38 | } |
39 | 39 | |
40 | -if(!function_exists('amarkal_ui_register_component')) |
|
40 | +if (!function_exists('amarkal_ui_register_component')) |
|
41 | 41 | { |
42 | 42 | /** |
43 | 43 | * Register a custom UI component. The registered component's class should |
@@ -47,13 +47,13 @@ discard block |
||
47 | 47 | * to one of the core component's type, it will override the core component. |
48 | 48 | * @param string $class_name The component's class name. |
49 | 49 | */ |
50 | - function amarkal_ui_register_component( $type, $class_name ) |
|
50 | + function amarkal_ui_register_component($type, $class_name) |
|
51 | 51 | { |
52 | - Amarkal\UI\ComponentFactory::register( $type, $class_name ); |
|
52 | + Amarkal\UI\ComponentFactory::register($type, $class_name); |
|
53 | 53 | } |
54 | 54 | } |
55 | 55 | |
56 | -if(!function_exists('amarkal_ui_register_scripts')) |
|
56 | +if (!function_exists('amarkal_ui_register_scripts')) |
|
57 | 57 | { |
58 | 58 | /** |
59 | 59 | * Register Amarkal UI styles & scripts. These scripts are later enqueued by |
@@ -61,8 +61,8 @@ discard block |
||
61 | 61 | */ |
62 | 62 | function amarkal_ui_register_scripts() |
63 | 63 | { |
64 | - \wp_register_script('amarkal-ui',Amarkal\Core\Utility::path_to_url(__DIR__.'/assets/js/dist/amarkal-ui.min.js'),array('jquery'),false,true); |
|
65 | - \wp_register_style('amarkal-ui',Amarkal\Core\Utility::path_to_url(__DIR__.'/assets/css/dist/amarkal-ui.min.css'),array()); |
|
64 | + \wp_register_script('amarkal-ui', Amarkal\Core\Utility::path_to_url(__DIR__.'/assets/js/dist/amarkal-ui.min.js'), array('jquery'), false, true); |
|
65 | + \wp_register_style('amarkal-ui', Amarkal\Core\Utility::path_to_url(__DIR__.'/assets/css/dist/amarkal-ui.min.css'), array()); |
|
66 | 66 | } |
67 | - \add_action('admin_init','amarkal_ui_register_scripts'); |
|
67 | + \add_action('admin_init', 'amarkal_ui_register_scripts'); |
|
68 | 68 | } |
69 | 69 | \ No newline at end of file |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | 'required' => false, |
23 | 23 | 'readonly' => false, |
24 | 24 | 'default' => null, |
25 | - 'filter' => array( $this, 'filter' ) |
|
25 | + 'filter' => array($this, 'filter') |
|
26 | 26 | ); |
27 | 27 | } |
28 | 28 | |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | */ |
48 | 48 | public function filter($v) |
49 | 49 | { |
50 | - if($v !== 'on') return 'off'; |
|
50 | + if ($v !== 'on') return 'off'; |
|
51 | 51 | return 'on'; |
52 | 52 | } |
53 | 53 | } |
54 | 54 | \ No newline at end of file |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | * |
60 | 60 | * @param array $components An array of arrays of component arguments |
61 | 61 | */ |
62 | - public function __construct( array $components = array() ) |
|
62 | + public function __construct(array $components = array()) |
|
63 | 63 | { |
64 | 64 | $this->add_components($components); |
65 | 65 | } |
@@ -81,18 +81,18 @@ discard block |
||
81 | 81 | * |
82 | 82 | * @return array The updated values array. |
83 | 83 | */ |
84 | - public function update( array $new_instance = array(), array $old_instance = array() ) |
|
84 | + public function update(array $new_instance = array(), array $old_instance = array()) |
|
85 | 85 | { |
86 | - $this->old_instance = array_merge($this->get_defaults(),$old_instance); |
|
87 | - $this->new_instance = array_merge($this->old_instance,$new_instance); |
|
86 | + $this->old_instance = array_merge($this->get_defaults(), $old_instance); |
|
87 | + $this->new_instance = array_merge($this->old_instance, $new_instance); |
|
88 | 88 | $this->final_instance = $this->new_instance; |
89 | 89 | |
90 | - foreach ( $this->components as $component ) |
|
90 | + foreach ($this->components as $component) |
|
91 | 91 | { |
92 | 92 | // Update individual fields, as well as the composite parent field. |
93 | - if ( $component instanceof ValueComponentInterface ) |
|
93 | + if ($component instanceof ValueComponentInterface) |
|
94 | 94 | { |
95 | - $this->update_component( $component ); |
|
95 | + $this->update_component($component); |
|
96 | 96 | } |
97 | 97 | } |
98 | 98 | |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | */ |
107 | 107 | public function reset() |
108 | 108 | { |
109 | - foreach( $this->components as $c ) |
|
109 | + foreach ($this->components as $c) |
|
110 | 110 | { |
111 | 111 | $c->value = $c->default; |
112 | 112 | $this->final_instance[$c->name] = $c->default; |
@@ -131,10 +131,10 @@ discard block |
||
131 | 131 | * @param array $args The component arguments |
132 | 132 | * @throws \RuntimeException If a component with the same name has already been registered |
133 | 133 | */ |
134 | - public function add_component( array $args ) |
|
134 | + public function add_component(array $args) |
|
135 | 135 | { |
136 | 136 | $name = $args['name']; |
137 | - if(array_key_exists($name, $this->components)) |
|
137 | + if (array_key_exists($name, $this->components)) |
|
138 | 138 | { |
139 | 139 | throw new \RuntimeException("A component with the name <b>$name</b> has already been created"); |
140 | 140 | } |
@@ -146,9 +146,9 @@ discard block |
||
146 | 146 | * |
147 | 147 | * @param array $components |
148 | 148 | */ |
149 | - public function add_components( array $components ) |
|
149 | + public function add_components(array $components) |
|
150 | 150 | { |
151 | - foreach( $components as $component ) |
|
151 | + foreach ($components as $component) |
|
152 | 152 | { |
153 | 153 | $this->add_component($component); |
154 | 154 | } |
@@ -160,9 +160,9 @@ discard block |
||
160 | 160 | * @param string $name |
161 | 161 | * @return UI\AbstractComponent |
162 | 162 | */ |
163 | - public function get_component( $name ) |
|
163 | + public function get_component($name) |
|
164 | 164 | { |
165 | - if(!array_key_exists($name, $this->components)) |
|
165 | + if (!array_key_exists($name, $this->components)) |
|
166 | 166 | { |
167 | 167 | throw new \RuntimeException("Can't find a component with the name <b>$name</b>"); |
168 | 168 | } |
@@ -186,21 +186,21 @@ discard block |
||
186 | 186 | * |
187 | 187 | * @param ValueComponentInterface $component The component to validate. |
188 | 188 | */ |
189 | - private function update_component( ValueComponentInterface $component ) |
|
189 | + private function update_component(ValueComponentInterface $component) |
|
190 | 190 | { |
191 | 191 | $component->value = $this->final_instance[$component->name]; |
192 | 192 | |
193 | 193 | // Skip if this field is disabled |
194 | - if( $this->is_disabled($component) ) |
|
194 | + if ($this->is_disabled($component)) |
|
195 | 195 | { |
196 | 196 | return; |
197 | 197 | } |
198 | 198 | |
199 | 199 | // Apply user-defined filter |
200 | - $this->filter( $component ); |
|
200 | + $this->filter($component); |
|
201 | 201 | |
202 | 202 | // Validate value |
203 | - $this->validate( $component ); |
|
203 | + $this->validate($component); |
|
204 | 204 | } |
205 | 205 | |
206 | 206 | /** |
@@ -209,7 +209,7 @@ discard block |
||
209 | 209 | * @param UI\AbstractComponent $component |
210 | 210 | * @return boolean |
211 | 211 | */ |
212 | - private function is_disabled( $component ) |
|
212 | + private function is_disabled($component) |
|
213 | 213 | { |
214 | 214 | return |
215 | 215 | $component instanceof DisableableComponentInterface && |
@@ -224,13 +224,13 @@ discard block |
||
224 | 224 | * |
225 | 225 | * @param UI\AbstractComponent $component |
226 | 226 | */ |
227 | - private function filter( $component ) |
|
227 | + private function filter($component) |
|
228 | 228 | { |
229 | - if( $component instanceof FilterableComponentInterface ) |
|
229 | + if ($component instanceof FilterableComponentInterface) |
|
230 | 230 | { |
231 | 231 | $filter = $component->filter; |
232 | 232 | |
233 | - if( is_callable( $filter ) ) |
|
233 | + if (is_callable($filter)) |
|
234 | 234 | { |
235 | 235 | $component->value = \call_user_func_array($filter, array($this->final_instance[$component->name])); |
236 | 236 | $this->final_instance[$component->name] = $component->value; |
@@ -246,22 +246,22 @@ discard block |
||
246 | 246 | * |
247 | 247 | * @param UI\AbstractComponent $component The component to validate. |
248 | 248 | */ |
249 | - private function validate( $component ) |
|
249 | + private function validate($component) |
|
250 | 250 | { |
251 | - if( !($component instanceof ValidatableComponentInterface) ) return; |
|
251 | + if (!($component instanceof ValidatableComponentInterface)) return; |
|
252 | 252 | |
253 | 253 | $name = $component->name; |
254 | 254 | $validate = $component->validation; |
255 | 255 | |
256 | 256 | $component->validity = $component::VALID; |
257 | 257 | |
258 | - if(is_callable($validate)) |
|
258 | + if (is_callable($validate)) |
|
259 | 259 | { |
260 | 260 | $error = ''; |
261 | 261 | $valid = \call_user_func_array($validate, array($this->final_instance[$name], &$error)); |
262 | 262 | |
263 | 263 | // Invalid input, use old instance or default value |
264 | - if ( true !== $valid ) |
|
264 | + if (true !== $valid) |
|
265 | 265 | { |
266 | 266 | $this->errors[$name] = $error ? $error : ValidatableComponentInterface::DEFAULT_MESSAGE; |
267 | 267 | $component->value = $this->old_instance[$name]; |
@@ -280,7 +280,7 @@ discard block |
||
280 | 280 | { |
281 | 281 | $defaults = array(); |
282 | 282 | |
283 | - foreach( $this->components as $component ) |
|
283 | + foreach ($this->components as $component) |
|
284 | 284 | { |
285 | 285 | $defaults[$component->name] = $component->default; |
286 | 286 | } |