pryley / site-reviews

plugin/Modules/Schema.php

Spacing +84 added lines, -84 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 );
     }
 
     /**
@@ -273,11 +273,11 @@ 
     protected function getThingDescription()
     {
         $post = get_post();
-        if (!($post instanceof WP_Post)) {
+        if( !($post instanceof WP_Post) ) {
             return '';
         }
-        $text = strip_shortcodes(wp_strip_all_tags($post->post_excerpt));
-        return wp_trim_words($text, apply_filters('excerpt_length', 55));
+        $text = strip_shortcodes( wp_strip_all_tags( $post->post_excerpt ) );
+        return wp_trim_words( $text, apply_filters( 'excerpt_length', 55 ) );
     }
 
     /**
@@ -285,7 +285,7 @@ 
      */
     protected function getThingImage()
     {
-        return (string) get_the_post_thumbnail_url(null, 'large');
+        return (string)get_the_post_thumbnail_url( null, 'large' );
     }
 
     /**
@@ -301,6 +301,6 @@ 
      */
     protected function getThingUrl()
     {
-        return (string) get_the_permalink();
+        return (string)get_the_permalink();
     }
 }

plugin/Application.php

Spacing +63 added lines, -63 removed lines

@@ -28,13 +28,13 @@ 
     public function __construct()
     {
         static::$instance = $this;
-        $this->file = realpath(trailingslashit(dirname(__DIR__)).static::ID.'.php');
-        $plugin = get_file_data($this->file, [
+        $this->file = realpath( trailingslashit( dirname( __DIR__ ) ).static::ID.'.php' );
+        $plugin = get_file_data( $this->file, [
             'languages' => 'Domain Path',
             'name' => 'Plugin Name',
             'version' => 'Version',
-        ], 'plugin');
-        array_walk($plugin, function ($value, $key) {
+        ], 'plugin' );
+        array_walk( $plugin, function( $value, $key ) {
             $this->$key = $value;
         });
     }
@@ -44,7 +44,7 @@ 
      */
     public function activate()
     {
-        $this->make(DefaultsManager::class)->set();
+        $this->make( DefaultsManager::class )->set();
         $this->scheduleCronJob();
         $this->upgrade();
     }
@@ -55,34 +55,34 @@ 
     public function catchFatalError()
     {
         $error = error_get_last();
-        if (E_ERROR !== $error['type'] || false === strpos($error['message'], $this->path())) {
+        if( E_ERROR !== $error['type'] || false === strpos( $error['message'], $this->path() ) ) {
             return;
         }
-        glsr_log()->error($error['message']);
+        glsr_log()->error( $error['message'] );
     }
 
     /**
      * @param string $name
      * @return array
      */
-    public function config($name)
+    public function config( $name )
     {
-        $configFile = $this->path('config/'.$name.'.php');
-        $config = file_exists($configFile)
+        $configFile = $this->path( 'config/'.$name.'.php' );
+        $config = file_exists( $configFile )
             ? include $configFile
             : [];
-        return apply_filters('site-reviews/config/'.$name, $config);
+        return apply_filters( 'site-reviews/config/'.$name, $config );
     }
 
     /**
      * @param string $property
      * @return string
      */
-    public function constant($property, $className = 'static')
+    public function constant( $property, $className = 'static' )
     {
         $constant = $className.'::'.$property;
-        return defined($constant)
-            ? apply_filters('site-reviews/const/'.$property, constant($constant))
+        return defined( $constant )
+            ? apply_filters( 'site-reviews/const/'.$property, constant( $constant ) )
             : '';
     }
 
@@ -98,17 +98,17 @@ 
      * @param string $view
      * @return void|string
      */
-    public function file($view)
+    public function file( $view )
     {
-        $view.= '.php';
+        $view .= '.php';
         $filePaths = [];
-        if (glsr(Helper::class)->startsWith('templates/', $view)) {
-            $filePaths[] = $this->themePath(glsr(Helper::class)->removePrefix('templates/', $view));
+        if( glsr( Helper::class )->startsWith( 'templates/', $view ) ) {
+            $filePaths[] = $this->themePath( glsr( Helper::class )->removePrefix( 'templates/', $view ) );
         }
-        $filePaths[] = $this->path($view);
-        $filePaths[] = $this->path('views/'.$view);
-        foreach ($filePaths as $file) {
-            if (!file_exists($file)) {
+        $filePaths[] = $this->path( $view );
+        $filePaths[] = $this->path( 'views/'.$view );
+        foreach( $filePaths as $file ) {
+            if( !file_exists( $file ) ) {
                 continue;
             }
             return $file;
@@ -120,32 +120,32 @@ 
      */
     public function getDefaults()
     {
-        if (empty($this->defaults)) {
-            $this->defaults = $this->make(DefaultsManager::class)->get();
+        if( empty($this->defaults) ) {
+            $this->defaults = $this->make( DefaultsManager::class )->get();
             $this->upgrade();
         }
-        return apply_filters('site-reviews/get/defaults', $this->defaults);
+        return apply_filters( 'site-reviews/get/defaults', $this->defaults );
     }
 
     /**
      * @return bool
      */
-    public function getPermission($page = '')
+    public function getPermission( $page = '' )
     {
         $permissions = [
             'addons' => 'install_plugins',
             'settings' => 'manage_options',
         ];
-        return glsr_get($permissions, $page, $this->constant('CAPABILITY'));
+        return glsr_get( $permissions, $page, $this->constant( 'CAPABILITY' ) );
     }
 
     /**
      * @return bool
      */
-    public function hasPermission($page = '')
+    public function hasPermission( $page = '' )
     {
         $isAdmin = $this->isAdmin();
-        return !$isAdmin || ($isAdmin && current_user_can($this->getPermission($page)));
+        return !$isAdmin || ($isAdmin && current_user_can( $this->getPermission( $page ) ));
     }
 
     /**
@@ -153,8 +153,8 @@ 
      */
     public function init()
     {
-        $this->make(Actions::class)->run();
-        $this->make(Filters::class)->run();
+        $this->make( Actions::class )->run();
+        $this->make( Filters::class )->run();
     }
 
     /**
@@ -169,14 +169,14 @@ 
      * @param string $file
      * @return string
      */
-    public function path($file = '', $realpath = true)
+    public function path( $file = '', $realpath = true )
     {
-        $path = plugin_dir_path($this->file);
-        if (!$realpath) {
-            $path = trailingslashit(WP_PLUGIN_DIR).basename(dirname($this->file));
+        $path = plugin_dir_path( $this->file );
+        if( !$realpath ) {
+            $path = trailingslashit( WP_PLUGIN_DIR ).basename( dirname( $this->file ) );
         }
-        $path = trailingslashit($path).ltrim(trim($file), '/');
-        return apply_filters('site-reviews/path', $path, $file);
+        $path = trailingslashit( $path ).ltrim( trim( $file ), '/' );
+        return apply_filters( 'site-reviews/path', $path, $file );
     }
 
     /**
@@ -184,7 +184,7 @@ 
      */
     public function registerAddons()
     {
-        do_action('site-reviews/addon/register', $this);
+        do_action( 'site-reviews/addon/register', $this );
     }
 
     /**
@@ -192,8 +192,8 @@ 
      */
     public function registerLanguages()
     {
-        load_plugin_textdomain(static::ID, false,
-            trailingslashit(plugin_basename($this->path()).'/'.$this->languages)
+        load_plugin_textdomain( static::ID, false,
+            trailingslashit( plugin_basename( $this->path() ).'/'.$this->languages )
         );
     }
 
@@ -202,26 +202,26 @@ 
      */
     public function registerReviewTypes()
     {
-        $types = apply_filters('site-reviews/addon/types', []);
-        $this->reviewTypes = wp_parse_args($types, [
-            'local' => __('Local', 'site-reviews'),
-        ]);
+        $types = apply_filters( 'site-reviews/addon/types', [] );
+        $this->reviewTypes = wp_parse_args( $types, [
+            'local' => __( 'Local', 'site-reviews' ),
+        ] );
     }
 
     /**
      * @param string $view
      * @return void
      */
-    public function render($view, array $data = [])
+    public function render( $view, array $data = [] )
     {
-        $view = apply_filters('site-reviews/render/view', $view, $data);
-        $file = apply_filters('site-reviews/views/file', $this->file($view), $view, $data);
-        if (!file_exists($file)) {
-            glsr_log()->error('File not found: '.$file);
+        $view = apply_filters( 'site-reviews/render/view', $view, $data );
+        $file = apply_filters( 'site-reviews/views/file', $this->file( $view ), $view, $data );
+        if( !file_exists( $file ) ) {
+            glsr_log()->error( 'File not found: '.$file );
             return;
         }
-        $data = apply_filters('site-reviews/views/data', $data, $view);
-        extract($data);
+        $data = apply_filters( 'site-reviews/views/data', $data, $view );
+        extract( $data );
         include $file;
     }
 
@@ -230,19 +230,19 @@ 
      */
     public function scheduleCronJob()
     {
-        if (wp_next_scheduled(static::CRON_EVENT)) {
+        if( wp_next_scheduled( static::CRON_EVENT ) ) {
             return;
         }
-        wp_schedule_event(time(), 'twicedaily', static::CRON_EVENT);
+        wp_schedule_event( time(), 'twicedaily', static::CRON_EVENT );
     }
 
     /**
      * @param string $file
      * @return string
      */
-    public function themePath($file = '')
+    public function themePath( $file = '' )
     {
-        return get_stylesheet_directory().'/'.static::ID.'/'.ltrim(trim($file), '/');
+        return get_stylesheet_directory().'/'.static::ID.'/'.ltrim( trim( $file ), '/' );
     }
 
     /**
@@ -250,7 +250,7 @@ 
      */
     public function unscheduleCronJob()
     {
-        wp_unschedule_event(intval(wp_next_scheduled(static::CRON_EVENT)), static::CRON_EVENT);
+        wp_unschedule_event( intval( wp_next_scheduled( static::CRON_EVENT ) ), static::CRON_EVENT );
     }
 
     /**
@@ -258,7 +258,7 @@ 
      */
     public function upgrade()
     {
-        $this->make(Upgrader::class)->run();
+        $this->make( Upgrader::class )->run();
     }
 
     /**
@@ -266,10 +266,10 @@ 
      * @return void
      * @action upgrader_process_complete
      */
-    public function upgraded($upgrader, array $data)
+    public function upgraded( $upgrader, array $data )
     {
-        if (array_key_exists('plugins', $data)
-            && in_array(plugin_basename($this->file), $data['plugins'])
+        if( array_key_exists( 'plugins', $data )
+            && in_array( plugin_basename( $this->file ), $data['plugins'] )
             && 'update' === $data['action']
             && 'plugin' === $data['type']
         ) {
@@ -281,9 +281,9 @@ 
      * @param string $path
      * @return string
      */
-    public function url($path = '')
+    public function url( $path = '' )
     {
-        $url = esc_url(plugin_dir_url($this->file).ltrim(trim($path), '/'));
-        return apply_filters('site-reviews/url', $url, $path);
+        $url = esc_url( plugin_dir_url( $this->file ).ltrim( trim( $path ), '/' ) );
+        return apply_filters( 'site-reviews/url', $url, $path );
     }
 }

plugin/Handlers/EnqueuePublicAssets.php

Spacing +36 added lines, -36 removed lines

@@ -26,7 +26,7 @@ 
      */
     public function enqueueAssets()
     {
-        if (apply_filters('site-reviews/assets/css', true)) {
+        if( apply_filters( 'site-reviews/assets/css', true ) ) {
             wp_enqueue_style(
                 Application::ID,
                 $this->getStylesheet(),
@@ -34,14 +34,14 @@ 
                 glsr()->version
             );
         }
-        if (apply_filters('site-reviews/assets/js', true)) {
-            $dependencies = apply_filters('site-reviews/assets/polyfill', true)
+        if( apply_filters( 'site-reviews/assets/js', true ) ) {
+            $dependencies = apply_filters( 'site-reviews/assets/polyfill', true )
                 ? [Application::ID.'/polyfill']
                 : [];
-            $dependencies = apply_filters('site-reviews/enqueue/public/dependencies', $dependencies);
+            $dependencies = apply_filters( 'site-reviews/enqueue/public/dependencies', $dependencies );
             wp_enqueue_script(
                 Application::ID,
-                glsr()->url('assets/scripts/'.Application::ID.'.js'),
+                glsr()->url( 'assets/scripts/'.Application::ID.'.js' ),
                 $dependencies,
                 glsr()->version,
                 true
@@ -54,13 +54,13 @@ 
      */
     public function enqueuePolyfillService()
     {
-        if (!apply_filters('site-reviews/assets/polyfill', true)) {
+        if( !apply_filters( 'site-reviews/assets/polyfill', true ) ) {
             return;
         }
-        wp_enqueue_script(Application::ID.'/polyfill', add_query_arg([
+        wp_enqueue_script( Application::ID.'/polyfill', add_query_arg( [
             'features' => 'CustomEvent,Element.prototype.closest,Element.prototype.dataset,Event,XMLHttpRequest,MutationObserver',
             'flags' => 'gated',
-        ], 'https://polyfill.io/v3/polyfill.min.js'));
+        ], 'https://polyfill.io/v3/polyfill.min.js' ) );
     }
 
     /**
@@ -71,14 +71,14 @@ 
         // wpforms-recaptcha
         // google-recaptcha
         // nf-google-recaptcha
-        if (!glsr(OptionManager::class)->isRecaptchaEnabled()) {
+        if( !glsr( OptionManager::class )->isRecaptchaEnabled() ) {
             return;
         }
-        $language = apply_filters('site-reviews/recaptcha/language', get_locale());
-        wp_enqueue_script(Application::ID.'/google-recaptcha', add_query_arg([
+        $language = apply_filters( 'site-reviews/recaptcha/language', get_locale() );
+        wp_enqueue_script( Application::ID.'/google-recaptcha', add_query_arg( [
             'hl' => $language,
             'render' => 'explicit',
-        ], 'https://www.google.com/recaptcha/api.js'));
+        ], 'https://www.google.com/recaptcha/api.js' ) );
     }
 
     /**
@@ -89,13 +89,13 @@ 
         $variables = [
             'action' => Application::PREFIX.'action',
             'ajaxpagination' => $this->getFixedSelectorsForPagination(),
-            'ajaxurl' => admin_url('admin-ajax.php'),
+            'ajaxurl' => admin_url( 'admin-ajax.php' ),
             'nameprefix' => Application::ID,
-            'validationconfig' => glsr(Style::class)->validation,
-            'validationstrings' => glsr(ValidationStringsDefaults::class)->defaults(),
+            'validationconfig' => glsr( Style::class )->validation,
+            'validationstrings' => glsr( ValidationStringsDefaults::class )->defaults(),
         ];
-        $variables = apply_filters('site-reviews/enqueue/public/localize', $variables);
-        wp_add_inline_script(Application::ID, $this->buildInlineScript($variables), 'before');
+        $variables = apply_filters( 'site-reviews/enqueue/public/localize', $variables );
+        wp_add_inline_script( Application::ID, $this->buildInlineScript( $variables ), 'before' );
     }
 
     /**
@@ -103,35 +103,35 @@ 
      */
     public function inlineStyles()
     {
-        $inlineStylesheetPath = glsr()->path('assets/styles/inline-styles.css');
-        if (!apply_filters('site-reviews/assets/css', true)) {
+        $inlineStylesheetPath = glsr()->path( 'assets/styles/inline-styles.css' );
+        if( !apply_filters( 'site-reviews/assets/css', true ) ) {
             return;
         }
-        if (!file_exists($inlineStylesheetPath)) {
-            glsr_log()->error('Inline stylesheet is missing: '.$inlineStylesheetPath);
+        if( !file_exists( $inlineStylesheetPath ) ) {
+            glsr_log()->error( 'Inline stylesheet is missing: '.$inlineStylesheetPath );
             return;
         }
-        $inlineStylesheetValues = glsr()->config('inline-styles');
+        $inlineStylesheetValues = glsr()->config( 'inline-styles' );
         $stylesheet = str_replace(
-            array_keys($inlineStylesheetValues),
-            array_values($inlineStylesheetValues),
-            file_get_contents($inlineStylesheetPath)
+            array_keys( $inlineStylesheetValues ),
+            array_values( $inlineStylesheetValues ),
+            file_get_contents( $inlineStylesheetPath )
         );
-        wp_add_inline_style(Application::ID, $stylesheet);
+        wp_add_inline_style( Application::ID, $stylesheet );
     }
 
     /**
      * @return string
      */
-    protected function buildInlineScript(array $variables)
+    protected function buildInlineScript( array $variables )
     {
         $script = 'window.hasOwnProperty("GLSR")||(window.GLSR={});';
-        foreach ($variables as $key => $value) {
-            $script.= sprintf('GLSR.%s=%s;', $key, json_encode($value, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
+        foreach( $variables as $key => $value ) {
+            $script .= sprintf( 'GLSR.%s=%s;', $key, json_encode( $value, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE ) );
         }
         $pattern = '/\"([^ \-\"]+)\"(:[{\[\"])/'; // removes unnecessary quotes surrounding object keys
-        $optimizedScript = preg_replace($pattern, '$1$2', $script);
-        return apply_filters('site-reviews/enqueue/public/inline-script', $optimizedScript, $script, $variables);
+        $optimizedScript = preg_replace( $pattern, '$1$2', $script );
+        return apply_filters( 'site-reviews/enqueue/public/inline-script', $optimizedScript, $script, $variables );
     }
 
     /**
@@ -140,7 +140,7 @@ 
     protected function getFixedSelectorsForPagination()
     {
         $selectors = ['#wpadminbar', '.site-navigation-fixed'];
-        return apply_filters('site-reviews/enqueue/public/localize/ajax-pagination', $selectors);
+        return apply_filters( 'site-reviews/enqueue/public/localize/ajax-pagination', $selectors );
     }
 
     /**
@@ -148,9 +148,9 @@ 
      */
     protected function getStylesheet()
     {
-        $currentStyle = glsr(Style::class)->style;
-        return file_exists(glsr()->path('assets/styles/custom/'.$currentStyle.'.css'))
-            ? glsr()->url('assets/styles/custom/'.$currentStyle.'.css')
-            : glsr()->url('assets/styles/'.Application::ID.'.css');
+        $currentStyle = glsr( Style::class )->style;
+        return file_exists( glsr()->path( 'assets/styles/custom/'.$currentStyle.'.css' ) )
+            ? glsr()->url( 'assets/styles/custom/'.$currentStyle.'.css' )
+            : glsr()->url( 'assets/styles/'.Application::ID.'.css' );
     }
 }

autoload.php

Spacing +7 added lines, -7 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 
-defined('WPINC') || die;
+defined( 'WPINC' ) || die;
 
 require_once ABSPATH.WPINC.'/class-phpass.php';
 
-spl_autoload_register(function ($className) {
+spl_autoload_register( function( $className ) {
     $namespaces = [
         'GeminiLabs\\SiteReviews\\' => __DIR__.'/plugin/',
         'GeminiLabs\\SiteReviews\\Tests\\' => __DIR__.'/tests/',
@@ -12,13 +12,13 @@ 
         'GeminiLabs\\Sinergi\\BrowserDetector\\' => __DIR__.'/vendors/sinergi/browser-detector/',
         'GeminiLabs\\Vectorface\\Whip\\' => __DIR__.'/vendors/vectorface/whip/',
     ];
-    foreach ($namespaces as $prefix => $baseDir) {
-        $len = strlen($prefix);
-        if (0 !== strncmp($prefix, $className, $len)) {
+    foreach( $namespaces as $prefix => $baseDir ) {
+        $len = strlen( $prefix );
+        if( 0 !== strncmp( $prefix, $className, $len ) ) {
             continue;
         }
-        $file = $baseDir.str_replace('\\', '/', substr($className, $len)).'.php';
-        if (!file_exists($file)) {
+        $file = $baseDir.str_replace( '\\', '/', substr( $className, $len ) ).'.php';
+        if( !file_exists( $file ) ) {
             continue;
         }
         require $file;

compatibility.php

Spacing +14 added lines, -14 removed lines

@@ -1,14 +1,14 @@ 
 <?php
 
-defined('WPINC') || die;
+defined( 'WPINC' ) || die;
 
 /*
  * @param \GeminiLabs\SiteReviews\Modules\Html\Builder $instance
  * @return void
  * @see https://www.elegantthemes.com/gallery/divi/
  */
-add_action('site-reviews/customize/divi', function ($instance) {
-    if ('label' != $instance->tag || 'checkbox' != $instance->args['type']) {
+add_action( 'site-reviews/customize/divi', function( $instance ) {
+    if( 'label' != $instance->tag || 'checkbox' != $instance->args['type'] ) {
         return;
     }
     $instance->args['text'] = '<i></i>'.$instance->args['text'];
@@ -21,25 +21,25 @@ 
  * @return void
  * @see https://wordpress.org/plugins/wp-super-cache/
  */
-add_action('site-reviews/review/created', function ($review, $request) {
-    if (!function_exists('wp_cache_post_change')) {
+add_action( 'site-reviews/review/created', function( $review, $request ) {
+    if( !function_exists( 'wp_cache_post_change' ) ) {
         return;
     }
-    wp_cache_post_change($request->post_id);
-    if (empty($review->assigned_to) || $review->assigned_to == $request->post_id) {
+    wp_cache_post_change( $request->post_id );
+    if( empty($review->assigned_to) || $review->assigned_to == $request->post_id ) {
         return;
     }
-    wp_cache_post_change($review->assigned_to);
-}, 10, 2);
+    wp_cache_post_change( $review->assigned_to );
+}, 10, 2 );
 
 /*
  * @param array $scriptHandles
  * @return array
  * @see https://wordpress.org/plugins/speed-booster-pack/
  */
-add_filter('sbp_exclude_defer_scripts', function ($scriptHandles) {
+add_filter( 'sbp_exclude_defer_scripts', function( $scriptHandles ) {
     $scriptHandles[] = 'site-reviews/google-recaptcha';
-    return array_keys(array_flip($scriptHandles));
+    return array_keys( array_flip( $scriptHandles ) );
 });
 
 /*
@@ -48,8 +48,8 @@ 
  * @return array
  * @see https://searchandfilter.com/
  */
-add_filter('sf_edit_query_args', function ($query) {
-    if (!empty($query['meta_key']) && '_glsr_ranking' == $query['meta_key']) {
+add_filter( 'sf_edit_query_args', function( $query ) {
+    if( !empty($query['meta_key']) && '_glsr_ranking' == $query['meta_key'] ) {
         unset($query['meta_key']);
         $query['meta_query'] = [
             'relation' => 'OR',
@@ -58,4 +58,4 @@ 
         ];
     }
     return $query;
-}, 20);
+}, 20 );

plugin/Controllers/AjaxController.php

Spacing +57 added lines, -57 removed lines

@@ -15,9 +15,9 @@ 
     /**
      * @return void
      */
-    public function routerChangeStatus(array $request)
+    public function routerChangeStatus( array $request )
     {
-        wp_send_json_success($this->execute(new ChangeStatus($request)));
+        wp_send_json_success( $this->execute( new ChangeStatus( $request ) ) );
     }
 
     /**
@@ -25,11 +25,11 @@ 
      */
     public function routerClearConsole()
     {
-        glsr(AdminController::class)->routerClearConsole();
-        wp_send_json_success([
-            'console' => glsr(Console::class)->get(),
-            'notices' => glsr(Notice::class)->get(),
-        ]);
+        glsr( AdminController::class )->routerClearConsole();
+        wp_send_json_success( [
+            'console' => glsr( Console::class )->get(),
+            'notices' => glsr( Notice::class )->get(),
+        ] );
     }
 
     /**
@@ -37,23 +37,23 @@ 
      */
     public function routerCountReviews()
     {
-        glsr(AdminController::class)->routerCountReviews();
-        wp_send_json_success([
-            'notices' => glsr(Notice::class)->get(),
-        ]);
+        glsr( AdminController::class )->routerCountReviews();
+        wp_send_json_success( [
+            'notices' => glsr( Notice::class )->get(),
+        ] );
     }
 
     /**
      * @return void
      */
-    public function routerMceShortcode(array $request)
+    public function routerMceShortcode( array $request )
     {
         $shortcode = $request['shortcode'];
         $response = false;
-        if (array_key_exists($shortcode, glsr()->mceShortcodes)) {
+        if( array_key_exists( $shortcode, glsr()->mceShortcodes ) ) {
             $data = glsr()->mceShortcodes[$shortcode];
-            if (!empty($data['errors'])) {
-                $data['btn_okay'] = [esc_html__('Okay', 'site-reviews')];
+            if( !empty($data['errors']) ) {
+                $data['btn_okay'] = [esc_html__( 'Okay', 'site-reviews' )];
             }
             $response = [
                 'body' => $data['fields'],
@@ -63,7 +63,7 @@ 
                 'title' => $data['title'],
             ];
         }
-        wp_send_json_success($response);
+        wp_send_json_success( $response );
     }
 
     /**
@@ -71,95 +71,95 @@ 
      */
     public function routerFetchConsole()
     {
-        glsr(AdminController::class)->routerFetchConsole();
-        wp_send_json_success([
-            'console' => glsr(Console::class)->get(),
-            'notices' => glsr(Notice::class)->get(),
-        ]);
+        glsr( AdminController::class )->routerFetchConsole();
+        wp_send_json_success( [
+            'console' => glsr( Console::class )->get(),
+            'notices' => glsr( Notice::class )->get(),
+        ] );
     }
 
     /**
      * @return void
      */
-    public function routerSearchPosts(array $request)
+    public function routerSearchPosts( array $request )
     {
-        $results = glsr(Database::class)->searchPosts($request['search']);
-        wp_send_json_success([
-            'empty' => '<div>'.__('Nothing found.', 'site-reviews').'</div>',
+        $results = glsr( Database::class )->searchPosts( $request['search'] );
+        wp_send_json_success( [
+            'empty' => '<div>'.__( 'Nothing found.', 'site-reviews' ).'</div>',
             'items' => $results,
-        ]);
+        ] );
     }
 
     /**
      * @return void
      */
-    public function routerSearchTranslations(array $request)
+    public function routerSearchTranslations( array $request )
     {
-        if (empty($request['exclude'])) {
+        if( empty($request['exclude']) ) {
             $request['exclude'] = [];
         }
-        $results = glsr(Translation::class)
-            ->search($request['search'])
+        $results = glsr( Translation::class )
+            ->search( $request['search'] )
             ->exclude()
-            ->exclude($request['exclude'])
+            ->exclude( $request['exclude'] )
             ->renderResults();
-        wp_send_json_success([
-            'empty' => '<div>'.__('Nothing found.', 'site-reviews').'</div>',
+        wp_send_json_success( [
+            'empty' => '<div>'.__( 'Nothing found.', 'site-reviews' ).'</div>',
             'items' => $results,
-        ]);
+        ] );
     }
 
     /**
      * @return void
      */
-    public function routerSubmitReview(array $request)
+    public function routerSubmitReview( array $request )
     {
-        $command = glsr(PublicController::class)->routerSubmitReview($request);
-        $redirect = trim(strval(get_post_meta($command->post_id, 'redirect_to', true)));
-        $redirect = apply_filters('site-reviews/review/redirect', $redirect, $command);
+        $command = glsr( PublicController::class )->routerSubmitReview( $request );
+        $redirect = trim( strval( get_post_meta( $command->post_id, 'redirect_to', true ) ) );
+        $redirect = apply_filters( 'site-reviews/review/redirect', $redirect, $command );
         $data = [
-            'errors' => glsr()->sessionGet($command->form_id.'errors', false),
-            'message' => glsr()->sessionGet($command->form_id.'message', ''),
-            'recaptcha' => glsr()->sessionGet($command->form_id.'recaptcha', false),
+            'errors' => glsr()->sessionGet( $command->form_id.'errors', false ),
+            'message' => glsr()->sessionGet( $command->form_id.'message', '' ),
+            'recaptcha' => glsr()->sessionGet( $command->form_id.'recaptcha', false ),
             'redirect' => $redirect,
         ];
-        if (false === $data['errors']) {
+        if( false === $data['errors'] ) {
             glsr()->sessionClear();
-            wp_send_json_success($data);
+            wp_send_json_success( $data );
         }
-        wp_send_json_error($data);
+        wp_send_json_error( $data );
     }
 
     /**
      * @return void
      */
-    public function routerFetchPagedReviews(array $request)
+    public function routerFetchPagedReviews( array $request )
     {
         $urlQuery = [];
-        parse_str(parse_url(glsr_get($request, 'url'), PHP_URL_QUERY), $urlQuery);
+        parse_str( parse_url( glsr_get( $request, 'url' ), PHP_URL_QUERY ), $urlQuery );
         $args = [
-            'paged' => glsr_get($urlQuery, glsr()->constant('PAGED_QUERY_VAR'), 1),
-            'pagedUrl' => home_url(parse_url(glsr_get($request, 'url'), PHP_URL_PATH)),
+            'paged' => glsr_get( $urlQuery, glsr()->constant( 'PAGED_QUERY_VAR' ), 1 ),
+            'pagedUrl' => home_url( parse_url( glsr_get( $request, 'url' ), PHP_URL_PATH ) ),
             'pagination' => 'ajax',
             'schema' => false,
         ];
-        $atts = (array) json_decode(glsr_get($request, 'atts'));
-        $html = glsr(SiteReviews::class)->build(wp_parse_args($args, $atts));
-        return wp_send_json_success([
+        $atts = (array)json_decode( glsr_get( $request, 'atts' ) );
+        $html = glsr( SiteReviews::class )->build( wp_parse_args( $args, $atts ) );
+        return wp_send_json_success( [
             'pagination' => $html->getPagination(),
             'reviews' => $html->getReviews(),
-        ]);
+        ] );
     }
 
     /**
      * @return void
      */
-    public function routerTogglePinned(array $request)
+    public function routerTogglePinned( array $request )
     {
-        $isPinned = $this->execute(new TogglePinned($request));
-        wp_send_json_success([
-            'notices' => glsr(Notice::class)->get(),
+        $isPinned = $this->execute( new TogglePinned( $request ) );
+        wp_send_json_success( [
+            'notices' => glsr( Notice::class )->get(),
             'pinned' => $isPinned,
-        ]);
+        ] );
     }
 }

plugin/Modules/Upgrader.php

Spacing +20 added lines, -20 removed lines

@@ -18,25 +18,25 @@ 
     public function run()
     {
         $filenames = [];
-        $iterator = new DirectoryIterator(dirname(__FILE__).'/Upgrader');
-        foreach ($iterator as $fileinfo) {
-            if (!$fileinfo->isFile()) {
+        $iterator = new DirectoryIterator( dirname( __FILE__ ).'/Upgrader' );
+        foreach( $iterator as $fileinfo ) {
+            if( !$fileinfo->isFile() ) {
                 continue;
             }
             $filenames[] = $fileinfo->getFilename();
         }
-        natsort($filenames);
+        natsort( $filenames );
         $this->currentVersion = $this->currentVersion();
-        array_walk($filenames, function ($file) {
-            $className = str_replace('.php', '', $file);
-            $version = str_replace(['Upgrade_', '_'], ['', '.'], $className);
-            $versionSuffix = preg_replace('/[\d.]+(.+)?/', '${1}', glsr()->version); // allow alpha/beta versions
-            if ($this->currentVersion == '0.0.0' 
-                || version_compare($this->currentVersion, $version.$versionSuffix, '>=')) {
+        array_walk( $filenames, function( $file ) {
+            $className = str_replace( '.php', '', $file );
+            $version = str_replace( ['Upgrade_', '_'], ['', '.'], $className );
+            $versionSuffix = preg_replace( '/[\d.]+(.+)?/', '${1}', glsr()->version ); // allow alpha/beta versions
+            if( $this->currentVersion == '0.0.0' 
+                || version_compare( $this->currentVersion, $version.$versionSuffix, '>=' ) ) {
                 return;
             }
-            glsr('Modules\\Upgrader\\'.$className);
-            glsr_log()->notice('Completed Upgrade for v'.$version.$versionSuffix);
+            glsr( 'Modules\\Upgrader\\'.$className );
+            glsr_log()->notice( 'Completed Upgrade for v'.$version.$versionSuffix );
         });
         $this->finish();
     }
@@ -46,10 +46,10 @@ 
      */
     public function finish()
     {
-        if ($this->currentVersion !== glsr()->version) {
+        if( $this->currentVersion !== glsr()->version ) {
             $this->setReviewCounts();
-            $this->updateVersionFrom($this->currentVersion);
-        } elseif (!glsr(OptionManager::class)->get('last_review_count', false)) {
+            $this->updateVersionFrom( $this->currentVersion );
+        } elseif( !glsr( OptionManager::class )->get( 'last_review_count', false ) ) {
             $this->setReviewCounts();
         }
     }
@@ -59,7 +59,7 @@ 
      */
     protected function currentVersion()
     {
-        return glsr(OptionManager::class)->get('version', '0.0.0');
+        return glsr( OptionManager::class )->get( 'version', '0.0.0' );
     }
 
     /**
@@ -67,16 +67,16 @@ 
      */
     protected function setReviewCounts()
     {
-        add_action('admin_init', 'glsr_calculate_ratings');
+        add_action( 'admin_init', 'glsr_calculate_ratings' );
     }
 
     /**
      * @param string $previousVersion
      * @return void
      */
-    protected function updateVersionFrom($previousVersion)
+    protected function updateVersionFrom( $previousVersion )
     {
-        glsr(OptionManager::class)->set('version', glsr()->version);
-        glsr(OptionManager::class)->set('version_upgraded_from', $previousVersion);
+        glsr( OptionManager::class )->set( 'version', glsr()->version );
+        glsr( OptionManager::class )->set( 'version_upgraded_from', $previousVersion );
     }
 }

plugin/Modules/Validator/ValidateReview.php

Spacing +69 added lines, -69 removed lines

@@ -56,18 +56,18 @@ 
     /**
      * @return static
      */
-    public function validate(array $request)
+    public function validate( array $request )
     {
         $this->form_id = $request['form_id'];
-        $this->options = glsr(OptionManager::class)->all();
-        $this->request = $this->validateRequest($request);
+        $this->options = glsr( OptionManager::class )->all();
+        $this->request = $this->validateRequest( $request );
         $this->validateCustom();
         $this->validateHoneyPot();
         $this->validateBlacklist();
         $this->validateAkismet();
         $this->validateRecaptcha();
-        if (!empty($this->error)) {
-            $this->setSessionValues('message', $this->error);
+        if( !empty($this->error) ) {
+            $this->setSessionValues( 'message', $this->error );
         }
         return $this;
     }
@@ -77,9 +77,9 @@ 
      * @param mixed $fallback
      * @return mixed
      */
-    protected function getOption($path, $fallback = '')
+    protected function getOption( $path, $fallback = '' )
     {
-        return glsr(Helper::class)->dataGet($this->options, $path, $fallback);
+        return glsr( Helper::class )->dataGet( $this->options, $path, $fallback );
     }
 
     /**
@@ -87,11 +87,11 @@ 
      */
     protected function getRecaptchaStatus()
     {
-        if (!glsr(OptionManager::class)->isRecaptchaEnabled()) {
+        if( !glsr( OptionManager::class )->isRecaptchaEnabled() ) {
             return static::RECAPTCHA_DISABLED;
         }
-        if (empty($this->request['_recaptcha-token'])) {
-            return $this->request['_counter'] < intval(apply_filters('site-reviews/recaptcha/timeout', 5))
+        if( empty($this->request['_recaptcha-token']) ) {
+            return $this->request['_counter'] < intval( apply_filters( 'site-reviews/recaptcha/timeout', 5 ) )
                 ? static::RECAPTCHA_EMPTY
                 : static::RECAPTCHA_FAILED;
         }
@@ -103,23 +103,23 @@ 
      */
     protected function getRecaptchaTokenStatus()
     {
-        $endpoint = add_query_arg([
-            'remoteip' => glsr(Helper::class)->getIpAddress(),
+        $endpoint = add_query_arg( [
+            'remoteip' => glsr( Helper::class )->getIpAddress(),
             'response' => $this->request['_recaptcha-token'],
-            'secret' => $this->getOption('settings.submissions.recaptcha.secret'),
-        ], static::RECAPTCHA_ENDPOINT);
-        if (is_wp_error($response = wp_remote_get($endpoint))) {
-            glsr_log()->error($response->get_error_message());
+            'secret' => $this->getOption( 'settings.submissions.recaptcha.secret' ),
+        ], static::RECAPTCHA_ENDPOINT );
+        if( is_wp_error( $response = wp_remote_get( $endpoint ) ) ) {
+            glsr_log()->error( $response->get_error_message() );
             return static::RECAPTCHA_FAILED;
         }
-        $response = json_decode(wp_remote_retrieve_body($response));
-        if (!empty($response->success)) {
-            return boolval($response->success)
+        $response = json_decode( wp_remote_retrieve_body( $response ) );
+        if( !empty($response->success) ) {
+            return boolval( $response->success )
                 ? static::RECAPTCHA_VALID
                 : static::RECAPTCHA_INVALID;
         }
-        foreach ($response->{'error-codes'} as $error) {
-            glsr_log()->error('reCAPTCHA error: '.$error);
+        foreach( $response->{'error-codes'} as $error ) {
+            glsr_log()->error( 'reCAPTCHA error: '.$error );
         }
         return static::RECAPTCHA_INVALID;
     }
@@ -127,28 +127,28 @@ 
     /**
      * @return array
      */
-    protected function getValidationRules(array $request)
+    protected function getValidationRules( array $request )
     {
         $rules = array_intersect_key(
-            apply_filters('site-reviews/validation/rules', static::VALIDATION_RULES, $request),
-            array_flip($this->getOption('settings.submissions.required', []))
+            apply_filters( 'site-reviews/validation/rules', static::VALIDATION_RULES, $request ),
+            array_flip( $this->getOption( 'settings.submissions.required', [] ) )
         );
-        $excluded = explode(',', glsr_get($request, 'excluded'));
-        return array_diff_key($rules, array_flip($excluded));
+        $excluded = explode( ',', glsr_get( $request, 'excluded' ) );
+        return array_diff_key( $rules, array_flip( $excluded ) );
     }
 
     /**
      * @return bool
      */
-    protected function isRequestValid(array $request)
+    protected function isRequestValid( array $request )
     {
-        $rules = $this->getValidationRules($request);
-        $errors = glsr(Validator::class)->validate($request, $rules);
-        if (empty($errors)) {
+        $rules = $this->getValidationRules( $request );
+        $errors = glsr( Validator::class )->validate( $request, $rules );
+        if( empty($errors) ) {
             return true;
         }
-        $this->setSessionValues('errors', $errors);
-        $this->setSessionValues('values', $request);
+        $this->setSessionValues( 'errors', $errors );
+        $this->setSessionValues( 'values', $request );
         return false;
     }
 
@@ -158,11 +158,11 @@ 
      * @param string $loggedMessage
      * @return void
      */
-    protected function setSessionValues($type, $value, $loggedMessage = '')
+    protected function setSessionValues( $type, $value, $loggedMessage = '' )
     {
-        glsr()->sessionSet($this->form_id.$type, $value);
-        if (!empty($loggedMessage)) {
-            glsr_log()->warning($loggedMessage)->debug($this->request);
+        glsr()->sessionSet( $this->form_id.$type, $value );
+        if( !empty($loggedMessage) ) {
+            glsr_log()->warning( $loggedMessage )->debug( $this->request );
         }
     }
 
@@ -171,14 +171,14 @@ 
      */
     protected function validateAkismet()
     {
-        if (!empty($this->error)) {
+        if( !empty($this->error) ) {
             return;
         }
-        if (!glsr(Akismet::class)->isSpam($this->request)) {
+        if( !glsr( Akismet::class )->isSpam( $this->request ) ) {
             return;
         }
-        $this->setSessionValues('errors', [], 'Akismet caught a spam submission (consider adding the IP address to the blacklist):');
-        $this->error = __('This review has been flagged as possible spam and cannot be submitted.', 'site-reviews');
+        $this->setSessionValues( 'errors', [], 'Akismet caught a spam submission (consider adding the IP address to the blacklist):' );
+        $this->error = __( 'This review has been flagged as possible spam and cannot be submitted.', 'site-reviews' );
     }
 
     /**
@@ -186,16 +186,16 @@ 
      */
     protected function validateBlacklist()
     {
-        if (!empty($this->error)) {
+        if( !empty($this->error) ) {
             return;
         }
-        if (!glsr(Blacklist::class)->isBlacklisted($this->request)) {
+        if( !glsr( Blacklist::class )->isBlacklisted( $this->request ) ) {
             return;
         }
-        $blacklistAction = $this->getOption('settings.submissions.blacklist.action');
-        if ('reject' == $blacklistAction) {
-            $this->setSessionValues('errors', [], 'Blacklisted submission detected:');
-            $this->error = __('Your review cannot be submitted at this time.', 'site-reviews');
+        $blacklistAction = $this->getOption( 'settings.submissions.blacklist.action' );
+        if( 'reject' == $blacklistAction ) {
+            $this->setSessionValues( 'errors', [], 'Blacklisted submission detected:' );
+            $this->error = __( 'Your review cannot be submitted at this time.', 'site-reviews' );
             return;
         }
         $this->request['blacklisted'] = true;
@@ -206,18 +206,18 @@ 
      */
     protected function validateCustom()
     {
-        if (!empty($this->error)) {
+        if( !empty($this->error) ) {
             return;
         }
-        $validated = apply_filters('site-reviews/validate/custom', true, $this->request);
-        if (true === $validated) {
+        $validated = apply_filters( 'site-reviews/validate/custom', true, $this->request );
+        if( true === $validated ) {
             return;
         }
-        $this->setSessionValues('errors', []);
-        $this->setSessionValues('values', $this->request);
-        $this->error = is_string($validated)
+        $this->setSessionValues( 'errors', [] );
+        $this->setSessionValues( 'values', $this->request );
+        $this->error = is_string( $validated )
             ? $validated
-            : __('The review submission failed. Please notify the site administrator.', 'site-reviews');
+            : __( 'The review submission failed. Please notify the site administrator.', 'site-reviews' );
     }
 
     /**
@@ -225,14 +225,14 @@ 
      */
     protected function validateHoneyPot()
     {
-        if (!empty($this->error)) {
+        if( !empty($this->error) ) {
             return;
         }
-        if (empty($this->request['gotcha'])) {
+        if( empty($this->request['gotcha']) ) {
             return;
         }
-        $this->setSessionValues('errors', [], 'The Honeypot caught a bad submission:');
-        $this->error = __('The review submission failed. Please notify the site administrator.', 'site-reviews');
+        $this->setSessionValues( 'errors', [], 'The Honeypot caught a bad submission:' );
+        $this->error = __( 'The review submission failed. Please notify the site administrator.', 'site-reviews' );
     }
 
     /**
@@ -240,23 +240,23 @@ 
      */
     protected function validateRecaptcha()
     {
-        if (!empty($this->error)) {
+        if( !empty($this->error) ) {
             return;
         }
         $status = $this->getRecaptchaStatus();
-        if (in_array($status, [static::RECAPTCHA_DISABLED, static::RECAPTCHA_VALID])) {
+        if( in_array( $status, [static::RECAPTCHA_DISABLED, static::RECAPTCHA_VALID] ) ) {
             return;
         }
-        if ($status == static::RECAPTCHA_EMPTY) {
-            $this->setSessionValues('recaptcha', 'unset');
+        if( $status == static::RECAPTCHA_EMPTY ) {
+            $this->setSessionValues( 'recaptcha', 'unset' );
             $this->recaptchaIsUnset = true;
             return;
         }
-        $this->setSessionValues('errors', []);
-        $this->setSessionValues('recaptcha', 'reset');
+        $this->setSessionValues( 'errors', [] );
+        $this->setSessionValues( 'recaptcha', 'reset' );
         $errors = [
-            static::RECAPTCHA_FAILED => __('The reCAPTCHA failed to load, please refresh the page and try again.', 'site-reviews'),
-            static::RECAPTCHA_INVALID => __('The reCAPTCHA verification failed, please try again.', 'site-reviews'),
+            static::RECAPTCHA_FAILED => __( 'The reCAPTCHA failed to load, please refresh the page and try again.', 'site-reviews' ),
+            static::RECAPTCHA_INVALID => __( 'The reCAPTCHA verification failed, please try again.', 'site-reviews' ),
         ];
         $this->error = $errors[$status];
     }
@@ -264,12 +264,12 @@ 
     /**
      * @return array
      */
-    protected function validateRequest(array $request)
+    protected function validateRequest( array $request )
     {
-        if (!$this->isRequestValid($request)) {
-            $this->error = __('Please fix the submission errors.', 'site-reviews');
+        if( !$this->isRequestValid( $request ) ) {
+            $this->error = __( 'Please fix the submission errors.', 'site-reviews' );
             return $request;
         }
-        return array_merge(glsr(ValidateReviewDefaults::class)->defaults(), $request);
+        return array_merge( glsr( ValidateReviewDefaults::class )->defaults(), $request );
     }
 }

plugin/Modules/Html/Partials/SiteReviewsForm.php

Spacing +70 added lines, -70 removed lines

@@ -40,20 +40,20 @@ 
     /**
      * @return void|string
      */
-    public function build(array $args = [])
+    public function build( array $args = [] )
     {
         $this->args = $args;
-        if (!is_user_logged_in() && glsr(OptionManager::class)->getBool('settings.general.require.login')) {
+        if( !is_user_logged_in() && glsr( OptionManager::class )->getBool( 'settings.general.require.login' ) ) {
             return $this->buildLoginRegister();
         }
-        $this->errors = glsr()->sessionGet($args['id'].'errors', []);
-        $this->message = glsr()->sessionGet($args['id'].'message', '');
-        $this->required = glsr(OptionManager::class)->get('settings.submissions.required', []);
-        $this->values = glsr()->sessionGet($args['id'].'values', []);
-        $fields = array_reduce($this->getFields(), function ($carry, $field) {
+        $this->errors = glsr()->sessionGet( $args['id'].'errors', [] );
+        $this->message = glsr()->sessionGet( $args['id'].'message', '' );
+        $this->required = glsr( OptionManager::class )->get( 'settings.submissions.required', [] );
+        $this->values = glsr()->sessionGet( $args['id'].'values', [] );
+        $fields = array_reduce( $this->getFields(), function( $carry, $field ) {
             return $carry.$field;
         });
-        return glsr(Template::class)->build('templates/reviews-form', [
+        return glsr( Template::class )->build( 'templates/reviews-form', [
             'args' => $args,
             'context' => [
                 'class' => $this->getClass(),
@@ -62,7 +62,7 @@ 
                 'response' => $this->buildResponse(),
                 'submit_button' => $this->buildSubmitButton().$this->buildRecaptcha(),
             ],
-        ]);
+        ] );
     }
 
     /**
@@ -70,11 +70,11 @@ 
      */
     protected function buildLoginRegister()
     {
-        return glsr(Template::class)->build('templates/login-register', [
+        return glsr( Template::class )->build( 'templates/login-register', [
             'context' => [
-                'text' => trim($this->getLoginText().' '.$this->getRegisterText()),
+                'text' => trim( $this->getLoginText().' '.$this->getRegisterText() ),
             ],
-        ]);
+        ] );
     }
 
     /**
@@ -82,15 +82,15 @@ 
      */
     protected function buildRecaptcha()
     {
-        if (!glsr(OptionManager::class)->isRecaptchaEnabled()) {
+        if( !glsr( OptionManager::class )->isRecaptchaEnabled() ) {
             return;
         }
-        return glsr(Builder::class)->div([
+        return glsr( Builder::class )->div( [
             'class' => 'glsr-recaptcha-holder',
-            'data-badge' => glsr(OptionManager::class)->get('settings.submissions.recaptcha.position'),
-            'data-sitekey' => sanitize_text_field(glsr(OptionManager::class)->get('settings.submissions.recaptcha.key')),
+            'data-badge' => glsr( OptionManager::class )->get( 'settings.submissions.recaptcha.position' ),
+            'data-sitekey' => sanitize_text_field( glsr( OptionManager::class )->get( 'settings.submissions.recaptcha.key' ) ),
             'data-size' => 'invisible',
-        ]);
+        ] );
     }
 
     /**
@@ -99,15 +99,15 @@ 
     protected function buildResponse()
     {
         $classes = !empty($this->errors)
-            ? glsr(StyleValidationDefaults::class)->defaults()['message_error_class']
+            ? glsr( StyleValidationDefaults::class )->defaults()['message_error_class']
             : '';
-        return glsr(Template::class)->build('templates/form/response', [
+        return glsr( Template::class )->build( 'templates/form/response', [
             'context' => [
                 'class' => $classes,
-                'message' => wpautop($this->message),
+                'message' => wpautop( $this->message ),
             ],
             'has_errors' => !empty($this->errors),
-        ]);
+        ] );
     }
 
     /**
@@ -115,11 +115,11 @@ 
      */
     protected function buildSubmitButton()
     {
-        return glsr(Template::class)->build('templates/form/submit-button', [
+        return glsr( Template::class )->build( 'templates/form/submit-button', [
             'context' => [
-                'text' => __('Submit your review', 'site-reviews'),
+                'text' => __( 'Submit your review', 'site-reviews' ),
             ],
-        ]);
+        ] );
     }
 
     /**
@@ -127,7 +127,7 @@ 
      */
     protected function getClass()
     {
-        return trim('glsr-form glsr-'.glsr(Style::class)->get().' '.$this->args['class']);
+        return trim( 'glsr-form glsr-'.glsr( Style::class )->get().' '.$this->args['class'] );
     }
 
     /**
@@ -137,18 +137,18 @@ 
     {
         $hiddenFields = $this->getHiddenFields();
         $hiddenFields[] = $this->getHoneypotField();
-        $fields = $this->normalizeFields(glsr(Form::class)->getFields('submission-form'));
-        $paths = array_map(function ($obj) {
+        $fields = $this->normalizeFields( glsr( Form::class )->getFields( 'submission-form' ) );
+        $paths = array_map( function( $obj ) {
             return $obj->field['path'];
-        }, $hiddenFields);
-        foreach ($fields as $field) {
-            $index = array_search($field->field['path'], $paths);
-            if (false === $index) {
+        }, $hiddenFields );
+        foreach( $fields as $field ) {
+            $index = array_search( $field->field['path'], $paths );
+            if( false === $index ) {
                 continue;
             }
             unset($hiddenFields[$index]);
         }
-        return array_merge($hiddenFields, $fields);
+        return array_merge( $hiddenFields, $fields );
     }
 
     /**
@@ -156,11 +156,11 @@ 
      */
     protected function getLoginText()
     {
-        $loginLink = glsr(Builder::class)->a([
-            'href' => wp_login_url(strval(get_permalink())),
-            'text' => __('logged in', 'site-reviews'),
-        ]);
-        return sprintf(__('You must be %s to submit a review.', 'site-reviews'), $loginLink);
+        $loginLink = glsr( Builder::class )->a( [
+            'href' => wp_login_url( strval( get_permalink() ) ),
+            'text' => __( 'logged in', 'site-reviews' ),
+        ] );
+        return sprintf( __( 'You must be %s to submit a review.', 'site-reviews' ), $loginLink );
     }
 
     /**
@@ -168,14 +168,14 @@ 
      */
     protected function getRegisterText()
     {
-        if (!get_option('users_can_register') || !glsr(OptionManager::class)->getBool('settings.general.require.login')) {
+        if( !get_option( 'users_can_register' ) || !glsr( OptionManager::class )->getBool( 'settings.general.require.login' ) ) {
             return;
         }
-        $registerLink = glsr(Builder::class)->a([
+        $registerLink = glsr( Builder::class )->a( [
             'href' => wp_registration_url(),
-            'text' => __('register', 'site-reviews'),
-        ]);
-        return sprintf(__('You may also %s for an account.', 'site-reviews'), $registerLink);
+            'text' => __( 'register', 'site-reviews' ),
+        ] );
+        return sprintf( __( 'You may also %s for an account.', 'site-reviews' ), $registerLink );
     }
 
     /**
@@ -190,13 +190,13 @@ 
             'name' => '_counter',
         ], [
             'name' => '_nonce',
-            'value' => wp_create_nonce('submit-review'),
+            'value' => wp_create_nonce( 'submit-review' ),
         ], [
             'name' => '_post_id',
             'value' => get_the_ID(),
         ], [
             'name' => '_referer',
-            'value' => wp_unslash(filter_input(INPUT_SERVER, 'REQUEST_URI')),
+            'value' => wp_unslash( filter_input( INPUT_SERVER, 'REQUEST_URI' ) ),
         ], [
             'name' => 'assign_to',
             'value' => $this->args['assign_to'],
@@ -210,9 +210,9 @@ 
             'name' => 'form_id',
             'value' => $this->args['id'],
         ]];
-        return array_map(function ($field) {
-            return new Field(wp_parse_args($field, ['type' => 'hidden']));
-        }, $fields);
+        return array_map( function( $field ) {
+            return new Field( wp_parse_args( $field, ['type' => 'hidden'] ) );
+        }, $fields );
     }
 
     /**
@@ -220,40 +220,40 @@ 
      */
     protected function getHoneypotField()
     {
-        return new Field([
+        return new Field( [
             'name' => 'gotcha',
             'type' => 'honeypot',
-        ]);
+        ] );
     }
 
     /**
      * @return void
      */
-    protected function normalizeFieldId(Field &$field)
+    protected function normalizeFieldId( Field &$field )
     {
-        if (empty($this->args['id']) || empty($field->field['id'])) {
+        if( empty($this->args['id']) || empty($field->field['id']) ) {
             return;
         }
-        $field->field['id'].= '-'.$this->args['id'];
+        $field->field['id'] .= '-'.$this->args['id'];
     }
 
     /**
      * @return void
      */
-    protected function normalizeFieldClass(Field &$field)
+    protected function normalizeFieldClass( Field &$field )
     {
-        if (!isset($field->field['class'])) {
+        if( !isset($field->field['class']) ) {
             $field->field['class'] = '';
         }
-        $field->field['class'] = trim($field->field['class'].' glsr-field-control');
+        $field->field['class'] = trim( $field->field['class'].' glsr-field-control' );
     }
 
     /**
      * @return void
      */
-    protected function normalizeFieldErrors(Field &$field)
+    protected function normalizeFieldErrors( Field &$field )
     {
-        if (!array_key_exists($field->field['path'], $this->errors)) {
+        if( !array_key_exists( $field->field['path'], $this->errors ) ) {
             return;
         }
         $field->field['errors'] = $this->errors[$field->field['path']];
@@ -262,9 +262,9 @@ 
     /**
      * @return void
      */
-    protected function normalizeFieldRequired(Field &$field)
+    protected function normalizeFieldRequired( Field &$field )
     {
-        if (!in_array($field->field['path'], $this->required)) {
+        if( !in_array( $field->field['path'], $this->required ) ) {
             return;
         }
         $field->field['required'] = true;
@@ -273,19 +273,19 @@ 
     /**
      * @return array
      */
-    protected function normalizeFields($fields)
+    protected function normalizeFields( $fields )
     {
         $normalizedFields = [];
-        foreach ($fields as $field) {
-            if (in_array($field->field['path'], $this->args['hide'])) {
+        foreach( $fields as $field ) {
+            if( in_array( $field->field['path'], $this->args['hide'] ) ) {
                 continue;
             }
             $field->field['is_public'] = true;
-            $this->normalizeFieldClass($field);
-            $this->normalizeFieldErrors($field);
-            $this->normalizeFieldRequired($field);
-            $this->normalizeFieldValue($field);
-            $this->normalizeFieldId($field);
+            $this->normalizeFieldClass( $field );
+            $this->normalizeFieldErrors( $field );
+            $this->normalizeFieldRequired( $field );
+            $this->normalizeFieldValue( $field );
+            $this->normalizeFieldId( $field );
             $normalizedFields[] = $field;
         }
         return $normalizedFields;
@@ -294,12 +294,12 @@ 
     /**
      * @return void
      */
-    protected function normalizeFieldValue(Field &$field)
+    protected function normalizeFieldValue( Field &$field )
     {
-        if (!array_key_exists($field->field['path'], $this->values)) {
+        if( !array_key_exists( $field->field['path'], $this->values ) ) {
             return;
         }
-        if (in_array($field->field['type'], ['radio', 'checkbox'])) {
+        if( in_array( $field->field['type'], ['radio', 'checkbox'] ) ) {
             $field->field['checked'] = $field->field['value'] == $this->values[$field->field['path']];
         } else {
             $field->field['value'] = $this->values[$field->field['path']];