@@ -6,13 +6,13 @@ |
||
6 | 6 | |
7 | 7 | class Log extends Facade |
8 | 8 | { |
9 | - /** |
|
10 | - * Get the fully qualified class name of the component. |
|
11 | - * |
|
12 | - * @return string |
|
13 | - */ |
|
14 | - protected static function getFacadeAccessor() |
|
15 | - { |
|
16 | - return \GeminiLabs\Castor\Helpers\Log::class; |
|
17 | - } |
|
9 | + /** |
|
10 | + * Get the fully qualified class name of the component. |
|
11 | + * |
|
12 | + * @return string |
|
13 | + */ |
|
14 | + protected static function getFacadeAccessor() |
|
15 | + { |
|
16 | + return \GeminiLabs\Castor\Helpers\Log::class; |
|
17 | + } |
|
18 | 18 | } |
@@ -4,8 +4,7 @@ |
||
4 | 4 | |
5 | 5 | use GeminiLabs\Castor\Facade; |
6 | 6 | |
7 | -class Log extends Facade |
|
8 | -{ |
|
7 | +class Log extends Facade { |
|
9 | 8 | /** |
10 | 9 | * Get the fully qualified class name of the component. |
11 | 10 | * |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | */ |
17 | 17 | public function afterSetupTheme() |
18 | 18 | { |
19 | - add_editor_style( Theme::assetUri( 'css/editor.css' )); |
|
19 | + add_editor_style( Theme::assetUri( 'css/editor.css' ) ); |
|
20 | 20 | add_theme_support( 'customize-selective-refresh-widgets' ); |
21 | 21 | add_theme_support( 'html5', ['caption', 'comment-form', 'comment-list', 'gallery', 'search-form'] ); |
22 | 22 | add_theme_support( 'post-thumbnails' ); |
@@ -26,11 +26,11 @@ discard block |
||
26 | 26 | add_theme_support( 'soil-nice-search' ); |
27 | 27 | add_theme_support( 'soil-relative-urls' ); |
28 | 28 | add_theme_support( 'title-tag' ); |
29 | - load_theme_textdomain( 'castor', Theme::paths( 'dir.template' ) . '/languages' ); |
|
29 | + load_theme_textdomain( 'castor', Theme::paths( 'dir.template' ).'/languages' ); |
|
30 | 30 | |
31 | 31 | $menus = apply_filters( 'castor/register/nav_menus', [ |
32 | 32 | 'main_menu' => __( 'Main Menu', 'castor' ), |
33 | - ]); |
|
33 | + ] ); |
|
34 | 34 | |
35 | 35 | foreach( $menus as $location => $description ) { |
36 | 36 | register_nav_menu( $location, $description ); |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | if( Theme::displaySidebar() ) { |
47 | 47 | $classes[] = 'has-sidebar'; |
48 | 48 | } |
49 | - return array_keys( array_flip( $classes )); |
|
49 | + return array_keys( array_flip( $classes ) ); |
|
50 | 50 | } |
51 | 51 | |
52 | 52 | /** |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | */ |
74 | 74 | public function filterTemplate( $template ) |
75 | 75 | { |
76 | - if( is_string( $template )) { |
|
76 | + if( is_string( $template ) ) { |
|
77 | 77 | $template = Template::setLayout( $template ); |
78 | 78 | Development::storeTemplatePath( $template ); |
79 | 79 | } |
@@ -98,8 +98,8 @@ discard block |
||
98 | 98 | */ |
99 | 99 | public function loadAdminFavicon() |
100 | 100 | { |
101 | - if( file_exists( Theme::assetPath( 'favicon/favicon-admin.ico' ))) { |
|
102 | - printf( '<link rel="shortcut icon" href="%s">', Theme::assetUri( 'favicon/favicon-admin.ico' )); |
|
101 | + if( file_exists( Theme::assetPath( 'favicon/favicon-admin.ico' ) ) ) { |
|
102 | + printf( '<link rel="shortcut icon" href="%s">', Theme::assetUri( 'favicon/favicon-admin.ico' ) ); |
|
103 | 103 | } |
104 | 104 | } |
105 | 105 | |
@@ -109,8 +109,8 @@ discard block |
||
109 | 109 | */ |
110 | 110 | public function login() |
111 | 111 | { |
112 | - if( file_exists( Theme::assetPath( 'css/login.css' ))) { |
|
113 | - printf( '<link rel="stylesheet" href="%s">', Theme::assetUri( 'css/login.css' )); |
|
112 | + if( file_exists( Theme::assetPath( 'css/login.css' ) ) ) { |
|
113 | + printf( '<link rel="stylesheet" href="%s">', Theme::assetUri( 'css/login.css' ) ); |
|
114 | 114 | } |
115 | 115 | } |
116 | 116 | |
@@ -120,14 +120,14 @@ discard block |
||
120 | 120 | */ |
121 | 121 | public function registerAdminAssets() |
122 | 122 | { |
123 | - if( file_exists( Theme::assetPath( 'css/admin.css' ))) { |
|
123 | + if( file_exists( Theme::assetPath( 'css/admin.css' ) ) ) { |
|
124 | 124 | wp_enqueue_style( 'castor/admin.css', |
125 | 125 | Theme::assetUri( 'css/admin.css' ), |
126 | 126 | apply_filters( 'castor/enqueue/admin/css/deps', [] ), |
127 | 127 | null |
128 | 128 | ); |
129 | 129 | } |
130 | - if( file_exists( Theme::assetPath( 'css/admin.js' ))) { |
|
130 | + if( file_exists( Theme::assetPath( 'css/admin.js' ) ) ) { |
|
131 | 131 | wp_enqueue_script( 'castor/admin.js', |
132 | 132 | Theme::assetUri( 'js/admin.js' ), |
133 | 133 | apply_filters( 'castor/enqueue/admin/js/deps', [] ), |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | wp_localize_script( 'castor/main.js', apply_filters( 'castor/enqueue/js/localize/variable', 'globals' ), |
158 | 158 | apply_filters( 'castor/enqueue/js/localize/variables', [ |
159 | 159 | 'ajax' => admin_url( 'admin-ajax.php' ), |
160 | - ]) |
|
160 | + ] ) |
|
161 | 161 | ); |
162 | 162 | } |
163 | 163 | |
@@ -173,7 +173,7 @@ discard block |
||
173 | 173 | 'render_callback' => function() { |
174 | 174 | bloginfo( 'name' ); |
175 | 175 | }, |
176 | - ]); |
|
176 | + ] ); |
|
177 | 177 | } |
178 | 178 | |
179 | 179 | /** |
@@ -196,15 +196,15 @@ discard block |
||
196 | 196 | 'after_widget' => '</div>', |
197 | 197 | 'before_title' => '<h4>', |
198 | 198 | 'after_title' => '</h4>', |
199 | - ]); |
|
199 | + ] ); |
|
200 | 200 | |
201 | 201 | $sidebars = apply_filters( 'castor/register/sidebars', [ |
202 | 202 | 'sidebar-primary' => __( 'Primary Sidebar', 'castor' ), |
203 | 203 | 'sidebar-footer' => __( 'Footer Widgets', 'castor' ), |
204 | - ]); |
|
204 | + ] ); |
|
205 | 205 | |
206 | 206 | foreach( $sidebars as $id => $name ) { |
207 | - register_sidebar([ |
|
207 | + register_sidebar( [ |
|
208 | 208 | 'id' => $id, |
209 | 209 | 'name' => $name, |
210 | 210 | ] + $defaults ); |
@@ -8,8 +8,7 @@ |
||
8 | 8 | use GeminiLabs\Castor\Facades\Utility; |
9 | 9 | use WP_Customize_Manager; |
10 | 10 | |
11 | -class Controller |
|
12 | -{ |
|
11 | +class Controller { |
|
13 | 12 | /** |
14 | 13 | * @return void |
15 | 14 | * @action after_setup_theme |
@@ -4,6 +4,5 @@ |
||
4 | 4 | |
5 | 5 | use Exception; |
6 | 6 | |
7 | -class BindingResolutionException extends Exception |
|
8 | -{ |
|
7 | +class BindingResolutionException extends Exception { |
|
9 | 8 | } |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | */ |
41 | 41 | public static function getInstance( array $aliases = [] ) |
42 | 42 | { |
43 | - if( is_null( static::$instance )) { |
|
43 | + if( is_null( static::$instance ) ) { |
|
44 | 44 | return static::$instance = new static( $aliases ); |
45 | 45 | } |
46 | 46 | |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | */ |
61 | 61 | public function load( $alias ) |
62 | 62 | { |
63 | - if( isset( $this->aliases[$alias] )) { |
|
63 | + if( isset( $this->aliases[$alias] ) ) { |
|
64 | 64 | return class_alias( $this->aliases[$alias], $alias ); |
65 | 65 | } |
66 | 66 | } |
@@ -2,8 +2,7 @@ discard block |
||
2 | 2 | |
3 | 3 | namespace GeminiLabs\Castor; |
4 | 4 | |
5 | -class AliasLoader |
|
6 | -{ |
|
5 | +class AliasLoader { |
|
7 | 6 | /** |
8 | 7 | * The singleton instance of the loader. |
9 | 8 | * |
@@ -31,7 +30,8 @@ discard block |
||
31 | 30 | } |
32 | 31 | |
33 | 32 | private function __clone() |
34 | - {} |
|
33 | + { |
|
34 | +} |
|
35 | 35 | |
36 | 36 | /** |
37 | 37 | * Get or create the singleton alias loader instance. |
@@ -102,11 +102,11 @@ |
||
102 | 102 | */ |
103 | 103 | protected static function resolveFacadeInstance( $name ) |
104 | 104 | { |
105 | - if( is_object( $name )) { |
|
105 | + if( is_object( $name ) ) { |
|
106 | 106 | return $name; |
107 | 107 | } |
108 | 108 | |
109 | - if( isset( static::$resolvedInstance[$name] )) { |
|
109 | + if( isset( static::$resolvedInstance[$name] ) ) { |
|
110 | 110 | return static::$resolvedInstance[$name]; |
111 | 111 | } |
112 | 112 |
@@ -5,8 +5,7 @@ |
||
5 | 5 | use GeminiLabs\Castor\Application; |
6 | 6 | use RuntimeException; |
7 | 7 | |
8 | -abstract class Facade |
|
9 | -{ |
|
8 | +abstract class Facade { |
|
10 | 9 | /** |
11 | 10 | * The application instance being facaded. |
12 | 11 | * |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | public function get( $attachment ) |
27 | 27 | { |
28 | 28 | $attachment = $this->normalize( $attachment ); |
29 | - if( $attachment && $thumbnail = wp_get_attachment_image_src( $attachment, 'thumbnail' )) { |
|
29 | + if( $attachment && $thumbnail = wp_get_attachment_image_src( $attachment, 'thumbnail' ) ) { |
|
30 | 30 | $medium = $this->normalizeSrc( wp_get_attachment_image_src( $attachment, 'medium' ), $thumbnail ); |
31 | 31 | $large = $this->normalizeSrc( wp_get_attachment_image_src( $attachment, 'large' ), $medium ); |
32 | 32 | |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | |
54 | 54 | protected function normalize( $attachmentId ) |
55 | 55 | { |
56 | - if( !filter_var( $attachmentId, FILTER_VALIDATE_INT )) { |
|
56 | + if( !filter_var( $attachmentId, FILTER_VALIDATE_INT ) ) { |
|
57 | 57 | $attachmentId = $this->postmeta->get( $attachmentId ); |
58 | 58 | } |
59 | 59 | |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | */ |
72 | 72 | protected function normalizeSrc( array $image, $fallback = false ) |
73 | 73 | { |
74 | - if( is_array( $fallback ) && count( array_diff( $image, $fallback )) < 2 ) { |
|
74 | + if( is_array( $fallback ) && count( array_diff( $image, $fallback ) ) < 2 ) { |
|
75 | 75 | $image = $fallback; |
76 | 76 | } |
77 | 77 | return [ |
@@ -5,8 +5,7 @@ discard block |
||
5 | 5 | use GeminiLabs\Castor\Helpers\PostMeta; |
6 | 6 | use GeminiLabs\Castor\Helpers\Utility; |
7 | 7 | |
8 | -class Image |
|
9 | -{ |
|
8 | +class Image { |
|
10 | 9 | public $image; |
11 | 10 | |
12 | 11 | protected $postmeta; |
@@ -59,7 +58,9 @@ discard block |
||
59 | 58 | |
60 | 59 | $attachment = get_post( $attachmentId ); |
61 | 60 | |
62 | - if( is_null( $attachment ) || $attachment->post_type != 'attachment' )return; |
|
61 | + if( is_null( $attachment ) || $attachment->post_type != 'attachment' ) { |
|
62 | + return; |
|
63 | + } |
|
63 | 64 | |
64 | 65 | return $attachment->ID; |
65 | 66 | } |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | foreach( $rules as $rule ) { |
79 | 79 | $this->validateAttribute( $rule, $attribute ); |
80 | 80 | |
81 | - if( $this->shouldStopValidating( $attribute ))break; |
|
81 | + if( $this->shouldStopValidating( $attribute ) )break; |
|
82 | 82 | } |
83 | 83 | } |
84 | 84 | |
@@ -97,10 +97,10 @@ discard block |
||
97 | 97 | { |
98 | 98 | $message = $this->getMessage( $attribute, $rule, $parameters ); |
99 | 99 | |
100 | - $this->errors[ $attribute ]['errors'][] = $message; |
|
100 | + $this->errors[$attribute]['errors'][] = $message; |
|
101 | 101 | |
102 | - if( !isset( $this->errors[ $attribute ]['value'] )) { |
|
103 | - $this->errors[ $attribute ]['value'] = $this->getValue( $attribute ); |
|
102 | + if( !isset( $this->errors[$attribute]['value'] ) ) { |
|
103 | + $this->errors[$attribute]['value'] = $this->getValue( $attribute ); |
|
104 | 104 | } |
105 | 105 | } |
106 | 106 | |
@@ -116,7 +116,7 @@ discard block |
||
116 | 116 | { |
117 | 117 | $this->addError( $attribute, $rule, $parameters ); |
118 | 118 | |
119 | - $this->failedRules[ $attribute ][ $rule ] = $parameters; |
|
119 | + $this->failedRules[$attribute][$rule] = $parameters; |
|
120 | 120 | } |
121 | 121 | |
122 | 122 | /** |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | */ |
143 | 143 | protected function getMessage( $attribute, $rule, array $parameters ) |
144 | 144 | { |
145 | - if( in_array( $rule, $this->sizeRules )) { |
|
145 | + if( in_array( $rule, $this->sizeRules ) ) { |
|
146 | 146 | return $this->getSizeMessage( $attribute, $rule, $parameters ); |
147 | 147 | } |
148 | 148 | |
@@ -161,15 +161,15 @@ discard block |
||
161 | 161 | */ |
162 | 162 | protected function getRule( $attribute, $rules ) |
163 | 163 | { |
164 | - if( !array_key_exists( $attribute, $this->rules ))return; |
|
164 | + if( !array_key_exists( $attribute, $this->rules ) )return; |
|
165 | 165 | |
166 | 166 | $rules = (array) $rules; |
167 | 167 | |
168 | - foreach( $this->rules[ $attribute ] as $rule ) { |
|
168 | + foreach( $this->rules[$attribute] as $rule ) { |
|
169 | 169 | list( $rule, $parameters ) = $this->parseRule( $rule ); |
170 | 170 | |
171 | - if( in_array( $rule, $rules )) { |
|
172 | - return [ $rule, $parameters ]; |
|
171 | + if( in_array( $rule, $rules ) ) { |
|
172 | + return [$rule, $parameters]; |
|
173 | 173 | } |
174 | 174 | } |
175 | 175 | } |
@@ -189,7 +189,7 @@ discard block |
||
189 | 189 | if( is_numeric( $value ) && $hasNumeric ) { |
190 | 190 | return $value; |
191 | 191 | } |
192 | - elseif( is_array( $value )) { |
|
192 | + elseif( is_array( $value ) ) { |
|
193 | 193 | return count( $value ); |
194 | 194 | } |
195 | 195 | |
@@ -223,8 +223,8 @@ discard block |
||
223 | 223 | */ |
224 | 224 | protected function getValue( $attribute ) |
225 | 225 | { |
226 | - if( isset( $this->data[ $attribute ] )) { |
|
227 | - return $this->data[ $attribute ]; |
|
226 | + if( isset( $this->data[$attribute] ) ) { |
|
227 | + return $this->data[$attribute]; |
|
228 | 228 | } |
229 | 229 | } |
230 | 230 | |
@@ -238,7 +238,7 @@ discard block |
||
238 | 238 | */ |
239 | 239 | protected function hasRule( $attribute, $rules ) |
240 | 240 | { |
241 | - return !is_null( $this->getRule( $attribute, $rules )); |
|
241 | + return !is_null( $this->getRule( $attribute, $rules ) ); |
|
242 | 242 | } |
243 | 243 | |
244 | 244 | /** |
@@ -251,7 +251,7 @@ discard block |
||
251 | 251 | protected function normalizeData( $data ) |
252 | 252 | { |
253 | 253 | // If an object was provided, get its public properties |
254 | - if( is_object( $data )) { |
|
254 | + if( is_object( $data ) ) { |
|
255 | 255 | $this->data = get_object_vars( $data ); |
256 | 256 | } |
257 | 257 | else { |
@@ -272,7 +272,7 @@ discard block |
||
272 | 272 | protected function parseParameters( $rule, $parameter ) |
273 | 273 | { |
274 | 274 | if( strtolower( $rule ) == 'regex' ) { |
275 | - return [ $parameter ]; |
|
275 | + return [$parameter]; |
|
276 | 276 | } |
277 | 277 | |
278 | 278 | return str_getcsv( $parameter ); |
@@ -297,10 +297,10 @@ discard block |
||
297 | 297 | $parameters = $this->parseParameters( $rule, $parameter ); |
298 | 298 | } |
299 | 299 | |
300 | - $rule = ucwords( str_replace( ['-', '_'], ' ', trim( $rule ))); |
|
300 | + $rule = ucwords( str_replace( ['-', '_'], ' ', trim( $rule ) ) ); |
|
301 | 301 | $rule = str_replace( ' ', '', $rule ); |
302 | 302 | |
303 | - return [ $rule, $parameters ]; |
|
303 | + return [$rule, $parameters]; |
|
304 | 304 | } |
305 | 305 | |
306 | 306 | /** |
@@ -312,7 +312,7 @@ discard block |
||
312 | 312 | */ |
313 | 313 | protected function replaceBetween( $message, array $parameters ) |
314 | 314 | { |
315 | - return str_replace([':min', ':max'], $parameters, $message ); |
|
315 | + return str_replace( [':min', ':max'], $parameters, $message ); |
|
316 | 316 | } |
317 | 317 | |
318 | 318 | /** |
@@ -363,7 +363,7 @@ discard block |
||
363 | 363 | protected function setRules( array $rules ) |
364 | 364 | { |
365 | 365 | foreach( $rules as $key => $rule ) { |
366 | - $rules[ $key ] = is_string( $rule ) ? explode( '|', $rule ) : $rule; |
|
366 | + $rules[$key] = is_string( $rule ) ? explode( '|', $rule ) : $rule; |
|
367 | 367 | } |
368 | 368 | |
369 | 369 | $this->rules = $rules; |
@@ -381,8 +381,8 @@ discard block |
||
381 | 381 | protected function shouldStopValidating( $attribute ) |
382 | 382 | { |
383 | 383 | return $this->hasRule( $attribute, $this->implicitRules ) |
384 | - && isset( $this->failedRules[ $attribute ] ) |
|
385 | - && array_intersect( array_keys( $this->failedRules[ $attribute ] ), $this->implicitRules ); |
|
384 | + && isset( $this->failedRules[$attribute] ) |
|
385 | + && array_intersect( array_keys( $this->failedRules[$attribute] ), $this->implicitRules ); |
|
386 | 386 | } |
387 | 387 | |
388 | 388 | /** |
@@ -394,7 +394,7 @@ discard block |
||
394 | 394 | */ |
395 | 395 | protected function snakeCase( $string ) |
396 | 396 | { |
397 | - if( !ctype_lower( $string )) { |
|
397 | + if( !ctype_lower( $string ) ) { |
|
398 | 398 | $string = preg_replace( '/\s+/u', '', $string ); |
399 | 399 | $string = preg_replace( '/(.)(?=[A-Z])/u', '$1_', $string ); |
400 | 400 | $string = mb_strtolower( $string, 'UTF-8' ); |
@@ -416,15 +416,15 @@ discard block |
||
416 | 416 | { |
417 | 417 | $strings = glsr_resolve( 'Strings' )->validation(); |
418 | 418 | |
419 | - $message = isset( $strings[ $key ] ) |
|
420 | - ? $strings[ $key ] |
|
419 | + $message = isset( $strings[$key] ) |
|
420 | + ? $strings[$key] |
|
421 | 421 | : false; |
422 | 422 | |
423 | 423 | if( !$message )return; |
424 | 424 | |
425 | 425 | $message = str_replace( ':attribute', $attribute, $message ); |
426 | 426 | |
427 | - if( method_exists( $this, $replacer = "replace{$rule}" )) { |
|
427 | + if( method_exists( $this, $replacer = "replace{$rule}" ) ) { |
|
428 | 428 | $message = $this->$replacer( $message, $parameters ); |
429 | 429 | } |
430 | 430 | |
@@ -467,11 +467,11 @@ discard block |
||
467 | 467 | |
468 | 468 | $method = "validate{$rule}"; |
469 | 469 | |
470 | - if( !method_exists( $this, $method )) { |
|
470 | + if( !method_exists( $this, $method ) ) { |
|
471 | 471 | throw new BadMethodCallException( "Method [$method] does not exist." ); |
472 | 472 | } |
473 | 473 | |
474 | - if( !$this->$method( $this->getValue( $attribute ), $attribute, $parameters )) { |
|
474 | + if( !$this->$method( $this->getValue( $attribute ), $attribute, $parameters ) ) { |
|
475 | 475 | $this->addFailure( $attribute, $rule, $parameters ); |
476 | 476 | } |
477 | 477 | } |
@@ -556,7 +556,7 @@ discard block |
||
556 | 556 | */ |
557 | 557 | protected function validateRequired( $value ) |
558 | 558 | { |
559 | - if( is_string( $value )) { |
|
559 | + if( is_string( $value ) ) { |
|
560 | 560 | $value = trim( $value ); |
561 | 561 | } |
562 | 562 | return is_null( $value ) || empty( $value ) |
@@ -5,8 +5,7 @@ discard block |
||
5 | 5 | use BadMethodCallException; |
6 | 6 | use InvalidArgumentException; |
7 | 7 | |
8 | -class Validator |
|
9 | -{ |
|
8 | +class Validator { |
|
10 | 9 | /** |
11 | 10 | * @var array |
12 | 11 | */ |
@@ -78,7 +77,9 @@ discard block |
||
78 | 77 | foreach( $rules as $rule ) { |
79 | 78 | $this->validateAttribute( $rule, $attribute ); |
80 | 79 | |
81 | - if( $this->shouldStopValidating( $attribute ))break; |
|
80 | + if( $this->shouldStopValidating( $attribute )) { |
|
81 | + break; |
|
82 | + } |
|
82 | 83 | } |
83 | 84 | } |
84 | 85 | |
@@ -161,7 +162,9 @@ discard block |
||
161 | 162 | */ |
162 | 163 | protected function getRule( $attribute, $rules ) |
163 | 164 | { |
164 | - if( !array_key_exists( $attribute, $this->rules ))return; |
|
165 | + if( !array_key_exists( $attribute, $this->rules )) { |
|
166 | + return; |
|
167 | + } |
|
165 | 168 | |
166 | 169 | $rules = (array) $rules; |
167 | 170 | |
@@ -420,7 +423,9 @@ discard block |
||
420 | 423 | ? $strings[ $key ] |
421 | 424 | : false; |
422 | 425 | |
423 | - if( !$message )return; |
|
426 | + if( !$message ) { |
|
427 | + return; |
|
428 | + } |
|
424 | 429 | |
425 | 430 | $message = str_replace( ':attribute', $attribute, $message ); |
426 | 431 | |
@@ -463,7 +468,9 @@ discard block |
||
463 | 468 | { |
464 | 469 | list( $rule, $parameters ) = $this->parseRule( $rule ); |
465 | 470 | |
466 | - if( $rule == '' )return; |
|
471 | + if( $rule == '' ) { |
|
472 | + return; |
|
473 | + } |
|
467 | 474 | |
468 | 475 | $method = "validate{$rule}"; |
469 | 476 |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | $this->to = $email['to']; |
56 | 56 | |
57 | 57 | add_action( 'phpmailer_init', function( PHPMailer $phpmailer ) { |
58 | - if( $phpmailer->ContentType === 'text/plain' || !empty( $phpmailer->AltBody ))return; |
|
58 | + if( $phpmailer->ContentType === 'text/plain' || !empty( $phpmailer->AltBody ) )return; |
|
59 | 59 | $phpmailer->AltBody = $this->buildPlainTextMessage( $phpmailer->Body ); |
60 | 60 | }); |
61 | 61 | |
@@ -106,11 +106,11 @@ discard block |
||
106 | 106 | 'reply-to', |
107 | 107 | ]; |
108 | 108 | |
109 | - $headers = array_intersect_key( $email, array_flip( $allowed )); |
|
109 | + $headers = array_intersect_key( $email, array_flip( $allowed ) ); |
|
110 | 110 | $headers = array_filter( $headers ); |
111 | 111 | |
112 | 112 | foreach( $headers as $key => $value ) { |
113 | - unset( $headers[ $key ] ); |
|
113 | + unset( $headers[$key] ); |
|
114 | 114 | $headers[] = sprintf( '%s: %s', $key, $value ); |
115 | 115 | } |
116 | 116 | |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | ? $this->renderTemplate( $email['template'], $email['template-tags'] ) |
131 | 131 | : $email['message']; |
132 | 132 | |
133 | - $message = $this->filterHtml( $email['before'] . $message . $email['after'] ); |
|
133 | + $message = $this->filterHtml( $email['before'].$message.$email['after'] ); |
|
134 | 134 | $message = str_replace( '{message}', $message, $body ); |
135 | 135 | |
136 | 136 | return apply_filters( 'castor/email/message', $message, 'html', $this ); |
@@ -177,7 +177,7 @@ discard block |
||
177 | 177 | */ |
178 | 178 | protected function normalize( $email ) |
179 | 179 | { |
180 | - $defaults = array_fill_keys([ |
|
180 | + $defaults = array_fill_keys( [ |
|
181 | 181 | 'after', 'attachments', 'bcc', 'before', 'cc', 'from', 'message', 'reply-to', 'subject', |
182 | 182 | 'template', 'template-tags', 'to', |
183 | 183 | ], '' ); |
@@ -188,7 +188,7 @@ discard block |
||
188 | 188 | foreach( ['attachments', 'template-tags'] as $key ) { |
189 | 189 | $email[$key] = array_filter( (array) $email[$key] ); |
190 | 190 | } |
191 | - if( empty( $email['reply-to'] )) { |
|
191 | + if( empty( $email['reply-to'] ) ) { |
|
192 | 192 | $email['reply-to'] = $email['from']; |
193 | 193 | } |
194 | 194 | |
@@ -204,12 +204,12 @@ discard block |
||
204 | 204 | */ |
205 | 205 | protected function renderTemplate( $templatePath, array $args = [] ) |
206 | 206 | { |
207 | - $file = $this->template->get( sprintf( 'castor/%s', $templatePath )); |
|
207 | + $file = $this->template->get( sprintf( 'castor/%s', $templatePath ) ); |
|
208 | 208 | |
209 | - if( !file_exists( $file )) { |
|
209 | + if( !file_exists( $file ) ) { |
|
210 | 210 | $file = sprintf( '%s/templates/%s.php', dirname( __DIR__ ), $templatePath ); |
211 | 211 | } |
212 | - if( !file_exists( $file ))return; |
|
212 | + if( !file_exists( $file ) )return; |
|
213 | 213 | |
214 | 214 | ob_start(); |
215 | 215 | include $file; |
@@ -4,8 +4,7 @@ discard block |
||
4 | 4 | |
5 | 5 | use GeminiLabs\Castor\Helpers\Template; |
6 | 6 | |
7 | -class Email |
|
8 | -{ |
|
7 | +class Email { |
|
9 | 8 | /** |
10 | 9 | * @var Template |
11 | 10 | */ |
@@ -55,7 +54,9 @@ discard block |
||
55 | 54 | $this->to = $email['to']; |
56 | 55 | |
57 | 56 | add_action( 'phpmailer_init', function( PHPMailer $phpmailer ) { |
58 | - if( $phpmailer->ContentType === 'text/plain' || !empty( $phpmailer->AltBody ))return; |
|
57 | + if( $phpmailer->ContentType === 'text/plain' || !empty( $phpmailer->AltBody )) { |
|
58 | + return; |
|
59 | + } |
|
59 | 60 | $phpmailer->AltBody = $this->buildPlainTextMessage( $phpmailer->Body ); |
60 | 61 | }); |
61 | 62 | |
@@ -79,7 +80,9 @@ discard block |
||
79 | 80 | */ |
80 | 81 | public function send() |
81 | 82 | { |
82 | - if( !$this->message || !$this->subject || !$this->to )return; |
|
83 | + if( !$this->message || !$this->subject || !$this->to ) { |
|
84 | + return; |
|
85 | + } |
|
83 | 86 | |
84 | 87 | $sent = wp_mail( |
85 | 88 | $this->to, |
@@ -209,7 +212,9 @@ discard block |
||
209 | 212 | if( !file_exists( $file )) { |
210 | 213 | $file = sprintf( '%s/templates/%s.php', dirname( __DIR__ ), $templatePath ); |
211 | 214 | } |
212 | - if( !file_exists( $file ))return; |
|
215 | + if( !file_exists( $file )) { |
|
216 | + return; |
|
217 | + } |
|
213 | 218 | |
214 | 219 | ob_start(); |
215 | 220 | include $file; |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | foreach( $attributes as $key => $value ) { |
102 | 102 | // if data attributes, use single quotes in case of json encoded values |
103 | 103 | $quotes = false !== stripos( $key, 'data-' ) ? "'" : '"'; |
104 | - if( is_array( $value )) { |
|
104 | + if( is_array( $value ) ) { |
|
105 | 105 | $value = json_encode( $value ); |
106 | 106 | $quotes = "'"; |
107 | 107 | } |
@@ -144,29 +144,29 @@ discard block |
||
144 | 144 | */ |
145 | 145 | protected function filterAttributes( array $attributeKeys ) |
146 | 146 | { |
147 | - $filtered = array_intersect_key( $this->args, array_flip( $attributeKeys )); |
|
147 | + $filtered = array_intersect_key( $this->args, array_flip( $attributeKeys ) ); |
|
148 | 148 | |
149 | 149 | // normalize truthy boolean attributes |
150 | 150 | foreach( $filtered as $key => $value ) { |
151 | - if( !in_array( $key, self::BOOLEAN_ATTRIBUTES ))continue; |
|
151 | + if( !in_array( $key, self::BOOLEAN_ATTRIBUTES ) )continue; |
|
152 | 152 | |
153 | 153 | if( $value !== false ) { |
154 | - $filtered[ $key ] = ''; |
|
154 | + $filtered[$key] = ''; |
|
155 | 155 | continue; |
156 | 156 | } |
157 | 157 | |
158 | - unset( $filtered[ $key ] ); |
|
158 | + unset( $filtered[$key] ); |
|
159 | 159 | } |
160 | 160 | |
161 | 161 | $filteredKeys = array_filter( array_keys( $filtered ), function( $key ) use ( $filtered ) { |
162 | 162 | return !( |
163 | - empty( $filtered[ $key ] ) |
|
164 | - && !is_numeric( $filtered[ $key ] ) |
|
163 | + empty( $filtered[$key] ) |
|
164 | + && !is_numeric( $filtered[$key] ) |
|
165 | 165 | && !in_array( $key, self::BOOLEAN_ATTRIBUTES ) |
166 | 166 | ); |
167 | 167 | }); |
168 | 168 | |
169 | - return array_intersect_key( $filtered, array_flip( $filteredKeys )); |
|
169 | + return array_intersect_key( $filtered, array_flip( $filteredKeys ) ); |
|
170 | 170 | } |
171 | 171 | |
172 | 172 | /** |
@@ -183,20 +183,20 @@ discard block |
||
183 | 183 | foreach( $this->args as $key => $value ) { |
184 | 184 | |
185 | 185 | $length = strlen( $wildcard ); |
186 | - $result = substr( $key, 0, $length) === $wildcard; |
|
186 | + $result = substr( $key, 0, $length ) === $wildcard; |
|
187 | 187 | |
188 | 188 | if( $result ) { |
189 | 189 | // only allow data attributes to have an empty value |
190 | - if( $wildcard != 'data-' && empty( $value ))continue; |
|
190 | + if( $wildcard != 'data-' && empty( $value ) )continue; |
|
191 | 191 | |
192 | - if( is_array( $value )) { |
|
192 | + if( is_array( $value ) ) { |
|
193 | 193 | |
194 | 194 | if( $wildcard != 'data-' )continue; |
195 | 195 | |
196 | 196 | $value = json_encode( $value ); |
197 | 197 | } |
198 | 198 | |
199 | - $wildcards[ $key ] = $value; |
|
199 | + $wildcards[$key] = $value; |
|
200 | 200 | } |
201 | 201 | } |
202 | 202 | } |
@@ -209,7 +209,7 @@ discard block |
||
209 | 209 | */ |
210 | 210 | protected function filterInputType() |
211 | 211 | { |
212 | - if( !isset( $this->args['type'] ) || !in_array( $this->args['type'], self::INPUT_TYPES )) { |
|
212 | + if( !isset( $this->args['type'] ) || !in_array( $this->args['type'], self::INPUT_TYPES ) ) { |
|
213 | 213 | $this->args['type'] = 'text'; |
214 | 214 | } |
215 | 215 | } |
@@ -219,7 +219,7 @@ discard block |
||
219 | 219 | */ |
220 | 220 | protected function parseAttributes( array $attributes, array $args = [] ) |
221 | 221 | { |
222 | - if( !empty( $args )) { |
|
222 | + if( !empty( $args ) ) { |
|
223 | 223 | $this->args = array_change_key_case( $args ); |
224 | 224 | } |
225 | 225 |
@@ -2,8 +2,7 @@ discard block |
||
2 | 2 | |
3 | 3 | namespace GeminiLabs\Castor\Services; |
4 | 4 | |
5 | -class Normalizer |
|
6 | -{ |
|
5 | +class Normalizer { |
|
7 | 6 | const BOOLEAN_ATTRIBUTES = [ |
8 | 7 | 'autofocus', 'capture', 'checked', 'disabled', 'draggable', 'formnovalidate', 'hidden', |
9 | 8 | 'multiple', 'novalidate', 'readonly', 'required', 'selected', 'spellcheck', |
@@ -148,7 +147,9 @@ discard block |
||
148 | 147 | |
149 | 148 | // normalize truthy boolean attributes |
150 | 149 | foreach( $filtered as $key => $value ) { |
151 | - if( !in_array( $key, self::BOOLEAN_ATTRIBUTES ))continue; |
|
150 | + if( !in_array( $key, self::BOOLEAN_ATTRIBUTES )) { |
|
151 | + continue; |
|
152 | + } |
|
152 | 153 | |
153 | 154 | if( $value !== false ) { |
154 | 155 | $filtered[ $key ] = ''; |
@@ -187,11 +188,15 @@ discard block |
||
187 | 188 | |
188 | 189 | if( $result ) { |
189 | 190 | // only allow data attributes to have an empty value |
190 | - if( $wildcard != 'data-' && empty( $value ))continue; |
|
191 | + if( $wildcard != 'data-' && empty( $value )) { |
|
192 | + continue; |
|
193 | + } |
|
191 | 194 | |
192 | 195 | if( is_array( $value )) { |
193 | 196 | |
194 | - if( $wildcard != 'data-' )continue; |
|
197 | + if( $wildcard != 'data-' ) { |
|
198 | + continue; |
|
199 | + } |
|
195 | 200 | |
196 | 201 | $value = json_encode( $value ); |
197 | 202 | } |