pryley / site-reviews

plugin/Shortcodes/Shortcode.php

Spacing +58 added lines, -58 removed lines

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

plugin/Modules/Schema.php

Spacing +83 added lines, -83 removed lines

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

plugin/Modules/Html/Settings.php

Spacing +67 added lines, -67 removed lines

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

plugin/Controllers/ListTableController.php

Spacing +94 added lines, -94 removed lines

@@ -19,15 +19,15 @@ 
      */
     public function approve()
     {
-        if (Application::ID != filter_input(INPUT_GET, 'plugin')) {
+        if( Application::ID != filter_input( INPUT_GET, 'plugin' ) ) {
             return;
         }
-        check_admin_referer('approve-review_'.($postId = $this->getPostId()));
-        wp_update_post([
+        check_admin_referer( 'approve-review_'.($postId = $this->getPostId()) );
+        wp_update_post( [
             'ID' => $postId,
             'post_status' => 'publish',
-        ]);
-        wp_safe_redirect(wp_get_referer());
+        ] );
+        wp_safe_redirect( wp_get_referer() );
         exit;
     }
 
@@ -36,15 +36,15 @@ 
      * @return array
      * @filter bulk_post_updated_messages
      */
-    public function filterBulkUpdateMessages($messages, array $counts)
+    public function filterBulkUpdateMessages( $messages, array $counts )
     {
-        $messages = glsr(Helper::class)->consolidateArray($messages);
+        $messages = glsr( Helper::class )->consolidateArray( $messages );
         $messages[Application::POST_TYPE] = [
-            'updated' => _n('%s review updated.', '%s reviews updated.', $counts['updated'], 'site-reviews'),
-            'locked' => _n('%s review not updated, somebody is editing it.', '%s reviews not updated, somebody is editing them.', $counts['locked'], 'site-reviews'),
-            'deleted' => _n('%s review permanently deleted.', '%s reviews permanently deleted.', $counts['deleted'], 'site-reviews'),
-            'trashed' => _n('%s review moved to the Trash.', '%s reviews moved to the Trash.', $counts['trashed'], 'site-reviews'),
-            'untrashed' => _n('%s review restored from the Trash.', '%s reviews restored from the Trash.', $counts['untrashed'], 'site-reviews'),
+            'updated' => _n( '%s review updated.', '%s reviews updated.', $counts['updated'], 'site-reviews' ),
+            'locked' => _n( '%s review not updated, somebody is editing it.', '%s reviews not updated, somebody is editing them.', $counts['locked'], 'site-reviews' ),
+            'deleted' => _n( '%s review permanently deleted.', '%s reviews permanently deleted.', $counts['deleted'], 'site-reviews' ),
+            'trashed' => _n( '%s review moved to the Trash.', '%s reviews moved to the Trash.', $counts['trashed'], 'site-reviews' ),
+            'untrashed' => _n( '%s review restored from the Trash.', '%s reviews restored from the Trash.', $counts['untrashed'], 'site-reviews' ),
         ];
         return $messages;
     }
@@ -54,20 +54,20 @@ 
      * @return array
      * @filter manage_.Application::POST_TYPE._posts_columns
      */
-    public function filterColumnsForPostType($columns)
+    public function filterColumnsForPostType( $columns )
     {
-        $columns = glsr(Helper::class)->consolidateArray($columns);
+        $columns = glsr( Helper::class )->consolidateArray( $columns );
         $postTypeColumns = glsr()->postTypeColumns[Application::POST_TYPE];
-        foreach ($postTypeColumns as $key => &$value) {
-            if (!array_key_exists($key, $columns) || !empty($value)) {
+        foreach( $postTypeColumns as $key => &$value ) {
+            if( !array_key_exists( $key, $columns ) || !empty($value) ) {
                 continue;
             }
             $value = $columns[$key];
         }
-        if (count(glsr(Database::class)->getReviewsMeta('review_type')) < 2) {
+        if( count( glsr( Database::class )->getReviewsMeta( 'review_type' ) ) < 2 ) {
             unset($postTypeColumns['review_type']);
         }
-        return array_filter($postTypeColumns, 'strlen');
+        return array_filter( $postTypeColumns, 'strlen' );
     }
 
     /**
@@ -76,10 +76,10 @@ 
      * @return string
      * @filter post_date_column_status
      */
-    public function filterDateColumnStatus($status, $post)
+    public function filterDateColumnStatus( $status, $post )
     {
-        if (Application::POST_TYPE == glsr_get($post, 'post_type')) {
-            $status = __('Submitted', 'site-reviews');
+        if( Application::POST_TYPE == glsr_get( $post, 'post_type' ) ) {
+            $status = __( 'Submitted', 'site-reviews' );
         }
         return $status;
     }
@@ -90,10 +90,10 @@ 
      * @return array
      * @filter default_hidden_columns
      */
-    public function filterDefaultHiddenColumns($hidden, $screen)
+    public function filterDefaultHiddenColumns( $hidden, $screen )
     {
-        if (glsr_get($screen, 'id') == 'edit-'.Application::POST_TYPE) {
-            $hidden = glsr(Helper::class)->consolidateArray($hidden);
+        if( glsr_get( $screen, 'id' ) == 'edit-'.Application::POST_TYPE ) {
+            $hidden = glsr( Helper::class )->consolidateArray( $hidden );
             $hidden = ['reviewer'];
         }
         return $hidden;
@@ -105,11 +105,11 @@ 
      * @return array
      * @filter display_post_states
      */
-    public function filterPostStates($postStates, $post)
+    public function filterPostStates( $postStates, $post )
     {
-        $postStates = glsr(Helper::class)->consolidateArray($postStates);
-        if (Application::POST_TYPE == glsr_get($post, 'post_type') && array_key_exists('pending', $postStates)) {
-            $postStates['pending'] = __('Unapproved', 'site-reviews');
+        $postStates = glsr( Helper::class )->consolidateArray( $postStates );
+        if( Application::POST_TYPE == glsr_get( $post, 'post_type' ) && array_key_exists( 'pending', $postStates ) ) {
+            $postStates['pending'] = __( 'Unapproved', 'site-reviews' );
         }
         return $postStates;
     }
@@ -120,28 +120,28 @@ 
      * @return array
      * @filter post_row_actions
      */
-    public function filterRowActions($actions, $post)
+    public function filterRowActions( $actions, $post )
     {
-        if (Application::POST_TYPE != glsr_get($post, 'post_type') || 'trash' == $post->post_status) {
+        if( Application::POST_TYPE != glsr_get( $post, 'post_type' ) || 'trash' == $post->post_status ) {
             return $actions;
         }
         unset($actions['inline hide-if-no-js']); //Remove Quick-edit
         $rowActions = [
-            'approve' => esc_attr__('Approve', 'site-reviews'),
-            'unapprove' => esc_attr__('Unapprove', 'site-reviews'),
+            'approve' => esc_attr__( 'Approve', 'site-reviews' ),
+            'unapprove' => esc_attr__( 'Unapprove', 'site-reviews' ),
         ];
         $newActions = [];
-        foreach ($rowActions as $key => $text) {
-            $newActions[$key] = glsr(Builder::class)->a($text, [
-                'aria-label' => sprintf(esc_attr_x('%s this review', 'Approve the review', 'site-reviews'), $text),
+        foreach( $rowActions as $key => $text ) {
+            $newActions[$key] = glsr( Builder::class )->a( $text, [
+                'aria-label' => sprintf( esc_attr_x( '%s this review', 'Approve the review', 'site-reviews' ), $text ),
                 'class' => 'glsr-change-status',
                 'href' => wp_nonce_url(
-                    admin_url('post.php?post='.$post->ID.'&action='.$key.'&plugin='.Application::ID),
+                    admin_url( 'post.php?post='.$post->ID.'&action='.$key.'&plugin='.Application::ID ),
                     $key.'-review_'.$post->ID
                 ),
-            ]);
+            ] );
         }
-        return $newActions + glsr(Helper::class)->consolidateArray($actions);
+        return $newActions + glsr( Helper::class )->consolidateArray( $actions );
     }
 
     /**
@@ -149,13 +149,13 @@ 
      * @return array
      * @filter manage_edit-.Application::POST_TYPE._sortable_columns
      */
-    public function filterSortableColumns($columns)
+    public function filterSortableColumns( $columns )
     {
-        $columns = glsr(Helper::class)->consolidateArray($columns);
+        $columns = glsr( Helper::class )->consolidateArray( $columns );
         $postTypeColumns = glsr()->postTypeColumns[Application::POST_TYPE];
         unset($postTypeColumns['cb']);
-        foreach ($postTypeColumns as $key => $value) {
-            if (glsr(Helper::class)->startsWith('taxonomy', $key)) {
+        foreach( $postTypeColumns as $key => $value ) {
+            if( glsr( Helper::class )->startsWith( 'taxonomy', $key ) ) {
                 continue;
             }
             $columns[$key] = $key;
@@ -173,22 +173,22 @@ 
      * @return string
      * @filter ngettext
      */
-    public function filterStatusText($translation, $single, $plural, $number, $domain)
+    public function filterStatusText( $translation, $single, $plural, $number, $domain )
     {
-        if ($this->canModifyTranslation($domain)) {
+        if( $this->canModifyTranslation( $domain ) ) {
             $strings = [
-                'Published' => __('Approved', 'site-reviews'),
-                'Pending' => __('Unapproved', 'site-reviews'),
+                'Published' => __( 'Approved', 'site-reviews' ),
+                'Pending' => __( 'Unapproved', 'site-reviews' ),
             ];
-            foreach ($strings as $search => $replace) {
-                if (false === strpos($single, $search)) {
+            foreach( $strings as $search => $replace ) {
+                if( false === strpos( $single, $search ) ) {
                     continue;
                 }
-                $translation = $this->getTranslation([
+                $translation = $this->getTranslation( [
                     'number' => $number,
-                    'plural' => str_replace($search, $replace, $plural),
-                    'single' => str_replace($search, $replace, $single),
-                ]);
+                    'plural' => str_replace( $search, $replace, $plural ),
+                    'single' => str_replace( $search, $replace, $single ),
+                ] );
             }
         }
         return $translation;
@@ -200,10 +200,10 @@ 
      * @return void
      * @action bulk_edit_custom_box
      */
-    public function renderBulkEditFields($columnName, $postType)
+    public function renderBulkEditFields( $columnName, $postType )
     {
-        if ('assigned_to' == $columnName && Application::POST_TYPE == $postType) {
-            glsr()->render('partials/editor/bulk-edit-assigned-to');
+        if( 'assigned_to' == $columnName && Application::POST_TYPE == $postType ) {
+            glsr()->render( 'partials/editor/bulk-edit-assigned-to' );
         }
     }
 
@@ -212,9 +212,9 @@ 
      * @return void
      * @action restrict_manage_posts
      */
-    public function renderColumnFilters($postType)
+    public function renderColumnFilters( $postType )
     {
-        glsr(Columns::class)->renderFilters($postType);
+        glsr( Columns::class )->renderFilters( $postType );
     }
 
     /**
@@ -223,9 +223,9 @@ 
      * @return void
      * @action manage_posts_custom_column
      */
-    public function renderColumnValues($column, $postId)
+    public function renderColumnValues( $column, $postId )
     {
-        glsr(Columns::class)->renderValues($column, $postId);
+        glsr( Columns::class )->renderValues( $column, $postId );
     }
 
     /**
@@ -233,14 +233,14 @@ 
      * @return void
      * @action save_post_.Application::POST_TYPE
      */
-    public function saveBulkEditFields($postId)
+    public function saveBulkEditFields( $postId )
     {
-        if (!current_user_can('edit_posts')) {
+        if( !current_user_can( 'edit_posts' ) ) {
             return;
         }
-        $assignedTo = filter_input(INPUT_GET, 'assigned_to');
-        if ($assignedTo && get_post($assignedTo)) {
-            glsr(Database::class)->update($postId, 'assigned_to', $assignedTo);
+        $assignedTo = filter_input( INPUT_GET, 'assigned_to' );
+        if( $assignedTo && get_post( $assignedTo ) ) {
+            glsr( Database::class )->update( $postId, 'assigned_to', $assignedTo );
         }
     }
 
@@ -248,15 +248,15 @@ 
      * @return void
      * @action pre_get_posts
      */
-    public function setQueryForColumn(WP_Query $query)
+    public function setQueryForColumn( WP_Query $query )
     {
-        if (!$this->hasPermission($query)) {
+        if( !$this->hasPermission( $query ) ) {
             return;
         }
-        $this->setMetaQuery($query, [
+        $this->setMetaQuery( $query, [
             'rating', 'review_type',
-        ]);
-        $this->setOrderby($query);
+        ] );
+        $this->setOrderby( $query );
     }
 
     /**
@@ -265,15 +265,15 @@ 
      */
     public function unapprove()
     {
-        if (Application::ID != filter_input(INPUT_GET, 'plugin')) {
+        if( Application::ID != filter_input( INPUT_GET, 'plugin' ) ) {
             return;
         }
-        check_admin_referer('unapprove-review_'.($postId = $this->getPostId()));
-        wp_update_post([
+        check_admin_referer( 'unapprove-review_'.($postId = $this->getPostId()) );
+        wp_update_post( [
             'ID' => $postId,
             'post_status' => 'pending',
-        ]);
-        wp_safe_redirect(wp_get_referer());
+        ] );
+        wp_safe_redirect( wp_get_referer() );
         exit;
     }
 
@@ -282,7 +282,7 @@ 
      * @param string $domain
      * @return bool
      */
-    protected function canModifyTranslation($domain = 'default')
+    protected function canModifyTranslation( $domain = 'default' )
     {
         $screen = glsr_current_screen();
         return 'default' == $domain
@@ -294,7 +294,7 @@ 
      * Get the modified translation string.
      * @return string
      */
-    protected function getTranslation(array $args)
+    protected function getTranslation( array $args )
     {
         $defaults = [
             'number' => 0,
@@ -302,57 +302,57 @@ 
             'single' => '',
             'text' => '',
         ];
-        $args = (object) wp_parse_args($args, $defaults);
-        $translations = get_translations_for_domain(Application::ID);
+        $args = (object)wp_parse_args( $args, $defaults );
+        $translations = get_translations_for_domain( Application::ID );
         return $args->text
-            ? $translations->translate($args->text)
-            : $translations->translate_plural($args->single, $args->plural, $args->number);
+            ? $translations->translate( $args->text )
+            : $translations->translate_plural( $args->single, $args->plural, $args->number );
     }
 
     /**
      * @return bool
      */
-    protected function hasPermission(WP_Query $query)
+    protected function hasPermission( WP_Query $query )
     {
         global $pagenow;
         return is_admin()
             && $query->is_main_query()
-            && Application::POST_TYPE == $query->get('post_type')
+            && Application::POST_TYPE == $query->get( 'post_type' )
             && 'edit.php' == $pagenow;
     }
 
     /**
      * @return void
      */
-    protected function setMetaQuery(WP_Query $query, array $metaKeys)
+    protected function setMetaQuery( WP_Query $query, array $metaKeys )
     {
-        foreach ($metaKeys as $key) {
-            if (!($value = filter_input(INPUT_GET, $key))) {
+        foreach( $metaKeys as $key ) {
+            if( !($value = filter_input( INPUT_GET, $key )) ) {
                 continue;
             }
-            $metaQuery = (array) $query->get('meta_query');
+            $metaQuery = (array)$query->get( 'meta_query' );
             $metaQuery[] = [
-                'key' => glsr(Helper::class)->prefix('_', $key),
+                'key' => glsr( Helper::class )->prefix( '_', $key ),
                 'value' => $value,
             ];
-            $query->set('meta_query', $metaQuery);
+            $query->set( 'meta_query', $metaQuery );
         }
     }
 
     /**
      * @return void
      */
-    protected function setOrderby(WP_Query $query)
+    protected function setOrderby( WP_Query $query )
     {
-        $orderby = $query->get('orderby');
+        $orderby = $query->get( 'orderby' );
         $columns = glsr()->postTypeColumns[Application::POST_TYPE];
         unset($columns['cb'], $columns['title'], $columns['date']);
-        if (in_array($orderby, array_keys($columns))) {
-            if ('reviewer' == $orderby) {
+        if( in_array( $orderby, array_keys( $columns ) ) ) {
+            if( 'reviewer' == $orderby ) {
                 $orderby = '_author';
             }
-            $query->set('meta_key', $orderby);
-            $query->set('orderby', 'meta_value');
+            $query->set( 'meta_key', $orderby );
+            $query->set( 'orderby', 'meta_value' );
         }
     }
 }

plugin/HelperTraits/Arr.php

Spacing +54 added lines, -54 removed lines

@@ -7,10 +7,10 @@ 
     /**
      * @return bool
      */
-    public function compareArrays(array $arr1, array $arr2)
+    public function compareArrays( array $arr1, array $arr2 )
     {
-        sort($arr1);
-        sort($arr2);
+        sort( $arr1 );
+        sort( $arr2 );
         return $arr1 == $arr2;
     }
 
@@ -18,21 +18,21 @@ 
      * @param mixed $array
      * @return array
      */
-    public function consolidateArray($array)
+    public function consolidateArray( $array )
     {
-        return is_array($array) || is_object($array)
-            ? (array) $array
+        return is_array( $array ) || is_object( $array )
+            ? (array)$array
             : [];
     }
 
     /**
      * @return array
      */
-    public function convertDotNotationArray(array $array)
+    public function convertDotNotationArray( array $array )
     {
         $results = [];
-        foreach ($array as $path => $value) {
-            $results = $this->dataSet($results, $path, $value);
+        foreach( $array as $path => $value ) {
+            $results = $this->dataSet( $results, $path, $value );
         }
         return $results;
     }
@@ -42,12 +42,12 @@ 
      * @param mixed $callback
      * @return array
      */
-    public function convertStringToArray($string, $callback = null)
+    public function convertStringToArray( $string, $callback = null )
     {
-        $array = array_map('trim', explode(',', $string));
+        $array = array_map( 'trim', explode( ',', $string ) );
         return $callback
-            ? array_filter($array, $callback)
-            : array_filter($array);
+            ? array_filter( $array, $callback )
+            : array_filter( $array );
     }
 
     /**
@@ -57,12 +57,12 @@ 
      * @param mixed $fallback
      * @return mixed
      */
-    public function dataGet($data, $path = '', $fallback = '')
+    public function dataGet( $data, $path = '', $fallback = '' )
     {
-        $data = $this->consolidateArray($data);
-        $keys = explode('.', $path);
-        foreach ($keys as $key) {
-            if (!isset($data[$key])) {
+        $data = $this->consolidateArray( $data );
+        $keys = explode( '.', $path );
+        foreach( $keys as $key ) {
+            if( !isset($data[$key]) ) {
                 return $fallback;
             }
             $data = $data[$key];
@@ -76,14 +76,14 @@ 
      * @param mixed $value
      * @return array
      */
-    public function dataSet(array $data, $path, $value)
+    public function dataSet( array $data, $path, $value )
     {
-        $token = strtok($path, '.');
+        $token = strtok( $path, '.' );
         $ref = &$data;
-        while (false !== $token) {
-            $ref = $this->consolidateArray($ref);
+        while( false !== $token ) {
+            $ref = $this->consolidateArray( $ref );
             $ref = &$ref[$token];
-            $token = strtok('.');
+            $token = strtok( '.' );
         }
         $ref = $value;
         return $data;
@@ -94,17 +94,17 @@ 
      * @param string $prefix
      * @return array
      */
-    public function flattenArray(array $array, $flattenValue = false, $prefix = '')
+    public function flattenArray( array $array, $flattenValue = false, $prefix = '' )
     {
         $result = [];
-        foreach ($array as $key => $value) {
-            $newKey = ltrim($prefix.'.'.$key, '.');
-            if ($this->isIndexedFlatArray($value)) {
-                if ($flattenValue) {
-                    $value = '['.implode(', ', $value).']';
+        foreach( $array as $key => $value ) {
+            $newKey = ltrim( $prefix.'.'.$key, '.' );
+            if( $this->isIndexedFlatArray( $value ) ) {
+                if( $flattenValue ) {
+                    $value = '['.implode( ', ', $value ).']';
                 }
-            } elseif (is_array($value)) {
-                $result = array_merge($result, $this->flattenArray($value, $flattenValue, $newKey));
+            } elseif( is_array( $value ) ) {
+                $result = array_merge( $result, $this->flattenArray( $value, $flattenValue, $newKey ) );
                 continue;
             }
             $result[$newKey] = $value;
@@ -117,47 +117,47 @@ 
      * @param string $position
      * @return array
      */
-    public function insertInArray(array $array, array $insert, $key, $position = 'before')
+    public function insertInArray( array $array, array $insert, $key, $position = 'before' )
     {
-        $keyPosition = intval(array_search($key, array_keys($array)));
-        if ('after' == $position) {
+        $keyPosition = intval( array_search( $key, array_keys( $array ) ) );
+        if( 'after' == $position ) {
             ++$keyPosition;
         }
-        if (false !== $keyPosition) {
-            $result = array_slice($array, 0, $keyPosition);
-            $result = array_merge($result, $insert);
-            return array_merge($result, array_slice($array, $keyPosition));
+        if( false !== $keyPosition ) {
+            $result = array_slice( $array, 0, $keyPosition );
+            $result = array_merge( $result, $insert );
+            return array_merge( $result, array_slice( $array, $keyPosition ) );
         }
-        return array_merge($array, $insert);
+        return array_merge( $array, $insert );
     }
 
     /**
      * @param mixed $array
      * @return bool
      */
-    public function isIndexedFlatArray($array)
+    public function isIndexedFlatArray( $array )
     {
-        if (!is_array($array) || array_filter($array, 'is_array')) {
+        if( !is_array( $array ) || array_filter( $array, 'is_array' ) ) {
             return false;
         }
-        return wp_is_numeric_array($array);
+        return wp_is_numeric_array( $array );
     }
 
     /**
      * @param bool $prefixed
      * @return array
      */
-    public function prefixArrayKeys(array $values, $prefixed = true)
+    public function prefixArrayKeys( array $values, $prefixed = true )
     {
         $trim = '_';
         $prefix = $prefixed
             ? $trim
             : '';
         $prefixed = [];
-        foreach ($values as $key => $value) {
-            $key = trim($key);
-            if (0 === strpos($key, $trim)) {
-                $key = substr($key, strlen($trim));
+        foreach( $values as $key => $value ) {
+            $key = trim( $key );
+            if( 0 === strpos( $key, $trim ) ) {
+                $key = substr( $key, strlen( $trim ) );
             }
             $prefixed[$prefix.$key] = $value;
         }
@@ -167,15 +167,15 @@ 
     /**
      * @return array
      */
-    public function removeEmptyArrayValues(array $array)
+    public function removeEmptyArrayValues( array $array )
     {
         $result = [];
-        foreach ($array as $key => $value) {
-            if (!$value) {
+        foreach( $array as $key => $value ) {
+            if( !$value ) {
                 continue;
             }
-            $result[$key] = is_array($value)
-                ? $this->removeEmptyArrayValues($value)
+            $result[$key] = is_array( $value )
+                ? $this->removeEmptyArrayValues( $value )
                 : $value;
         }
         return $result;
@@ -184,8 +184,8 @@ 
     /**
      * @return array
      */
-    public function unprefixArrayKeys(array $values)
+    public function unprefixArrayKeys( array $values )
     {
-        return $this->prefixArrayKeys($values, false);
+        return $this->prefixArrayKeys( $values, false );
     }
 }

plugin/Database/SqlQueries.php

Spacing +44 added lines, -44 removed lines

@@ -21,17 +21,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 );
     }
 
     /**
@@ -39,23 +39,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}
-        ");
+        " );
     }
 
     /**
@@ -63,17 +63,17 @@ 
      * @param string $metaKey
      * @return array
      */
-    public function getReviewCountsFor($metaKey)
+    public function getReviewCountsFor( $metaKey )
     {
-        $metaKey = glsr(Helper::class)->prefix('_', $metaKey);
-        return (array) $this->db->get_results("
+        $metaKey = glsr( Helper::class )->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
-        ");
+        " );
     }
 
     /**
@@ -81,9 +81,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
@@ -92,8 +92,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 ) );
     }
 
     /**
@@ -101,12 +101,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
@@ -118,7 +118,7 @@ 
             GROUP BY p.ID
             ORDER By p.ID ASC
             LIMIT {$limit}
-        ");
+        " );
     }
 
     /**
@@ -126,10 +126,10 @@ 
      * @param string $status
      * @return array
      */
-    public function getReviewsMeta($key, $status = 'publish')
+    public function getReviewsMeta( $key, $status = 'publish' )
     {
-        $key = glsr(Helper::class)->prefix('_', $key);
-        $values = $this->db->get_col("
+        $key = glsr( Helper::class )->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
@@ -139,8 +139,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;
     }
 
@@ -148,34 +148,34 @@ 
      * @param string $and
      * @return string
      */
-    protected function getAndForCounts(array $args, $and = '')
+    protected function getAndForCounts( array $args, $and = '' )
     {
-        $postIds = implode(',', array_filter(glsr_get($args, 'post_ids', [])));
-        $termIds = implode(',', array_filter(glsr_get($args, 'term_ids', [])));
-        if (!empty($args['type'])) {
-            $and.= "AND m2.meta_value = '{$args['type']}' ";
+        $postIds = implode( ',', array_filter( glsr_get( $args, 'post_ids', [] ) ) );
+        $termIds = implode( ',', array_filter( glsr_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(glsr_get($args, 'post_ids'))) {
-            $innerJoin.= "INNER JOIN {$this->db->postmeta} AS m3 ON p.ID = m3.post_id ";
+        if( !empty(glsr_get( $args, 'post_ids' )) ) {
+            $innerJoin .= "INNER JOIN {$this->db->postmeta} AS m3 ON p.ID = m3.post_id ";
         }
-        if (!empty(glsr_get($args, 'term_ids'))) {
-            $innerJoin.= "INNER JOIN {$this->db->term_relationships} AS tr ON p.ID = tr.object_id ";
+        if( !empty(glsr_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/Modules/Upgrader.php

Spacing +23 added lines, -23 removed lines

@@ -18,24 +18,24 @@ 
     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() ) {
                 $filenames[] = $fileinfo->getFilename();
             }
         }
-        natsort($filenames);
+        natsort( $filenames );
         $this->currentVersion = $this->currentVersion();
-        array_walk($filenames, function ($file) {
-            $className = str_replace('.php', '', $file);
-            $upgradeFromVersion = str_replace(['Upgrade_', '_'], ['', '.'], $className);
-            $suffix = preg_replace('/[\d.]+(.+)?/', '${1}', glsr()->version); // allow alpha/beta versions
-            if ('0.0.0' == $this->currentVersion
-                || version_compare($this->currentVersion, $upgradeFromVersion.$suffix, '>=')) {
+        array_walk( $filenames, function( $file ) {
+            $className = str_replace( '.php', '', $file );
+            $upgradeFromVersion = str_replace( ['Upgrade_', '_'], ['', '.'], $className );
+            $suffix = preg_replace( '/[\d.]+(.+)?/', '${1}', glsr()->version ); // allow alpha/beta versions
+            if( '0.0.0' == $this->currentVersion
+                || version_compare( $this->currentVersion, $upgradeFromVersion.$suffix, '>=' ) ) {
                 return;
             }
-            glsr('Modules\\Upgrader\\'.$className);
-            glsr_log()->notice('Completed Upgrade for v'.$upgradeFromVersion.$suffix);
+            glsr( 'Modules\\Upgrader\\'.$className );
+            glsr_log()->notice( 'Completed Upgrade for v'.$upgradeFromVersion.$suffix );
         });
         $this->finish();
     }
@@ -45,10 +45,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();
         }
     }
@@ -60,10 +60,10 @@ 
     {
         $fallback = '0.0.0';
         $majorVersions = [4, 3, 2];
-        foreach ($majorVersions as $majorVersion) {
-            $settings = get_option(OptionManager::databaseKey($majorVersion));
-            $version = glsr_get($settings, 'version', $fallback);
-            if (version_compare($version, $fallback, '>')) {
+        foreach( $majorVersions as $majorVersion ) {
+            $settings = get_option( OptionManager::databaseKey( $majorVersion ) );
+            $version = glsr_get( $settings, 'version', $fallback );
+            if( version_compare( $version, $fallback, '>' ) ) {
                 return $version;
             }
         }
@@ -75,16 +75,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/Wpml.php

Spacing +21 added lines, -21 removed lines

@@ -13,44 +13,44 @@ 
     /**
      * {@inheritdoc}
      */
-    public function getPost($postId)
+    public function getPost( $postId )
     {
-        $postId = trim($postId);
-        if (!is_numeric($postId)) {
+        $postId = trim( $postId );
+        if( !is_numeric( $postId ) ) {
             return;
         }
-        if ($this->isEnabled()) {
-            $postId = apply_filters('wpml_object_id', $postId, 'any', true);
+        if( $this->isEnabled() ) {
+            $postId = apply_filters( 'wpml_object_id', $postId, 'any', true );
         }
-        return get_post(intval($postId));
+        return get_post( intval( $postId ) );
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getPostIds(array $postIds)
+    public function getPostIds( array $postIds )
     {
-        if (!$this->isEnabled()) {
+        if( !$this->isEnabled() ) {
             return $postIds;
         }
         $newPostIds = [];
-        foreach ($this->cleanIds($postIds) as $postId) {
-            $postType = get_post_type($postId);
-            if (!$postType) {
+        foreach( $this->cleanIds( $postIds ) as $postId ) {
+            $postType = get_post_type( $postId );
+            if( !$postType ) {
                 continue;
             }
             $elementType = 'post_'.$postType;
-            $trid = apply_filters('wpml_element_trid', null, $postId, $elementType);
-            $translations = apply_filters('wpml_get_element_translations', null, $trid, $elementType);
-            if (!is_array($translations)) {
+            $trid = apply_filters( 'wpml_element_trid', null, $postId, $elementType );
+            $translations = apply_filters( 'wpml_get_element_translations', null, $trid, $elementType );
+            if( !is_array( $translations ) ) {
                 $translations = [];
             }
             $newPostIds = array_merge(
                 $newPostIds,
-                array_column($translations, 'element_id')
+                array_column( $translations, 'element_id' )
             );
         }
-        return $this->cleanIds($newPostIds);
+        return $this->cleanIds( $newPostIds );
     }
 
     /**
@@ -58,7 +58,7 @@ 
      */
     public function isActive()
     {
-        return defined('ICL_SITEPRESS_VERSION');
+        return defined( 'ICL_SITEPRESS_VERSION' );
     }
 
     /**
@@ -67,7 +67,7 @@ 
     public function isEnabled()
     {
         return $this->isActive()
-            && 'wpml' == glsr(OptionManager::class)->get('settings.general.multilingual');
+            && 'wpml' == glsr( OptionManager::class )->get( 'settings.general.multilingual' );
     }
 
     /**
@@ -76,14 +76,14 @@ 
     public function isSupported()
     {
         return $this->isActive()
-            && version_compare(ICL_SITEPRESS_VERSION, static::SUPPORTED_VERSION, '>=');
+            && version_compare( ICL_SITEPRESS_VERSION, static::SUPPORTED_VERSION, '>=' );
     }
 
     /**
      * @return array
      */
-    protected function cleanIds(array $postIds)
+    protected function cleanIds( array $postIds )
     {
-        return array_filter(array_unique($postIds));
+        return array_filter( array_unique( $postIds ) );
     }
 }

plugin/Modules/Polylang.php

Spacing +21 added lines, -21 removed lines

@@ -13,37 +13,37 @@ 
     /**
      * {@inheritdoc}
      */
-    public function getPost($postId)
+    public function getPost( $postId )
     {
-        $postId = trim($postId);
-        if (!is_numeric($postId)) {
+        $postId = trim( $postId );
+        if( !is_numeric( $postId ) ) {
             return;
         }
-        if ($this->isEnabled()) {
-            $polylangPostId = pll_get_post($postId, pll_get_post_language(get_the_ID()));
+        if( $this->isEnabled() ) {
+            $polylangPostId = pll_get_post( $postId, pll_get_post_language( get_the_ID() ) );
         }
-        if (!empty($polylangPostId)) {
+        if( !empty($polylangPostId) ) {
             $postId = $polylangPostId;
         }
-        return get_post(intval($postId));
+        return get_post( intval( $postId ) );
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getPostIds(array $postIds)
+    public function getPostIds( array $postIds )
     {
-        if (!$this->isEnabled()) {
+        if( !$this->isEnabled() ) {
             return $postIds;
         }
         $newPostIds = [];
-        foreach ($this->cleanIds($postIds) as $postId) {
+        foreach( $this->cleanIds( $postIds ) as $postId ) {
             $newPostIds = array_merge(
                 $newPostIds,
-                array_values(pll_get_post_translations($postId))
+                array_values( pll_get_post_translations( $postId ) )
             );
         }
-        return $this->cleanIds($newPostIds);
+        return $this->cleanIds( $newPostIds );
     }
 
     /**
@@ -51,10 +51,10 @@ 
      */
     public function isActive()
     {
-        return function_exists('PLL')
-            && function_exists('pll_get_post')
-            && function_exists('pll_get_post_language')
-            && function_exists('pll_get_post_translations');
+        return function_exists( 'PLL' )
+            && function_exists( 'pll_get_post' )
+            && function_exists( 'pll_get_post_language' )
+            && function_exists( 'pll_get_post_translations' );
     }
 
     /**
@@ -63,7 +63,7 @@ 
     public function isEnabled()
     {
         return $this->isActive()
-            && 'polylang' == glsr(OptionManager::class)->get('settings.general.multilingual');
+            && 'polylang' == glsr( OptionManager::class )->get( 'settings.general.multilingual' );
     }
 
     /**
@@ -71,15 +71,15 @@ 
      */
     public function isSupported()
     {
-        return defined('POLYLANG_VERSION')
-            && version_compare(POLYLANG_VERSION, static::SUPPORTED_VERSION, '>=');
+        return defined( 'POLYLANG_VERSION' )
+            && version_compare( POLYLANG_VERSION, static::SUPPORTED_VERSION, '>=' );
     }
 
     /**
      * @return array
      */
-    protected function cleanIds(array $postIds)
+    protected function cleanIds( array $postIds )
     {
-        return array_filter(array_unique($postIds));
+        return array_filter( array_unique( $postIds ) );
     }
 }