pryley / site-reviews

plugin/Controllers/EditorController.php

Spacing +135 added lines, -135 removed lines

@@ -25,7 +25,7 @@ 
      */
     public function customizePostStatusLabels()
     {
-        glsr(Labels::class)->customizePostStatusLabels();
+        glsr( Labels::class )->customizePostStatusLabels();
     }
 
     /**
@@ -33,10 +33,10 @@ 
      * @return array
      * @filter wp_editor_settings
      */
-    public function filterEditorSettings($settings)
+    public function filterEditorSettings( $settings )
     {
-        return glsr(Customization::class)->filterEditorSettings(
-            glsr(Helper::class)->consolidateArray($settings)
+        return glsr( Customization::class )->filterEditorSettings(
+            glsr( Helper::class )->consolidateArray( $settings )
         );
     }
 
@@ -46,9 +46,9 @@ 
      * @return string
      * @filter the_editor
      */
-    public function filterEditorTextarea($html)
+    public function filterEditorTextarea( $html )
     {
-        return glsr(Customization::class)->filterEditorTextarea($html);
+        return glsr( Customization::class )->filterEditorTextarea( $html );
     }
 
     /**
@@ -58,12 +58,12 @@ 
      * @return bool
      * @filter is_protected_meta
      */
-    public function filterIsProtectedMeta($protected, $metaKey, $metaType)
+    public function filterIsProtectedMeta( $protected, $metaKey, $metaType )
     {
-        if ('post' == $metaType && Application::POST_TYPE == get_post_type()) {
-            $values = glsr(CreateReviewDefaults::class)->unguarded();
-            $values = glsr(Helper::class)->prefixArrayKeys($values);
-            if (array_key_exists($metaKey, $values)) {
+        if( 'post' == $metaType && Application::POST_TYPE == get_post_type() ) {
+            $values = glsr( CreateReviewDefaults::class )->unguarded();
+            $values = glsr( Helper::class )->prefixArrayKeys( $values );
+            if( array_key_exists( $metaKey, $values ) ) {
                 $protected = false;
             }
         }
@@ -77,9 +77,9 @@ 
      * @return string
      * @filter gettext
      */
-    public function filterPostStatusLabels($translation, $text, $domain)
+    public function filterPostStatusLabels( $translation, $text, $domain )
     {
-        return glsr(Labels::class)->filterPostStatusLabels($translation, $text, $domain);
+        return glsr( Labels::class )->filterPostStatusLabels( $translation, $text, $domain );
     }
 
     /**
@@ -89,9 +89,9 @@ 
      * @return string
      * @filter gettext_with_context
      */
-    public function filterPostStatusLabelsWithContext($translation, $text, $context, $domain)
+    public function filterPostStatusLabelsWithContext( $translation, $text, $context, $domain )
     {
-        return glsr(Labels::class)->filterPostStatusLabels($translation, $text, $domain);
+        return glsr( Labels::class )->filterPostStatusLabels( $translation, $text, $domain );
     }
 
     /**
@@ -99,10 +99,10 @@ 
      * @return array
      * @filter post_updated_messages
      */
-    public function filterUpdateMessages($messages)
+    public function filterUpdateMessages( $messages )
     {
-        return glsr(Labels::class)->filterUpdateMessages(
-            glsr(Helper::class)->consolidateArray($messages)
+        return glsr( Labels::class )->filterUpdateMessages(
+            glsr( Helper::class )->consolidateArray( $messages )
         );
     }
 
@@ -110,14 +110,14 @@ 
      * @return void
      * @action add_meta_boxes_{Application::POST_TYPE}
      */
-    public function registerMetaBoxes($post)
+    public function registerMetaBoxes( $post )
     {
-        add_meta_box(Application::ID.'_assigned_to', __('Assigned To', 'site-reviews'), [$this, 'renderAssignedToMetabox'], null, 'side');
-        add_meta_box(Application::ID.'_review', __('Details', 'site-reviews'), [$this, 'renderDetailsMetaBox'], null, 'side');
-        if ('local' != glsr(Database::class)->get($post->ID, 'review_type')) {
+        add_meta_box( Application::ID.'_assigned_to', __( 'Assigned To', 'site-reviews' ), [$this, 'renderAssignedToMetabox'], null, 'side' );
+        add_meta_box( Application::ID.'_review', __( 'Details', 'site-reviews' ), [$this, 'renderDetailsMetaBox'], null, 'side' );
+        if( 'local' != glsr( Database::class )->get( $post->ID, 'review_type' ) ) {
             return;
         }
-        add_meta_box(Application::ID.'_response', __('Respond Publicly', 'site-reviews'), [$this, 'renderResponseMetaBox'], null, 'normal');
+        add_meta_box( Application::ID.'_response', __( 'Respond Publicly', 'site-reviews' ), [$this, 'renderResponseMetaBox'], null, 'normal' );
     }
 
     /**
@@ -126,7 +126,7 @@ 
      */
     public function removeAutosave()
     {
-        glsr(Customization::class)->removeAutosave();
+        glsr( Customization::class )->removeAutosave();
     }
 
     /**
@@ -135,7 +135,7 @@ 
      */
     public function removeMetaBoxes()
     {
-        glsr(Customization::class)->removeMetaBoxes();
+        glsr( Customization::class )->removeMetaBoxes();
     }
 
     /**
@@ -143,7 +143,7 @@ 
      */
     public function removePostTypeSupport()
     {
-        glsr(Customization::class)->removePostTypeSupport();
+        glsr( Customization::class )->removePostTypeSupport();
     }
 
     /**
@@ -151,17 +151,17 @@ 
      * @return void
      * @callback add_meta_box
      */
-    public function renderAssignedToMetabox($post)
+    public function renderAssignedToMetabox( $post )
     {
-        if (!$this->isReviewPostType($post)) {
+        if( !$this->isReviewPostType( $post ) ) {
             return;
         }
-        $assignedTo = (string) glsr(Database::class)->get($post->ID, 'assigned_to');
-        wp_nonce_field('assigned_to', '_nonce-assigned-to', false);
-        glsr()->render('partials/editor/metabox-assigned-to', [
+        $assignedTo = (string)glsr( Database::class )->get( $post->ID, 'assigned_to' );
+        wp_nonce_field( 'assigned_to', '_nonce-assigned-to', false );
+        glsr()->render( 'partials/editor/metabox-assigned-to', [
             'id' => $assignedTo,
-            'template' => $this->buildAssignedToTemplate($assignedTo, $post),
-        ]);
+            'template' => $this->buildAssignedToTemplate( $assignedTo, $post ),
+        ] );
     }
 
     /**
@@ -169,16 +169,16 @@ 
      * @return void
      * @callback add_meta_box
      */
-    public function renderDetailsMetaBox($post)
+    public function renderDetailsMetaBox( $post )
     {
-        if (!$this->isReviewPostType($post)) {
+        if( !$this->isReviewPostType( $post ) ) {
             return;
         }
-        $review = glsr_get_review($post);
-        glsr()->render('partials/editor/metabox-details', [
-            'button' => $this->buildDetailsMetaBoxRevertButton($review, $post),
-            'metabox' => $this->normalizeDetailsMetaBox($review),
-        ]);
+        $review = glsr_get_review( $post );
+        glsr()->render( 'partials/editor/metabox-details', [
+            'button' => $this->buildDetailsMetaBoxRevertButton( $review, $post ),
+            'metabox' => $this->normalizeDetailsMetaBox( $review ),
+        ] );
     }
 
     /**
@@ -187,16 +187,16 @@ 
      */
     public function renderPinnedInPublishMetaBox()
     {
-        if (!$this->isReviewPostType(get_post())) {
+        if( !$this->isReviewPostType( get_post() ) ) {
             return;
         }
-        glsr(Template::class)->render('partials/editor/pinned', [
+        glsr( Template::class )->render( 'partials/editor/pinned', [
             'context' => [
-                'no' => __('No', 'site-reviews'),
-                'yes' => __('Yes', 'site-reviews'),
+                'no' => __( 'No', 'site-reviews' ),
+                'yes' => __( 'Yes', 'site-reviews' ),
             ],
-            'pinned' => wp_validate_boolean(glsr(Database::class)->get(get_the_ID(), 'pinned')),
-        ]);
+            'pinned' => wp_validate_boolean( glsr( Database::class )->get( get_the_ID(), 'pinned' ) ),
+        ] );
     }
 
     /**
@@ -204,15 +204,15 @@ 
      * @return void
      * @callback add_meta_box
      */
-    public function renderResponseMetaBox($post)
+    public function renderResponseMetaBox( $post )
     {
-        if (!$this->isReviewPostType($post)) {
+        if( !$this->isReviewPostType( $post ) ) {
             return;
         }
-        wp_nonce_field('response', '_nonce-response', false);
-        glsr()->render('partials/editor/metabox-response', [
-            'response' => glsr(Database::class)->get($post->ID, 'response'),
-        ]);
+        wp_nonce_field( 'response', '_nonce-response', false );
+        glsr()->render( 'partials/editor/metabox-response', [
+            'response' => glsr( Database::class )->get( $post->ID, 'response' ),
+        ] );
     }
 
     /**
@@ -220,15 +220,15 @@ 
      * @return void
      * @action edit_form_after_title
      */
-    public function renderReviewEditor($post)
+    public function renderReviewEditor( $post )
     {
-        if (!$this->isReviewPostType($post) || $this->isReviewEditable($post)) {
+        if( !$this->isReviewPostType( $post ) || $this->isReviewEditable( $post ) ) {
             return;
         }
-        glsr()->render('partials/editor/review', [
+        glsr()->render( 'partials/editor/review', [
             'post' => $post,
-            'response' => glsr(Database::class)->get($post->ID, 'response'),
-        ]);
+            'response' => glsr( Database::class )->get( $post->ID, 'response' ),
+        ] );
     }
 
     /**
@@ -238,11 +238,11 @@ 
     public function renderReviewFields()
     {
         $screen = glsr_current_screen();
-        if ('post' != $screen->base || Application::POST_TYPE != $screen->post_type) {
+        if( 'post' != $screen->base || Application::POST_TYPE != $screen->post_type ) {
             return;
         }
-        add_action('edit_form_after_title', [$this, 'renderReviewEditor']);
-        add_action('edit_form_top', [$this, 'renderReviewNotice']);
+        add_action( 'edit_form_after_title', [$this, 'renderReviewEditor'] );
+        add_action( 'edit_form_top', [$this, 'renderReviewNotice'] );
     }
 
     /**
@@ -250,20 +250,20 @@ 
      * @return void
      * @action edit_form_top
      */
-    public function renderReviewNotice($post)
+    public function renderReviewNotice( $post )
     {
-        if (!$this->isReviewPostType($post) || $this->isReviewEditable($post)) {
+        if( !$this->isReviewPostType( $post ) || $this->isReviewEditable( $post ) ) {
             return;
         }
-        glsr(Notice::class)->addWarning(sprintf(
-            __('%s reviews are read-only.', 'site-reviews'),
-            glsr(Columns::class)->buildColumnReviewType($post->ID)
-        ));
-        glsr(Template::class)->render('partials/editor/notice', [
+        glsr( Notice::class )->addWarning( sprintf(
+            __( '%s reviews are read-only.', 'site-reviews' ),
+            glsr( Columns::class )->buildColumnReviewType( $post->ID )
+        ) );
+        glsr( Template::class )->render( 'partials/editor/notice', [
             'context' => [
-                'notices' => glsr(Notice::class)->get(),
+                'notices' => glsr( Notice::class )->get(),
             ],
-        ]);
+        ] );
     }
 
     /**
@@ -272,16 +272,16 @@ 
      * @see glsr_categories_meta_box()
      * @callback register_taxonomy
      */
-    public function renderTaxonomyMetabox($post)
+    public function renderTaxonomyMetabox( $post )
     {
-        if (!$this->isReviewPostType($post)) {
+        if( !$this->isReviewPostType( $post ) ) {
             return;
         }
-        glsr()->render('partials/editor/metabox-categories', [
+        glsr()->render( 'partials/editor/metabox-categories', [
             'post' => $post,
             'tax_name' => Application::TAXONOMY,
-            'taxonomy' => get_taxonomy(Application::TAXONOMY),
-        ]);
+            'taxonomy' => get_taxonomy( Application::TAXONOMY ),
+        ] );
     }
 
     /**
@@ -291,12 +291,12 @@ 
      */
     public function revertReview()
     {
-        if (Application::ID != filter_input(INPUT_GET, 'plugin')) {
+        if( Application::ID != filter_input( INPUT_GET, 'plugin' ) ) {
             return;
         }
-        check_admin_referer('revert-review_'.($postId = $this->getPostId()));
-        glsr(ReviewManager::class)->revert($postId);
-        $this->redirect($postId, 52);
+        check_admin_referer( 'revert-review_'.($postId = $this->getPostId()) );
+        glsr( ReviewManager::class )->revert( $postId );
+        $this->redirect( $postId, 52 );
     }
 
     /**
@@ -304,79 +304,79 @@ 
      * @return void
      * @action save_post_.Application::POST_TYPE
      */
-    public function saveMetaboxes($postId)
+    public function saveMetaboxes( $postId )
     {
-        glsr(Metaboxes::class)->saveAssignedToMetabox($postId);
-        glsr(Metaboxes::class)->saveResponseMetabox($postId);
-        do_action('site-reviews/review/saved', glsr_get_review($postId));
+        glsr( Metaboxes::class )->saveAssignedToMetabox( $postId );
+        glsr( Metaboxes::class )->saveResponseMetabox( $postId );
+        do_action( 'site-reviews/review/saved', glsr_get_review( $postId ) );
     }
 
     /**
      * @param string $assignedTo
      * @return string
      */
-    protected function buildAssignedToTemplate($assignedTo, WP_Post $post)
+    protected function buildAssignedToTemplate( $assignedTo, WP_Post $post )
     {
-        $assignedPost = glsr(Database::class)->getAssignedToPost($post->ID, $assignedTo);
-        if (!($assignedPost instanceof WP_Post)) {
+        $assignedPost = glsr( Database::class )->getAssignedToPost( $post->ID, $assignedTo );
+        if( !($assignedPost instanceof WP_Post) ) {
             return;
         }
-        return glsr(Template::class)->build('partials/editor/assigned-post', [
+        return glsr( Template::class )->build( 'partials/editor/assigned-post', [
             'context' => [
-                'data.url' => (string) get_permalink($assignedPost),
-                'data.title' => get_the_title($assignedPost),
+                'data.url' => (string)get_permalink( $assignedPost ),
+                'data.title' => get_the_title( $assignedPost ),
             ],
-        ]);
+        ] );
     }
 
     /**
      * @return string
      */
-    protected function buildDetailsMetaBoxRevertButton(Review $review, WP_Post $post)
+    protected function buildDetailsMetaBoxRevertButton( Review $review, WP_Post $post )
     {
-        $isModified = !glsr(Helper::class)->compareArrays(
+        $isModified = !glsr( Helper::class )->compareArrays(
             [$review->title, $review->content, $review->date],
             [
-                glsr(Database::class)->get($post->ID, 'title'),
-                glsr(Database::class)->get($post->ID, 'content'),
-                glsr(Database::class)->get($post->ID, 'date'),
+                glsr( Database::class )->get( $post->ID, 'title' ),
+                glsr( Database::class )->get( $post->ID, 'content' ),
+                glsr( Database::class )->get( $post->ID, 'date' ),
             ]
         );
-        if ($isModified) {
+        if( $isModified ) {
             $revertUrl = wp_nonce_url(
-                admin_url('post.php?post='.$post->ID.'&action=revert&plugin='.Application::ID),
+                admin_url( 'post.php?post='.$post->ID.'&action=revert&plugin='.Application::ID ),
                 'revert-review_'.$post->ID
             );
-            return glsr(Builder::class)->a(__('Revert Changes', 'site-reviews'), [
+            return glsr( Builder::class )->a( __( 'Revert Changes', 'site-reviews' ), [
                 'class' => 'button button-large',
                 'href' => $revertUrl,
                 'id' => 'revert',
-            ]);
+            ] );
         }
-        return glsr(Builder::class)->button(__('Nothing to Revert', 'site-reviews'), [
+        return glsr( Builder::class )->button( __( 'Nothing to Revert', 'site-reviews' ), [
             'class' => 'button-large',
             'disabled' => true,
             'id' => 'revert',
-        ]);
+        ] );
     }
 
     /**
      * @param object $review
      * @return string|void
      */
-    protected function getReviewType($review)
+    protected function getReviewType( $review )
     {
-        if (count(glsr()->reviewTypes) < 2) {
+        if( count( glsr()->reviewTypes ) < 2 ) {
             return;
         }
-        $reviewType = array_key_exists($review->review_type, glsr()->reviewTypes)
+        $reviewType = array_key_exists( $review->review_type, glsr()->reviewTypes )
             ? glsr()->reviewTypes[$review->review_type]
-            : __('Unknown', 'site-reviews');
-        if (!empty($review->url)) {
-            $reviewType = glsr(Builder::class)->a($reviewType, [
+            : __( 'Unknown', 'site-reviews' );
+        if( !empty($review->url) ) {
+            $reviewType = glsr( Builder::class )->a( $reviewType, [
                 'href' => $review->url,
                 'target' => '_blank',
-            ]);
+            ] );
         }
         return $reviewType;
     }
@@ -384,18 +384,18 @@ 
     /**
      * @return bool
      */
-    protected function isReviewEditable($post)
+    protected function isReviewEditable( $post )
     {
-        return $this->isReviewPostType($post)
-            && post_type_supports(Application::POST_TYPE, 'title')
-            && 'local' == glsr(Database::class)->get($post->ID, 'review_type');
+        return $this->isReviewPostType( $post )
+            && post_type_supports( Application::POST_TYPE, 'title' )
+            && 'local' == glsr( Database::class )->get( $post->ID, 'review_type' );
     }
 
     /**
      * @param mixed $post
      * @return bool
      */
-    protected function isReviewPostType($post)
+    protected function isReviewPostType( $post )
     {
         return $post instanceof WP_Post && Application::POST_TYPE == $post->post_type;
     }
@@ -403,29 +403,29 @@ 
     /**
      * @return array
      */
-    protected function normalizeDetailsMetaBox(Review $review)
+    protected function normalizeDetailsMetaBox( Review $review )
     {
         $user = empty($review->user_id)
-            ? __('Unregistered user', 'site-reviews')
-            : glsr(Builder::class)->a(get_the_author_meta('display_name', $review->user_id), [
-                'href' => get_author_posts_url($review->user_id),
-            ]);
+            ? __( 'Unregistered user', 'site-reviews' )
+            : glsr( Builder::class )->a( get_the_author_meta( 'display_name', $review->user_id ), [
+                'href' => get_author_posts_url( $review->user_id ),
+            ] );
         $email = empty($review->email)
             ? '&mdash;'
-            : glsr(Builder::class)->a($review->email, [
-                'href' => 'mailto:'.$review->email.'?subject='.esc_attr(__('RE:', 'site-reviews').' '.$review->title),
-            ]);
+            : glsr( Builder::class )->a( $review->email, [
+                'href' => 'mailto:'.$review->email.'?subject='.esc_attr( __( 'RE:', 'site-reviews' ).' '.$review->title ),
+            ] );
         $metabox = [
-            __('Rating', 'site-reviews') => glsr_star_rating($review->rating),
-            __('Type', 'site-reviews') => $this->getReviewType($review),
-            __('Date', 'site-reviews') => get_date_from_gmt($review->date, 'F j, Y'),
-            __('Name', 'site-reviews') => $review->author,
-            __('Email', 'site-reviews') => $email,
-            __('User', 'site-reviews') => $user,
-            __('IP Address', 'site-reviews') => $review->ip_address,
-            __('Avatar', 'site-reviews') => sprintf('<img src="%s" width="96">', $review->avatar),
+            __( 'Rating', 'site-reviews' ) => glsr_star_rating( $review->rating ),
+            __( 'Type', 'site-reviews' ) => $this->getReviewType( $review ),
+            __( 'Date', 'site-reviews' ) => get_date_from_gmt( $review->date, 'F j, Y' ),
+            __( 'Name', 'site-reviews' ) => $review->author,
+            __( 'Email', 'site-reviews' ) => $email,
+            __( 'User', 'site-reviews' ) => $user,
+            __( 'IP Address', 'site-reviews' ) => $review->ip_address,
+            __( 'Avatar', 'site-reviews' ) => sprintf( '<img src="%s" width="96">', $review->avatar ),
         ];
-        return array_filter(apply_filters('site-reviews/metabox/details', $metabox, $review));
+        return array_filter( apply_filters( 'site-reviews/metabox/details', $metabox, $review ) );
     }
 
     /**
@@ -433,16 +433,16 @@ 
      * @param int $messageIndex
      * @return void
      */
-    protected function redirect($postId, $messageIndex)
+    protected function redirect( $postId, $messageIndex )
     {
         $referer = wp_get_referer();
         $hasReferer = !$referer
-            || false !== strpos($referer, 'post.php')
-            || false !== strpos($referer, 'post-new.php');
+            || false !== strpos( $referer, 'post.php' )
+            || false !== strpos( $referer, 'post-new.php' );
         $redirectUri = $hasReferer
-            ? remove_query_arg(['deleted', 'ids', 'trashed', 'untrashed'], $referer)
-            : get_edit_post_link($postId);
-        wp_safe_redirect(add_query_arg(['message' => $messageIndex], $redirectUri));
+            ? remove_query_arg( ['deleted', 'ids', 'trashed', 'untrashed'], $referer )
+            : get_edit_post_link( $postId );
+        wp_safe_redirect( add_query_arg( ['message' => $messageIndex], $redirectUri ) );
         exit;
     }
 }

plugin/Modules/Rebusify.php

Spacing +21 added lines, -21 removed lines

@@ -11,28 +11,28 @@ 
     /**
      * @return void|array
      */
-    public function sendReview(Review $review)
+    public function sendReview( Review $review )
     {
-        return $this->send('index.php', [
-            'body' => $this->getBodyForReview($review),
+        return $this->send( 'index.php', [
+            'body' => $this->getBodyForReview( $review ),
             'timeout' => 120,
-        ]);
+        ] );
     }
 
     /**
      * @return void|array
      */
-    public function sendReviewResponse(Review $review)
+    public function sendReviewResponse( Review $review )
     {
-        return $this->send('fetch_customer_reply.php', [
-            'body' => $this->getBodyForResponse($review),
-        ]);
+        return $this->send( 'fetch_customer_reply.php', [
+            'body' => $this->getBodyForResponse( $review ),
+        ] );
     }
 
     /**
      * @return array
      */
-    protected function getBodyForResponse(Review $review)
+    protected function getBodyForResponse( Review $review )
     {
         $rebusifyResponse = [
             'reply' => $review->response, // what is the 300 character limit for?
@@ -40,13 +40,13 @@ 
             'review_transaction_id' => '', // @todo
             'type' => 'M',
         ];
-        return apply_filters('site-reviews/rebusify/response', $rebusifyResponse, $review);
+        return apply_filters( 'site-reviews/rebusify/response', $rebusifyResponse, $review );
     }
 
     /**
      * @return array
      */
-    protected function getBodyForReview(Review $review)
+    protected function getBodyForReview( Review $review )
     {
         $rebusifyReview = [
             'domain' => get_site_url(),
@@ -57,30 +57,30 @@ 
             'title' => $review->title, // what is the 35 character limit for?
             'transaction' => '', // @todo
         ];
-        return apply_filters('site-reviews/rebusify/review', $rebusifyReview, $review);
+        return apply_filters( 'site-reviews/rebusify/review', $rebusifyReview, $review );
     }
 
     /**
      * @return void|array
      */
-    protected function send($endpoint, $args)
+    protected function send( $endpoint, $args )
     {
-        $args = wp_parse_args($args, [
+        $args = wp_parse_args( $args, [
             'blocking' => false,
             'body' => [],
             'headers' => ['Content-Type' => 'application/x-www-form-urlencoded'],
             'redirection' => 5,
             'sslverify' => false,
             'timeout' => 5,
-        ]);
-        $response = wp_remote_post(trailingslashit(static::API_URL).$endpoint, $args);
-        if (is_wp_error($response)) {
-            glsr_log()->error('REBUSIFY: '.$response->get_error_message());
+        ] );
+        $response = wp_remote_post( trailingslashit( static::API_URL ).$endpoint, $args );
+        if( is_wp_error( $response ) ) {
+            glsr_log()->error( 'REBUSIFY: '.$response->get_error_message() );
             return;
         }
-        if (200 === wp_remote_retrieve_response_code($response)) {
-            $responsedata = wp_remote_retrieve_body($response);
-            return json_decode($responsedata, true);
+        if( 200 === wp_remote_retrieve_response_code( $response ) ) {
+            $responsedata = wp_remote_retrieve_body( $response );
+            return json_decode( $responsedata, true );
         }
     }
 }

plugin/Contracts/MultilingualContract.php

Spacing +2 added lines, -2 removed lines

@@ -8,12 +8,12 @@
      * @param int|string $postId
      * @return \WP_Post|void|null
      */
-    public function getPost($postId);
+    public function getPost( $postId );
 
     /**
      * @return array
      */
-    public function getPostIds(array $postIds);
+    public function getPostIds( array $postIds );
 
     /**
      * @return bool

plugin/Shortcodes/Shortcode.php

Spacing +58 added lines, -58 removed lines

@@ -25,17 +25,17 @@ 
      * @param string $type
      * @return string
      */
-    public function build($atts, array $args = [], $type = 'shortcode')
+    public function build( $atts, array $args = [], $type = 'shortcode' )
     {
         $this->partialName = $this->getShortcodePartialName();
         $this->shortcodeName = $this->getShortcodeName();
-        $args = $this->normalizeArgs($args, $type);
-        $atts = $this->normalizeAtts($atts, $type);
-        $partial = glsr(Partial::class)->build($this->partialName, $atts);
+        $args = $this->normalizeArgs( $args, $type );
+        $atts = $this->normalizeAtts( $atts, $type );
+        $partial = glsr( Partial::class )->build( $this->partialName, $atts );
         $title = !empty($atts['title'])
             ? $args['before_title'].$atts['title'].$args['after_title']
             : '';
-        $debug = sprintf('<glsr-%1$s hidden data-atts=\'%2$s\'></glsr-%1$s>', $type, $atts['json']);
+        $debug = sprintf( '<glsr-%1$s hidden data-atts=\'%2$s\'></glsr-%1$s>', $type, $atts['json'] );
         return $args['before_widget'].$title.$partial.$debug.$args['after_widget'];
     }
 
@@ -43,17 +43,17 @@ 
      * @param string|array $atts
      * @return string
      */
-    public function buildShortcode($atts = [])
+    public function buildShortcode( $atts = [] )
     {
-        return $this->build($atts);
+        return $this->build( $atts );
     }
 
     /**
      * @return array
      */
-    public function getDefaults($atts)
+    public function getDefaults( $atts )
     {
-        return glsr($this->getShortcodeDefaultsClassName())->restrict(wp_parse_args($atts));
+        return glsr( $this->getShortcodeDefaultsClassName() )->restrict( wp_parse_args( $atts ) );
     }
 
     /**
@@ -62,15 +62,15 @@ 
     public function getHideOptions()
     {
         $options = $this->hideOptions();
-        return apply_filters('site-reviews/shortcode/hide-options', $options, $this->shortcodeName);
+        return apply_filters( 'site-reviews/shortcode/hide-options', $options, $this->shortcodeName );
     }
 
     /**
      * @return string
      */
-    public function getShortcodeClassName($replace = '', $search = 'Shortcode')
+    public function getShortcodeClassName( $replace = '', $search = 'Shortcode' )
     {
-        return str_replace($search, $replace, (new ReflectionClass($this))->getShortName());
+        return str_replace( $search, $replace, (new ReflectionClass( $this ))->getShortName() );
     }
 
     /**
@@ -78,8 +78,8 @@ 
      */
     public function getShortcodeDefaultsClassName()
     {
-        return glsr(Helper::class)->buildClassName(
-            $this->getShortcodeClassName('Defaults'),
+        return glsr( Helper::class )->buildClassName(
+            $this->getShortcodeClassName( 'Defaults' ),
             'Defaults'
         );
     }
@@ -89,7 +89,7 @@ 
      */
     public function getShortcodeName()
     {
-        return glsr(Helper::class)->snakeCase($this->getShortcodeClassName());
+        return glsr( Helper::class )->snakeCase( $this->getShortcodeClassName() );
     }
 
     /**
@@ -97,7 +97,7 @@ 
      */
     public function getShortcodePartialName()
     {
-        return glsr(Helper::class)->dashCase($this->getShortcodeClassName());
+        return glsr( Helper::class )->dashCase( $this->getShortcodeClassName() );
     }
 
     /**
@@ -105,15 +105,15 @@ 
      * @param string $type
      * @return array
      */
-    public function normalizeArgs($args, $type = 'shortcode')
+    public function normalizeArgs( $args, $type = 'shortcode' )
     {
-        $args = wp_parse_args($args, [
+        $args = wp_parse_args( $args, [
             'before_widget' => '<div class="glsr-'.$type.' '.$type.'-'.$this->partialName.'">',
             'after_widget' => '</div>',
             'before_title' => '<h3 class="glsr-'.$type.'-title">',
             'after_title' => '</h3>',
-        ]);
-        return apply_filters('site-reviews/shortcode/args', $args, $type, $this->partialName);
+        ] );
+        return apply_filters( 'site-reviews/shortcode/args', $args, $type, $this->partialName );
     }
 
     /**
@@ -121,16 +121,16 @@ 
      * @param string $type
      * @return array
      */
-    public function normalizeAtts($atts, $type = 'shortcode')
+    public function normalizeAtts( $atts, $type = 'shortcode' )
     {
-        $atts = apply_filters('site-reviews/shortcode/atts', $atts, $type, $this->partialName);
-        $atts = $this->getDefaults($atts);
-        array_walk($atts, function (&$value, $key) {
-            $methodName = glsr(Helper::class)->buildMethodName($key, 'normalize');
-            if (!method_exists($this, $methodName)) {
+        $atts = apply_filters( 'site-reviews/shortcode/atts', $atts, $type, $this->partialName );
+        $atts = $this->getDefaults( $atts );
+        array_walk( $atts, function( &$value, $key ) {
+            $methodName = glsr( Helper::class )->buildMethodName( $key, 'normalize' );
+            if( !method_exists( $this, $methodName ) ) {
                 return;
             }
-            $value = $this->$methodName($value);
+            $value = $this->$methodName( $value );
         });
         return $atts;
     }
@@ -144,12 +144,12 @@ 
      * @param string $postId
      * @return int|string
      */
-    protected function normalizeAssignedTo($postId)
+    protected function normalizeAssignedTo( $postId )
     {
-        if ('parent_id' == $postId) {
-            $postId = intval(wp_get_post_parent_id(intval(get_the_ID())));
-        } elseif ('post_id' == $postId) {
-            $postId = intval(get_the_ID());
+        if( 'parent_id' == $postId ) {
+            $postId = intval( wp_get_post_parent_id( intval( get_the_ID() ) ) );
+        } elseif( 'post_id' == $postId ) {
+            $postId = intval( get_the_ID() );
         }
         return $postId;
     }
@@ -158,23 +158,23 @@ 
      * @param string $postId
      * @return int|string
      */
-    protected function normalizeAssignTo($postId)
+    protected function normalizeAssignTo( $postId )
     {
-        return $this->normalizeAssignedTo($postId);
+        return $this->normalizeAssignedTo( $postId );
     }
 
     /**
      * @param string|array $hide
      * @return array
      */
-    protected function normalizeHide($hide)
+    protected function normalizeHide( $hide )
     {
-        if (is_string($hide)) {
-            $hide = explode(',', $hide);
+        if( is_string( $hide ) ) {
+            $hide = explode( ',', $hide );
         }
-        $hideKeys = array_keys($this->getHideOptions());
-        return array_filter(array_map('trim', $hide), function ($value) use ($hideKeys) {
-            return in_array($value, $hideKeys);
+        $hideKeys = array_keys( $this->getHideOptions() );
+        return array_filter( array_map( 'trim', $hide ), function( $value ) use ($hideKeys) {
+            return in_array( $value, $hideKeys );
         });
     }
 
@@ -182,51 +182,51 @@ 
      * @param string $id
      * @return string
      */
-    protected function normalizeId($id)
+    protected function normalizeId( $id )
     {
-        return sanitize_title($id);
+        return sanitize_title( $id );
     }
 
     /**
      * @param string $labels
      * @return array
      */
-    protected function normalizeLabels($labels)
+    protected function normalizeLabels( $labels )
     {
         $defaults = [
-            __('Excellent', 'site-reviews'),
-            __('Very good', 'site-reviews'),
-            __('Average', 'site-reviews'),
-            __('Poor', 'site-reviews'),
-            __('Terrible', 'site-reviews'),
+            __( 'Excellent', 'site-reviews' ),
+            __( 'Very good', 'site-reviews' ),
+            __( 'Average', 'site-reviews' ),
+            __( 'Poor', 'site-reviews' ),
+            __( 'Terrible', 'site-reviews' ),
         ];
-        $maxRating = glsr()->constant('MAX_RATING', Rating::class);
-        $defaults = array_pad(array_slice($defaults, 0, $maxRating), $maxRating, '');
-        $labels = array_map('trim', explode(',', $labels));
-        foreach ($defaults as $i => $label) {
-            if (empty($labels[$i])) {
+        $maxRating = glsr()->constant( 'MAX_RATING', Rating::class );
+        $defaults = array_pad( array_slice( $defaults, 0, $maxRating ), $maxRating, '' );
+        $labels = array_map( 'trim', explode( ',', $labels ) );
+        foreach( $defaults as $i => $label ) {
+            if( empty($labels[$i]) ) {
                 continue;
             }
             $defaults[$i] = $labels[$i];
         }
-        return array_combine(range($maxRating, 1), $defaults);
+        return array_combine( range( $maxRating, 1 ), $defaults );
     }
 
     /**
      * @param string $schema
      * @return bool
      */
-    protected function normalizeSchema($schema)
+    protected function normalizeSchema( $schema )
     {
-        return wp_validate_boolean($schema);
+        return wp_validate_boolean( $schema );
     }
 
     /**
      * @param string $text
      * @return string
      */
-    protected function normalizeText($text)
+    protected function normalizeText( $text )
     {
-        return trim($text);
+        return trim( $text );
     }
 }

plugin/Modules/Html/Partials/SiteReviews.php

Spacing +114 added lines, -114 removed lines

@@ -43,13 +43,13 @@ 
      * @param Reviews|null $reviews
      * @return ReviewsHtml
      */
-    public function build(array $args = [], $reviews = null)
+    public function build( array $args = [], $reviews = null )
     {
-        $this->args = glsr(SiteReviewsDefaults::class)->merge($args);
-        $this->options = glsr(Helper::class)->flattenArray(glsr(OptionManager::class)->all());
+        $this->args = glsr( SiteReviewsDefaults::class )->merge( $args );
+        $this->options = glsr( Helper::class )->flattenArray( glsr( OptionManager::class )->all() );
         $this->reviews = $reviews instanceof Reviews
             ? $reviews
-            : glsr(ReviewManager::class)->get($args);
+            : glsr( ReviewManager::class )->get( $args );
         $this->generateSchema();
         return $this->buildReviews();
     }
@@ -57,26 +57,26 @@ 
     /**
      * @return ReviewHtml
      */
-    public function buildReview(Review $review)
+    public function buildReview( Review $review )
     {
-        $review = apply_filters('site-reviews/review/build/before', $review);
+        $review = apply_filters( 'site-reviews/review/build/before', $review );
         $this->current = $review;
         $renderedFields = [];
-        foreach ($review as $key => $value) {
-            $method = glsr(Helper::class)->buildMethodName($key, 'buildOption');
-            $field = method_exists($this, $method)
-                ? $this->$method($key, $value)
+        foreach( $review as $key => $value ) {
+            $method = glsr( Helper::class )->buildMethodName( $key, 'buildOption' );
+            $field = method_exists( $this, $method )
+                ? $this->$method( $key, $value )
                 : false;
-            $field = apply_filters('site-reviews/review/build/'.$key, $field, $value, $this, $review);
-            if (false === $field) {
+            $field = apply_filters( 'site-reviews/review/build/'.$key, $field, $value, $this, $review );
+            if( false === $field ) {
                 continue;
             }
             $renderedFields[$key] = $field;
         }
-        $this->wrap($renderedFields, $review);
-        $renderedFields = apply_filters('site-reviews/review/build/after', $renderedFields, $review, $this);
+        $this->wrap( $renderedFields, $review );
+        $renderedFields = apply_filters( 'site-reviews/review/build/after', $renderedFields, $review, $this );
         $this->current = null;
-        return new ReviewHtml($review, (array) $renderedFields);
+        return new ReviewHtml( $review, (array)$renderedFields );
     }
 
     /**
@@ -85,10 +85,10 @@ 
     public function buildReviews()
     {
         $renderedReviews = [];
-        foreach ($this->reviews as $index => $review) {
-            $renderedReviews[] = $this->buildReview($review);
+        foreach( $this->reviews as $index => $review ) {
+            $renderedReviews[] = $this->buildReview( $review );
         }
-        return new ReviewsHtml($renderedReviews, $this->reviews->max_num_pages, $this->args);
+        return new ReviewsHtml( $renderedReviews, $this->reviews->max_num_pages, $this->args );
     }
 
     /**
@@ -96,11 +96,11 @@ 
      */
     public function generateSchema()
     {
-        if (!wp_validate_boolean($this->args['schema'])) {
+        if( !wp_validate_boolean( $this->args['schema'] ) ) {
             return;
         }
-        glsr(Schema::class)->store(
-            glsr(Schema::class)->build($this->args)
+        glsr( Schema::class )->store(
+            glsr( Schema::class )->build( $this->args )
         );
     }
 
@@ -109,12 +109,12 @@ 
      * @param string $path
      * @return bool
      */
-    public function isHidden($key, $path = '')
+    public function isHidden( $key, $path = '' )
     {
         $isOptionEnabled = !empty($path)
-            ? $this->isOptionEnabled($path)
+            ? $this->isOptionEnabled( $path )
             : true;
-        return in_array($key, $this->args['hide']) || !$isOptionEnabled;
+        return in_array( $key, $this->args['hide'] ) || !$isOptionEnabled;
     }
 
     /**
@@ -122,19 +122,19 @@ 
      * @param string $value
      * @return void|string
      */
-    protected function buildOptionAssignedTo($key, $value)
+    protected function buildOptionAssignedTo( $key, $value )
     {
-        if ($this->isHidden($key, 'settings.reviews.assigned_links')) {
+        if( $this->isHidden( $key, 'settings.reviews.assigned_links' ) ) {
             return;
         }
-        $post = glsr(Polylang::class)->getPost($value);
-        if (!($post instanceof WP_Post)) {
+        $post = glsr( Polylang::class )->getPost( $value );
+        if( !($post instanceof WP_Post) ) {
             return;
         }
-        $permalink = glsr(Builder::class)->a(get_the_title($post->ID), [
-            'href' => get_the_permalink($post->ID),
-        ]);
-        $assignedTo = sprintf(__('Review of %s', 'site-reviews'), $permalink);
+        $permalink = glsr( Builder::class )->a( get_the_title( $post->ID ), [
+            'href' => get_the_permalink( $post->ID ),
+        ] );
+        $assignedTo = sprintf( __( 'Review of %s', 'site-reviews' ), $permalink );
         return '<span>'.$assignedTo.'</span>';
     }
 
@@ -143,9 +143,9 @@ 
      * @param string $value
      * @return void|string
      */
-    protected function buildOptionAuthor($key, $value)
+    protected function buildOptionAuthor( $key, $value )
     {
-        if (!$this->isHidden($key)) {
+        if( !$this->isHidden( $key ) ) {
             return '<span>'.$value.'</span>';
         }
     }
@@ -155,18 +155,18 @@ 
      * @param string $value
      * @return void|string
      */
-    protected function buildOptionAvatar($key, $value)
+    protected function buildOptionAvatar( $key, $value )
     {
-        if ($this->isHidden($key, 'settings.reviews.avatars')) {
+        if( $this->isHidden( $key, 'settings.reviews.avatars' ) ) {
             return;
         }
-        $size = $this->getOption('settings.reviews.avatars_size', 40);
-        return glsr(Builder::class)->img([
+        $size = $this->getOption( 'settings.reviews.avatars_size', 40 );
+        return glsr( Builder::class )->img( [
             'height' => $size,
-            'src' => $this->generateAvatar($value),
-            'style' => sprintf('width:%1$spx; height:%1$spx;', $size),
+            'src' => $this->generateAvatar( $value ),
+            'style' => sprintf( 'width:%1$spx; height:%1$spx;', $size ),
             'width' => $size,
-        ]);
+        ] );
     }
 
     /**
@@ -174,10 +174,10 @@ 
      * @param string $value
      * @return void|string
      */
-    protected function buildOptionContent($key, $value)
+    protected function buildOptionContent( $key, $value )
     {
-        $text = $this->normalizeText($value);
-        if (!$this->isHiddenOrEmpty($key, $text)) {
+        $text = $this->normalizeText( $value );
+        if( !$this->isHiddenOrEmpty( $key, $text ) ) {
             return '<p>'.$text.'</p>';
         }
     }
@@ -187,19 +187,19 @@ 
      * @param string $value
      * @return void|string
      */
-    protected function buildOptionDate($key, $value)
+    protected function buildOptionDate( $key, $value )
     {
-        if ($this->isHidden($key)) {
+        if( $this->isHidden( $key ) ) {
             return;
         }
-        $dateFormat = $this->getOption('settings.reviews.date.format', 'default');
-        if ('relative' == $dateFormat) {
-            $date = glsr(Date::class)->relative($value);
+        $dateFormat = $this->getOption( 'settings.reviews.date.format', 'default' );
+        if( 'relative' == $dateFormat ) {
+            $date = glsr( Date::class )->relative( $value );
         } else {
             $format = 'custom' == $dateFormat
-                ? $this->getOption('settings.reviews.date.custom', 'M j, Y')
-                : glsr(OptionManager::class)->getWP('date_format', 'F j, Y');
-            $date = date_i18n($format, strtotime($value));
+                ? $this->getOption( 'settings.reviews.date.custom', 'M j, Y' )
+                : glsr( OptionManager::class )->getWP( 'date_format', 'F j, Y' );
+            $date = date_i18n( $format, strtotime( $value ) );
         }
         return '<span>'.$date.'</span>';
     }
@@ -209,10 +209,10 @@ 
      * @param string $value
      * @return void|string
      */
-    protected function buildOptionRating($key, $value)
+    protected function buildOptionRating( $key, $value )
     {
-        if (!$this->isHiddenOrEmpty($key, $value)) {
-            return glsr_star_rating($value);
+        if( !$this->isHiddenOrEmpty( $key, $value ) ) {
+            return glsr_star_rating( $value );
         }
     }
 
@@ -221,16 +221,16 @@ 
      * @param string $value
      * @return void|string
      */
-    protected function buildOptionResponse($key, $value)
+    protected function buildOptionResponse( $key, $value )
     {
-        if ($this->isHiddenOrEmpty($key, $value)) {
+        if( $this->isHiddenOrEmpty( $key, $value ) ) {
             return;
         }
-        $title = sprintf(__('Response from %s', 'site-reviews'), get_bloginfo('name'));
-        $text = $this->normalizeText($value);
+        $title = sprintf( __( 'Response from %s', 'site-reviews' ), get_bloginfo( 'name' ) );
+        $text = $this->normalizeText( $value );
         $text = '<p><strong>'.$title.'</strong></p><p>'.$text.'</p>';
-        $response = glsr(Builder::class)->div($text, ['class' => 'glsr-review-response-inner']);
-        $background = glsr(Builder::class)->div(['class' => 'glsr-review-response-background']);
+        $response = glsr( Builder::class )->div( $text, ['class' => 'glsr-review-response-inner'] );
+        $background = glsr( Builder::class )->div( ['class' => 'glsr-review-response-background'] );
         return $response.$background;
     }
 
@@ -239,13 +239,13 @@ 
      * @param string $value
      * @return void|string
      */
-    protected function buildOptionTitle($key, $value)
+    protected function buildOptionTitle( $key, $value )
     {
-        if ($this->isHidden($key)) {
+        if( $this->isHidden( $key ) ) {
             return;
         }
-        if (empty($value)) {
-            $value = __('No Title', 'site-reviews');
+        if( empty($value) ) {
+            $value = __( 'No Title', 'site-reviews' );
         }
         return '<h3>'.$value.'</h3>';
     }
@@ -254,16 +254,16 @@ 
      * @param string $avatarUrl
      * @return string
      */
-    protected function generateAvatar($avatarUrl)
+    protected function generateAvatar( $avatarUrl )
     {
-        if (!$this->isOptionEnabled('settings.reviews.avatars_regenerate') || 'local' != $this->current->review_type) {
+        if( !$this->isOptionEnabled( 'settings.reviews.avatars_regenerate' ) || 'local' != $this->current->review_type ) {
             return $avatarUrl;
         }
-        $authorIdOrEmail = get_the_author_meta('ID', $this->current->user_id);
-        if (empty($authorIdOrEmail)) {
+        $authorIdOrEmail = get_the_author_meta( 'ID', $this->current->user_id );
+        if( empty($authorIdOrEmail) ) {
             $authorIdOrEmail = $this->current->email;
         }
-        if ($newAvatar = get_avatar_url($authorIdOrEmail)) {
+        if( $newAvatar = get_avatar_url( $authorIdOrEmail ) ) {
             return $newAvatar;
         }
         return $avatarUrl;
@@ -273,20 +273,20 @@ 
      * @param string $text
      * @return string
      */
-    protected function getExcerpt($text)
+    protected function getExcerpt( $text )
     {
-        $limit = intval($this->getOption('settings.reviews.excerpts_length', 55));
-        $split = extension_loaded('intl')
-            ? $this->getExcerptIntlSplit($text, $limit)
-            : $this->getExcerptSplit($text, $limit);
-        $hiddenText = substr($text, $split);
-        if (!empty($hiddenText)) {
-            $showMore = glsr(Builder::class)->span($hiddenText, [
+        $limit = intval( $this->getOption( 'settings.reviews.excerpts_length', 55 ) );
+        $split = extension_loaded( 'intl' )
+            ? $this->getExcerptIntlSplit( $text, $limit )
+            : $this->getExcerptSplit( $text, $limit );
+        $hiddenText = substr( $text, $split );
+        if( !empty($hiddenText) ) {
+            $showMore = glsr( Builder::class )->span( $hiddenText, [
                 'class' => 'glsr-hidden glsr-hidden-text',
-                'data-show-less' => __('Show less', 'site-reviews'),
-                'data-show-more' => __('Show more', 'site-reviews'),
-            ]);
-            $text = ltrim(substr($text, 0, $split)).$showMore;
+                'data-show-less' => __( 'Show less', 'site-reviews' ),
+                'data-show-more' => __( 'Show more', 'site-reviews' ),
+            ] );
+            $text = ltrim( substr( $text, 0, $split ) ).$showMore;
         }
         return $text;
     }
@@ -296,22 +296,22 @@ 
      * @param int $limit
      * @return int
      */
-    protected function getExcerptIntlSplit($text, $limit)
+    protected function getExcerptIntlSplit( $text, $limit )
     {
-        $words = IntlRuleBasedBreakIterator::createWordInstance('');
-        $words->setText($text);
+        $words = IntlRuleBasedBreakIterator::createWordInstance( '' );
+        $words->setText( $text );
         $count = 0;
-        foreach ($words as $offset) {
-            if (IntlRuleBasedBreakIterator::WORD_NONE === $words->getRuleStatus()) {
+        foreach( $words as $offset ) {
+            if( IntlRuleBasedBreakIterator::WORD_NONE === $words->getRuleStatus() ) {
                 continue;
             }
             ++$count;
-            if ($count != $limit) {
+            if( $count != $limit ) {
                 continue;
             }
             return $offset;
         }
-        return strlen($text);
+        return strlen( $text );
     }
 
     /**
@@ -319,13 +319,13 @@ 
      * @param int $limit
      * @return int
      */
-    protected function getExcerptSplit($text, $limit)
+    protected function getExcerptSplit( $text, $limit )
     {
-        if (str_word_count($text, 0) > $limit) {
-            $words = array_keys(str_word_count($text, 2));
+        if( str_word_count( $text, 0 ) > $limit ) {
+            $words = array_keys( str_word_count( $text, 2 ) );
             return $words[$limit];
         }
-        return strlen($text);
+        return strlen( $text );
     }
 
     /**
@@ -333,9 +333,9 @@ 
      * @param mixed $fallback
      * @return mixed
      */
-    protected function getOption($path, $fallback = '')
+    protected function getOption( $path, $fallback = '' )
     {
-        if (array_key_exists($path, $this->options)) {
+        if( array_key_exists( $path, $this->options ) ) {
             return $this->options[$path];
         }
         return $fallback;
@@ -346,50 +346,50 @@ 
      * @param string $value
      * @return bool
      */
-    protected function isHiddenOrEmpty($key, $value)
+    protected function isHiddenOrEmpty( $key, $value )
     {
-        return $this->isHidden($key) || empty($value);
+        return $this->isHidden( $key ) || empty($value);
     }
 
     /**
      * @param string $path
      * @return bool
      */
-    protected function isOptionEnabled($path)
+    protected function isOptionEnabled( $path )
     {
-        return 'yes' == $this->getOption($path);
+        return 'yes' == $this->getOption( $path );
     }
 
     /**
      * @param string $text
      * @return string
      */
-    protected function normalizeText($text)
+    protected function normalizeText( $text )
     {
-        $text = wp_kses($text, wp_kses_allowed_html());
-        $text = convert_smilies(strip_shortcodes($text));
-        $text = str_replace(']]>', ']]&gt;', $text);
-        $text = preg_replace('/(\R){2,}/', '$1', $text);
-        if ($this->isOptionEnabled('settings.reviews.excerpts')) {
-            $text = $this->getExcerpt($text);
+        $text = wp_kses( $text, wp_kses_allowed_html() );
+        $text = convert_smilies( strip_shortcodes( $text ) );
+        $text = str_replace( ']]>', ']]&gt;', $text );
+        $text = preg_replace( '/(\R){2,}/', '$1', $text );
+        if( $this->isOptionEnabled( 'settings.reviews.excerpts' ) ) {
+            $text = $this->getExcerpt( $text );
         }
-        return wptexturize(nl2br($text));
+        return wptexturize( nl2br( $text ) );
     }
 
     /**
      * @return void
      */
-    protected function wrap(array &$renderedFields, Review $review)
+    protected function wrap( array &$renderedFields, Review $review )
     {
-        $renderedFields = apply_filters('site-reviews/review/wrap', $renderedFields, $review, $this);
-        array_walk($renderedFields, function (&$value, $key) use ($review) {
-            $value = apply_filters('site-reviews/review/wrap/'.$key, $value, $review);
-            if (empty($value)) {
+        $renderedFields = apply_filters( 'site-reviews/review/wrap', $renderedFields, $review, $this );
+        array_walk( $renderedFields, function( &$value, $key ) use ($review) {
+            $value = apply_filters( 'site-reviews/review/wrap/'.$key, $value, $review );
+            if( empty($value) ) {
                 return;
             }
-            $value = glsr(Builder::class)->div($value, [
+            $value = glsr( Builder::class )->div( $value, [
                 'class' => 'glsr-review-'.$key,
-            ]);
+            ] );
         });
     }
 }

plugin/Modules/System.php

Spacing +110 added lines, -110 removed lines

@@ -39,17 +39,17 @@ 
             'setting' => 'Plugin Settings',
             'reviews' => 'Review Counts',
         ];
-        $systemInfo = array_reduce(array_keys($details), function ($carry, $key) use ($details) {
-            $methodName = glsr(Helper::class)->buildMethodName('get-'.$key.'-details');
-            if (method_exists($this, $methodName) && $systemDetails = $this->$methodName()) {
+        $systemInfo = array_reduce( array_keys( $details ), function( $carry, $key ) use ($details) {
+            $methodName = glsr( Helper::class )->buildMethodName( 'get-'.$key.'-details' );
+            if( method_exists( $this, $methodName ) && $systemDetails = $this->$methodName() ) {
                 return $carry.$this->implode(
-                    strtoupper($details[$key]),
-                    apply_filters('site-reviews/system/'.$key, $systemDetails)
+                    strtoupper( $details[$key] ),
+                    apply_filters( 'site-reviews/system/'.$key, $systemDetails )
                 );
             }
             return $carry;
         });
-        return trim($systemInfo);
+        return trim( $systemInfo );
     }
 
     /**
@@ -58,9 +58,9 @@ 
     public function getActivePluginDetails()
     {
         $plugins = get_plugins();
-        $activePlugins = glsr(OptionManager::class)->getWP('active_plugins', [], 'array');
-        $inactive = array_diff_key($plugins, array_flip($activePlugins));
-        return $this->normalizePluginList(array_diff_key($plugins, $inactive));
+        $activePlugins = glsr( OptionManager::class )->getWP( 'active_plugins', [], 'array' );
+        $inactive = array_diff_key( $plugins, array_flip( $activePlugins ) );
+        return $this->normalizePluginList( array_diff_key( $plugins, $inactive ) );
     }
 
     /**
@@ -68,8 +68,8 @@ 
      */
     public function getAddonDetails()
     {
-        $details = apply_filters('site-reviews/addon/system-info', []);
-        ksort($details);
+        $details = apply_filters( 'site-reviews/addon/system-info', [] );
+        ksort( $details );
         return $details;
     }
 
@@ -79,11 +79,11 @@ 
     public function getBrowserDetails()
     {
         $browser = new Browser();
-        $name = esc_attr($browser->getName());
-        $userAgent = esc_attr($browser->getUserAgent()->getUserAgentString());
-        $version = esc_attr($browser->getVersion());
+        $name = esc_attr( $browser->getName() );
+        $userAgent = esc_attr( $browser->getUserAgent()->getUserAgentString() );
+        $version = esc_attr( $browser->getVersion() );
         return [
-            'Browser Name' => sprintf('%s %s', $name, $version),
+            'Browser Name' => sprintf( '%s %s', $name, $version ),
             'Browser UA' => $userAgent,
         ];
     }
@@ -93,12 +93,12 @@ 
      */
     public function getInactivePluginDetails()
     {
-        $activePlugins = glsr(OptionManager::class)->getWP('active_plugins', [], 'array');
-        $inactivePlugins = $this->normalizePluginList(array_diff_key(get_plugins(), array_flip($activePlugins)));
+        $activePlugins = glsr( OptionManager::class )->getWP( 'active_plugins', [], 'array' );
+        $inactivePlugins = $this->normalizePluginList( array_diff_key( get_plugins(), array_flip( $activePlugins ) ) );
         $multisitePlugins = $this->getMultisitePluginDetails();
         return empty($multisitePlugins)
             ? $inactivePlugins
-            : array_diff($inactivePlugins, $multisitePlugins);
+            : array_diff( $inactivePlugins, $multisitePlugins );
     }
 
     /**
@@ -106,10 +106,10 @@ 
      */
     public function getMuPluginDetails()
     {
-        if (empty($plugins = get_mu_plugins())) {
+        if( empty($plugins = get_mu_plugins()) ) {
             return [];
         }
-        return $this->normalizePluginList($plugins);
+        return $this->normalizePluginList( $plugins );
     }
 
     /**
@@ -117,11 +117,11 @@ 
      */
     public function getMultisitePluginDetails()
     {
-        $activePlugins = (array) get_site_option('active_sitewide_plugins', []);
-        if (!is_multisite() || empty($activePlugins)) {
+        $activePlugins = (array)get_site_option( 'active_sitewide_plugins', [] );
+        if( !is_multisite() || empty($activePlugins) ) {
             return [];
         }
-        return $this->normalizePluginList(array_intersect_key(get_plugins(), $activePlugins));
+        return $this->normalizePluginList( array_intersect_key( get_plugins(), $activePlugins ) );
     }
 
     /**
@@ -129,31 +129,31 @@ 
      */
     public function getPhpDetails()
     {
-        $displayErrors = ini_get('display_errors')
-            ? 'On ('.ini_get('display_errors').')'
+        $displayErrors = ini_get( 'display_errors' )
+            ? 'On ('.ini_get( 'display_errors' ).')'
             : 'N/A';
-        $intlSupport = extension_loaded('intl')
-            ? phpversion('intl')
+        $intlSupport = extension_loaded( 'intl' )
+            ? phpversion( 'intl' )
             : 'false';
         return [
-            'cURL' => var_export(function_exists('curl_init'), true),
-            'Default Charset' => ini_get('default_charset'),
+            'cURL' => var_export( function_exists( 'curl_init' ), true ),
+            'Default Charset' => ini_get( 'default_charset' ),
             'Display Errors' => $displayErrors,
-            'fsockopen' => var_export(function_exists('fsockopen'), true),
+            'fsockopen' => var_export( function_exists( 'fsockopen' ), true ),
             'Intl' => $intlSupport,
-            'IPv6' => var_export(defined('AF_INET6'), true),
-            'Max Execution Time' => ini_get('max_execution_time'),
-            'Max Input Nesting Level' => ini_get('max_input_nesting_level'),
-            'Max Input Vars' => ini_get('max_input_vars'),
-            'Memory Limit' => ini_get('memory_limit'),
-            'Post Max Size' => ini_get('post_max_size'),
-            'Sendmail Path' => ini_get('sendmail_path'),
-            'Session Cookie Path' => esc_html(ini_get('session.cookie_path')),
-            'Session Name' => esc_html(ini_get('session.name')),
-            'Session Save Path' => esc_html(ini_get('session.save_path')),
-            'Session Use Cookies' => var_export(wp_validate_boolean(ini_get('session.use_cookies')), true),
-            'Session Use Only Cookies' => var_export(wp_validate_boolean(ini_get('session.use_only_cookies')), true),
-            'Upload Max Filesize' => ini_get('upload_max_filesize'),
+            'IPv6' => var_export( defined( 'AF_INET6' ), true ),
+            'Max Execution Time' => ini_get( 'max_execution_time' ),
+            'Max Input Nesting Level' => ini_get( 'max_input_nesting_level' ),
+            'Max Input Vars' => ini_get( 'max_input_vars' ),
+            'Memory Limit' => ini_get( 'memory_limit' ),
+            'Post Max Size' => ini_get( 'post_max_size' ),
+            'Sendmail Path' => ini_get( 'sendmail_path' ),
+            'Session Cookie Path' => esc_html( ini_get( 'session.cookie_path' ) ),
+            'Session Name' => esc_html( ini_get( 'session.name' ) ),
+            'Session Save Path' => esc_html( ini_get( 'session.save_path' ) ),
+            'Session Use Cookies' => var_export( wp_validate_boolean( ini_get( 'session.use_cookies' ) ), true ),
+            'Session Use Only Cookies' => var_export( wp_validate_boolean( ini_get( 'session.use_only_cookies' ) ), true ),
+            'Upload Max Filesize' => ini_get( 'upload_max_filesize' ),
         ];
     }
 
@@ -162,19 +162,19 @@ 
      */
     public function getReviewsDetails()
     {
-        $counts = glsr(CountsManager::class)->getCounts();
-        $counts = glsr(Helper::class)->flattenArray($counts);
-        array_walk($counts, function (&$ratings) use ($counts) {
-            if (!is_array($ratings)) {
+        $counts = glsr( CountsManager::class )->getCounts();
+        $counts = glsr( Helper::class )->flattenArray( $counts );
+        array_walk( $counts, function( &$ratings ) use ($counts) {
+            if( !is_array( $ratings ) ) {
                 glsr_log()
-                    ->error('$ratings is not an array, possibly due to incorrectly imported reviews.')
-                    ->debug($ratings)
-                    ->debug($counts);
+                    ->error( '$ratings is not an array, possibly due to incorrectly imported reviews.' )
+                    ->debug( $ratings )
+                    ->debug( $counts );
                 return;
             }
-            $ratings = array_sum($ratings).' ('.implode(', ', $ratings).')';
+            $ratings = array_sum( $ratings ).' ('.implode( ', ', $ratings ).')';
         });
-        ksort($counts);
+        ksort( $counts );
         return $counts;
     }
 
@@ -188,7 +188,7 @@ 
             'Host Name' => $this->getHostName(),
             'MySQL Version' => $wpdb->db_version(),
             'PHP Version' => PHP_VERSION,
-            'Server Software' => filter_input(INPUT_SERVER, 'SERVER_SOFTWARE'),
+            'Server Software' => filter_input( INPUT_SERVER, 'SERVER_SOFTWARE' ),
         ];
     }
 
@@ -197,17 +197,17 @@ 
      */
     public function getSettingDetails()
     {
-        $helper = glsr(Helper::class);
-        $settings = glsr(OptionManager::class)->get('settings', []);
-        $settings = $helper->flattenArray($settings, true);
-        $settings = $this->purgeSensitiveData($settings);
-        ksort($settings);
+        $helper = glsr( Helper::class );
+        $settings = glsr( OptionManager::class )->get( 'settings', [] );
+        $settings = $helper->flattenArray( $settings, true );
+        $settings = $this->purgeSensitiveData( $settings );
+        ksort( $settings );
         $details = [];
-        foreach ($settings as $key => $value) {
-            if ($helper->startsWith('strings', $key) && $helper->endsWith('id', $key)) {
+        foreach( $settings as $key => $value ) {
+            if( $helper->startsWith( 'strings', $key ) && $helper->endsWith( 'id', $key ) ) {
                 continue;
             }
-            $value = htmlspecialchars(trim(preg_replace('/\s\s+/', '\\n', $value)), ENT_QUOTES, 'UTF-8');
+            $value = htmlspecialchars( trim( preg_replace( '/\s\s+/', '\\n', $value ) ), ENT_QUOTES, 'UTF-8' );
             $details[$key] = $value;
         }
         return $details;
@@ -219,11 +219,11 @@ 
     public function getPluginDetails()
     {
         return [
-            'Console level' => glsr(Console::class)->humanLevel(),
-            'Console size' => glsr(Console::class)->humanSize('0'),
-            'Last Rating Count' => date_i18n('Y-m-d H:i', glsr(OptionManager::class)->get('last_review_count')),
+            'Console level' => glsr( Console::class )->humanLevel(),
+            'Console size' => glsr( Console::class )->humanSize( '0' ),
+            'Last Rating Count' => date_i18n( 'Y-m-d H:i', glsr( OptionManager::class )->get( 'last_review_count' ) ),
             'Version (current)' => glsr()->version,
-            'Version (previous)' => glsr(OptionManager::class)->get('version_upgraded_from'),
+            'Version (previous)' => glsr( OptionManager::class )->get( 'version_upgraded_from' ),
         ];
     }
 
@@ -235,23 +235,23 @@ 
         global $wpdb;
         $theme = wp_get_theme();
         return [
-            'Active Theme' => sprintf('%s v%s', (string) $theme->Name, (string) $theme->Version),
-            'Email Domain' => substr(strrchr(glsr(OptionManager::class)->getWP('admin_email'), '@'), 1),
+            'Active Theme' => sprintf( '%s v%s', (string)$theme->Name, (string)$theme->Version ),
+            'Email Domain' => substr( strrchr( glsr( OptionManager::class )->getWP( 'admin_email' ), '@' ), 1 ),
             'Home URL' => home_url(),
             'Language' => get_locale(),
             'Memory Limit' => WP_MEMORY_LIMIT,
-            'Multisite' => var_export(is_multisite(), true),
-            'Page For Posts ID' => glsr(OptionManager::class)->getWP('page_for_posts'),
-            'Page On Front ID' => glsr(OptionManager::class)->getWP('page_on_front'),
-            'Permalink Structure' => glsr(OptionManager::class)->getWP('permalink_structure', 'default'),
-            'Post Stati' => implode(', ', get_post_stati()),
-            'Remote Post' => glsr(Cache::class)->getRemotePostTest(),
-            'Show On Front' => glsr(OptionManager::class)->getWP('show_on_front'),
+            'Multisite' => var_export( is_multisite(), true ),
+            'Page For Posts ID' => glsr( OptionManager::class )->getWP( 'page_for_posts' ),
+            'Page On Front ID' => glsr( OptionManager::class )->getWP( 'page_on_front' ),
+            'Permalink Structure' => glsr( OptionManager::class )->getWP( 'permalink_structure', 'default' ),
+            'Post Stati' => implode( ', ', get_post_stati() ),
+            'Remote Post' => glsr( Cache::class )->getRemotePostTest(),
+            'Show On Front' => glsr( OptionManager::class )->getWP( 'show_on_front' ),
             'Site URL' => site_url(),
-            'Timezone' => glsr(OptionManager::class)->getWP('timezone_string', ini_get('date.timezone').' (PHP)'),
-            'Version' => get_bloginfo('version'),
-            'WP Debug' => var_export(defined('WP_DEBUG'), true),
-            'WP Max Upload Size' => size_format(wp_max_upload_size()),
+            'Timezone' => glsr( OptionManager::class )->getWP( 'timezone_string', ini_get( 'date.timezone' ).' (PHP)' ),
+            'Version' => get_bloginfo( 'version' ),
+            'WP Debug' => var_export( defined( 'WP_DEBUG' ), true ),
+            'WP Max Upload Size' => size_format( wp_max_upload_size() ),
             'WP Memory Limit' => WP_MEMORY_LIMIT,
         ];
     }
@@ -281,13 +281,13 @@ 
             'secureserver.net' => 'GoDaddy',
             'WPE_APIKEY' => 'WP Engine',
         ];
-        foreach ($checks as $key => $value) {
-            if (!$this->isWebhostCheckValid($key)) {
+        foreach( $checks as $key => $value ) {
+            if( !$this->isWebhostCheckValid( $key ) ) {
                 continue;
             }
             return $value;
         }
-        return implode(',', array_filter([DB_HOST, filter_input(INPUT_SERVER, 'SERVER_NAME')]));
+        return implode( ',', array_filter( [DB_HOST, filter_input( INPUT_SERVER, 'SERVER_NAME' )] ) );
     }
 
     /**
@@ -295,9 +295,9 @@ 
      */
     protected function getHostName()
     {
-        return sprintf('%s (%s)',
+        return sprintf( '%s (%s)',
             $this->detectWebhostProvider(),
-            glsr(Helper::class)->getIpAddress()
+            glsr( Helper::class )->getIpAddress()
         );
     }
 
@@ -307,9 +307,9 @@ 
     protected function getWordpressPlugins()
     {
         $plugins = get_plugins();
-        $activePlugins = glsr(OptionManager::class)->getWP('active_plugins', [], 'array');
-        $inactive = $this->normalizePluginList(array_diff_key($plugins, array_flip($activePlugins)));
-        $active = $this->normalizePluginList(array_diff_key($plugins, $inactive));
+        $activePlugins = glsr( OptionManager::class )->getWP( 'active_plugins', [], 'array' );
+        $inactive = $this->normalizePluginList( array_diff_key( $plugins, array_flip( $activePlugins ) ) );
+        $active = $this->normalizePluginList( array_diff_key( $plugins, $inactive ) );
         return $active + $inactive;
     }
 
@@ -317,58 +317,58 @@ 
      * @param string $title
      * @return string
      */
-    protected function implode($title, array $details)
+    protected function implode( $title, array $details )
     {
         $strings = ['['.$title.']'];
-        $padding = max(array_map('strlen', array_keys($details)));
-        $padding = max([$padding, static::PAD]);
-        foreach ($details as $key => $value) {
-            $strings[] = is_string($key)
-                ? sprintf('%s : %s', str_pad($key, $padding, '.'), $value)
+        $padding = max( array_map( 'strlen', array_keys( $details ) ) );
+        $padding = max( [$padding, static::PAD] );
+        foreach( $details as $key => $value ) {
+            $strings[] = is_string( $key )
+                ? sprintf( '%s : %s', str_pad( $key, $padding, '.' ), $value )
                 : ' - '.$value;
         }
-        return implode(PHP_EOL, $strings).PHP_EOL.PHP_EOL;
+        return implode( PHP_EOL, $strings ).PHP_EOL.PHP_EOL;
     }
 
     /**
      * @param string $key
      * @return bool
      */
-    protected function isWebhostCheckValid($key)
+    protected function isWebhostCheckValid( $key )
     {
-        return defined($key)
-            || filter_input(INPUT_SERVER, $key)
-            || false !== strpos(filter_input(INPUT_SERVER, 'SERVER_NAME'), $key)
-            || false !== strpos(DB_HOST, $key)
-            || false !== strpos(php_uname(), $key);
+        return defined( $key )
+            || filter_input( INPUT_SERVER, $key )
+            || false !== strpos( filter_input( INPUT_SERVER, 'SERVER_NAME' ), $key )
+            || false !== strpos( DB_HOST, $key )
+            || false !== strpos( php_uname(), $key );
     }
 
     /**
      * @return array
      */
-    protected function normalizePluginList(array $plugins)
+    protected function normalizePluginList( array $plugins )
     {
-        $plugins = array_map(function ($plugin) {
-            return sprintf('%s v%s', glsr_get($plugin, 'Name'), glsr_get($plugin, 'Version'));
-        }, $plugins);
-        natcasesort($plugins);
-        return array_flip($plugins);
+        $plugins = array_map( function( $plugin ) {
+            return sprintf( '%s v%s', glsr_get( $plugin, 'Name' ), glsr_get( $plugin, 'Version' ) );
+        }, $plugins );
+        natcasesort( $plugins );
+        return array_flip( $plugins );
     }
 
     /**
      * @return array
      */
-    protected function purgeSensitiveData(array $settings)
+    protected function purgeSensitiveData( array $settings )
     {
         $keys = [
             'licenses.', 'submissions.recaptcha.key', 'submissions.recaptcha.secret',
         ];
-        array_walk($settings, function (&$value, $setting) use ($keys) {
-            foreach ($keys as $key) {
-                if (!glsr(Helper::class)->startsWith($key, $setting) || empty($value)) {
+        array_walk( $settings, function( &$value, $setting ) use ($keys) {
+            foreach( $keys as $key ) {
+                if( !glsr( Helper::class )->startsWith( $key, $setting ) || empty($value) ) {
                     continue;
                 }
-                $value = str_repeat('•', 13);
+                $value = str_repeat( '•', 13 );
                 return;
             }
         });

plugin/Modules/Schema.php

Spacing +83 added lines, -83 removed lines

@@ -25,21 +25,21 @@ 
     /**
      * @return array
      */
-    public function build(array $args = [])
+    public function build( array $args = [] )
     {
         $this->args = $args;
-        $schema = $this->buildSummary($args);
+        $schema = $this->buildSummary( $args );
         $reviews = [];
-        foreach (glsr(ReviewManager::class)->get($this->args) as $review) {
+        foreach( glsr( ReviewManager::class )->get( $this->args ) as $review ) {
             // Only include critic reviews that have been directly produced by your site, not reviews from third-party sites or syndicated reviews.
             // @see https://developers.google.com/search/docs/data-types/review
-            if ('local' != $review->review_type) {
+            if( 'local' != $review->review_type ) {
                 continue;
             }
-            $reviews[] = $this->buildReview($review);
+            $reviews[] = $this->buildReview( $review );
         }
-        if (!empty($reviews)) {
-            array_walk($reviews, function (&$review) {
+        if( !empty($reviews) ) {
+            array_walk( $reviews, function( &$review ) {
                 unset($review['@context']);
                 unset($review['itemReviewed']);
             });
@@ -52,27 +52,27 @@ 
      * @param array|null $args
      * @return array
      */
-    public function buildSummary($args = null)
+    public function buildSummary( $args = null )
     {
-        if (is_array($args)) {
+        if( is_array( $args ) ) {
             $this->args = $args;
         }
-        $buildSummary = glsr(Helper::class)->buildMethodName($this->getSchemaOptionValue('type'), 'buildSummaryFor');
-        $count = array_sum($this->getRatingCounts());
-        $schema = method_exists($this, $buildSummary)
+        $buildSummary = glsr( Helper::class )->buildMethodName( $this->getSchemaOptionValue( 'type' ), 'buildSummaryFor' );
+        $count = array_sum( $this->getRatingCounts() );
+        $schema = method_exists( $this, $buildSummary )
             ? $this->$buildSummary()
             : $this->buildSummaryForCustom();
-        if (!empty($count)) {
+        if( !empty($count) ) {
             $schema->aggregateRating(
-                $this->getSchemaType('AggregateRating')
-                    ->ratingValue($this->getRatingValue())
-                    ->reviewCount($count)
-                    ->bestRating(glsr()->constant('MAX_RATING', Rating::class))
-                    ->worstRating(glsr()->constant('MIN_RATING', Rating::class))
+                $this->getSchemaType( 'AggregateRating' )
+                    ->ratingValue( $this->getRatingValue() )
+                    ->reviewCount( $count )
+                    ->bestRating( glsr()->constant( 'MAX_RATING', Rating::class ) )
+                    ->worstRating( glsr()->constant( 'MIN_RATING', Rating::class ) )
             );
         }
         $schema = $schema->toArray();
-        return apply_filters('site-reviews/schema/'.$schema['@type'], $schema, $args);
+        return apply_filters( 'site-reviews/schema/'.$schema['@type'], $schema, $args );
     }
 
     /**
@@ -80,64 +80,64 @@ 
      */
     public function render()
     {
-        if (empty(glsr()->schemas)) {
+        if( empty(glsr()->schemas) ) {
             return;
         }
-        printf('<script type="application/ld+json">%s</script>', json_encode(
-            apply_filters('site-reviews/schema/all', glsr()->schemas),
+        printf( '<script type="application/ld+json">%s</script>', json_encode(
+            apply_filters( 'site-reviews/schema/all', glsr()->schemas ),
             JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES
-        ));
+        ) );
     }
 
     /**
      * @return void
      */
-    public function store(array $schema)
+    public function store( array $schema )
     {
         $schemas = glsr()->schemas;
         $schemas[] = $schema;
-        glsr()->schemas = array_map('unserialize', array_unique(array_map('serialize', $schemas)));
+        glsr()->schemas = array_map( 'unserialize', array_unique( array_map( 'serialize', $schemas ) ) );
     }
 
     /**
      * @param Review $review
      * @return array
      */
-    protected function buildReview($review)
+    protected function buildReview( $review )
     {
-        $schema = $this->getSchemaType('Review')
-            ->doIf(!in_array('title', $this->args['hide']), function ($schema) use ($review) {
-                $schema->name($review->title);
+        $schema = $this->getSchemaType( 'Review' )
+            ->doIf( !in_array( 'title', $this->args['hide'] ), function( $schema ) use ($review) {
+                $schema->name( $review->title );
             })
-            ->doIf(!in_array('excerpt', $this->args['hide']), function ($schema) use ($review) {
-                $schema->reviewBody($review->content);
+            ->doIf( !in_array( 'excerpt', $this->args['hide'] ), function( $schema ) use ($review) {
+                $schema->reviewBody( $review->content );
             })
-            ->datePublished((new DateTime($review->date)))
-            ->author($this->getSchemaType('Person')->name($review->author))
-            ->itemReviewed($this->getSchemaType()->name($this->getSchemaOptionValue('name')));
-        if (!empty($review->rating)) {
+            ->datePublished( (new DateTime( $review->date )) )
+            ->author( $this->getSchemaType( 'Person' )->name( $review->author ) )
+            ->itemReviewed( $this->getSchemaType()->name( $this->getSchemaOptionValue( 'name' ) ) );
+        if( !empty($review->rating) ) {
             $schema->reviewRating(
-                $this->getSchemaType('Rating')
-                    ->ratingValue($review->rating)
-                    ->bestRating(glsr()->constant('MAX_RATING', Rating::class))
-                    ->worstRating(glsr()->constant('MIN_RATING', Rating::class))
+                $this->getSchemaType( 'Rating' )
+                    ->ratingValue( $review->rating )
+                    ->bestRating( glsr()->constant( 'MAX_RATING', Rating::class ) )
+                    ->worstRating( glsr()->constant( 'MIN_RATING', Rating::class ) )
             );
         }
-        return apply_filters('site-reviews/schema/review', $schema->toArray(), $review, $this->args);
+        return apply_filters( 'site-reviews/schema/review', $schema->toArray(), $review, $this->args );
     }
 
     /**
      * @param mixed $schema
      * @return mixed
      */
-    protected function buildSchemaValues($schema, array $values = [])
+    protected function buildSchemaValues( $schema, array $values = [] )
     {
-        foreach ($values as $value) {
-            $option = $this->getSchemaOptionValue($value);
-            if (empty($option)) {
+        foreach( $values as $value ) {
+            $option = $this->getSchemaOptionValue( $value );
+            if( empty($option) ) {
                 continue;
             }
-            $schema->$value($option);
+            $schema->$value( $option );
         }
         return $schema;
     }
@@ -147,9 +147,9 @@ 
      */
     protected function buildSummaryForCustom()
     {
-        return $this->buildSchemaValues($this->getSchemaType(), [
+        return $this->buildSchemaValues( $this->getSchemaType(), [
             'description', 'image', 'name', 'url',
-        ]);
+        ] );
     }
 
     /**
@@ -157,9 +157,9 @@ 
      */
     protected function buildSummaryForLocalBusiness()
     {
-        return $this->buildSchemaValues($this->buildSummaryForCustom(), [
+        return $this->buildSchemaValues( $this->buildSummaryForCustom(), [
             'address', 'priceRange', 'telephone',
-        ]);
+        ] );
     }
 
     /**
@@ -167,15 +167,15 @@ 
      */
     protected function buildSummaryForProduct()
     {
-        $offerType = $this->getSchemaOption('offerType', 'AggregateOffer');
-        $offers = $this->buildSchemaValues($this->getSchemaType($offerType), [
+        $offerType = $this->getSchemaOption( 'offerType', 'AggregateOffer' );
+        $offers = $this->buildSchemaValues( $this->getSchemaType( $offerType ), [
             'highPrice', 'lowPrice', 'price', 'priceCurrency',
-        ]);
+        ] );
         return $this->buildSummaryForCustom()
-            ->doIf(!empty($offers->getProperties()), function ($schema) use ($offers) {
-                $schema->offers($offers);
+            ->doIf( !empty($offers->getProperties()), function( $schema ) use ($offers) {
+                $schema->offers( $offers );
             })
-            ->setProperty('@id', $this->getSchemaOptionValue('url').'#product');
+            ->setProperty( '@id', $this->getSchemaOptionValue( 'url' ).'#product' );
     }
 
     /**
@@ -183,8 +183,8 @@ 
      */
     protected function getRatingCounts()
     {
-        if (!isset($this->ratingCounts)) {
-            $this->ratingCounts = glsr(ReviewManager::class)->getRatingCounts($this->args);
+        if( !isset($this->ratingCounts) ) {
+            $this->ratingCounts = glsr( ReviewManager::class )->getRatingCounts( $this->args );
         }
         return $this->ratingCounts;
     }
@@ -194,7 +194,7 @@ 
      */
     protected function getRatingValue()
     {
-        return glsr(Rating::class)->getAverage($this->getRatingCounts());
+        return glsr( Rating::class )->getAverage( $this->getRatingCounts() );
     }
 
     /**
@@ -202,15 +202,15 @@ 
      * @param string $fallback
      * @return string
      */
-    protected function getSchemaOption($option, $fallback)
+    protected function getSchemaOption( $option, $fallback )
     {
-        $option = strtolower($option);
-        if ($schemaOption = trim((string) get_post_meta(intval(get_the_ID()), 'schema_'.$option, true))) {
+        $option = strtolower( $option );
+        if( $schemaOption = trim( (string)get_post_meta( intval( get_the_ID() ), 'schema_'.$option, true ) ) ) {
             return $schemaOption;
         }
-        $setting = glsr(OptionManager::class)->get('settings.schema.'.$option);
-        if (is_array($setting)) {
-            return $this->getSchemaOptionDefault($setting, $fallback);
+        $setting = glsr( OptionManager::class )->get( 'settings.schema.'.$option );
+        if( is_array( $setting ) ) {
+            return $this->getSchemaOptionDefault( $setting, $fallback );
         }
         return !empty($setting)
             ? $setting
@@ -221,12 +221,12 @@ 
      * @param string $fallback
      * @return string
      */
-    protected function getSchemaOptionDefault(array $setting, $fallback)
+    protected function getSchemaOptionDefault( array $setting, $fallback )
     {
-        $setting = wp_parse_args($setting, [
+        $setting = wp_parse_args( $setting, [
             'custom' => '',
             'default' => $fallback,
-        ]);
+        ] );
         return 'custom' != $setting['default']
             ? $setting['default']
             : $setting['custom'];
@@ -237,17 +237,17 @@ 
      * @param string $fallback
      * @return void|string
      */
-    protected function getSchemaOptionValue($option, $fallback = 'post')
+    protected function getSchemaOptionValue( $option, $fallback = 'post' )
     {
-        $value = $this->getSchemaOption($option, $fallback);
-        if ($value != $fallback) {
+        $value = $this->getSchemaOption( $option, $fallback );
+        if( $value != $fallback ) {
             return $value;
         }
-        if (!is_single() && !is_page()) {
+        if( !is_single() && !is_page() ) {
             return;
         }
-        $method = glsr(Helper::class)->buildMethodName($option, 'getThing');
-        if (method_exists($this, $method)) {
+        $method = glsr( Helper::class )->buildMethodName( $option, 'getThing' );
+        if( method_exists( $this, $method ) ) {
             return $this->$method();
         }
     }
@@ -256,15 +256,15 @@ 
      * @param string|null $type
      * @return mixed
      */
-    protected function getSchemaType($type = null)
+    protected function getSchemaType( $type = null )
     {
-        if (!is_string($type)) {
-            $type = $this->getSchemaOption('type', 'LocalBusiness');
+        if( !is_string( $type ) ) {
+            $type = $this->getSchemaOption( 'type', 'LocalBusiness' );
         }
-        $className = glsr(Helper::class)->buildClassName($type, 'Modules\Schema');
-        return class_exists($className)
+        $className = glsr( Helper::class )->buildClassName( $type, 'Modules\Schema' );
+        return class_exists( $className )
             ? new $className()
-            : new UnknownType($type);
+            : new UnknownType( $type );
     }
 
     /**
@@ -272,8 +272,8 @@ 
      */
     protected function getThingDescription()
     {
-        $description = strip_shortcodes(wp_strip_all_tags(get_the_excerpt()));
-        return wp_trim_words($description, apply_filters('excerpt_length', 55));
+        $description = strip_shortcodes( wp_strip_all_tags( get_the_excerpt() ) );
+        return wp_trim_words( $description, apply_filters( 'excerpt_length', 55 ) );
     }
 
     /**
@@ -281,7 +281,7 @@ 
      */
     protected function getThingImage()
     {
-        return (string) get_the_post_thumbnail_url(null, 'large');
+        return (string)get_the_post_thumbnail_url( null, 'large' );
     }
 
     /**
@@ -297,6 +297,6 @@ 
      */
     protected function getThingUrl()
     {
-        return (string) get_the_permalink();
+        return (string)get_the_permalink();
     }
 }

plugin/Database.php

Spacing +47 added lines, -47 removed lines

@@ -17,10 +17,10 @@ 
      * @param bool $single
      * @return mixed
      */
-    public function get($postId, $key, $single = true)
+    public function get( $postId, $key, $single = true )
     {
-        $key = glsr(Helper::class)->prefix('_', $key);
-        return get_post_meta(intval($postId), $key, $single);
+        $key = glsr( Helper::class )->prefix( '_', $key );
+        return get_post_meta( intval( $postId ), $key, $single );
     }
 
     /**
@@ -28,16 +28,16 @@ 
      * @param string $assignedTo
      * @return void|WP_Post
      */
-    public function getAssignedToPost($postId, $assignedTo = '')
+    public function getAssignedToPost( $postId, $assignedTo = '' )
     {
-        if (empty($assignedTo)) {
-            $assignedTo = $this->get($postId, 'assigned_to');
+        if( empty($assignedTo) ) {
+            $assignedTo = $this->get( $postId, 'assigned_to' );
         }
-        if (empty($assignedTo)) {
+        if( empty($assignedTo) ) {
             return;
         }
-        $assignedPost = get_post($assignedTo);
-        if ($assignedPost instanceof WP_Post && $assignedPost->ID != $postId) {
+        $assignedPost = get_post( $assignedTo );
+        if( $assignedPost instanceof WP_Post && $assignedPost->ID != $postId ) {
             return $assignedPost;
         }
     }
@@ -47,25 +47,25 @@ 
      * @param string $metaValue
      * @return array|int
      */
-    public function getReviewCount($metaKey = '', $metaValue = '')
+    public function getReviewCount( $metaKey = '', $metaValue = '' )
     {
-        if (!$metaKey) {
-            return (array) wp_count_posts(Application::POST_TYPE);
+        if( !$metaKey ) {
+            return (array)wp_count_posts( Application::POST_TYPE );
         }
-        $counts = glsr(Cache::class)->getReviewCountsFor($metaKey);
-        if (!$metaValue) {
+        $counts = glsr( Cache::class )->getReviewCountsFor( $metaKey );
+        if( !$metaValue ) {
             return $counts;
         }
-        return glsr_get($counts, $metaValue, 0);
+        return glsr_get( $counts, $metaValue, 0 );
     }
 
     /**
      * @param string $metaReviewType
      * @return array
      */
-    public function getReviewIdsByType($metaReviewType)
+    public function getReviewIdsByType( $metaReviewType )
     {
-        return glsr(SqlQueries::class)->getReviewIdsByType($metaReviewType);
+        return glsr( SqlQueries::class )->getReviewIdsByType( $metaReviewType );
     }
 
     /**
@@ -73,24 +73,24 @@ 
      * @param string $status
      * @return array
      */
-    public function getReviewsMeta($key, $status = 'publish')
+    public function getReviewsMeta( $key, $status = 'publish' )
     {
-        if ('all' == $status || empty($status)) {
-            $status = get_post_stati(['exclude_from_search' => false]);
+        if( 'all' == $status || empty($status) ) {
+            $status = get_post_stati( ['exclude_from_search' => false] );
         }
-        return glsr(SqlQueries::class)->getReviewsMeta($key, $status);
+        return glsr( SqlQueries::class )->getReviewsMeta( $key, $status );
     }
 
     /**
      * @param string $field
      * @return array
      */
-    public function getTermIds(array $values, $field)
+    public function getTermIds( array $values, $field )
     {
         $termIds = [];
-        foreach ($values as $value) {
-            $term = get_term_by($field, $value, Application::TAXONOMY);
-            if (!isset($term->term_id)) {
+        foreach( $values as $value ) {
+            $term = get_term_by( $field, $value, Application::TAXONOMY );
+            if( !isset($term->term_id) ) {
                 continue;
             }
             $termIds[] = $term->term_id;
@@ -101,17 +101,17 @@ 
     /**
      * @return array
      */
-    public function getTerms(array $args = [])
+    public function getTerms( array $args = [] )
     {
-        $args = wp_parse_args($args, [
+        $args = wp_parse_args( $args, [
             'count' => false,
             'fields' => 'id=>name',
             'hide_empty' => false,
             'taxonomy' => Application::TAXONOMY,
-        ]);
-        $terms = get_terms($args);
-        if (is_wp_error($terms)) {
-            glsr_log()->error($terms->get_error_message());
+        ] );
+        $terms = get_terms( $args );
+        if( is_wp_error( $terms ) ) {
+            glsr_log()->error( $terms->get_error_message() );
             return [];
         }
         return $terms;
@@ -121,36 +121,36 @@ 
      * @param string $searchTerm
      * @return void|string
      */
-    public function searchPosts($searchTerm)
+    public function searchPosts( $searchTerm )
     {
         $args = [
             'post_status' => 'publish',
             'post_type' => 'any',
         ];
-        if (is_numeric($searchTerm)) {
+        if( is_numeric( $searchTerm ) ) {
             $args['post__in'] = [$searchTerm];
         } else {
             $args['orderby'] = 'relevance';
             $args['posts_per_page'] = 10;
             $args['s'] = $searchTerm;
         }
-        $queryBuilder = glsr(QueryBuilder::class);
-        add_filter('posts_search', [$queryBuilder, 'filterSearchByTitle'], 500, 2);
-        $search = new WP_Query($args);
-        remove_filter('posts_search', [$queryBuilder, 'filterSearchByTitle'], 500);
-        if (!$search->have_posts()) {
+        $queryBuilder = glsr( QueryBuilder::class );
+        add_filter( 'posts_search', [$queryBuilder, 'filterSearchByTitle'], 500, 2 );
+        $search = new WP_Query( $args );
+        remove_filter( 'posts_search', [$queryBuilder, 'filterSearchByTitle'], 500 );
+        if( !$search->have_posts() ) {
             return;
         }
         $results = '';
-        while ($search->have_posts()) {
+        while( $search->have_posts() ) {
             $search->the_post();
             ob_start();
-            glsr()->render('partials/editor/search-result', [
+            glsr()->render( 'partials/editor/search-result', [
                 'ID' => get_the_ID(),
-                'permalink' => esc_url((string) get_permalink()),
-                'title' => esc_attr(get_the_title()),
-            ]);
-            $results.= ob_get_clean();
+                'permalink' => esc_url( (string)get_permalink() ),
+                'title' => esc_attr( get_the_title() ),
+            ] );
+            $results .= ob_get_clean();
         }
         wp_reset_postdata();
         return $results;
@@ -162,9 +162,9 @@ 
      * @param mixed $value
      * @return int|bool
      */
-    public function update($postId, $key, $value)
+    public function update( $postId, $key, $value )
     {
-        $key = glsr(Helper::class)->prefix('_', $key);
-        return update_post_meta($postId, $key, $value);
+        $key = glsr( Helper::class )->prefix( '_', $key );
+        return update_post_meta( $postId, $key, $value );
     }
 }

plugin/Modules/Html/Settings.php

Spacing +67 added lines, -67 removed lines

@@ -18,31 +18,31 @@ 
      * @param string $id
      * @return string
      */
-    public function buildFields($id)
+    public function buildFields( $id )
     {
-        $this->settings = glsr(DefaultsManager::class)->settings();
-        $method = glsr(Helper::class)->buildMethodName($id, 'getTemplateDataFor');
-        $data = !method_exists($this, $method)
-            ? $this->getTemplateData($id)
-            : $this->$method($id);
-        return glsr(Template::class)->build('pages/settings/'.$id, $data);
+        $this->settings = glsr( DefaultsManager::class )->settings();
+        $method = glsr( Helper::class )->buildMethodName( $id, 'getTemplateDataFor' );
+        $data = !method_exists( $this, $method )
+            ? $this->getTemplateData( $id )
+            : $this->$method( $id );
+        return glsr( Template::class )->build( 'pages/settings/'.$id, $data );
     }
 
     /**
      * @return string
      */
-    protected function getFieldDefault(array $field)
+    protected function getFieldDefault( array $field )
     {
-        return glsr_get($field, 'default');
+        return glsr_get( $field, 'default' );
     }
 
     /**
      * @return string
      */
-    protected function getFieldNameForDependsOn($path)
+    protected function getFieldNameForDependsOn( $path )
     {
-        $fieldName = glsr(Helper::class)->convertPathToName($path, OptionManager::databaseKey());
-        return $this->isMultiDependency($path)
+        $fieldName = glsr( Helper::class )->convertPathToName( $path, OptionManager::databaseKey() );
+        return $this->isMultiDependency( $path )
             ? $fieldName.'[]'
             : $fieldName;
     }
@@ -50,25 +50,25 @@ 
     /**
      * @return array
      */
-    protected function getSettingFields($path)
+    protected function getSettingFields( $path )
     {
-        return array_filter($this->settings, function ($key) use ($path) {
-            return glsr(Helper::class)->startsWith($path, $key);
-        }, ARRAY_FILTER_USE_KEY);
+        return array_filter( $this->settings, function( $key ) use ($path) {
+            return glsr( Helper::class )->startsWith( $path, $key );
+        }, ARRAY_FILTER_USE_KEY );
     }
 
     /**
      * @return string
      */
-    protected function getSettingRows(array $fields)
+    protected function getSettingRows( array $fields )
     {
         $rows = '';
-        foreach ($fields as $name => $field) {
-            $field = wp_parse_args($field, [
+        foreach( $fields as $name => $field ) {
+            $field = wp_parse_args( $field, [
                 'is_setting' => true,
                 'name' => $name,
-            ]);
-            $rows.= new Field($this->normalize($field));
+            ] );
+            $rows .= new Field( $this->normalize( $field ) );
         }
         return $rows;
     }
@@ -77,12 +77,12 @@ 
      * @param string $id
      * @return array
      */
-    protected function getTemplateData($id)
+    protected function getTemplateData( $id )
     {
-        $fields = $this->getSettingFields($this->normalizeSettingPath($id));
+        $fields = $this->getSettingFields( $this->normalizeSettingPath( $id ) );
         return [
             'context' => [
-                'rows' => $this->getSettingRows($fields),
+                'rows' => $this->getSettingRows( $fields ),
             ],
         ];
     }
@@ -91,19 +91,19 @@ 
      * @param string $id
      * @return array
      */
-    protected function getTemplateDataForAddons($id)
+    protected function getTemplateDataForAddons( $id )
     {
-        $fields = $this->getSettingFields($this->normalizeSettingPath($id));
-        $settings = glsr(Helper::class)->convertDotNotationArray($fields);
-        $settingKeys = array_keys($settings['settings']['addons']);
+        $fields = $this->getSettingFields( $this->normalizeSettingPath( $id ) );
+        $settings = glsr( Helper::class )->convertDotNotationArray( $fields );
+        $settingKeys = array_keys( $settings['settings']['addons'] );
         $results = [];
-        foreach ($settingKeys as $key) {
-            $addonFields = array_filter($fields, function ($path) use ($key) {
-                return glsr(Helper::class)->startsWith('settings.addons.'.$key, $path);
-            }, ARRAY_FILTER_USE_KEY);
-            $results[$key] = $this->getSettingRows($addonFields);
+        foreach( $settingKeys as $key ) {
+            $addonFields = array_filter( $fields, function( $path ) use ($key) {
+                return glsr( Helper::class )->startsWith( 'settings.addons.'.$key, $path );
+            }, ARRAY_FILTER_USE_KEY );
+            $results[$key] = $this->getSettingRows( $addonFields );
         }
-        ksort($results);
+        ksort( $results );
         return [
             'settings' => $results,
         ];
@@ -113,13 +113,13 @@ 
      * @param string $id
      * @return array
      */
-    protected function getTemplateDataForLicenses($id)
+    protected function getTemplateDataForLicenses( $id )
     {
-        $fields = $this->getSettingFields($this->normalizeSettingPath($id));
-        ksort($fields);
+        $fields = $this->getSettingFields( $this->normalizeSettingPath( $id ) );
+        ksort( $fields );
         return [
             'context' => [
-                'rows' => $this->getSettingRows($fields),
+                'rows' => $this->getSettingRows( $fields ),
             ],
         ];
     }
@@ -129,7 +129,7 @@ 
      */
     protected function getTemplateDataForTranslations()
     {
-        $translations = glsr(Translation::class)->renderAll();
+        $translations = glsr( Translation::class )->renderAll();
         $class = empty($translations)
             ? 'glsr-hidden'
             : '';
@@ -147,16 +147,16 @@ 
      * @param string|array $expectedValue
      * @return bool
      */
-    protected function isFieldHidden($path, $expectedValue)
+    protected function isFieldHidden( $path, $expectedValue )
     {
-        $optionValue = glsr(OptionManager::class)->get(
+        $optionValue = glsr( OptionManager::class )->get(
             $path,
-            glsr(Helper::class)->dataGet(glsr()->defaults, $path)
+            glsr( Helper::class )->dataGet( glsr()->defaults, $path )
         );
-        if (is_array($expectedValue)) {
-            return is_array($optionValue)
-                ? 0 === count(array_intersect($optionValue, $expectedValue))
-                : !in_array($optionValue, $expectedValue);
+        if( is_array( $expectedValue ) ) {
+            return is_array( $optionValue )
+                ? 0 === count( array_intersect( $optionValue, $expectedValue ) )
+                : !in_array( $optionValue, $expectedValue );
         }
         return $optionValue != $expectedValue;
     }
@@ -164,9 +164,9 @@ 
     /**
      * @return bool
      */
-    protected function isMultiDependency($path)
+    protected function isMultiDependency( $path )
     {
-        if (isset($this->settings[$path])) {
+        if( isset($this->settings[$path]) ) {
             $field = $this->settings[$path];
             return ('checkbox' == $field['type'] && !empty($field['options']))
                 || !empty($field['multiple']);
@@ -177,32 +177,32 @@ 
     /**
      * @return array
      */
-    protected function normalize(array $field)
+    protected function normalize( array $field )
     {
-        $field = $this->normalizeDependsOn($field);
-        $field = $this->normalizeLabelAndLegend($field);
-        $field = $this->normalizeValue($field);
+        $field = $this->normalizeDependsOn( $field );
+        $field = $this->normalizeLabelAndLegend( $field );
+        $field = $this->normalizeValue( $field );
         return $field;
     }
 
     /**
      * @return array
      */
-    protected function normalizeDependsOn(array $field)
+    protected function normalizeDependsOn( array $field )
     {
-        if (!empty($field['depends_on']) && is_array($field['depends_on'])) {
+        if( !empty($field['depends_on']) && is_array( $field['depends_on'] ) ) {
             $isFieldHidden = false;
             $conditions = [];
-            foreach ($field['depends_on'] as $path => $value) {
+            foreach( $field['depends_on'] as $path => $value ) {
                 $conditions[] = [
-                    'name' => $this->getFieldNameForDependsOn($path),
+                    'name' => $this->getFieldNameForDependsOn( $path ),
                     'value' => $value,
                 ];
-                if ($this->isFieldHidden($path, $value)) {
+                if( $this->isFieldHidden( $path, $value ) ) {
                     $isFieldHidden = true;
                 }
             }
-            $field['data-depends'] = json_encode($conditions, JSON_HEX_APOS | JSON_HEX_QUOT);
+            $field['data-depends'] = json_encode( $conditions, JSON_HEX_APOS | JSON_HEX_QUOT );
             $field['is_hidden'] = $isFieldHidden;
         }
         return $field;
@@ -211,14 +211,14 @@ 
     /**
      * @return array
      */
-    protected function normalizeLabelAndLegend(array $field)
+    protected function normalizeLabelAndLegend( array $field )
     {
-        if (!empty($field['label'])) {
+        if( !empty($field['label']) ) {
             $field['legend'] = $field['label'];
             unset($field['label']);
         } else {
             $field['is_valid'] = false;
-            glsr_log()->warning('Setting field is missing a label')->debug($field);
+            glsr_log()->warning( 'Setting field is missing a label' )->debug( $field );
         }
         return $field;
     }
@@ -226,12 +226,12 @@ 
     /**
      * @return array
      */
-    protected function normalizeValue(array $field)
+    protected function normalizeValue( array $field )
     {
-        if (!isset($field['value'])) {
-            $field['value'] = glsr(OptionManager::class)->get(
+        if( !isset($field['value']) ) {
+            $field['value'] = glsr( OptionManager::class )->get(
                 $field['name'],
-                $this->getFieldDefault($field)
+                $this->getFieldDefault( $field )
             );
         }
         return $field;
@@ -240,8 +240,8 @@ 
     /**
      * @return string
      */
-    protected function normalizeSettingPath($path)
+    protected function normalizeSettingPath( $path )
     {
-        return glsr(Helper::class)->prefix('settings.', rtrim($path, '.'));
+        return glsr( Helper::class )->prefix( 'settings.', rtrim( $path, '.' ) );
     }
 }