pryley / site-reviews

plugin/Modules/Notification.php

Spacing +45 added lines, -45 removed lines

@@ -30,18 +30,18 @@ 
 
     public function __construct()
     {
-        $types = glsr(OptionManager::class)->get('settings.general.notifications', []);
-        $this->email = count(array_intersect(['admin', 'custom'], $types)) > 0;
-        $this->slack = in_array('slack', $types);
+        $types = glsr( OptionManager::class )->get( 'settings.general.notifications', [] );
+        $this->email = count( array_intersect( ['admin', 'custom'], $types ) ) > 0;
+        $this->slack = in_array( 'slack', $types );
         $this->types = $types;
     }
 
     /**
      * @return void
      */
-    public function send(Review $review)
+    public function send( Review $review )
     {
-        if (empty($this->types)) {
+        if( empty($this->types) ) {
             return;
         }
         $this->review = $review;
@@ -49,41 +49,41 @@ 
             'link' => $this->getLink(),
             'title' => $this->getTitle(),
         ];
-        $this->sendToEmail($args);
-        $this->sendToSlack($args);
+        $this->sendToEmail( $args );
+        $this->sendToSlack( $args );
     }
 
     /**
      * @return Email
      */
-    protected function buildEmail(array $args)
+    protected function buildEmail( array $args )
     {
-        return glsr(Email::class)->compose([
+        return glsr( Email::class )->compose( [
             'to' => $this->getEmailAddresses(),
             'subject' => $args['title'],
             'template' => 'email-notification',
             'template-tags' => [
-                'review_author' => $this->review->author ?: __('Anonymous', 'site-reviews'),
+                'review_author' => $this->review->author ?: __( 'Anonymous', 'site-reviews' ),
                 'review_content' => $this->review->content,
                 'review_email' => $this->review->email,
                 'review_ip' => $this->review->ip_address,
-                'review_link' => sprintf('<a href="%1$s">%1$s</a>', $args['link']),
+                'review_link' => sprintf( '<a href="%1$s">%1$s</a>', $args['link'] ),
                 'review_rating' => $this->review->rating,
                 'review_title' => $this->review->title,
             ],
-        ]);
+        ] );
     }
 
     /**
      * @return Slack
      */
-    protected function buildSlackNotification(array $args)
+    protected function buildSlackNotification( array $args )
     {
-        return glsr(Slack::class)->compose($this->review, [
+        return glsr( Slack::class )->compose( $this->review, [
             'button_url' => $args['link'],
-            'fallback' => $this->buildEmail($args)->read('plaintext'),
+            'fallback' => $this->buildEmail( $args )->read( 'plaintext' ),
             'pretext' => $args['title'],
-        ]);
+        ] );
     }
 
     /**
@@ -92,24 +92,24 @@ 
     protected function getEmailAddresses()
     {
         $emails = [];
-        if (in_array('admin', $this->types)) {
-            $emails[] = glsr(OptionManager::class)->getWP('admin_email');
+        if( in_array( 'admin', $this->types ) ) {
+            $emails[] = glsr( OptionManager::class )->getWP( 'admin_email' );
         }
-        if (in_array('author', $this->types)) {
-            $assignedPost = get_post(intval($this->review->assigned_to));
-            if ($assignedPost instanceof WP_Post) {
+        if( in_array( 'author', $this->types ) ) {
+            $assignedPost = get_post( intval( $this->review->assigned_to ) );
+            if( $assignedPost instanceof WP_Post ) {
                 $this->email = true;
-                $emails[] = get_the_author_meta('user_email', intval($assignedPost->post_author));
+                $emails[] = get_the_author_meta( 'user_email', intval( $assignedPost->post_author ) );
             }
         }
-        if (in_array('custom', $this->types)) {
-            $customEmails = glsr(OptionManager::class)->get('settings.general.notification_email');
-            $customEmails = str_replace([' ', ',', ';'], ',', $customEmails);
-            $customEmails = explode(',', $customEmails);
-            $emails = array_merge($emails, $customEmails);
+        if( in_array( 'custom', $this->types ) ) {
+            $customEmails = glsr( OptionManager::class )->get( 'settings.general.notification_email' );
+            $customEmails = str_replace( [' ', ',', ';'], ',', $customEmails );
+            $customEmails = explode( ',', $customEmails );
+            $emails = array_merge( $emails, $customEmails );
         }
-        $emails = array_filter(array_keys(array_flip($emails)));
-        return apply_filters('site-reviews/notification/emails', $emails, $this->review);
+        $emails = array_filter( array_keys( array_flip( $emails ) ) );
+        return apply_filters( 'site-reviews/notification/emails', $emails, $this->review );
     }
 
     /**
@@ -117,7 +117,7 @@ 
      */
     protected function getLink()
     {
-        return admin_url('post.php?post='.$this->review->ID.'&action=edit');
+        return admin_url( 'post.php?post='.$this->review->ID.'&action=edit' );
     }
 
     /**
@@ -125,29 +125,29 @@ 
      */
     protected function getTitle()
     {
-        $assignedTitle = get_the_title(intval($this->review->assigned_to));
+        $assignedTitle = get_the_title( intval( $this->review->assigned_to ) );
         $title = _nx(
             'New %s-star review',
             'New %s-star review of: %s',
-            intval(empty($assignedTitle)),
+            intval( empty($assignedTitle) ),
             'This string differs depending on whether or not the review has been assigned to a post.',
             'site-reviews'
         );
-        $title = sprintf('[%s] %s',
-            wp_specialchars_decode(glsr(OptionManager::class)->getWP('blogname'), ENT_QUOTES),
-            sprintf($title, $this->review->rating, $assignedTitle)
+        $title = sprintf( '[%s] %s',
+            wp_specialchars_decode( glsr( OptionManager::class )->getWP( 'blogname' ), ENT_QUOTES ),
+            sprintf( $title, $this->review->rating, $assignedTitle )
         );
-        return apply_filters('site-reviews/notification/title', $title, $this->review);
+        return apply_filters( 'site-reviews/notification/title', $title, $this->review );
     }
 
     /**
      * @return void
      */
-    protected function sendToEmail(array $args)
+    protected function sendToEmail( array $args )
     {
-        $email = $this->buildEmail($args);
-        if (empty($email->to)) {
-            glsr_log()->error('Email notification was not sent (missing email address)');
+        $email = $this->buildEmail( $args );
+        if( empty($email->to) ) {
+            glsr_log()->error( 'Email notification was not sent (missing email address)' );
             return;
         }
         $email->send();
@@ -156,16 +156,16 @@ 
     /**
      * @return void
      */
-    protected function sendToSlack(array $args)
+    protected function sendToSlack( array $args )
     {
-        if (!$this->slack) {
+        if( !$this->slack ) {
             return;
         }
-        $notification = $this->buildSlackNotification($args);
+        $notification = $this->buildSlackNotification( $args );
         $result = $notification->send();
-        if (is_wp_error($result)) {
+        if( is_wp_error( $result ) ) {
             $notification->review = null;
-            glsr_log()->error($result->get_error_message())->debug($notification);
+            glsr_log()->error( $result->get_error_message() )->debug( $notification );
         }
     }
 }

plugin/Controllers/EditorController/Customization.php

Spacing +13 added lines, -13 removed lines

@@ -10,9 +10,9 @@ 
     /**
      * @return array
      */
-    public function filterEditorSettings(array $settings)
+    public function filterEditorSettings( array $settings )
     {
-        if ($this->isReviewEditable()) {
+        if( $this->isReviewEditable() ) {
             $settings = [
                 'media_buttons' => false,
                 'quicktags' => false,
@@ -27,10 +27,10 @@ 
      * @param string $html
      * @return string
      */
-    public function filterEditorTextarea($html)
+    public function filterEditorTextarea( $html )
     {
-        if ($this->isReviewEditable()) {
-            $html = str_replace('<textarea', '<div id="ed_toolbar"></div><textarea', $html);
+        if( $this->isReviewEditable() ) {
+            $html = str_replace( '<textarea', '<div id="ed_toolbar"></div><textarea', $html );
         }
         return $html;
     }
@@ -40,10 +40,10 @@ 
      */
     public function removeAutosave()
     {
-        if (!$this->isReviewEditor() || $this->isReviewEditable()) {
+        if( !$this->isReviewEditor() || $this->isReviewEditable() ) {
             return;
         }
-        wp_deregister_script('autosave');
+        wp_deregister_script( 'autosave' );
     }
 
     /**
@@ -51,7 +51,7 @@ 
      */
     public function removeMetaBoxes()
     {
-        remove_meta_box('slugdiv', Application::POST_TYPE, 'advanced');
+        remove_meta_box( 'slugdiv', Application::POST_TYPE, 'advanced' );
     }
 
     /**
@@ -59,11 +59,11 @@ 
      */
     public function removePostTypeSupport()
     {
-        if (!$this->isReviewEditor() || $this->isReviewEditable()) {
+        if( !$this->isReviewEditor() || $this->isReviewEditable() ) {
             return;
         }
-        remove_post_type_support(Application::POST_TYPE, 'title');
-        remove_post_type_support(Application::POST_TYPE, 'editor');
+        remove_post_type_support( Application::POST_TYPE, 'title' );
+        remove_post_type_support( Application::POST_TYPE, 'editor' );
     }
 
     /**
@@ -71,9 +71,9 @@ 
      */
     protected function isReviewEditable()
     {
-        $postId = intval(filter_input(INPUT_GET, 'post'));
+        $postId = intval( filter_input( INPUT_GET, 'post' ) );
         return $postId > 0
-            && 'local' == glsr(Database::class)->get($postId, 'review_type')
+            && 'local' == glsr( Database::class )->get( $postId, 'review_type' )
             && $this->isReviewEditor();
     }
 

plugin/Defaults/EmailDefaults.php

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
      */
     protected function getFromEmail()
     {
-        return glsr(OptionManager::class)->getWP('admin_email');
+        return glsr( OptionManager::class )->getWP( 'admin_email' );
     }
 
     /**
@@ -41,6 +41,6 @@ 
      */
     protected function getFromName()
     {
-        return wp_specialchars_decode(glsr(OptionManager::class)->getWP('blogname'), ENT_QUOTES);
+        return wp_specialchars_decode( glsr( OptionManager::class )->getWP( 'blogname' ), ENT_QUOTES );
     }
 }

views/pages/settings/schema.php

Spacing +3 added lines, -3 removed lines

@@ -1,7 +1,7 @@
-<?php defined('WPINC') || die; ?>
+<?php defined( 'WPINC' ) || die; ?>
 
-<p><?= __('The JSON-LD schema is disabled by default. To use it, please enable the option in your blocks or shortcodes. The schema appears in Google\'s search results and shows the star rating and other information about your reviews. If the schema has been enabled, you can use Google\'s <a href="https://search.google.com/structured-data/testing-tool">Structured Data Testing Tool</a> to test your pages for valid schema data.', 'site-reviews'); ?></p>
-<p><?= __('You may override any of these options on a per-post/page basis by using its Custom Field name and adding a custom value using the <a href="https://codex.wordpress.org/Using_Custom_Fields#Usage">Custom Fields</a> metabox.', 'site-reviews'); ?></p>
+<p><?= __( 'The JSON-LD schema is disabled by default. To use it, please enable the option in your blocks or shortcodes. The schema appears in Google\'s search results and shows the star rating and other information about your reviews. If the schema has been enabled, you can use Google\'s <a href="https://search.google.com/structured-data/testing-tool">Structured Data Testing Tool</a> to test your pages for valid schema data.', 'site-reviews' ); ?></p>
+<p><?= __( 'You may override any of these options on a per-post/page basis by using its Custom Field name and adding a custom value using the <a href="https://codex.wordpress.org/Using_Custom_Fields#Usage">Custom Fields</a> metabox.', 'site-reviews' ); ?></p>
 <table class="form-table">
     <tbody>
         {{ rows }}

plugin/Modules/Notice.php

Spacing +30 added lines, -30 removed lines

@@ -13,41 +13,41 @@ 
      * @param string|array|WP_Error $message
      * @return void
      */
-    public function add($type, $message, array $args = [])
+    public function add( $type, $message, array $args = [] )
     {
-        if (empty(array_filter([$message, $type]))) {
+        if( empty(array_filter( [$message, $type] )) ) {
             return;
         }
         $args['message'] = $message;
         $args['type'] = $type;
-        add_settings_error(Application::ID, '', json_encode($this->normalize($args)));
+        add_settings_error( Application::ID, '', json_encode( $this->normalize( $args ) ) );
     }
 
     /**
      * @param string|array|WP_Error $message
      * @return void
      */
-    public function addError($message, array $args = [])
+    public function addError( $message, array $args = [] )
     {
-        $this->add('error', $message, $args);
+        $this->add( 'error', $message, $args );
     }
 
     /**
      * @param string|array|WP_Error $message
      * @return void
      */
-    public function addSuccess($message, array $args = [])
+    public function addSuccess( $message, array $args = [] )
     {
-        $this->add('success', $message, $args);
+        $this->add( 'success', $message, $args );
     }
 
     /**
      * @param string|array|WP_Error $message
      * @return void
      */
-    public function addWarning($message, array $args = [])
+    public function addWarning( $message, array $args = [] )
     {
-        $this->add('warning', $message, $args);
+        $this->add( 'warning', $message, $args );
     }
 
     /**
@@ -57,7 +57,7 @@ 
     {
         global $wp_settings_errors;
         $wp_settings_errors = [];
-        delete_transient('settings_errors');
+        delete_transient( 'settings_errors' );
         return $this;
     }
 
@@ -66,39 +66,39 @@ 
      */
     public function get()
     {
-        $notices = array_map('unserialize',
-            array_unique(array_map('serialize', get_settings_errors(Application::ID)))
+        $notices = array_map( 'unserialize',
+            array_unique( array_map( 'serialize', get_settings_errors( Application::ID ) ) )
         );
-        $notices = array_reduce($notices, function ($carry, $notice) {
-            return $carry.$this->buildNotice(json_decode($notice['message'], true));
+        $notices = array_reduce( $notices, function( $carry, $notice ) {
+            return $carry.$this->buildNotice( json_decode( $notice['message'], true ) );
         });
-        return apply_filters('site-reviews/notices', $notices);
+        return apply_filters( 'site-reviews/notices', $notices );
     }
 
     /**
      * @return string
      */
-    protected function buildNotice(array $args)
+    protected function buildNotice( array $args )
     {
-        $messages = array_reduce($args['messages'], function ($carry, $message) {
-            return $carry.glsr(Builder::class)->p($message);
+        $messages = array_reduce( $args['messages'], function( $carry, $message ) {
+            return $carry.glsr( Builder::class )->p( $message );
         });
         $class = 'notice notice-'.$args['type'];
-        if ($args['inline']) {
-            $class.= ' inline';
+        if( $args['inline'] ) {
+            $class .= ' inline';
         }
-        if ($args['dismissible']) {
-            $class.= ' is-dismissible';
+        if( $args['dismissible'] ) {
+            $class .= ' is-dismissible';
         }
-        return glsr(Builder::class)->div($messages, [
+        return glsr( Builder::class )->div( $messages, [
             'class' => $class,
-        ]);
+        ] );
     }
 
     /**
      * @return array
      */
-    protected function normalize(array $args)
+    protected function normalize( array $args )
     {
         $defaults = [
             'dismissible' => true,
@@ -106,13 +106,13 @@ 
             'message' => '',
             'type' => '',
         ];
-        $args = shortcode_atts($defaults, $args);
-        if (!in_array($args['type'], ['error', 'warning', 'success'])) {
+        $args = shortcode_atts( $defaults, $args );
+        if( !in_array( $args['type'], ['error', 'warning', 'success'] ) ) {
             $args['type'] = 'success';
         }
-        $args['messages'] = is_wp_error($args['message'])
-            ? (array) $args['message']->get_error_message()
-            : (array) $args['message'];
+        $args['messages'] = is_wp_error( $args['message'] )
+            ? (array)$args['message']->get_error_message()
+            : (array)$args['message'];
         unset($args['message']);
         return $args;
     }

views/pages/welcome/upgrade-guide.php

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php defined('WPINC') || die; ?>
+<?php defined( 'WPINC' ) || die; ?>
 
 <p class="about-description">If you are using any Site Reviews code snippets or have built any custom integrations with Site Reviews, please make sure to read this upgrade guide.</p>
 <div class="is-fullwidth">

views/pages/settings/index.php

Spacing +6 added lines, -6 removed lines

@@ -1,21 +1,21 @@
-<?php defined('WPINC') || die; ?>
+<?php defined( 'WPINC' ) || die; ?>
 
 <div class="wrap">
-    <h1 class="wp-heading-inline"><?= esc_html(get_admin_page_title()); ?></h1>
+    <h1 class="wp-heading-inline"><?= esc_html( get_admin_page_title() ); ?></h1>
     <?= $notices; ?>
     <h2 class="glsr-nav-tab-wrapper nav-tab-wrapper">
-        <?php foreach ($tabs as $id => $title) : ?>
+        <?php foreach( $tabs as $id => $title ) : ?>
         <a class="glsr-nav-tab nav-tab" href="#<?= $id; ?>"><?= $title; ?></a>
         <?php endforeach; ?>
     </h2>
     <form class="glsr-form" action="options.php" enctype="multipart/form-data" method="post">
-        <?php foreach ($tabs as $id => $title) : ?>
+        <?php foreach( $tabs as $id => $title ) : ?>
         <div class="glsr-nav-view ui-tabs-hide" id="<?= $id; ?>">
-            <?= $settings->buildFields($id); ?>
+            <?= $settings->buildFields( $id ); ?>
         </div>
         <?php endforeach; ?>
         <input type="hidden" name="_active_tab">
-        <?php settings_fields(glsr()->id.'-settings'); ?>
+        <?php settings_fields( glsr()->id.'-settings' ); ?>
         <?php submit_button(); ?>
     </form>
 </div>

views/pages/tools/index.php

Spacing +5 added lines, -5 removed lines

@@ -1,16 +1,16 @@
-<?php defined('WPINC') || die; ?>
+<?php defined( 'WPINC' ) || die; ?>
 
 <div class="wrap">
-    <h1 class="wp-heading-inline"><?= esc_html(get_admin_page_title()); ?></h1>
+    <h1 class="wp-heading-inline"><?= esc_html( get_admin_page_title() ); ?></h1>
     <?= $notices; ?>
     <h2 class="glsr-nav-tab-wrapper nav-tab-wrapper">
-        <?php foreach ($tabs as $id => $title) : ?>
+        <?php foreach( $tabs as $id => $title ) : ?>
         <a class="glsr-nav-tab nav-tab" href="#<?= $id; ?>"><?= $title; ?></a>
         <?php endforeach; ?>
     </h2>
-    <?php foreach ($tabs as $id => $title) : ?>
+    <?php foreach( $tabs as $id => $title ) : ?>
     <div class="glsr-nav-view ui-tabs-hide" id="<?= $id; ?>">
-        <?php $template->render('pages/tools/'.$id, $data); ?>
+        <?php $template->render( 'pages/tools/'.$id, $data ); ?>
     </div>
     <?php endforeach; ?>
     <input type="hidden" name="_active_tab">

plugin/Modules/Html/Field.php

Spacing +43 added lines, -43 removed lines

@@ -14,9 +14,9 @@ 
      */
     public $field;
 
-    public function __construct(array $field = [])
+    public function __construct( array $field = [] )
     {
-        $this->field = wp_parse_args($field, [
+        $this->field = wp_parse_args( $field, [
             'errors' => false,
             'is_hidden' => false,
             'is_multi' => false,
@@ -26,7 +26,7 @@ 
             'is_valid' => true,
             'is_widget' => false,
             'path' => '',
-        ]);
+        ] );
         $this->normalize();
     }
 
@@ -35,7 +35,7 @@ 
      */
     public function __toString()
     {
-        return (string) $this->build();
+        return (string)$this->build();
     }
 
     /**
@@ -43,16 +43,16 @@ 
      */
     public function build()
     {
-        if (!$this->field['is_valid']) {
+        if( !$this->field['is_valid'] ) {
             return;
         }
-        if ($this->field['is_raw']) {
-            return glsr(Builder::class)->{$this->field['type']}($this->field);
+        if( $this->field['is_raw'] ) {
+            return glsr( Builder::class )->{$this->field['type']}($this->field);
         }
-        if (!$this->field['is_setting']) {
+        if( !$this->field['is_setting'] ) {
             return $this->buildField();
         }
-        if (!$this->field['is_multi']) {
+        if( !$this->field['is_multi'] ) {
             return $this->buildSettingField();
         }
         return $this->buildSettingMultiField();
@@ -71,22 +71,22 @@ 
      */
     protected function buildField()
     {
-        $field = glsr(Template::class)->build('templates/form/field_'.$this->field['type'], [
+        $field = glsr( Template::class )->build( 'templates/form/field_'.$this->field['type'], [
             'context' => [
                 'class' => $this->getFieldClass(),
                 'errors' => $this->getFieldErrors(),
-                'field' => glsr(Builder::class)->raw($this->field),
-                'label' => glsr(Builder::class)->label([
+                'field' => glsr( Builder::class )->raw( $this->field ),
+                'label' => glsr( Builder::class )->label( [
                     'class' => 'glsr-'.$this->field['type'].'-label',
                     'for' => $this->field['id'],
                     'is_public' => $this->field['is_public'],
                     'text' => $this->field['label'].'<span></span>',
                     'type' => $this->field['type'],
-                ]),
+                ] ),
             ],
             'field' => $this->field,
-        ]);
-        return apply_filters('site-reviews/rendered/field', $field, $this->field['type'], $this->field);
+        ] );
+        return apply_filters( 'site-reviews/rendered/field', $field, $this->field['type'], $this->field );
     }
 
     /**
@@ -94,14 +94,14 @@ 
      */
     protected function buildSettingField()
     {
-        return glsr(Template::class)->build('partials/form/table-row', [
+        return glsr( Template::class )->build( 'partials/form/table-row', [
             'context' => [
                 'class' => $this->getFieldClass(),
-                'field' => glsr(Builder::class)->{$this->field['type']}($this->field),
-                'label' => glsr(Builder::class)->label($this->field['legend'], ['for' => $this->field['id']]),
+                'field' => glsr( Builder::class )->{$this->field['type']}($this->field),
+                'label' => glsr( Builder::class )->label( $this->field['legend'], ['for' => $this->field['id']] ),
             ],
             'field' => $this->field,
-        ]);
+        ] );
     }
 
     /**
@@ -111,16 +111,16 @@ 
     {
         $dependsOn = $this->getFieldDependsOn();
         unset($this->field['data-depends']);
-        return glsr(Template::class)->build('partials/form/table-row-multiple', [
+        return glsr( Template::class )->build( 'partials/form/table-row-multiple', [
             'context' => [
                 'class' => $this->getFieldClass(),
                 'depends_on' => $dependsOn,
-                'field' => glsr(Builder::class)->{$this->field['type']}($this->field),
-                'label' => glsr(Builder::class)->label($this->field['legend'], ['for' => $this->field['id']]),
+                'field' => glsr( Builder::class )->{$this->field['type']}($this->field),
+                'label' => glsr( Builder::class )->label( $this->field['legend'], ['for' => $this->field['id']] ),
                 'legend' => $this->field['legend'],
             ],
             'field' => $this->field,
-        ]);
+        ] );
     }
 
     /**
@@ -129,17 +129,17 @@ 
     protected function getFieldClass()
     {
         $classes = [];
-        if (!empty($this->field['errors'])) {
+        if( !empty($this->field['errors']) ) {
             $classes[] = 'glsr-has-error';
         }
-        if ($this->field['is_hidden']) {
+        if( $this->field['is_hidden'] ) {
             $classes[] = 'hidden';
         }
-        if (!empty($this->field['required'])) {
+        if( !empty($this->field['required']) ) {
             $classes[] = 'glsr-required';
         }
-        $classes = apply_filters('site-reviews/rendered/field/classes', $classes, $this->field);
-        return implode(' ', $classes);
+        $classes = apply_filters( 'site-reviews/rendered/field/classes', $classes, $this->field );
+        return implode( ' ', $classes );
     }
 
     /**
@@ -157,18 +157,18 @@ 
      */
     protected function getFieldErrors()
     {
-        if (empty($this->field['errors']) || !is_array($this->field['errors'])) {
+        if( empty($this->field['errors']) || !is_array( $this->field['errors'] ) ) {
             return;
         }
-        $errors = array_reduce($this->field['errors'], function ($carry, $error) {
-            return $carry.glsr(Builder::class)->span($error, ['class' => 'glsr-field-error']);
+        $errors = array_reduce( $this->field['errors'], function( $carry, $error ) {
+            return $carry.glsr( Builder::class )->span( $error, ['class' => 'glsr-field-error'] );
         });
-        return glsr(Template::class)->build('templates/form/field-errors', [
+        return glsr( Template::class )->build( 'templates/form/field-errors', [
             'context' => [
                 'errors' => $errors,
             ],
             'field' => $this->field,
-        ]);
+        ] );
     }
 
     /**
@@ -190,17 +190,17 @@ 
         $requiredValues = [
             'name', 'type',
         ];
-        foreach ($requiredValues as $value) {
-            if (isset($this->field[$value])) {
+        foreach( $requiredValues as $value ) {
+            if( isset($this->field[$value]) ) {
                 continue;
             }
             $missingValues[] = $value;
             $this->field['is_valid'] = false;
         }
-        if (!empty($missingValues)) {
+        if( !empty($missingValues) ) {
             glsr_log()
-                ->warning('Field is missing: '.implode(', ', $missingValues))
-                ->debug($this->field);
+                ->warning( 'Field is missing: '.implode( ', ', $missingValues ) )
+                ->debug( $this->field );
         }
         return $this->field['is_valid'];
     }
@@ -210,13 +210,13 @@ 
      */
     protected function normalize()
     {
-        if (!$this->isFieldValid()) {
+        if( !$this->isFieldValid() ) {
             return;
         }
         $this->field['path'] = $this->field['name'];
-        $className = Helper::buildClassName($this->field['type'], __NAMESPACE__.'\Fields');
-        if (class_exists($className)) {
-            $this->field = $className::merge($this->field);
+        $className = Helper::buildClassName( $this->field['type'], __NAMESPACE__.'\Fields' );
+        if( class_exists( $className ) ) {
+            $this->field = $className::merge( $this->field );
         }
         $this->normalizeFieldId();
         $this->normalizeFieldName();
@@ -227,7 +227,7 @@ 
      */
     protected function normalizeFieldId()
     {
-        if (isset($this->field['id']) || $this->field['is_raw']) {
+        if( isset($this->field['id']) || $this->field['is_raw'] ) {
             return;
         }
         $this->field['id'] = Str::convertPathToId(