pryley / site-reviews

plugin/Database/DefaultsManager.php

Spacing +14 added lines, -14 removed lines

@@ -12,11 +12,11 @@ 
     public function defaults()
     {
         $settings = $this->settings();
-        $defaults = (array) array_combine(array_keys($settings), glsr_array_column($settings, 'default'));
-        return wp_parse_args($defaults, [
+        $defaults = (array)array_combine( array_keys( $settings ), glsr_array_column( $settings, 'default' ) );
+        return wp_parse_args( $defaults, [
             'version' => '',
             'version_upgraded_from' => '',
-        ]);
+        ] );
     }
 
     /**
@@ -24,7 +24,7 @@ 
      */
     public function get()
     {
-        return Arr::convertDotNotationArray($this->defaults());
+        return Arr::convertDotNotationArray( $this->defaults() );
     }
 
     /**
@@ -32,11 +32,11 @@ 
      */
     public function set()
     {
-        $settings = glsr(OptionManager::class)->all();
-        $currentSettings = Arr::removeEmptyArrayValues($settings);
-        $defaultSettings = array_replace_recursive($this->get(), $currentSettings);
-        $updatedSettings = array_replace_recursive($settings, $defaultSettings);
-        update_option(OptionManager::databaseKey(), $updatedSettings);
+        $settings = glsr( OptionManager::class )->all();
+        $currentSettings = Arr::removeEmptyArrayValues( $settings );
+        $defaultSettings = array_replace_recursive( $this->get(), $currentSettings );
+        $updatedSettings = array_replace_recursive( $settings, $defaultSettings );
+        update_option( OptionManager::databaseKey(), $updatedSettings );
         return $defaultSettings;
     }
 
@@ -45,17 +45,17 @@ 
      */
     public function settings()
     {
-        $settings = apply_filters('site-reviews/addon/settings', glsr()->config('settings'));
-        return $this->normalize($settings);
+        $settings = apply_filters( 'site-reviews/addon/settings', glsr()->config( 'settings' ) );
+        return $this->normalize( $settings );
     }
 
     /**
      * @return array
      */
-    protected function normalize(array $settings)
+    protected function normalize( array $settings )
     {
-        array_walk($settings, function (&$setting) {
-            if (isset($setting['default'])) {
+        array_walk( $settings, function( &$setting ) {
+            if( isset($setting['default']) ) {
                 return;
             }
             $setting['default'] = '';

plugin/Database/OptionManager.php

Spacing +37 added lines, -37 removed lines

@@ -17,14 +17,14 @@ 
     /**
      * @return string
      */
-    public static function databaseKey($version = null)
+    public static function databaseKey( $version = null )
     {
-        if (null === $version) {
-            $version = explode('.', glsr()->version);
-            $version = array_shift($version);
+        if( null === $version ) {
+            $version = explode( '.', glsr()->version );
+            $version = array_shift( $version );
         }
         return Str::snakeCase(
-            Application::ID.'-v'.intval($version)
+            Application::ID.'-v'.intval( $version )
         );
     }
 
@@ -33,7 +33,7 @@ 
      */
     public function all()
     {
-        if (empty($this->options)) {
+        if( empty($this->options) ) {
             $this->reset();
         }
         return $this->options;
@@ -43,20 +43,20 @@ 
      * @param string $path
      * @return bool
      */
-    public function delete($path)
+    public function delete( $path )
     {
-        $keys = explode('.', $path);
-        $last = array_pop($keys);
+        $keys = explode( '.', $path );
+        $last = array_pop( $keys );
         $options = $this->all();
         $pointer = &$options;
-        foreach ($keys as $key) {
-            if (!isset($pointer[$key]) || !is_array($pointer[$key])) {
+        foreach( $keys as $key ) {
+            if( !isset($pointer[$key]) || !is_array( $pointer[$key] ) ) {
                 continue;
             }
             $pointer = &$pointer[$key];
         }
         unset($pointer[$last]);
-        return $this->set($options);
+        return $this->set( $options );
     }
 
     /**
@@ -65,19 +65,19 @@ 
      * @param string $cast
      * @return mixed
      */
-    public function get($path = '', $fallback = '', $cast = '')
+    public function get( $path = '', $fallback = '', $cast = '' )
     {
-        $result = Arr::get($this->all(), $path, $fallback);
-        return Helper::castTo($cast, $result);
+        $result = Arr::get( $this->all(), $path, $fallback );
+        return Helper::castTo( $cast, $result );
     }
 
     /**
      * @param string $path
      * @return bool
      */
-    public function getBool($path)
+    public function getBool( $path )
     {
-        return Helper::castTo('bool', $this->get($path));
+        return Helper::castTo( 'bool', $this->get( $path ) );
     }
 
     /**
@@ -86,13 +86,13 @@ 
      * @param string $cast
      * @return mixed
      */
-    public function getWP($path, $fallback = '', $cast = '')
+    public function getWP( $path, $fallback = '', $cast = '' )
     {
-        $option = get_option($path, $fallback);
-        if (empty($option)) {
+        $option = get_option( $path, $fallback );
+        if( empty($option) ) {
             $option = $fallback;
         }
-        return Helper::castTo($cast, $option);
+        return Helper::castTo( $cast, $option );
     }
 
     /**
@@ -100,25 +100,25 @@ 
      */
     public function json()
     {
-        return json_encode($this->all());
+        return json_encode( $this->all() );
     }
 
     /**
      * @return array
      */
-    public function normalize(array $options = [])
+    public function normalize( array $options = [] )
     {
         $options = wp_parse_args(
-            Arr::flattenArray($options),
-            glsr(DefaultsManager::class)->defaults()
+            Arr::flattenArray( $options ),
+            glsr( DefaultsManager::class )->defaults()
         );
-        array_walk($options, function (&$value) {
-            if (!is_string($value)) {
+        array_walk( $options, function( &$value ) {
+            if( !is_string( $value ) ) {
                 return;
             }
-            $value = wp_kses($value, wp_kses_allowed_html('post'));
+            $value = wp_kses( $value, wp_kses_allowed_html( 'post' ) );
         });
-        return Arr::convertDotNotationArray($options);
+        return Arr::convertDotNotationArray( $options );
     }
 
     /**
@@ -126,7 +126,7 @@ 
      */
     public function isRecaptchaEnabled()
     {
-        $integration = $this->get('settings.submissions.recaptcha.integration');
+        $integration = $this->get( 'settings.submissions.recaptcha.integration' );
         return 'all' == $integration || ('guest' == $integration && !is_user_logged_in());
     }
 
@@ -135,9 +135,9 @@ 
      */
     public function reset()
     {
-        $options = $this->getWP(static::databaseKey(), []);
-        if (!is_array($options) || empty($options)) {
-            delete_option(static::databaseKey());
+        $options = $this->getWP( static::databaseKey(), [] );
+        if( !is_array( $options ) || empty($options) ) {
+            delete_option( static::databaseKey() );
             $options = glsr()->defaults ?: [];
         }
         $this->options = $options;
@@ -148,12 +148,12 @@ 
      * @param mixed $value
      * @return bool
      */
-    public function set($pathOrOptions, $value = '')
+    public function set( $pathOrOptions, $value = '' )
     {
-        if (is_string($pathOrOptions)) {
-            $pathOrOptions = Arr::set($this->all(), $pathOrOptions, $value);
+        if( is_string( $pathOrOptions ) ) {
+            $pathOrOptions = Arr::set( $this->all(), $pathOrOptions, $value );
         }
-        if ($result = update_option(static::databaseKey(), (array) $pathOrOptions)) {
+        if( $result = update_option( static::databaseKey(), (array)$pathOrOptions ) ) {
             $this->reset();
         }
         return $result;

plugin/Commands/RegisterPostType.php

Spacing +28 added lines, -28 removed lines

@@ -15,10 +15,10 @@ 
     public $postType;
     public $single;
 
-    public function __construct($input)
+    public function __construct( $input )
     {
-        $args = glsr(PostTypeDefaults::class)->merge($input);
-        $this->normalize($args);
+        $args = glsr( PostTypeDefaults::class )->merge( $input );
+        $this->normalize( $args );
         $this->normalizeColumns();
         $this->normalizeLabels();
     }
@@ -26,19 +26,19 @@ 
     /**
      * @return void
      */
-    protected function normalize(array $args)
+    protected function normalize( array $args )
     {
-        foreach ($args as $key => $value) {
-            $property = Helper::buildPropertyName($key);
-            if (!property_exists($this, $property)) {
+        foreach( $args as $key => $value ) {
+            $property = Helper::buildPropertyName( $key );
+            if( !property_exists( $this, $property ) ) {
                 continue;
             }
             $this->$property = $value;
             unset($args[$key]);
         }
-        $this->args = wp_parse_args($args, [
+        $this->args = wp_parse_args( $args, [
             'menu_name' => $this->plural,
-        ]);
+        ] );
     }
 
     /**
@@ -46,22 +46,22 @@ 
      */
     protected function normalizeLabels()
     {
-        $this->args['labels'] = wp_parse_args($this->args['labels'], [
-            'add_new_item' => sprintf(_x('Add New %s', 'Add New Post', 'site-reviews'), $this->plural),
-            'all_items' => sprintf(_x('All %s', 'All Posts', 'site-reviews'), $this->plural),
-            'archives' => sprintf(_x('%s Archives', 'Post Archives', 'site-reviews'), $this->single),
-            'edit_item' => sprintf(_x('Edit %s', 'Edit Post', 'site-reviews'), $this->single),
-            'insert_into_item' => sprintf(_x('Insert into %s', 'Insert into Post', 'site-reviews'), $this->single),
+        $this->args['labels'] = wp_parse_args( $this->args['labels'], [
+            'add_new_item' => sprintf( _x( 'Add New %s', 'Add New Post', 'site-reviews' ), $this->plural ),
+            'all_items' => sprintf( _x( 'All %s', 'All Posts', 'site-reviews' ), $this->plural ),
+            'archives' => sprintf( _x( '%s Archives', 'Post Archives', 'site-reviews' ), $this->single ),
+            'edit_item' => sprintf( _x( 'Edit %s', 'Edit Post', 'site-reviews' ), $this->single ),
+            'insert_into_item' => sprintf( _x( 'Insert into %s', 'Insert into Post', 'site-reviews' ), $this->single ),
             'menu_name' => $this->args['menu_name'],
             'name' => $this->plural,
-            'new_item' => sprintf(_x('New %s', 'New Post', 'site-reviews'), $this->single),
-            'not_found' => sprintf(_x('No %s found', 'No Posts found', 'site-reviews'), $this->plural),
-            'not_found_in_trash' => sprintf(_x('No %s found in Trash', 'No Posts found in Trash', 'site-reviews'), $this->plural),
-            'search_items' => sprintf(_x('Search %s', 'Search Posts', 'site-reviews'), $this->plural),
+            'new_item' => sprintf( _x( 'New %s', 'New Post', 'site-reviews' ), $this->single ),
+            'not_found' => sprintf( _x( 'No %s found', 'No Posts found', 'site-reviews' ), $this->plural ),
+            'not_found_in_trash' => sprintf( _x( 'No %s found in Trash', 'No Posts found in Trash', 'site-reviews' ), $this->plural ),
+            'search_items' => sprintf( _x( 'Search %s', 'Search Posts', 'site-reviews' ), $this->plural ),
             'singular_name' => $this->single,
-            'uploaded_to_this_item' => sprintf(_x('Uploaded to this %s', 'Uploaded to this Post', 'site-reviews'), $this->single),
-            'view_item' => sprintf(_x('View %s', 'View Post', 'site-reviews'), $this->single),
-        ]);
+            'uploaded_to_this_item' => sprintf( _x( 'Uploaded to this %s', 'Uploaded to this Post', 'site-reviews' ), $this->single ),
+            'view_item' => sprintf( _x( 'View %s', 'View Post', 'site-reviews' ), $this->single ),
+        ] );
         unset($this->args['menu_name']);
     }
 
@@ -71,13 +71,13 @@ 
     protected function normalizeColumns()
     {
         $this->columns = ['cb' => ''] + $this->columns;
-        if (array_key_exists('category', $this->columns)) {
-            $keys = array_keys($this->columns);
-            $keys[array_search('category', $keys)] = 'taxonomy-'.Application::TAXONOMY;
-            $this->columns = array_combine($keys, $this->columns);
+        if( array_key_exists( 'category', $this->columns ) ) {
+            $keys = array_keys( $this->columns );
+            $keys[array_search( 'category', $keys )] = 'taxonomy-'.Application::TAXONOMY;
+            $this->columns = array_combine( $keys, $this->columns );
         }
-        if (array_key_exists('pinned', $this->columns)) {
-            $this->columns['pinned'] = glsr(Builder::class)->span('<span>'.$this->columns['pinned'].'</span>',
+        if( array_key_exists( 'pinned', $this->columns ) ) {
+            $this->columns['pinned'] = glsr( Builder::class )->span( '<span>'.$this->columns['pinned'].'</span>',
                 ['class' => 'pinned-icon']
             );
         }

plugin/Commands/CreateReview.php

Spacing +34 added lines, -34 removed lines

@@ -27,37 +27,37 @@ 
     public $title;
     public $url;
 
-    public function __construct($input)
+    public function __construct( $input )
     {
         $this->request = $input;
         $this->ajax_request = isset($input['_ajax_request']);
-        $this->assigned_to = $this->getNumeric('assign_to');
-        $this->author = sanitize_text_field($this->getUser('name'));
+        $this->assigned_to = $this->getNumeric( 'assign_to' );
+        $this->author = sanitize_text_field( $this->getUser( 'name' ) );
         $this->avatar = $this->getAvatar();
         $this->blacklisted = isset($input['blacklisted']);
         $this->category = $this->getCategory();
-        $this->content = sanitize_textarea_field($this->get('content'));
+        $this->content = sanitize_textarea_field( $this->get( 'content' ) );
         $this->custom = $this->getCustom();
-        $this->date = $this->getDate('date');
-        $this->email = sanitize_email($this->getUser('email'));
-        $this->form_id = sanitize_key($this->get('form_id'));
-        $this->ip_address = $this->get('ip_address');
-        $this->post_id = intval($this->get('_post_id'));
-        $this->rating = intval($this->get('rating'));
-        $this->referer = $this->get('_referer');
-        $this->response = sanitize_textarea_field($this->get('response'));
+        $this->date = $this->getDate( 'date' );
+        $this->email = sanitize_email( $this->getUser( 'email' ) );
+        $this->form_id = sanitize_key( $this->get( 'form_id' ) );
+        $this->ip_address = $this->get( 'ip_address' );
+        $this->post_id = intval( $this->get( '_post_id' ) );
+        $this->rating = intval( $this->get( 'rating' ) );
+        $this->referer = $this->get( '_referer' );
+        $this->response = sanitize_textarea_field( $this->get( 'response' ) );
         $this->terms = !empty($input['terms']);
-        $this->title = sanitize_text_field($this->get('title'));
-        $this->url = esc_url_raw($this->get('url'));
+        $this->title = sanitize_text_field( $this->get( 'title' ) );
+        $this->url = esc_url_raw( $this->get( 'url' ) );
     }
 
     /**
      * @param string $key
      * @return string
      */
-    protected function get($key)
+    protected function get( $key )
     {
-        return (string) Arr::get($this->request, $key);
+        return (string)Arr::get( $this->request, $key );
     }
 
     /**
@@ -65,9 +65,9 @@ 
      */
     protected function getAvatar()
     {
-        $avatar = $this->get('avatar');
-        return !filter_var($avatar, FILTER_VALIDATE_URL, FILTER_FLAG_PATH_REQUIRED)
-            ? (string) get_avatar_url($this->get('email'))
+        $avatar = $this->get( 'avatar' );
+        return !filter_var( $avatar, FILTER_VALIDATE_URL, FILTER_FLAG_PATH_REQUIRED )
+            ? (string)get_avatar_url( $this->get( 'email' ) )
             : $avatar;
     }
 
@@ -76,8 +76,8 @@ 
      */
     protected function getCategory()
     {
-        $categories = Arr::convertStringToArray($this->get('category'));
-        return sanitize_key(Arr::get($categories, 0));
+        $categories = Arr::convertStringToArray( $this->get( 'category' ) );
+        return sanitize_key( Arr::get( $categories, 0 ) );
     }
 
     /**
@@ -90,9 +90,9 @@ 
             '_referer', 'assign_to', 'category', 'content', 'date', 'email', 'excluded', 'form_id',
             'gotcha', 'ip_address', 'name', 'rating', 'response', 'terms', 'title', 'url',
         ];
-        $unset = apply_filters('site-reviews/create/unset-keys-from-custom', $unset);
+        $unset = apply_filters( 'site-reviews/create/unset-keys-from-custom', $unset );
         $custom = $this->request;
-        foreach ($unset as $value) {
+        foreach( $unset as $value ) {
             unset($custom[$value]);
         }
         return $custom;
@@ -102,29 +102,29 @@ 
      * @param string $key
      * @return string
      */
-    protected function getDate($key)
+    protected function getDate( $key )
     {
-        $date = strtotime($this->get($key));
-        if (false === $date) {
+        $date = strtotime( $this->get( $key ) );
+        if( false === $date ) {
             $date = time();
         }
-        return get_date_from_gmt(gmdate('Y-m-d H:i:s', $date));
+        return get_date_from_gmt( gmdate( 'Y-m-d H:i:s', $date ) );
     }
 
     /**
      * @param string $key
      * @return string
      */
-    protected function getUser($key)
+    protected function getUser( $key )
     {
-        $value = $this->get($key);
-        if (empty($value)) {
+        $value = $this->get( $key );
+        if( empty($value) ) {
             $user = wp_get_current_user();
             $userValues = [
                 'email' => 'user_email',
                 'name' => 'display_name',
             ];
-            if ($user->exists() && array_key_exists($key, $userValues)) {
+            if( $user->exists() && array_key_exists( $key, $userValues ) ) {
                 return $user->{$userValues[$key]};
             }
         }
@@ -135,10 +135,10 @@ 
      * @param string $key
      * @return string
      */
-    protected function getNumeric($key)
+    protected function getNumeric( $key )
     {
-        $value = $this->get($key);
-        return is_numeric($value)
+        $value = $this->get( $key );
+        return is_numeric( $value )
             ? $value
             : '';
     }

plugin/Router.php

Spacing +47 added lines, -47 removed lines

@@ -14,10 +14,10 @@ 
 
     public function __construct()
     {
-        $this->unguardedActions = apply_filters('site-reviews/router/unguarded-actions', [
+        $this->unguardedActions = apply_filters( 'site-reviews/router/unguarded-actions', [
             'dismiss-notice',
             'fetch-paged-reviews',
-        ]);
+        ] );
     }
 
     /**
@@ -26,11 +26,11 @@ 
     public function routeAdminPostRequest()
     {
         $request = $this->getRequest();
-        if (!$this->isValidPostRequest($request)) {
+        if( !$this->isValidPostRequest( $request ) ) {
             return;
         }
-        check_admin_referer($request['_action']);
-        $this->routeRequest('admin', $request['_action'], $request);
+        check_admin_referer( $request['_action'] );
+        $this->routeRequest( 'admin', $request['_action'], $request );
     }
 
     /**
@@ -39,9 +39,9 @@ 
     public function routeAjaxRequest()
     {
         $request = $this->getRequest();
-        $this->checkAjaxRequest($request);
-        $this->checkAjaxNonce($request);
-        $this->routeRequest('ajax', $request['_action'], $request);
+        $this->checkAjaxRequest( $request );
+        $this->checkAjaxNonce( $request );
+        $this->routeRequest( 'ajax', $request['_action'], $request );
         wp_die();
     }
 
@@ -50,45 +50,45 @@ 
      */
     public function routePublicPostRequest()
     {
-        if (is_admin()) {
+        if( is_admin() ) {
             return;
         }
         $request = $this->getRequest();
-        if (!$this->isValidPostRequest($request)) {
+        if( !$this->isValidPostRequest( $request ) ) {
             return;
         }
-        if (!$this->isValidPublicNonce($request)) {
+        if( !$this->isValidPublicNonce( $request ) ) {
             return;
         }
-        $this->routeRequest('public', $request['_action'], $request);
+        $this->routeRequest( 'public', $request['_action'], $request );
     }
 
     /**
      * @return void
      */
-    protected function checkAjaxNonce(array $request)
+    protected function checkAjaxNonce( array $request )
     {
-        if (!is_user_logged_in() || in_array(Arr::get($request, '_action'), $this->unguardedActions)) {
+        if( !is_user_logged_in() || in_array( Arr::get( $request, '_action' ), $this->unguardedActions ) ) {
             return;
         }
-        if (!isset($request['_nonce'])) {
-            $this->sendAjaxError('request is missing a nonce', $request);
+        if( !isset($request['_nonce']) ) {
+            $this->sendAjaxError( 'request is missing a nonce', $request );
         }
-        if (!wp_verify_nonce($request['_nonce'], $request['_action'])) {
-            $this->sendAjaxError('request failed the nonce check', $request, 403);
+        if( !wp_verify_nonce( $request['_nonce'], $request['_action'] ) ) {
+            $this->sendAjaxError( 'request failed the nonce check', $request, 403 );
         }
     }
 
     /**
      * @return void
      */
-    protected function checkAjaxRequest(array $request)
+    protected function checkAjaxRequest( array $request )
     {
-        if (!isset($request['_action'])) {
-            $this->sendAjaxError('request must include an action', $request);
+        if( !isset($request['_action']) ) {
+            $this->sendAjaxError( 'request must include an action', $request );
         }
-        if (empty($request['_ajax_request'])) {
-            $this->sendAjaxError('request is invalid', $request);
+        if( empty($request['_ajax_request']) ) {
+            $this->sendAjaxError( 'request is invalid', $request );
         }
     }
 
@@ -99,12 +99,12 @@ 
      */
     protected function getRequest()
     {
-        $request = Helper::filterInputArray(Application::ID);
-        if (Helper::filterInput('action') == Application::PREFIX.'action') {
+        $request = Helper::filterInputArray( Application::ID );
+        if( Helper::filterInput( 'action' ) == Application::PREFIX.'action' ) {
             $request['_ajax_request'] = true;
         }
-        if ('submit-review' == Helper::filterInput('_action', $request)) {
-            $request['_recaptcha-token'] = Helper::filterInput('g-recaptcha-response');
+        if( 'submit-review' == Helper::filterInput( '_action', $request ) ) {
+            $request['_recaptcha-token'] = Helper::filterInput( 'g-recaptcha-response' );
         }
         return $request;
     }
@@ -112,7 +112,7 @@ 
     /**
      * @return bool
      */
-    protected function isValidPostRequest(array $request = [])
+    protected function isValidPostRequest( array $request = [] )
     {
         return !empty($request['_action']) && empty($request['_ajax_request']);
     }
@@ -120,10 +120,10 @@ 
     /**
      * @return bool
      */
-    protected function isValidPublicNonce(array $request)
+    protected function isValidPublicNonce( array $request )
     {
-        if (is_user_logged_in() && !wp_verify_nonce($request['_nonce'], $request['_action'])) {
-            glsr_log()->error('nonce check failed for public request')->debug($request);
+        if( is_user_logged_in() && !wp_verify_nonce( $request['_nonce'], $request['_action'] ) ) {
+            glsr_log()->error( 'nonce check failed for public request' )->debug( $request );
             return false;
         }
         return true;
@@ -134,19 +134,19 @@ 
      * @param string $action
      * @return void
      */
-    protected function routeRequest($type, $action, array $request = [])
+    protected function routeRequest( $type, $action, array $request = [] )
     {
         $actionHook = 'site-reviews/route/'.$type.'/request';
-        $controller = glsr(Helper::buildClassName($type.'-controller', 'Controllers'));
-        $method = Helper::buildMethodName($action, 'router');
-        $request = apply_filters('site-reviews/route/request', $request, $action, $type);
-        do_action($actionHook, $action, $request);
-        if (is_callable([$controller, $method])) {
-            call_user_func([$controller, $method], $request);
+        $controller = glsr( Helper::buildClassName( $type.'-controller', 'Controllers' ) );
+        $method = Helper::buildMethodName( $action, 'router' );
+        $request = apply_filters( 'site-reviews/route/request', $request, $action, $type );
+        do_action( $actionHook, $action, $request );
+        if( is_callable( [$controller, $method] ) ) {
+            call_user_func( [$controller, $method], $request );
             return;
         }
-        if (0 === did_action($actionHook)) {
-            glsr_log('Unknown '.$type.' router request: '.$action);
+        if( 0 === did_action( $actionHook ) ) {
+            glsr_log( 'Unknown '.$type.' router request: '.$action );
         }
     }
 
@@ -155,14 +155,14 @@ 
      * @param int $statusCode
      * @return void
      */
-    protected function sendAjaxError($error, array $request, $statusCode = 400)
+    protected function sendAjaxError( $error, array $request, $statusCode = 400 )
     {
-        glsr_log()->error($error)->debug($request);
-        glsr(Notice::class)->addError(__('There was an error (try reloading the page).', 'site-reviews').' <code>'.$error.'</code>');
-        wp_send_json_error([
-            'message' => __('The form could not be submitted. Please notify the site administrator.', 'site-reviews'),
-            'notices' => glsr(Notice::class)->get(),
+        glsr_log()->error( $error )->debug( $request );
+        glsr( Notice::class )->addError( __( 'There was an error (try reloading the page).', 'site-reviews' ).' <code>'.$error.'</code>' );
+        wp_send_json_error( [
+            'message' => __( 'The form could not be submitted. Please notify the site administrator.', 'site-reviews' ),
+            'notices' => glsr( Notice::class )->get(),
             'error' => $error,
-        ]);
+        ] );
     }
 }

plugin/Database/CountsManager.php

Spacing +128 added lines, -128 removed lines

@@ -21,26 +21,26 @@ 
      * @return array
      * @todo verify the additional type checks are needed
      */
-    public function buildCounts(array $args = [])
+    public function buildCounts( array $args = [] )
     {
         $counts = [];
-        $query = $this->queryReviews($args);
-        while ($query) {
-            $types = array_keys(array_flip(glsr_array_column($query->reviews, 'type')));
-            $types = array_unique(array_merge(['local'], $types));
-            foreach ($types as $type) {
-                $type = $this->normalizeType($type);
-                if (isset($counts[$type])) {
+        $query = $this->queryReviews( $args );
+        while( $query ) {
+            $types = array_keys( array_flip( glsr_array_column( $query->reviews, 'type' ) ) );
+            $types = array_unique( array_merge( ['local'], $types ) );
+            foreach( $types as $type ) {
+                $type = $this->normalizeType( $type );
+                if( isset($counts[$type]) ) {
                     continue;
             }
-                $counts[$type] = array_fill_keys(range(0, glsr()->constant('MAX_RATING', Rating::class)), 0);
+                $counts[$type] = array_fill_keys( range( 0, glsr()->constant( 'MAX_RATING', Rating::class ) ), 0 );
             }
-            foreach ($query->reviews as $review) {
-                $type = $this->normalizeType($review->type);
+            foreach( $query->reviews as $review ) {
+                $type = $this->normalizeType( $review->type );
                 ++$counts[$type][$review->rating];
             }
             $query = $query->has_more
-                ? $this->queryReviews($args, end($query->reviews)->ID)
+                ? $this->queryReviews( $args, end( $query->reviews )->ID )
                 : false;
         }
         return $counts;
@@ -50,18 +50,18 @@ 
      * @param int $postId
      * @return array
      */
-    public function buildPostCounts($postId)
+    public function buildPostCounts( $postId )
     {
-        return $this->buildCounts(['post_ids' => [$postId]]);
+        return $this->buildCounts( ['post_ids' => [$postId]] );
     }
 
     /**
      * @param int $termTaxonomyId
      * @return array
      */
-    public function buildTermCounts($termTaxonomyId)
+    public function buildTermCounts( $termTaxonomyId )
     {
-        return $this->buildCounts(['term_ids' => [$termTaxonomyId]]);
+        return $this->buildCounts( ['term_ids' => [$termTaxonomyId]] );
     }
 
     /**
@@ -69,80 +69,80 @@ 
      */
     public function countAll()
     {
-        $terms = glsr(Database::class)->getTerms(['fields' => 'all']);
-        foreach ($terms as $term) {
-            $this->setTermCounts($term->term_id, $this->buildTermCounts($term->term_taxonomy_id));
+        $terms = glsr( Database::class )->getTerms( ['fields' => 'all'] );
+        foreach( $terms as $term ) {
+            $this->setTermCounts( $term->term_id, $this->buildTermCounts( $term->term_taxonomy_id ) );
         }
-        $postIds = glsr(SqlQueries::class)->getReviewsMeta('assigned_to');
-        foreach ($postIds as $postId) {
-            $this->setPostCounts($postId, $this->buildPostCounts($postId));
+        $postIds = glsr( SqlQueries::class )->getReviewsMeta( 'assigned_to' );
+        foreach( $postIds as $postId ) {
+            $this->setPostCounts( $postId, $this->buildPostCounts( $postId ) );
         }
-        $this->setCounts($this->buildCounts());
+        $this->setCounts( $this->buildCounts() );
     }
 
     /**
      * @return void
      */
-    public function decrease(Review $review)
+    public function decrease( Review $review )
     {
-        $this->decreaseCounts($review);
-        $this->decreasePostCounts($review);
-        $this->decreaseTermCounts($review);
+        $this->decreaseCounts( $review );
+        $this->decreasePostCounts( $review );
+        $this->decreaseTermCounts( $review );
     }
 
     /**
      * @return void
      */
-    public function decreaseCounts(Review $review)
+    public function decreaseCounts( Review $review )
     {
-        $this->setCounts($this->decreaseRating(
+        $this->setCounts( $this->decreaseRating(
             $this->getCounts(),
             $review->review_type,
             $review->rating
-        ));
+        ) );
     }
 
     /**
      * @return void
      */
-    public function decreasePostCounts(Review $review)
+    public function decreasePostCounts( Review $review )
     {
-        if (empty($counts = $this->getPostCounts($review->assigned_to))) {
+        if( empty($counts = $this->getPostCounts( $review->assigned_to )) ) {
             return;
         }
-        $counts = $this->decreaseRating($counts, $review->review_type, $review->rating);
-        $this->setPostCounts($review->assigned_to, $counts);
+        $counts = $this->decreaseRating( $counts, $review->review_type, $review->rating );
+        $this->setPostCounts( $review->assigned_to, $counts );
     }
 
     /**
      * @return void
      */
-    public function decreaseTermCounts(Review $review)
+    public function decreaseTermCounts( Review $review )
     {
-        foreach ($review->term_ids as $termId) {
-            if (empty($counts = $this->getTermCounts($termId))) {
+        foreach( $review->term_ids as $termId ) {
+            if( empty($counts = $this->getTermCounts( $termId )) ) {
                 continue;
             }
-            $counts = $this->decreaseRating($counts, $review->review_type, $review->rating);
-            $this->setTermCounts($termId, $counts);
+            $counts = $this->decreaseRating( $counts, $review->review_type, $review->rating );
+            $this->setTermCounts( $termId, $counts );
         }
     }
 
     /**
      * @return array
      */
-    public function flatten(array $reviewCounts, array $args = [])
+    public function flatten( array $reviewCounts, array $args = [] )
     {
         $counts = [];
-        array_walk_recursive($reviewCounts, function ($num, $index) use (&$counts) {
-            $counts[$index] = $num + intval(Arr::get($counts, $index, 0));
+        array_walk_recursive( $reviewCounts, function( $num, $index ) use (&$counts) {
+            $counts[$index] = $num + intval( Arr::get( $counts, $index, 0 ) );
         });
-        $args = wp_parse_args($args, [
-            'max' => glsr()->constant('MAX_RATING', Rating::class),
-            'min' => glsr()->constant('MIN_RATING', Rating::class),
-        ]);
-        foreach ($counts as $index => &$num) {
-            if ($index >= intval($args['min']) && $index <= intval($args['max'])) {
+        $args = wp_parse_args( $args, [
+            'max' => glsr()->constant( 'MAX_RATING', Rating::class ),
+            'min' => glsr()->constant( 'MIN_RATING', Rating::class ),
+        ] );
+        foreach( $counts as $index => &$num ) {
+            if( $index >= intval( $args['min'] ) && $index <= intval( $args['max'] ) ) {
                 continue;
             }
             $num = 0;
@@ -153,26 +153,26 @@ 
     /**
      * @return array
      */
-    public function get(array $args = [])
+    public function get( array $args = [] )
     {
-        $args = $this->normalizeArgs($args);
+        $args = $this->normalizeArgs( $args );
         $counts = [];
-        if ($this->isMixedCount($args)) {
-            $counts = [$this->buildCounts($args)]; // force query the database
+        if( $this->isMixedCount( $args ) ) {
+            $counts = [$this->buildCounts( $args )]; // force query the database
         } else {
-            foreach ($args['post_ids'] as $postId) {
-                $counts[] = $this->getPostCounts($postId);
+            foreach( $args['post_ids'] as $postId ) {
+                $counts[] = $this->getPostCounts( $postId );
         }
-            foreach ($args['term_ids'] as $termId) {
-                $counts[] = $this->getTermCounts($termId);
+            foreach( $args['term_ids'] as $termId ) {
+                $counts[] = $this->getTermCounts( $termId );
             }
-            if (empty($counts)) {
+            if( empty($counts) ) {
                 $counts[] = $this->getCounts();
             }
         }
-        return in_array($args['type'], ['', 'all'])
-            ? $this->normalize([$this->flatten($counts)])
-            : $this->normalize(glsr_array_column($counts, $args['type']));
+        return in_array( $args['type'], ['', 'all'] )
+            ? $this->normalize( [$this->flatten( $counts )] )
+            : $this->normalize( glsr_array_column( $counts, $args['type'] ) );
     }
 
     /**
@@ -180,9 +180,9 @@ 
      */
     public function getCounts()
     {
-        $counts = glsr(OptionManager::class)->get('counts', []);
-        if (!is_array($counts)) {
-            glsr_log()->error('Review counts is not an array; possibly due to incorrectly imported reviews.')->debug($counts);
+        $counts = glsr( OptionManager::class )->get( 'counts', [] );
+        if( !is_array( $counts ) ) {
+            glsr_log()->error( 'Review counts is not an array; possibly due to incorrectly imported reviews.' )->debug( $counts );
             return [];
         }
         return $counts;
@@ -192,105 +192,105 @@ 
      * @param int $postId
      * @return array
      */
-    public function getPostCounts($postId)
+    public function getPostCounts( $postId )
     {
-        return array_filter((array) get_post_meta($postId, static::META_COUNT, true));
+        return array_filter( (array)get_post_meta( $postId, static::META_COUNT, true ) );
     }
 
     /**
      * @param int $termId
      * @return array
      */
-    public function getTermCounts($termId)
+    public function getTermCounts( $termId )
     {
-        return array_filter((array) get_term_meta($termId, static::META_COUNT, true));
+        return array_filter( (array)get_term_meta( $termId, static::META_COUNT, true ) );
     }
 
     /**
      * @return void
      */
-    public function increase(Review $review)
+    public function increase( Review $review )
     {
-        $this->increaseCounts($review);
-        $this->increasePostCounts($review);
-        $this->increaseTermCounts($review);
+        $this->increaseCounts( $review );
+        $this->increasePostCounts( $review );
+        $this->increaseTermCounts( $review );
     }
 
     /**
      * @return void
      */
-    public function increaseCounts(Review $review)
+    public function increaseCounts( Review $review )
     {
-        if (empty($counts = $this->getCounts())) {
+        if( empty($counts = $this->getCounts()) ) {
             $counts = $this->buildCounts();
         }
-        $this->setCounts($this->increaseRating($counts, $review->review_type, $review->rating));
+        $this->setCounts( $this->increaseRating( $counts, $review->review_type, $review->rating ) );
     }
 
     /**
      * @return void
      */
-    public function increasePostCounts(Review $review)
+    public function increasePostCounts( Review $review )
     {
-        if (!(get_post($review->assigned_to) instanceof WP_Post)) {
+        if( !(get_post( $review->assigned_to ) instanceof WP_Post) ) {
             return;
         }
-        $counts = $this->getPostCounts($review->assigned_to);
+        $counts = $this->getPostCounts( $review->assigned_to );
         $counts = empty($counts)
-            ? $this->buildPostCounts($review->assigned_to)
-            : $this->increaseRating($counts, $review->review_type, $review->rating);
-        $this->setPostCounts($review->assigned_to, $counts);
+            ? $this->buildPostCounts( $review->assigned_to )
+            : $this->increaseRating( $counts, $review->review_type, $review->rating );
+        $this->setPostCounts( $review->assigned_to, $counts );
     }
 
     /**
      * @return void
      */
-    public function increaseTermCounts(Review $review)
+    public function increaseTermCounts( Review $review )
     {
-        $terms = glsr(ReviewManager::class)->normalizeTerms(implode(',', $review->term_ids));
-        foreach ($terms as $term) {
-            $counts = $this->getTermCounts($term['term_id']);
+        $terms = glsr( ReviewManager::class )->normalizeTerms( implode( ',', $review->term_ids ) );
+        foreach( $terms as $term ) {
+            $counts = $this->getTermCounts( $term['term_id'] );
             $counts = empty($counts)
-                ? $this->buildTermCounts($term['term_taxonomy_id'])
-                : $this->increaseRating($counts, $review->review_type, $review->rating);
-            $this->setTermCounts($term['term_id'], $counts);
+                ? $this->buildTermCounts( $term['term_taxonomy_id'] )
+                : $this->increaseRating( $counts, $review->review_type, $review->rating );
+            $this->setTermCounts( $term['term_id'], $counts );
         }
     }
 
     /**
      * @return void
      */
-    public function setCounts(array $reviewCounts)
+    public function setCounts( array $reviewCounts )
     {
-        glsr(OptionManager::class)->set('counts', $reviewCounts);
+        glsr( OptionManager::class )->set( 'counts', $reviewCounts );
     }
 
     /**
      * @param int $postId
      * @return void
      */
-    public function setPostCounts($postId, array $reviewCounts)
+    public function setPostCounts( $postId, array $reviewCounts )
     {
-        $ratingCounts = $this->flatten($reviewCounts);
-        update_post_meta($postId, static::META_COUNT, $reviewCounts);
-        update_post_meta($postId, static::META_AVERAGE, glsr(Rating::class)->getAverage($ratingCounts));
-        update_post_meta($postId, static::META_RANKING, glsr(Rating::class)->getRanking($ratingCounts));
+        $ratingCounts = $this->flatten( $reviewCounts );
+        update_post_meta( $postId, static::META_COUNT, $reviewCounts );
+        update_post_meta( $postId, static::META_AVERAGE, glsr( Rating::class )->getAverage( $ratingCounts ) );
+        update_post_meta( $postId, static::META_RANKING, glsr( Rating::class )->getRanking( $ratingCounts ) );
     }
 
     /**
      * @param int $termId
      * @return void
      */
-    public function setTermCounts($termId, array $reviewCounts)
+    public function setTermCounts( $termId, array $reviewCounts )
     {
-        $term = get_term($termId, Application::TAXONOMY);
-        if (!isset($term->term_id)) {
+        $term = get_term( $termId, Application::TAXONOMY );
+        if( !isset($term->term_id) ) {
             return;
         }
-        $ratingCounts = $this->flatten($reviewCounts);
-        update_term_meta($termId, static::META_COUNT, $reviewCounts);
-        update_term_meta($termId, static::META_AVERAGE, glsr(Rating::class)->getAverage($ratingCounts));
-        update_term_meta($termId, static::META_RANKING, glsr(Rating::class)->getRanking($ratingCounts));
+        $ratingCounts = $this->flatten( $reviewCounts );
+        update_term_meta( $termId, static::META_COUNT, $reviewCounts );
+        update_term_meta( $termId, static::META_AVERAGE, glsr( Rating::class )->getAverage( $ratingCounts ) );
+        update_term_meta( $termId, static::META_RANKING, glsr( Rating::class )->getRanking( $ratingCounts ) );
     }
 
     /**
@@ -298,10 +298,10 @@ 
      * @param int $rating
      * @return array
      */
-    protected function decreaseRating(array $reviewCounts, $type, $rating)
+    protected function decreaseRating( array $reviewCounts, $type, $rating )
     {
-        if (isset($reviewCounts[$type][$rating])) {
-            $reviewCounts[$type][$rating] = max(0, $reviewCounts[$type][$rating] - 1);
+        if( isset($reviewCounts[$type][$rating]) ) {
+            $reviewCounts[$type][$rating] = max( 0, $reviewCounts[$type][$rating] - 1 );
         }
         return $reviewCounts;
     }
@@ -311,23 +311,23 @@ 
      * @param int $rating
      * @return array
      */
-    protected function increaseRating(array $reviewCounts, $type, $rating)
+    protected function increaseRating( array $reviewCounts, $type, $rating )
     {
-        if (!array_key_exists($type, glsr()->reviewTypes)) {
+        if( !array_key_exists( $type, glsr()->reviewTypes ) ) {
             return $reviewCounts;
         }
-        if (!array_key_exists($type, $reviewCounts)) {
+        if( !array_key_exists( $type, $reviewCounts ) ) {
             $reviewCounts[$type] = [];
         }
-        $reviewCounts = $this->normalize($reviewCounts);
-        $reviewCounts[$type][$rating] = intval($reviewCounts[$type][$rating]) + 1;
+        $reviewCounts = $this->normalize( $reviewCounts );
+        $reviewCounts[$type][$rating] = intval( $reviewCounts[$type][$rating] ) + 1;
         return $reviewCounts;
     }
 
     /**
      * @return bool
      */
-    protected function isMixedCount(array $args)
+    protected function isMixedCount( array $args )
     {
         return !empty($args['post_ids']) && !empty($args['term_ids']);
     }
@@ -335,19 +335,19 @@ 
     /**
      * @return array
      */
-    protected function normalize(array $reviewCounts)
+    protected function normalize( array $reviewCounts )
     {
-        if (empty($reviewCounts)) {
+        if( empty($reviewCounts) ) {
             $reviewCounts = [[]];
         }
-        foreach ($reviewCounts as &$counts) {
-            foreach (range(0, glsr()->constant('MAX_RATING', Rating::class)) as $index) {
-                if (isset($counts[$index])) {
+        foreach( $reviewCounts as &$counts ) {
+            foreach( range( 0, glsr()->constant( 'MAX_RATING', Rating::class ) ) as $index ) {
+                if( isset($counts[$index]) ) {
                     continue;
                 }
                 $counts[$index] = 0;
             }
-            ksort($counts);
+            ksort( $counts );
         }
         return $reviewCounts;
     }
@@ -355,15 +355,15 @@ 
     /**
      * @return array
      */
-    protected function normalizeArgs(array $args)
+    protected function normalizeArgs( array $args )
     {
-        $args = wp_parse_args(array_filter($args), [
+        $args = wp_parse_args( array_filter( $args ), [
             'post_ids' => [],
             'term_ids' => [],
             'type' => 'local',
-        ]);
-        $args['post_ids'] = glsr(Polylang::class)->getPostIds($args['post_ids']);
-        $args['type'] = $this->normalizeType($args['type']);
+        ] );
+        $args['post_ids'] = glsr( Polylang::class )->getPostIds( $args['post_ids'] );
+        $args['type'] = $this->normalizeType( $args['type'] );
         return $args;
     }
 
@@ -371,9 +371,9 @@ 
      * @param string $type
      * @return string
      */
-    protected function normalizeType($type)
+    protected function normalizeType( $type )
     {
-        return empty($type) || !is_string($type)
+        return empty($type) || !is_string( $type )
             ? 'local'
             : $type;
     }
@@ -382,13 +382,13 @@ 
      * @param int $lastPostId
      * @return object
      */
-    protected function queryReviews(array $args = [], $lastPostId = 0)
+    protected function queryReviews( array $args = [], $lastPostId = 0 )
     {
-        $reviews = glsr(SqlQueries::class)->getReviewCounts($args, $lastPostId, static::LIMIT);
-        $hasMore = is_array($reviews)
-            ? count($reviews) == static::LIMIT
+        $reviews = glsr( SqlQueries::class )->getReviewCounts( $args, $lastPostId, static::LIMIT );
+        $hasMore = is_array( $reviews )
+            ? count( $reviews ) == static::LIMIT
             : false;
-        return (object) [
+        return (object)[
             'has_more' => $hasMore,
             'reviews' => $reviews,
         ];

plugin/Database/SqlQueries.php

Spacing +44 added lines, -44 removed lines

@@ -22,17 +22,17 @@ 
      * @param string $metaReviewId
      * @return int
      */
-    public function getPostIdFromReviewId($metaReviewId)
+    public function getPostIdFromReviewId( $metaReviewId )
     {
-        $postId = $this->db->get_var("
+        $postId = $this->db->get_var( "
             SELECT p.ID
             FROM {$this->db->posts} AS p
             INNER JOIN {$this->db->postmeta} AS m ON p.ID = m.post_id
             WHERE p.post_type = '{$this->postType}'
             AND m.meta_key = '_review_id'
             AND m.meta_value = '{$metaReviewId}'
-        ");
-        return intval($postId);
+        " );
+        return intval( $postId );
     }
 
     /**
@@ -40,23 +40,23 @@ 
      * @param int $limit
      * @return array
      */
-    public function getReviewCounts(array $args, $lastPostId = 0, $limit = 500)
+    public function getReviewCounts( array $args, $lastPostId = 0, $limit = 500 )
     {
-        return (array) $this->db->get_results("
+        return (array)$this->db->get_results( "
             SELECT DISTINCT p.ID, m1.meta_value AS rating, m2.meta_value AS type
             FROM {$this->db->posts} AS p
             INNER JOIN {$this->db->postmeta} AS m1 ON p.ID = m1.post_id
             INNER JOIN {$this->db->postmeta} AS m2 ON p.ID = m2.post_id
-            {$this->getInnerJoinForCounts($args)}
+            {$this->getInnerJoinForCounts( $args )}
             WHERE p.ID > {$lastPostId}
             AND p.post_status = 'publish'
             AND p.post_type = '{$this->postType}'
             AND m1.meta_key = '_rating'
             AND m2.meta_key = '_review_type'
-            {$this->getAndForCounts($args)}
+            {$this->getAndForCounts( $args )}
             ORDER By p.ID ASC
             LIMIT {$limit}
-        ");
+        " );
     }
 
     /**
@@ -64,17 +64,17 @@ 
      * @param string $metaKey
      * @return array
      */
-    public function getReviewCountsFor($metaKey)
+    public function getReviewCountsFor( $metaKey )
     {
-        $metaKey = Str::prefix('_', $metaKey);
-        return (array) $this->db->get_results("
+        $metaKey = Str::prefix( '_', $metaKey );
+        return (array)$this->db->get_results( "
             SELECT DISTINCT m.meta_value AS name, COUNT(*) num_posts
             FROM {$this->db->posts} AS p
             INNER JOIN {$this->db->postmeta} AS m ON p.ID = m.post_id
             WHERE p.post_type = '{$this->postType}'
             AND m.meta_key = '{$metaKey}'
             GROUP BY name
-        ");
+        " );
     }
 
     /**
@@ -82,9 +82,9 @@ 
      * @param string $reviewType
      * @return array
      */
-    public function getReviewIdsByType($reviewType)
+    public function getReviewIdsByType( $reviewType )
     {
-        $results = $this->db->get_col("
+        $results = $this->db->get_col( "
             SELECT DISTINCT m1.meta_value AS review_id
             FROM {$this->db->posts} AS p
             INNER JOIN {$this->db->postmeta} AS m1 ON p.ID = m1.post_id
@@ -93,8 +93,8 @@ 
             AND m1.meta_key = '_review_id'
             AND m2.meta_key = '_review_type'
             AND m2.meta_value = '{$reviewType}'
-        ");
-        return array_keys(array_flip($results));
+        " );
+        return array_keys( array_flip( $results ) );
     }
 
     /**
@@ -102,12 +102,12 @@ 
      * @param int $limit
      * @return array
      */
-    public function getReviewRatingsFromIds(array $postIds, $greaterThanId = 0, $limit = 100)
+    public function getReviewRatingsFromIds( array $postIds, $greaterThanId = 0, $limit = 100 )
     {
-        sort($postIds);
-        $postIds = array_slice($postIds, intval(array_search($greaterThanId, $postIds)), $limit);
-        $postIds = implode(',', $postIds);
-        return (array) $this->db->get_results("
+        sort( $postIds );
+        $postIds = array_slice( $postIds, intval( array_search( $greaterThanId, $postIds ) ), $limit );
+        $postIds = implode( ',', $postIds );
+        return (array)$this->db->get_results( "
             SELECT p.ID, m.meta_value AS rating
             FROM {$this->db->posts} AS p
             INNER JOIN {$this->db->postmeta} AS m ON p.ID = m.post_id
@@ -119,7 +119,7 @@ 
             GROUP BY p.ID
             ORDER By p.ID ASC
             LIMIT {$limit}
-        ");
+        " );
     }
 
     /**
@@ -127,10 +127,10 @@ 
      * @param string $status
      * @return array
      */
-    public function getReviewsMeta($key, $status = 'publish')
+    public function getReviewsMeta( $key, $status = 'publish' )
     {
-        $key = Str::prefix('_', $key);
-        $values = $this->db->get_col("
+        $key = Str::prefix( '_', $key );
+        $values = $this->db->get_col( "
             SELECT DISTINCT m.meta_value
             FROM {$this->db->postmeta} m
             LEFT JOIN {$this->db->posts} p ON p.ID = m.post_id
@@ -140,8 +140,8 @@ 
             AND p.post_status = '{$status}'
             GROUP BY p.ID -- remove duplicate meta_value entries
             ORDER BY m.meta_id ASC -- sort by oldest meta_value
-        ");
-        sort($values);
+        " );
+        sort( $values );
         return $values;
     }
 
@@ -149,34 +149,34 @@ 
      * @param string $and
      * @return string
      */
-    protected function getAndForCounts(array $args, $and = '')
+    protected function getAndForCounts( array $args, $and = '' )
     {
-        $postIds = implode(',', array_filter(Arr::get($args, 'post_ids', [])));
-        $termIds = implode(',', array_filter(Arr::get($args, 'term_ids', [])));
-        if (!empty($args['type'])) {
-            $and.= "AND m2.meta_value = '{$args['type']}' ";
+        $postIds = implode( ',', array_filter( Arr::get( $args, 'post_ids', [] ) ) );
+        $termIds = implode( ',', array_filter( Arr::get( $args, 'term_ids', [] ) ) );
+        if( !empty($args['type']) ) {
+            $and .= "AND m2.meta_value = '{$args['type']}' ";
         }
-        if ($postIds) {
-            $and.= "AND m3.meta_key = '_assigned_to' AND m3.meta_value IN ({$postIds}) ";
+        if( $postIds ) {
+            $and .= "AND m3.meta_key = '_assigned_to' AND m3.meta_value IN ({$postIds}) ";
         }
-        if ($termIds) {
-            $and.= "AND tr.term_taxonomy_id IN ({$termIds}) ";
+        if( $termIds ) {
+            $and .= "AND tr.term_taxonomy_id IN ({$termIds}) ";
         }
-        return apply_filters('site-reviews/query/and-for-counts', $and);
+        return apply_filters( 'site-reviews/query/and-for-counts', $and );
     }
 
     /**
      * @param string $innerJoin
      * @return string
      */
-    protected function getInnerJoinForCounts(array $args, $innerJoin = '')
+    protected function getInnerJoinForCounts( array $args, $innerJoin = '' )
     {
-        if (!empty(Arr::get($args, 'post_ids'))) {
-            $innerJoin.= "INNER JOIN {$this->db->postmeta} AS m3 ON p.ID = m3.post_id ";
+        if( !empty(Arr::get( $args, 'post_ids' )) ) {
+            $innerJoin .= "INNER JOIN {$this->db->postmeta} AS m3 ON p.ID = m3.post_id ";
         }
-        if (!empty(Arr::get($args, 'term_ids'))) {
-            $innerJoin.= "INNER JOIN {$this->db->term_relationships} AS tr ON p.ID = tr.object_id ";
+        if( !empty(Arr::get( $args, 'term_ids' )) ) {
+            $innerJoin .= "INNER JOIN {$this->db->term_relationships} AS tr ON p.ID = tr.object_id ";
         }
-        return apply_filters('site-reviews/query/inner-join-for-counts', $innerJoin);
+        return apply_filters( 'site-reviews/query/inner-join-for-counts', $innerJoin );
     }
 }

plugin/Controllers/TaxonomyController.php

Spacing +15 added lines, -15 removed lines

@@ -36,14 +36,14 @@ 
      */
     public function renderTaxonomyFilter()
     {
-        if (!is_object_in_taxonomy(glsr_current_screen()->post_type, Application::TAXONOMY)) {
+        if( !is_object_in_taxonomy( glsr_current_screen()->post_type, Application::TAXONOMY ) ) {
             return;
         }
-        echo glsr(Builder::class)->label(__('Filter by category', 'site-reviews'), [
+        echo glsr( Builder::class )->label( __( 'Filter by category', 'site-reviews' ), [
             'class' => 'screen-reader-text',
             'for' => Application::TAXONOMY,
-        ]);
-        wp_dropdown_categories([
+        ] );
+        wp_dropdown_categories( [
             'depth' => 3,
             'hide_empty' => true,
             'hide_if_empty' => true,
@@ -55,7 +55,7 @@ 
             'show_option_all' => $this->getShowOptionAll(),
             'taxonomy' => Application::TAXONOMY,
             'value_field' => 'slug',
-        ]);
+        ] );
     }
 
     /**
@@ -68,17 +68,17 @@ 
      * @return void
      * @action set_object_terms
      */
-    public function restrictTermSelection($postId, $terms, $newTTIds, $taxonomy, $append, $oldTTIds)
+    public function restrictTermSelection( $postId, $terms, $newTTIds, $taxonomy, $append, $oldTTIds )
     {
-        if (Application::TAXONOMY != $taxonomy || count($newTTIds) <= 1) {
+        if( Application::TAXONOMY != $taxonomy || count( $newTTIds ) <= 1 ) {
             return;
         }
-        $diff = array_diff($newTTIds, $oldTTIds);
-        if (empty($newTerm = array_shift($diff))) {
-            $newTerm = array_shift($newTTIds);
+        $diff = array_diff( $newTTIds, $oldTTIds );
+        if( empty($newTerm = array_shift( $diff )) ) {
+            $newTerm = array_shift( $newTTIds );
         }
-        if ($newTerm) {
-            wp_set_object_terms($postId, intval($newTerm), $taxonomy);
+        if( $newTerm ) {
+            wp_set_object_terms( $postId, intval( $newTerm ), $taxonomy );
         }
     }
 
@@ -88,7 +88,7 @@ 
     protected function getSelected()
     {
         global $wp_query;
-        return Arr::get($wp_query->query, Application::TAXONOMY);
+        return Arr::get( $wp_query->query, Application::TAXONOMY );
     }
 
     /**
@@ -96,9 +96,9 @@ 
      */
     protected function getShowOptionAll()
     {
-        $taxonomy = get_taxonomy(Application::TAXONOMY);
+        $taxonomy = get_taxonomy( Application::TAXONOMY );
         return $taxonomy
-            ? ucfirst(strtolower($taxonomy->labels->all_items))
+            ? ucfirst( strtolower( $taxonomy->labels->all_items ) )
             : '';
     }
 }

plugin/Controllers/SettingsController.php

Spacing +39 added lines, -39 removed lines

@@ -14,17 +14,17 @@ 
      * @return array
      * @callback register_setting
      */
-    public function callbackRegisterSettings($input)
+    public function callbackRegisterSettings( $input )
     {
-        $settings = Arr::consolidateArray($input);
-        if (1 === count($settings) && array_key_exists('settings', $settings)) {
-            $options = array_replace_recursive(glsr(OptionManager::class)->all(), $input);
-            $options = $this->sanitizeGeneral($input, $options);
-            $options = $this->sanitizeSubmissions($input, $options);
-            $options = $this->sanitizeTranslations($input, $options);
-            $options = apply_filters('site-reviews/settings/callback', $options, $settings);
-            if (filter_input(INPUT_POST, 'option_page') == Application::ID.'-settings') {
-                glsr(Notice::class)->addSuccess(__('Settings updated.', 'site-reviews'));
+        $settings = Arr::consolidateArray( $input );
+        if( 1 === count( $settings ) && array_key_exists( 'settings', $settings ) ) {
+            $options = array_replace_recursive( glsr( OptionManager::class )->all(), $input );
+            $options = $this->sanitizeGeneral( $input, $options );
+            $options = $this->sanitizeSubmissions( $input, $options );
+            $options = $this->sanitizeTranslations( $input, $options );
+            $options = apply_filters( 'site-reviews/settings/callback', $options, $settings );
+            if( filter_input( INPUT_POST, 'option_page' ) == Application::ID.'-settings' ) {
+                glsr( Notice::class )->addSuccess( __( 'Settings updated.', 'site-reviews' ) );
             }
             return $options;
         }
@@ -37,31 +37,31 @@ 
      */
     public function registerSettings()
     {
-        register_setting(Application::ID.'-settings', OptionManager::databaseKey(), [
+        register_setting( Application::ID.'-settings', OptionManager::databaseKey(), [
             'sanitize_callback' => [$this, 'callbackRegisterSettings'],
-        ]);
+        ] );
     }
 
     /**
      * @return array
      */
-    protected function sanitizeGeneral(array $input, array $options)
+    protected function sanitizeGeneral( array $input, array $options )
     {
         $inputForm = $input['settings']['general'];
-        if (!$this->hasMultilingualIntegration($inputForm['support']['multilingual'])) {
+        if( !$this->hasMultilingualIntegration( $inputForm['support']['multilingual'] ) ) {
             $options['settings']['general']['support']['multilingual'] = '';
         }
-        if ('' == trim($inputForm['notification_message'])) {
+        if( '' == trim( $inputForm['notification_message'] ) ) {
             $options['settings']['general']['notification_message'] = glsr()->defaults['settings']['general']['notification_message'];
         }
-        $options['settings']['general']['notifications'] = Arr::get($inputForm, 'notifications', []);
+        $options['settings']['general']['notifications'] = Arr::get( $inputForm, 'notifications', [] );
         return $options;
     }
 
     /**
      * @return array
      */
-    protected function sanitizeSubmissions(array $input, array $options)
+    protected function sanitizeSubmissions( array $input, array $options )
     {
         $inputForm = $input['settings']['submissions'];
         $options['settings']['submissions']['required'] = isset($inputForm['required'])
@@ -73,20 +73,20 @@ 
     /**
      * @return array
      */
-    protected function sanitizeTranslations(array $input, array $options)
+    protected function sanitizeTranslations( array $input, array $options )
     {
-        if (isset($input['settings']['strings'])) {
-            $options['settings']['strings'] = array_values(array_filter($input['settings']['strings']));
+        if( isset($input['settings']['strings']) ) {
+            $options['settings']['strings'] = array_values( array_filter( $input['settings']['strings'] ) );
             $allowedTags = [
                 'a' => ['class' => [], 'href' => [], 'target' => []],
                 'span' => ['class' => []],
             ];
-            array_walk($options['settings']['strings'], function (&$string) use ($allowedTags) {
-                if (isset($string['s2'])) {
-                    $string['s2'] = wp_kses($string['s2'], $allowedTags);
+            array_walk( $options['settings']['strings'], function( &$string ) use ($allowedTags) {
+                if( isset($string['s2']) ) {
+                    $string['s2'] = wp_kses( $string['s2'], $allowedTags );
                 }
-                if (isset($string['p2'])) {
-                    $string['p2'] = wp_kses($string['p2'], $allowedTags);
+                if( isset($string['p2']) ) {
+                    $string['p2'] = wp_kses( $string['p2'], $allowedTags );
                 }
             });
         }
@@ -96,24 +96,24 @@ 
     /**
      * @return bool
      */
-    protected function hasMultilingualIntegration($integration)
+    protected function hasMultilingualIntegration( $integration )
     {
-        if (!in_array($integration, ['polylang', 'wpml'])) {
+        if( !in_array( $integration, ['polylang', 'wpml'] ) ) {
             return false;
         }
-        $integrationClass = 'GeminiLabs\SiteReviews\Modules\\'.ucfirst($integration);
-        if (!glsr($integrationClass)->isActive()) {
-            glsr(Notice::class)->addError(sprintf(
-                __('Please install/activate the %s plugin to enable integration.', 'site-reviews'),
-                constant($integrationClass.'::PLUGIN_NAME')
-            ));
+        $integrationClass = 'GeminiLabs\SiteReviews\Modules\\'.ucfirst( $integration );
+        if( !glsr( $integrationClass )->isActive() ) {
+            glsr( Notice::class )->addError( sprintf(
+                __( 'Please install/activate the %s plugin to enable integration.', 'site-reviews' ),
+                constant( $integrationClass.'::PLUGIN_NAME' )
+            ) );
             return false;
-        } elseif (!glsr($integrationClass)->isSupported()) {
-            glsr(Notice::class)->addError(sprintf(
-                __('Please update the %s plugin to v%s or greater to enable integration.', 'site-reviews'),
-                constant($integrationClass.'::PLUGIN_NAME'),
-                constant($integrationClass.'::SUPPORTED_VERSION')
-            ));
+        } elseif( !glsr( $integrationClass )->isSupported() ) {
+            glsr( Notice::class )->addError( sprintf(
+                __( 'Please update the %s plugin to v%s or greater to enable integration.', 'site-reviews' ),
+                constant( $integrationClass.'::PLUGIN_NAME' ),
+                constant( $integrationClass.'::SUPPORTED_VERSION' )
+            ) );
             return false;
         }
         return true;