pryley / site-reviews

plugin/Modules/Html/Fields/Checkbox.php

Indentation +18 added lines, -18 removed lines

@@ -4,23 +4,23 @@
 
 class Checkbox extends Field
 {
-    /**
-     * @return array
-     */
-    public static function defaults()
-    {
-        return [
-            'value' => 1,
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	public static function defaults()
+	{
+		return [
+			'value' => 1,
+		];
+	}
 
-    /**
-     * @return array
-     */
-    public static function required()
-    {
-        return [
-            'is_multi' => true,
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	public static function required()
+	{
+		return [
+			'is_multi' => true,
+		];
+	}
 }

plugin/Modules/Html/Fields/Rating.php

Indentation +24 added lines, -24 removed lines

@@ -6,29 +6,29 @@
 
 class Rating extends Field
 {
-    /**
-     * @return string|void
-     */
-    public function build()
-    {
-        $this->builder->tag = 'select';
-        $this->mergeFieldArgs();
-        return $this->builder->getTag();
-    }
+	/**
+	 * @return string|void
+	 */
+	public function build()
+	{
+		$this->builder->tag = 'select';
+		$this->mergeFieldArgs();
+		return $this->builder->getTag();
+	}
 
-    /**
-     * @return array
-     */
-    public static function required()
-    {
-        $options = ['' => __('Select a Rating', 'site-reviews')];
-        foreach (range(glsr()->constant('MAX_RATING', RatingModule::class), 1) as $rating) {
-            $options[$rating] = sprintf(_n('%s Star', '%s Stars', $rating, 'site-reviews'), $rating);
-        }
-        return [
-            'class' => 'glsr-star-rating',
-            'options' => $options,
-            'type' => 'select',
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	public static function required()
+	{
+		$options = ['' => __('Select a Rating', 'site-reviews')];
+		foreach (range(glsr()->constant('MAX_RATING', RatingModule::class), 1) as $rating) {
+			$options[$rating] = sprintf(_n('%s Star', '%s Stars', $rating, 'site-reviews'), $rating);
+		}
+		return [
+			'class' => 'glsr-star-rating',
+			'options' => $options,
+			'type' => 'select',
+		];
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -21,9 +21,9 @@
      */
     public static function required()
     {
-        $options = ['' => __('Select a Rating', 'site-reviews')];
-        foreach (range(glsr()->constant('MAX_RATING', RatingModule::class), 1) as $rating) {
-            $options[$rating] = sprintf(_n('%s Star', '%s Stars', $rating, 'site-reviews'), $rating);
+        $options = ['' => __( 'Select a Rating', 'site-reviews' )];
+        foreach( range( glsr()->constant( 'MAX_RATING', RatingModule::class ), 1 ) as $rating ) {
+            $options[$rating] = sprintf( _n( '%s Star', '%s Stars', $rating, 'site-reviews' ), $rating );
         }
         return [
             'class' => 'glsr-star-rating',

plugin/Modules/Html/Form.php

Indentation +30 added lines, -30 removed lines

@@ -4,36 +4,36 @@
 
 class Form
 {
-    /**
-     * @param string $id
-     * @return string
-     */
-    public function buildFields($id)
-    {
-        return array_reduce($this->getFields($id), function ($carry, $field) {
-            return $carry.$field;
-        });
-    }
+	/**
+	 * @param string $id
+	 * @return string
+	 */
+	public function buildFields($id)
+	{
+		return array_reduce($this->getFields($id), function ($carry, $field) {
+			return $carry.$field;
+		});
+	}
 
-    /**
-     * @param string $id
-     * @return array
-     */
-    public function getFields($id)
-    {
-        $fields = [];
-        foreach (glsr()->config('forms/'.$id) as $name => $field) {
-            $fields[] = new Field(wp_parse_args($field, ['name' => $name]));
-        }
-        return $fields;
-    }
+	/**
+	 * @param string $id
+	 * @return array
+	 */
+	public function getFields($id)
+	{
+		$fields = [];
+		foreach (glsr()->config('forms/'.$id) as $name => $field) {
+			$fields[] = new Field(wp_parse_args($field, ['name' => $name]));
+		}
+		return $fields;
+	}
 
-    /**
-     * @param string $id
-     * @return void
-     */
-    public function renderFields($id)
-    {
-        echo $this->buildFields($id);
-    }
+	/**
+	 * @param string $id
+	 * @return void
+	 */
+	public function renderFields($id)
+	{
+		echo $this->buildFields($id);
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -8,9 +8,9 @@ 
      * @param string $id
      * @return string
      */
-    public function buildFields($id)
+    public function buildFields( $id )
     {
-        return array_reduce($this->getFields($id), function ($carry, $field) {
+        return array_reduce( $this->getFields( $id ), function( $carry, $field ) {
             return $carry.$field;
         });
     }
@@ -19,11 +19,11 @@ 
      * @param string $id
      * @return array
      */
-    public function getFields($id)
+    public function getFields( $id )
     {
         $fields = [];
-        foreach (glsr()->config('forms/'.$id) as $name => $field) {
-            $fields[] = new Field(wp_parse_args($field, ['name' => $name]));
+        foreach( glsr()->config( 'forms/'.$id ) as $name => $field ) {
+            $fields[] = new Field( wp_parse_args( $field, ['name' => $name] ) );
         }
         return $fields;
     }
@@ -32,8 +32,8 @@ 
      * @param string $id
      * @return void
      */
-    public function renderFields($id)
+    public function renderFields( $id )
     {
-        echo $this->buildFields($id);
+        echo $this->buildFields( $id );
     }
 }

plugin/Modules/Html/Partials/StarRating.php

Indentation +13 added lines, -13 removed lines

@@ -6,17 +6,17 @@
 
 class StarRating implements PartialContract
 {
-    /**
-     * @return void|string
-     */
-    public function build(array $args = [])
-    {
-        require_once ABSPATH.'wp-admin/includes/template.php';
-        ob_start();
-        wp_star_rating($args);
-        $stars = ob_get_clean();
-        return !glsr()->isAdmin()
-            ? str_replace(['star-rating', 'star star'], ['glsr-stars', 'glsr-star glsr-star'], $stars)
-            : $stars;
-    }
+	/**
+	 * @return void|string
+	 */
+	public function build(array $args = [])
+	{
+		require_once ABSPATH.'wp-admin/includes/template.php';
+		ob_start();
+		wp_star_rating($args);
+		$stars = ob_get_clean();
+		return !glsr()->isAdmin()
+			? str_replace(['star-rating', 'star star'], ['glsr-stars', 'glsr-star glsr-star'], $stars)
+			: $stars;
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -9,14 +9,14 @@
     /**
      * @return void|string
      */
-    public function build(array $args = [])
+    public function build( array $args = [] )
     {
         require_once ABSPATH.'wp-admin/includes/template.php';
         ob_start();
-        wp_star_rating($args);
+        wp_star_rating( $args );
         $stars = ob_get_clean();
         return !glsr()->isAdmin()
-            ? str_replace(['star-rating', 'star star'], ['glsr-stars', 'glsr-star glsr-star'], $stars)
+            ? str_replace( ['star-rating', 'star star'], ['glsr-stars', 'glsr-star glsr-star'], $stars )
             : $stars;
     }
 }

plugin/Modules/Html/Partials/SiteReviewsSummary.php

Indentation +187 added lines, -187 removed lines

@@ -10,191 +10,191 @@
 
 class SiteReviewsSummary
 {
-    /**
-     * @var array
-     */
-    protected $args;
-
-    /**
-     * @var float
-     */
-    protected $averageRating;
-
-    /**
-     * @var array
-     */
-    protected $ratingCounts;
-
-    /**
-     * @return void|string
-     */
-    public function build(array $args = [])
-    {
-        $this->args = $args;
-        $this->ratingCounts = glsr(ReviewManager::class)->getRatingCounts($args);
-        if (!array_sum($this->ratingCounts) && $this->isHidden('if_empty')) {
-            return;
-        }
-        $this->averageRating = glsr(Rating::class)->getAverage($this->ratingCounts);
-        $this->generateSchema();
-        return glsr(Template::class)->build('templates/reviews-summary', [
-            'context' => [
-                'assigned_to' => $this->args['assigned_to'],
-                'category' => $this->args['category'],
-                'class' => $this->getClass(),
-                'id' => $this->args['id'],
-                'percentages' => $this->buildPercentage(),
-                'rating' => $this->buildRating(),
-                'stars' => $this->buildStars(),
-                'text' => $this->buildText(),
-            ],
-        ]);
-    }
-
-    /**
-     * @return void|string
-     */
-    protected function buildPercentage()
-    {
-        if ($this->isHidden('bars')) {
-            return;
-        }
-        $percentages = preg_filter('/$/', '%', glsr(Rating::class)->getPercentages($this->ratingCounts));
-        $bars = array_reduce(range(glsr()->constant('MAX_RATING', Rating::class), 1), function ($carry, $level) use ($percentages) {
-            $label = $this->buildPercentageLabel($this->args['labels'][$level]);
-            $background = $this->buildPercentageBackground($percentages[$level]);
-            $count = apply_filters('site-reviews/summary/counts',
-                $percentages[$level],
-                $this->ratingCounts[$level]
-            );
-            $percent = $this->buildPercentageCount($count);
-            return $carry.glsr(Builder::class)->div($label.$background.$percent, [
-                'class' => 'glsr-bar',
-            ]);
-        });
-        return $this->wrap('percentage', $bars);
-    }
-
-    /**
-     * @param string $percent
-     * @return string
-     */
-    protected function buildPercentageBackground($percent)
-    {
-        $backgroundPercent = glsr(Builder::class)->span([
-            'class' => 'glsr-bar-background-percent',
-            'style' => 'width:'.$percent,
-        ]);
-        return '<span class="glsr-bar-background">'.$backgroundPercent.'</span>';
-    }
-
-    /**
-     * @param string $count
-     * @return string
-     */
-    protected function buildPercentageCount($count)
-    {
-        return '<span class="glsr-bar-percent">'.$count.'</span>';
-    }
-
-    /**
-     * @param string $label
-     * @return string
-     */
-    protected function buildPercentageLabel($label)
-    {
-        return '<span class="glsr-bar-label">'.$label.'</span>';
-    }
-
-    /**
-     * @return void|string
-     */
-    protected function buildRating()
-    {
-        if ($this->isHidden('rating')) {
-            return;
-        }
-        return $this->wrap('rating', '<span>'.$this->averageRating.'</span>');
-    }
-
-    /**
-     * @return void|string
-     */
-    protected function buildStars()
-    {
-        if ($this->isHidden('stars')) {
-            return;
-        }
-        $stars = glsr_star_rating($this->averageRating);
-        return $this->wrap('stars', $stars);
-    }
-
-    /**
-     * @return void|string
-     */
-    protected function buildText()
-    {
-        if ($this->isHidden('summary')) {
-            return;
-        }
-        $count = intval(array_sum($this->ratingCounts));
-        if (empty($this->args['text'])) {
-            // @todo document this change
-            $this->args['text'] = _nx(
-                '{rating} out of {max} stars (based on {num} review)',
-                '{rating} out of {max} stars (based on {num} reviews)',
-                $count,
-                'Do not translate {rating}, {max}, and {num}, they are template tags.',
-                'site-reviews'
-            );
-        }
-        $summary = str_replace(
-            ['{rating}', '{max}', '{num}'],
-            [$this->averageRating, glsr()->constant('MAX_RATING', Rating::class), $count],
-            $this->args['text']
-        );
-        return $this->wrap('text', '<span>'.$summary.'</span>');
-    }
-
-    /**
-     * @return void
-     */
-    protected function generateSchema()
-    {
-        if (!wp_validate_boolean($this->args['schema'])) {
-            return;
-        }
-        glsr(Schema::class)->store(
-            glsr(Schema::class)->buildSummary($this->args)
-        );
-    }
-
-    /**
-     * @return string
-     */
-    protected function getClass()
-    {
-        return trim('glsr-summary glsr-default '.$this->args['class']);
-    }
-
-    /**
-     * @param string $key
-     * @return bool
-     */
-    protected function isHidden($key)
-    {
-        return in_array($key, $this->args['hide']);
-    }
-
-    /**
-     * @param string $key
-     * @param string $value
-     * @return string
-     */
-    protected function wrap($key, $value)
-    {
-        return glsr(Builder::class)->div($value, [
-            'class' => 'glsr-summary-'.$key,
-        ]);
-    }
+	/**
+	 * @var array
+	 */
+	protected $args;
+
+	/**
+	 * @var float
+	 */
+	protected $averageRating;
+
+	/**
+	 * @var array
+	 */
+	protected $ratingCounts;
+
+	/**
+	 * @return void|string
+	 */
+	public function build(array $args = [])
+	{
+		$this->args = $args;
+		$this->ratingCounts = glsr(ReviewManager::class)->getRatingCounts($args);
+		if (!array_sum($this->ratingCounts) && $this->isHidden('if_empty')) {
+			return;
+		}
+		$this->averageRating = glsr(Rating::class)->getAverage($this->ratingCounts);
+		$this->generateSchema();
+		return glsr(Template::class)->build('templates/reviews-summary', [
+			'context' => [
+				'assigned_to' => $this->args['assigned_to'],
+				'category' => $this->args['category'],
+				'class' => $this->getClass(),
+				'id' => $this->args['id'],
+				'percentages' => $this->buildPercentage(),
+				'rating' => $this->buildRating(),
+				'stars' => $this->buildStars(),
+				'text' => $this->buildText(),
+			],
+		]);
+	}
+
+	/**
+	 * @return void|string
+	 */
+	protected function buildPercentage()
+	{
+		if ($this->isHidden('bars')) {
+			return;
+		}
+		$percentages = preg_filter('/$/', '%', glsr(Rating::class)->getPercentages($this->ratingCounts));
+		$bars = array_reduce(range(glsr()->constant('MAX_RATING', Rating::class), 1), function ($carry, $level) use ($percentages) {
+			$label = $this->buildPercentageLabel($this->args['labels'][$level]);
+			$background = $this->buildPercentageBackground($percentages[$level]);
+			$count = apply_filters('site-reviews/summary/counts',
+				$percentages[$level],
+				$this->ratingCounts[$level]
+			);
+			$percent = $this->buildPercentageCount($count);
+			return $carry.glsr(Builder::class)->div($label.$background.$percent, [
+				'class' => 'glsr-bar',
+			]);
+		});
+		return $this->wrap('percentage', $bars);
+	}
+
+	/**
+	 * @param string $percent
+	 * @return string
+	 */
+	protected function buildPercentageBackground($percent)
+	{
+		$backgroundPercent = glsr(Builder::class)->span([
+			'class' => 'glsr-bar-background-percent',
+			'style' => 'width:'.$percent,
+		]);
+		return '<span class="glsr-bar-background">'.$backgroundPercent.'</span>';
+	}
+
+	/**
+	 * @param string $count
+	 * @return string
+	 */
+	protected function buildPercentageCount($count)
+	{
+		return '<span class="glsr-bar-percent">'.$count.'</span>';
+	}
+
+	/**
+	 * @param string $label
+	 * @return string
+	 */
+	protected function buildPercentageLabel($label)
+	{
+		return '<span class="glsr-bar-label">'.$label.'</span>';
+	}
+
+	/**
+	 * @return void|string
+	 */
+	protected function buildRating()
+	{
+		if ($this->isHidden('rating')) {
+			return;
+		}
+		return $this->wrap('rating', '<span>'.$this->averageRating.'</span>');
+	}
+
+	/**
+	 * @return void|string
+	 */
+	protected function buildStars()
+	{
+		if ($this->isHidden('stars')) {
+			return;
+		}
+		$stars = glsr_star_rating($this->averageRating);
+		return $this->wrap('stars', $stars);
+	}
+
+	/**
+	 * @return void|string
+	 */
+	protected function buildText()
+	{
+		if ($this->isHidden('summary')) {
+			return;
+		}
+		$count = intval(array_sum($this->ratingCounts));
+		if (empty($this->args['text'])) {
+			// @todo document this change
+			$this->args['text'] = _nx(
+				'{rating} out of {max} stars (based on {num} review)',
+				'{rating} out of {max} stars (based on {num} reviews)',
+				$count,
+				'Do not translate {rating}, {max}, and {num}, they are template tags.',
+				'site-reviews'
+			);
+		}
+		$summary = str_replace(
+			['{rating}', '{max}', '{num}'],
+			[$this->averageRating, glsr()->constant('MAX_RATING', Rating::class), $count],
+			$this->args['text']
+		);
+		return $this->wrap('text', '<span>'.$summary.'</span>');
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function generateSchema()
+	{
+		if (!wp_validate_boolean($this->args['schema'])) {
+			return;
+		}
+		glsr(Schema::class)->store(
+			glsr(Schema::class)->buildSummary($this->args)
+		);
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function getClass()
+	{
+		return trim('glsr-summary glsr-default '.$this->args['class']);
+	}
+
+	/**
+	 * @param string $key
+	 * @return bool
+	 */
+	protected function isHidden($key)
+	{
+		return in_array($key, $this->args['hide']);
+	}
+
+	/**
+	 * @param string $key
+	 * @param string $value
+	 * @return string
+	 */
+	protected function wrap($key, $value)
+	{
+		return glsr(Builder::class)->div($value, [
+			'class' => 'glsr-summary-'.$key,
+		]);
+	}
 }

Spacing +40 added lines, -40 removed lines

@@ -28,16 +28,16 @@ 
     /**
      * @return void|string
      */
-    public function build(array $args = [])
+    public function build( array $args = [] )
     {
         $this->args = $args;
-        $this->ratingCounts = glsr(ReviewManager::class)->getRatingCounts($args);
-        if (!array_sum($this->ratingCounts) && $this->isHidden('if_empty')) {
+        $this->ratingCounts = glsr( ReviewManager::class )->getRatingCounts( $args );
+        if( !array_sum( $this->ratingCounts ) && $this->isHidden( 'if_empty' ) ) {
             return;
         }
-        $this->averageRating = glsr(Rating::class)->getAverage($this->ratingCounts);
+        $this->averageRating = glsr( Rating::class )->getAverage( $this->ratingCounts );
         $this->generateSchema();
-        return glsr(Template::class)->build('templates/reviews-summary', [
+        return glsr( Template::class )->build( 'templates/reviews-summary', [
             'context' => [
                 'assigned_to' => $this->args['assigned_to'],
                 'category' => $this->args['category'],
@@ -48,7 +48,7 @@ 
                 'stars' => $this->buildStars(),
                 'text' => $this->buildText(),
             ],
-        ]);
+        ] );
     }
 
     /**
@@ -56,35 +56,35 @@ 
      */
     protected function buildPercentage()
     {
-        if ($this->isHidden('bars')) {
+        if( $this->isHidden( 'bars' ) ) {
             return;
         }
-        $percentages = preg_filter('/$/', '%', glsr(Rating::class)->getPercentages($this->ratingCounts));
-        $bars = array_reduce(range(glsr()->constant('MAX_RATING', Rating::class), 1), function ($carry, $level) use ($percentages) {
-            $label = $this->buildPercentageLabel($this->args['labels'][$level]);
-            $background = $this->buildPercentageBackground($percentages[$level]);
-            $count = apply_filters('site-reviews/summary/counts',
+        $percentages = preg_filter( '/$/', '%', glsr( Rating::class )->getPercentages( $this->ratingCounts ) );
+        $bars = array_reduce( range( glsr()->constant( 'MAX_RATING', Rating::class ), 1 ), function( $carry, $level ) use ($percentages) {
+            $label = $this->buildPercentageLabel( $this->args['labels'][$level] );
+            $background = $this->buildPercentageBackground( $percentages[$level] );
+            $count = apply_filters( 'site-reviews/summary/counts',
                 $percentages[$level],
                 $this->ratingCounts[$level]
             );
-            $percent = $this->buildPercentageCount($count);
-            return $carry.glsr(Builder::class)->div($label.$background.$percent, [
+            $percent = $this->buildPercentageCount( $count );
+            return $carry.glsr( Builder::class )->div( $label.$background.$percent, [
                 'class' => 'glsr-bar',
-            ]);
+            ] );
         });
-        return $this->wrap('percentage', $bars);
+        return $this->wrap( 'percentage', $bars );
     }
 
     /**
      * @param string $percent
      * @return string
      */
-    protected function buildPercentageBackground($percent)
+    protected function buildPercentageBackground( $percent )
     {
-        $backgroundPercent = glsr(Builder::class)->span([
+        $backgroundPercent = glsr( Builder::class )->span( [
             'class' => 'glsr-bar-background-percent',
             'style' => 'width:'.$percent,
-        ]);
+        ] );
         return '<span class="glsr-bar-background">'.$backgroundPercent.'</span>';
     }
 
@@ -92,7 +92,7 @@ 
      * @param string $count
      * @return string
      */
-    protected function buildPercentageCount($count)
+    protected function buildPercentageCount( $count )
     {
         return '<span class="glsr-bar-percent">'.$count.'</span>';
     }
@@ -101,7 +101,7 @@ 
      * @param string $label
      * @return string
      */
-    protected function buildPercentageLabel($label)
+    protected function buildPercentageLabel( $label )
     {
         return '<span class="glsr-bar-label">'.$label.'</span>';
     }
@@ -111,10 +111,10 @@ 
      */
     protected function buildRating()
     {
-        if ($this->isHidden('rating')) {
+        if( $this->isHidden( 'rating' ) ) {
             return;
         }
-        return $this->wrap('rating', '<span>'.$this->averageRating.'</span>');
+        return $this->wrap( 'rating', '<span>'.$this->averageRating.'</span>' );
     }
 
     /**
@@ -122,11 +122,11 @@ 
      */
     protected function buildStars()
     {
-        if ($this->isHidden('stars')) {
+        if( $this->isHidden( 'stars' ) ) {
             return;
         }
-        $stars = glsr_star_rating($this->averageRating);
-        return $this->wrap('stars', $stars);
+        $stars = glsr_star_rating( $this->averageRating );
+        return $this->wrap( 'stars', $stars );
     }
 
     /**
@@ -134,11 +134,11 @@ 
      */
     protected function buildText()
     {
-        if ($this->isHidden('summary')) {
+        if( $this->isHidden( 'summary' ) ) {
             return;
         }
-        $count = intval(array_sum($this->ratingCounts));
-        if (empty($this->args['text'])) {
+        $count = intval( array_sum( $this->ratingCounts ) );
+        if( empty($this->args['text']) ) {
             // @todo document this change
             $this->args['text'] = _nx(
                 '{rating} out of {max} stars (based on {num} review)',
@@ -150,10 +150,10 @@ 
         }
         $summary = str_replace(
             ['{rating}', '{max}', '{num}'],
-            [$this->averageRating, glsr()->constant('MAX_RATING', Rating::class), $count],
+            [$this->averageRating, glsr()->constant( 'MAX_RATING', Rating::class ), $count],
             $this->args['text']
         );
-        return $this->wrap('text', '<span>'.$summary.'</span>');
+        return $this->wrap( 'text', '<span>'.$summary.'</span>' );
     }
 
     /**
@@ -161,11 +161,11 @@ 
      */
     protected function generateSchema()
     {
-        if (!wp_validate_boolean($this->args['schema'])) {
+        if( !wp_validate_boolean( $this->args['schema'] ) ) {
             return;
         }
-        glsr(Schema::class)->store(
-            glsr(Schema::class)->buildSummary($this->args)
+        glsr( Schema::class )->store(
+            glsr( Schema::class )->buildSummary( $this->args )
         );
     }
 
@@ -174,16 +174,16 @@ 
      */
     protected function getClass()
     {
-        return trim('glsr-summary glsr-default '.$this->args['class']);
+        return trim( 'glsr-summary glsr-default '.$this->args['class'] );
     }
 
     /**
      * @param string $key
      * @return bool
      */
-    protected function isHidden($key)
+    protected function isHidden( $key )
     {
-        return in_array($key, $this->args['hide']);
+        return in_array( $key, $this->args['hide'] );
     }
 
     /**
@@ -191,10 +191,10 @@ 
      * @param string $value
      * @return string
      */
-    protected function wrap($key, $value)
+    protected function wrap( $key, $value )
     {
-        return glsr(Builder::class)->div($value, [
+        return glsr( Builder::class )->div( $value, [
             'class' => 'glsr-summary-'.$key,
-        ]);
+        ] );
     }
 }

plugin/Modules/Html/Partials/SiteReviewsForm.php

Braces +2 added lines, -1 removed lines

@@ -302,7 +302,8 @@
         }
         if (in_array($field->field['type'], ['radio', 'checkbox'])) {
             $field->field['checked'] = $field->field['value'] == $this->values[$field->field['path']];
-        } else {
+        }
+        else {
             $field->field['value'] = $this->values[$field->field['path']];
         }
     }

Indentation +272 added lines, -272 removed lines

@@ -12,297 +12,297 @@
 
 class SiteReviewsForm
 {
-    /**
-     * @var array
-     */
-    protected $args;
+	/**
+	 * @var array
+	 */
+	protected $args;
 
-    /**
-     * @var array
-     */
-    protected $errors;
+	/**
+	 * @var array
+	 */
+	protected $errors;
 
-    /**
-     * @var string
-     */
-    protected $message;
+	/**
+	 * @var string
+	 */
+	protected $message;
 
-    /**
-     * @var array
-     */
-    protected $required;
+	/**
+	 * @var array
+	 */
+	protected $required;
 
-    /**
-     * @var array
-     */
-    protected $values;
+	/**
+	 * @var array
+	 */
+	protected $values;
 
-    /**
-     * @return void|string
-     */
-    public function build(array $args = [])
-    {
-        $this->args = $args;
-        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) {
-            return $carry.$field;
-        });
-        return glsr(Template::class)->build('templates/reviews-form', [
-            'args' => $args,
-            'context' => [
-                'class' => $this->getClass(),
-                'fields' => $fields,
-                'id' => $this->args['id'],
-                'response' => $this->buildResponse(),
-                'submit_button' => $this->buildSubmitButton().$this->buildRecaptcha(),
-            ],
-        ]);
-    }
+	/**
+	 * @return void|string
+	 */
+	public function build(array $args = [])
+	{
+		$this->args = $args;
+		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) {
+			return $carry.$field;
+		});
+		return glsr(Template::class)->build('templates/reviews-form', [
+			'args' => $args,
+			'context' => [
+				'class' => $this->getClass(),
+				'fields' => $fields,
+				'id' => $this->args['id'],
+				'response' => $this->buildResponse(),
+				'submit_button' => $this->buildSubmitButton().$this->buildRecaptcha(),
+			],
+		]);
+	}
 
-    /**
-     * @return string
-     */
-    protected function buildLoginRegister()
-    {
-        return glsr(Template::class)->build('templates/login-register', [
-            'context' => [
-                'text' => trim($this->getLoginText().' '.$this->getRegisterText()),
-            ],
-        ]);
-    }
+	/**
+	 * @return string
+	 */
+	protected function buildLoginRegister()
+	{
+		return glsr(Template::class)->build('templates/login-register', [
+			'context' => [
+				'text' => trim($this->getLoginText().' '.$this->getRegisterText()),
+			],
+		]);
+	}
 
-    /**
-     * @return void|string
-     */
-    protected function buildRecaptcha()
-    {
-        if (!glsr(OptionManager::class)->isRecaptchaEnabled()) {
-            return;
-        }
-        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-size' => 'invisible',
-        ]);
-    }
+	/**
+	 * @return void|string
+	 */
+	protected function buildRecaptcha()
+	{
+		if (!glsr(OptionManager::class)->isRecaptchaEnabled()) {
+			return;
+		}
+		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-size' => 'invisible',
+		]);
+	}
 
-    /**
-     * @return string
-     */
-    protected function buildResponse()
-    {
-        $classes = !empty($this->errors)
-            ? glsr(StyleValidationDefaults::class)->defaults()['message_error_class']
-            : '';
-        return glsr(Template::class)->build('templates/form/response', [
-            'context' => [
-                'class' => $classes,
-                'message' => wpautop($this->message),
-            ],
-            'has_errors' => !empty($this->errors),
-        ]);
-    }
+	/**
+	 * @return string
+	 */
+	protected function buildResponse()
+	{
+		$classes = !empty($this->errors)
+			? glsr(StyleValidationDefaults::class)->defaults()['message_error_class']
+			: '';
+		return glsr(Template::class)->build('templates/form/response', [
+			'context' => [
+				'class' => $classes,
+				'message' => wpautop($this->message),
+			],
+			'has_errors' => !empty($this->errors),
+		]);
+	}
 
-    /**
-     * @return string
-     */
-    protected function buildSubmitButton()
-    {
-        return glsr(Template::class)->build('templates/form/submit-button', [
-            'context' => [
-                'text' => __('Submit your review', 'site-reviews'),
-            ],
-        ]);
-    }
+	/**
+	 * @return string
+	 */
+	protected function buildSubmitButton()
+	{
+		return glsr(Template::class)->build('templates/form/submit-button', [
+			'context' => [
+				'text' => __('Submit your review', 'site-reviews'),
+			],
+		]);
+	}
 
-    /**
-     * @return string
-     */
-    protected function getClass()
-    {
-        return trim('glsr-form glsr-'.glsr(Style::class)->get().' '.$this->args['class']);
-    }
+	/**
+	 * @return string
+	 */
+	protected function getClass()
+	{
+		return trim('glsr-form glsr-'.glsr(Style::class)->get().' '.$this->args['class']);
+	}
 
-    /**
-     * @return array
-     */
-    protected function getFields()
-    {
-        $hiddenFields = $this->getHiddenFields();
-        $hiddenFields[] = $this->getHoneypotField();
-        $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) {
-                continue;
-            }
-            unset($hiddenFields[$index]);
-        }
-        return array_merge($hiddenFields, $fields);
-    }
+	/**
+	 * @return array
+	 */
+	protected function getFields()
+	{
+		$hiddenFields = $this->getHiddenFields();
+		$hiddenFields[] = $this->getHoneypotField();
+		$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) {
+				continue;
+			}
+			unset($hiddenFields[$index]);
+		}
+		return array_merge($hiddenFields, $fields);
+	}
 
-    /**
-     * @return string
-     */
-    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);
-    }
+	/**
+	 * @return string
+	 */
+	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);
+	}
 
-    /**
-     * @return void|string
-     */
-    protected function getRegisterText()
-    {
-        if (!get_option('users_can_register') || !glsr(OptionManager::class)->getBool('settings.general.require.login')) {
-            return;
-        }
-        $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);
-    }
+	/**
+	 * @return void|string
+	 */
+	protected function getRegisterText()
+	{
+		if (!get_option('users_can_register') || !glsr(OptionManager::class)->getBool('settings.general.require.login')) {
+			return;
+		}
+		$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);
+	}
 
-    /**
-     * @return array
-     */
-    protected function getHiddenFields()
-    {
-        $fields = [[
-            'name' => '_action',
-            'value' => 'submit-review',
-        ], [
-            'name' => '_counter',
-        ], [
-            'name' => '_nonce',
-            'value' => wp_create_nonce('submit-review'),
-        ], [
-            'name' => '_post_id',
-            'value' => get_the_ID(),
-        ], [
-            'name' => '_referer',
-            'value' => wp_unslash(filter_input(INPUT_SERVER, 'REQUEST_URI')),
-        ], [
-            'name' => 'assign_to',
-            'value' => $this->args['assign_to'],
-        ], [
-            'name' => 'category',
-            'value' => $this->args['category'],
-        ], [
-            'name' => 'excluded',
-            'value' => $this->args['hide'],
-        ], [
-            'name' => 'form_id',
-            'value' => $this->args['id'],
-        ]];
-        return array_map(function ($field) {
-            return new Field(wp_parse_args($field, ['type' => 'hidden']));
-        }, $fields);
-    }
+	/**
+	 * @return array
+	 */
+	protected function getHiddenFields()
+	{
+		$fields = [[
+			'name' => '_action',
+			'value' => 'submit-review',
+		], [
+			'name' => '_counter',
+		], [
+			'name' => '_nonce',
+			'value' => wp_create_nonce('submit-review'),
+		], [
+			'name' => '_post_id',
+			'value' => get_the_ID(),
+		], [
+			'name' => '_referer',
+			'value' => wp_unslash(filter_input(INPUT_SERVER, 'REQUEST_URI')),
+		], [
+			'name' => 'assign_to',
+			'value' => $this->args['assign_to'],
+		], [
+			'name' => 'category',
+			'value' => $this->args['category'],
+		], [
+			'name' => 'excluded',
+			'value' => $this->args['hide'],
+		], [
+			'name' => 'form_id',
+			'value' => $this->args['id'],
+		]];
+		return array_map(function ($field) {
+			return new Field(wp_parse_args($field, ['type' => 'hidden']));
+		}, $fields);
+	}
 
-    /**
-     * @return Field
-     */
-    protected function getHoneypotField()
-    {
-        return new Field([
-            'name' => 'gotcha',
-            'type' => 'honeypot',
-        ]);
-    }
+	/**
+	 * @return Field
+	 */
+	protected function getHoneypotField()
+	{
+		return new Field([
+			'name' => 'gotcha',
+			'type' => 'honeypot',
+		]);
+	}
 
-    /**
-     * @return void
-     */
-    protected function normalizeFieldId(Field &$field)
-    {
-        if (empty($this->args['id']) || empty($field->field['id'])) {
-            return;
-        }
-        $field->field['id'].= '-'.$this->args['id'];
-    }
+	/**
+	 * @return void
+	 */
+	protected function normalizeFieldId(Field &$field)
+	{
+		if (empty($this->args['id']) || empty($field->field['id'])) {
+			return;
+		}
+		$field->field['id'].= '-'.$this->args['id'];
+	}
 
-    /**
-     * @return void
-     */
-    protected function normalizeFieldClass(Field &$field)
-    {
-        if (!isset($field->field['class'])) {
-            $field->field['class'] = '';
-        }
-        $field->field['class'] = trim($field->field['class'].' glsr-field-control');
-    }
+	/**
+	 * @return void
+	 */
+	protected function normalizeFieldClass(Field &$field)
+	{
+		if (!isset($field->field['class'])) {
+			$field->field['class'] = '';
+		}
+		$field->field['class'] = trim($field->field['class'].' glsr-field-control');
+	}
 
-    /**
-     * @return void
-     */
-    protected function normalizeFieldErrors(Field &$field)
-    {
-        if (!array_key_exists($field->field['path'], $this->errors)) {
-            return;
-        }
-        $field->field['errors'] = $this->errors[$field->field['path']];
-    }
+	/**
+	 * @return void
+	 */
+	protected function normalizeFieldErrors(Field &$field)
+	{
+		if (!array_key_exists($field->field['path'], $this->errors)) {
+			return;
+		}
+		$field->field['errors'] = $this->errors[$field->field['path']];
+	}
 
-    /**
-     * @return void
-     */
-    protected function normalizeFieldRequired(Field &$field)
-    {
-        if (!in_array($field->field['path'], $this->required)) {
-            return;
-        }
-        $field->field['required'] = true;
-    }
+	/**
+	 * @return void
+	 */
+	protected function normalizeFieldRequired(Field &$field)
+	{
+		if (!in_array($field->field['path'], $this->required)) {
+			return;
+		}
+		$field->field['required'] = true;
+	}
 
-    /**
-     * @return array
-     */
-    protected function normalizeFields($fields)
-    {
-        $normalizedFields = [];
-        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);
-            $normalizedFields[] = $field;
-        }
-        return $normalizedFields;
-    }
+	/**
+	 * @return array
+	 */
+	protected function normalizeFields($fields)
+	{
+		$normalizedFields = [];
+		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);
+			$normalizedFields[] = $field;
+		}
+		return $normalizedFields;
+	}
 
-    /**
-     * @return void
-     */
-    protected function normalizeFieldValue(Field &$field)
-    {
-        if (!array_key_exists($field->field['path'], $this->values)) {
-            return;
-        }
-        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']];
-        }
-    }
+	/**
+	 * @return void
+	 */
+	protected function normalizeFieldValue(Field &$field)
+	{
+		if (!array_key_exists($field->field['path'], $this->values)) {
+			return;
+		}
+		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']];
+		}
+	}
 }

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']];

plugin/Modules/Translation.php

Braces +6 added lines, -3 removed lines

@@ -73,7 +73,8 @@ 
             foreach ($potEntries as $key => $entry) {
                 $entries[html_entity_decode($key, ENT_COMPAT, 'UTF-8')] = $entry;
             }
-        } catch (Exception $e) {
+        }
+        catch (Exception $e) {
             glsr_log()->error($e->getMessage());
         }
         return $entries;
@@ -196,7 +197,8 @@ 
                 if (in_array($needle, [$single, $plural])) {
                     $this->results[$key] = $entry;
                 }
-            } elseif (false !== strpos(sprintf('%s %s', $single, $plural), $needle)) {
+            }
+            elseif (false !== strpos(sprintf('%s %s', $single, $plural), $needle)) {
                 $this->results[$key] = $entry;
             }
         }
@@ -242,7 +244,8 @@ 
             foreach ($keys as $key) {
                 try {
                     $entry = $this->normalizeEntryString($entry, $key);
-                } catch (\TypeError $error) {
+                }
+                catch (\TypeError $error) {
                     glsr_log()->once('error', 'Translation/normalize', $error);
                     glsr_log()->once('debug', 'Translation/normalize', $entry);
                 }

Indentation +250 added lines, -250 removed lines

@@ -10,272 +10,272 @@
 
 class Translation
 {
-    const SEARCH_THRESHOLD = 3;
+	const SEARCH_THRESHOLD = 3;
 
-    /**
-     * @var array
-     */
-    protected $entries;
+	/**
+	 * @var array
+	 */
+	protected $entries;
 
-    /**
-     * @var array
-     */
-    protected $results;
+	/**
+	 * @var array
+	 */
+	protected $results;
 
-    /**
-     * Returns all saved custom translations with translation context.
-     * @return array
-     */
-    public function all()
-    {
-        $translations = $this->translations();
-        $entries = $this->filter($translations, $this->entries())->results();
-        array_walk($translations, function (&$entry) use ($entries) {
-            $entry['desc'] = array_key_exists($entry['id'], $entries)
-                ? $this->getEntryString($entries[$entry['id']], 'msgctxt')
-                : '';
-        });
-        return $translations;
-    }
+	/**
+	 * Returns all saved custom translations with translation context.
+	 * @return array
+	 */
+	public function all()
+	{
+		$translations = $this->translations();
+		$entries = $this->filter($translations, $this->entries())->results();
+		array_walk($translations, function (&$entry) use ($entries) {
+			$entry['desc'] = array_key_exists($entry['id'], $entries)
+				? $this->getEntryString($entries[$entry['id']], 'msgctxt')
+				: '';
+		});
+		return $translations;
+	}
 
-    /**
-     * @return array
-     */
-    public function entries()
-    {
-        if (!isset($this->entries)) {
-            $potFile = glsr()->path(glsr()->languages.'/'.Application::ID.'.pot');
-            $entries = $this->extractEntriesFromPotFile($potFile);
-            $entries = apply_filters('site-reviews/translation/entries', $entries);
-            $this->entries = $entries;
-        }
-        return $this->entries;
-    }
+	/**
+	 * @return array
+	 */
+	public function entries()
+	{
+		if (!isset($this->entries)) {
+			$potFile = glsr()->path(glsr()->languages.'/'.Application::ID.'.pot');
+			$entries = $this->extractEntriesFromPotFile($potFile);
+			$entries = apply_filters('site-reviews/translation/entries', $entries);
+			$this->entries = $entries;
+		}
+		return $this->entries;
+	}
 
-    /**
-     * @param array|null $entriesToExclude
-     * @param array|null $entries
-     * @return static
-     */
-    public function exclude($entriesToExclude = null, $entries = null)
-    {
-        return $this->filter($entriesToExclude, $entries, false);
-    }
+	/**
+	 * @param array|null $entriesToExclude
+	 * @param array|null $entries
+	 * @return static
+	 */
+	public function exclude($entriesToExclude = null, $entries = null)
+	{
+		return $this->filter($entriesToExclude, $entries, false);
+	}
 
-    /**
-     * @param string $potFile
-     * @return array
-     */
-    public function extractEntriesFromPotFile($potFile, array $entries = [])
-    {
-        try {
-            $potEntries = $this->normalize(Parser::parseFile($potFile)->getEntries());
-            foreach ($potEntries as $key => $entry) {
-                $entries[html_entity_decode($key, ENT_COMPAT, 'UTF-8')] = $entry;
-            }
-        } catch (Exception $e) {
-            glsr_log()->error($e->getMessage());
-        }
-        return $entries;
-    }
+	/**
+	 * @param string $potFile
+	 * @return array
+	 */
+	public function extractEntriesFromPotFile($potFile, array $entries = [])
+	{
+		try {
+			$potEntries = $this->normalize(Parser::parseFile($potFile)->getEntries());
+			foreach ($potEntries as $key => $entry) {
+				$entries[html_entity_decode($key, ENT_COMPAT, 'UTF-8')] = $entry;
+			}
+		} catch (Exception $e) {
+			glsr_log()->error($e->getMessage());
+		}
+		return $entries;
+	}
 
-    /**
-     * @param array|null $filterWith
-     * @param array|null $entries
-     * @param bool $intersect
-     * @return static
-     */
-    public function filter($filterWith = null, $entries = null, $intersect = true)
-    {
-        if (!is_array($entries)) {
-            $entries = $this->results;
-        }
-        if (!is_array($filterWith)) {
-            $filterWith = $this->translations();
-        }
-        $keys = array_flip(glsr_array_column($filterWith, 'id'));
-        $this->results = $intersect
-            ? array_intersect_key($entries, $keys)
-            : array_diff_key($entries, $keys);
-        return $this;
-    }
+	/**
+	 * @param array|null $filterWith
+	 * @param array|null $entries
+	 * @param bool $intersect
+	 * @return static
+	 */
+	public function filter($filterWith = null, $entries = null, $intersect = true)
+	{
+		if (!is_array($entries)) {
+			$entries = $this->results;
+		}
+		if (!is_array($filterWith)) {
+			$filterWith = $this->translations();
+		}
+		$keys = array_flip(glsr_array_column($filterWith, 'id'));
+		$this->results = $intersect
+			? array_intersect_key($entries, $keys)
+			: array_diff_key($entries, $keys);
+		return $this;
+	}
 
-    /**
-     * @param string $template
-     * @return string
-     */
-    public function render($template, array $entry)
-    {
-        $data = array_combine(
-            array_map(function ($key) { return 'data.'.$key; }, array_keys($entry)),
-            $entry
-        );
-        $data['data.class'] = $data['data.error'] = '';
-        if (false === array_search($entry['s1'], glsr_array_column($this->entries(), 'msgid'))) {
-            $data['data.class'] = 'is-invalid';
-            $data['data.error'] = __('This custom translation is no longer valid as the original text has been changed or removed.', 'site-reviews');
-        }
-        return glsr(Template::class)->build('partials/translations/'.$template, [
-            'context' => array_map('esc_html', $data),
-        ]);
-    }
+	/**
+	 * @param string $template
+	 * @return string
+	 */
+	public function render($template, array $entry)
+	{
+		$data = array_combine(
+			array_map(function ($key) { return 'data.'.$key; }, array_keys($entry)),
+			$entry
+		);
+		$data['data.class'] = $data['data.error'] = '';
+		if (false === array_search($entry['s1'], glsr_array_column($this->entries(), 'msgid'))) {
+			$data['data.class'] = 'is-invalid';
+			$data['data.error'] = __('This custom translation is no longer valid as the original text has been changed or removed.', 'site-reviews');
+		}
+		return glsr(Template::class)->build('partials/translations/'.$template, [
+			'context' => array_map('esc_html', $data),
+		]);
+	}
 
-    /**
-     * Returns a rendered string of all saved custom translations with translation context.
-     * @return string
-     */
-    public function renderAll()
-    {
-        $rendered = '';
-        foreach ($this->all() as $index => $entry) {
-            $entry['index'] = $index;
-            $entry['prefix'] = OptionManager::databaseKey();
-            $rendered.= $this->render($entry['type'], $entry);
-        }
-        return $rendered;
-    }
+	/**
+	 * Returns a rendered string of all saved custom translations with translation context.
+	 * @return string
+	 */
+	public function renderAll()
+	{
+		$rendered = '';
+		foreach ($this->all() as $index => $entry) {
+			$entry['index'] = $index;
+			$entry['prefix'] = OptionManager::databaseKey();
+			$rendered.= $this->render($entry['type'], $entry);
+		}
+		return $rendered;
+	}
 
-    /**
-     * @param bool $resetAfterRender
-     * @return string
-     */
-    public function renderResults($resetAfterRender = true)
-    {
-        $rendered = '';
-        foreach ($this->results as $id => $entry) {
-            $data = [
-                'desc' => $this->getEntryString($entry, 'msgctxt'),
-                'id' => $id,
-                'p1' => $this->getEntryString($entry, 'msgid_plural'),
-                's1' => $this->getEntryString($entry, 'msgid'),
-            ];
-            $text = !empty($data['p1'])
-                ? sprintf('%s | %s', $data['s1'], $data['p1'])
-                : $data['s1'];
-            $rendered.= $this->render('result', [
-                'entry' => json_encode($data, JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_TAG | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE),
-                'text' => wp_strip_all_tags($text),
-            ]);
-        }
-        if ($resetAfterRender) {
-            $this->reset();
-        }
-        return $rendered;
-    }
+	/**
+	 * @param bool $resetAfterRender
+	 * @return string
+	 */
+	public function renderResults($resetAfterRender = true)
+	{
+		$rendered = '';
+		foreach ($this->results as $id => $entry) {
+			$data = [
+				'desc' => $this->getEntryString($entry, 'msgctxt'),
+				'id' => $id,
+				'p1' => $this->getEntryString($entry, 'msgid_plural'),
+				's1' => $this->getEntryString($entry, 'msgid'),
+			];
+			$text = !empty($data['p1'])
+				? sprintf('%s | %s', $data['s1'], $data['p1'])
+				: $data['s1'];
+			$rendered.= $this->render('result', [
+				'entry' => json_encode($data, JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_TAG | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE),
+				'text' => wp_strip_all_tags($text),
+			]);
+		}
+		if ($resetAfterRender) {
+			$this->reset();
+		}
+		return $rendered;
+	}
 
-    /**
-     * @return void
-     */
-    public function reset()
-    {
-        $this->results = [];
-    }
+	/**
+	 * @return void
+	 */
+	public function reset()
+	{
+		$this->results = [];
+	}
 
-    /**
-     * @return array
-     */
-    public function results()
-    {
-        $results = $this->results;
-        $this->reset();
-        return $results;
-    }
+	/**
+	 * @return array
+	 */
+	public function results()
+	{
+		$results = $this->results;
+		$this->reset();
+		return $results;
+	}
 
-    /**
-     * @param string $needle
-     * @return static
-     */
-    public function search($needle = '')
-    {
-        $this->reset();
-        $needle = trim(strtolower($needle));
-        foreach ($this->entries() as $key => $entry) {
-            $single = strtolower($this->getEntryString($entry, 'msgid'));
-            $plural = strtolower($this->getEntryString($entry, 'msgid_plural'));
-            if (strlen($needle) < static::SEARCH_THRESHOLD) {
-                if (in_array($needle, [$single, $plural])) {
-                    $this->results[$key] = $entry;
-                }
-            } elseif (false !== strpos(sprintf('%s %s', $single, $plural), $needle)) {
-                $this->results[$key] = $entry;
-            }
-        }
-        return $this;
-    }
+	/**
+	 * @param string $needle
+	 * @return static
+	 */
+	public function search($needle = '')
+	{
+		$this->reset();
+		$needle = trim(strtolower($needle));
+		foreach ($this->entries() as $key => $entry) {
+			$single = strtolower($this->getEntryString($entry, 'msgid'));
+			$plural = strtolower($this->getEntryString($entry, 'msgid_plural'));
+			if (strlen($needle) < static::SEARCH_THRESHOLD) {
+				if (in_array($needle, [$single, $plural])) {
+					$this->results[$key] = $entry;
+				}
+			} elseif (false !== strpos(sprintf('%s %s', $single, $plural), $needle)) {
+				$this->results[$key] = $entry;
+			}
+		}
+		return $this;
+	}
 
-    /**
-     * Store the translations to avoid unnecessary loops.
-     * @return array
-     */
-    public function translations()
-    {
-        static $translations;
-        if (empty($translations)) {
-            $settings = glsr(OptionManager::class)->get('settings');
-            $translations = isset($settings['strings'])
-                ? $this->normalizeSettings((array) $settings['strings'])
-                : [];
-        }
-        return $translations;
-    }
+	/**
+	 * Store the translations to avoid unnecessary loops.
+	 * @return array
+	 */
+	public function translations()
+	{
+		static $translations;
+		if (empty($translations)) {
+			$settings = glsr(OptionManager::class)->get('settings');
+			$translations = isset($settings['strings'])
+				? $this->normalizeSettings((array) $settings['strings'])
+				: [];
+		}
+		return $translations;
+	}
 
-    /**
-     * @param string $key
-     * @return string
-     */
-    protected function getEntryString(array $entry, $key)
-    {
-        return isset($entry[$key])
-            ? implode('', (array) $entry[$key])
-            : '';
-    }
+	/**
+	 * @param string $key
+	 * @return string
+	 */
+	protected function getEntryString(array $entry, $key)
+	{
+		return isset($entry[$key])
+			? implode('', (array) $entry[$key])
+			: '';
+	}
 
-    /**
-     * @return array
-     */
-    protected function normalize(array $entries)
-    {
-        $keys = [
-            'msgctxt', 'msgid', 'msgid_plural', 'msgstr', 'msgstr[0]', 'msgstr[1]',
-        ];
-        array_walk($entries, function (&$entry) use ($keys) {
-            foreach ($keys as $key) {
-                try {
-                    $entry = $this->normalizeEntryString($entry, $key);
-                } catch (\TypeError $error) {
-                    glsr_log()->once('error', 'Translation/normalize', $error);
-                    glsr_log()->once('debug', 'Translation/normalize', $entry);
-                }
-            }
-        });
-        return $entries;
-    }
+	/**
+	 * @return array
+	 */
+	protected function normalize(array $entries)
+	{
+		$keys = [
+			'msgctxt', 'msgid', 'msgid_plural', 'msgstr', 'msgstr[0]', 'msgstr[1]',
+		];
+		array_walk($entries, function (&$entry) use ($keys) {
+			foreach ($keys as $key) {
+				try {
+					$entry = $this->normalizeEntryString($entry, $key);
+				} catch (\TypeError $error) {
+					glsr_log()->once('error', 'Translation/normalize', $error);
+					glsr_log()->once('debug', 'Translation/normalize', $entry);
+				}
+			}
+		});
+		return $entries;
+	}
 
-    /**
-     * @param string $key
-     * @return array
-     */
-    protected function normalizeEntryString(array $entry, $key)
-    {
-        if (isset($entry[$key])) {
-            $entry[$key] = $this->getEntryString($entry, $key);
-        }
-        return $entry;
-    }
+	/**
+	 * @param string $key
+	 * @return array
+	 */
+	protected function normalizeEntryString(array $entry, $key)
+	{
+		if (isset($entry[$key])) {
+			$entry[$key] = $this->getEntryString($entry, $key);
+		}
+		return $entry;
+	}
 
-    /**
-     * @return array
-     */
-    protected function normalizeSettings(array $strings)
-    {
-        $defaultString = array_fill_keys(['id', 's1', 's2', 'p1', 'p2'], '');
-        $strings = array_filter($strings, 'is_array');
-        foreach ($strings as &$string) {
-            $string['type'] = isset($string['p1']) ? 'plural' : 'single';
-            $string = wp_parse_args($string, $defaultString);
-        }
-        return array_filter($strings, function ($string) {
-            return !empty($string['id']);
-        });
-    }
+	/**
+	 * @return array
+	 */
+	protected function normalizeSettings(array $strings)
+	{
+		$defaultString = array_fill_keys(['id', 's1', 's2', 'p1', 'p2'], '');
+		$strings = array_filter($strings, 'is_array');
+		foreach ($strings as &$string) {
+			$string['type'] = isset($string['p1']) ? 'plural' : 'single';
+			$string = wp_parse_args($string, $defaultString);
+		}
+		return array_filter($strings, function ($string) {
+			return !empty($string['id']);
+		});
+	}
 }

Spacing +71 added lines, -71 removed lines

@@ -29,10 +29,10 @@ 
     public function all()
     {
         $translations = $this->translations();
-        $entries = $this->filter($translations, $this->entries())->results();
-        array_walk($translations, function (&$entry) use ($entries) {
-            $entry['desc'] = array_key_exists($entry['id'], $entries)
-                ? $this->getEntryString($entries[$entry['id']], 'msgctxt')
+        $entries = $this->filter( $translations, $this->entries() )->results();
+        array_walk( $translations, function( &$entry ) use ($entries) {
+            $entry['desc'] = array_key_exists( $entry['id'], $entries )
+                ? $this->getEntryString( $entries[$entry['id']], 'msgctxt' )
                 : '';
         });
         return $translations;
@@ -43,10 +43,10 @@ 
      */
     public function entries()
     {
-        if (!isset($this->entries)) {
-            $potFile = glsr()->path(glsr()->languages.'/'.Application::ID.'.pot');
-            $entries = $this->extractEntriesFromPotFile($potFile);
-            $entries = apply_filters('site-reviews/translation/entries', $entries);
+        if( !isset($this->entries) ) {
+            $potFile = glsr()->path( glsr()->languages.'/'.Application::ID.'.pot' );
+            $entries = $this->extractEntriesFromPotFile( $potFile );
+            $entries = apply_filters( 'site-reviews/translation/entries', $entries );
             $this->entries = $entries;
         }
         return $this->entries;
@@ -57,24 +57,24 @@ 
      * @param array|null $entries
      * @return static
      */
-    public function exclude($entriesToExclude = null, $entries = null)
+    public function exclude( $entriesToExclude = null, $entries = null )
     {
-        return $this->filter($entriesToExclude, $entries, false);
+        return $this->filter( $entriesToExclude, $entries, false );
     }
 
     /**
      * @param string $potFile
      * @return array
      */
-    public function extractEntriesFromPotFile($potFile, array $entries = [])
+    public function extractEntriesFromPotFile( $potFile, array $entries = [] )
     {
         try {
-            $potEntries = $this->normalize(Parser::parseFile($potFile)->getEntries());
-            foreach ($potEntries as $key => $entry) {
-                $entries[html_entity_decode($key, ENT_COMPAT, 'UTF-8')] = $entry;
+            $potEntries = $this->normalize( Parser::parseFile( $potFile )->getEntries() );
+            foreach( $potEntries as $key => $entry ) {
+                $entries[html_entity_decode( $key, ENT_COMPAT, 'UTF-8' )] = $entry;
             }
-        } catch (Exception $e) {
-            glsr_log()->error($e->getMessage());
+        } catch( Exception $e ) {
+            glsr_log()->error( $e->getMessage() );
         }
         return $entries;
     }
@@ -85,18 +85,18 @@ 
      * @param bool $intersect
      * @return static
      */
-    public function filter($filterWith = null, $entries = null, $intersect = true)
+    public function filter( $filterWith = null, $entries = null, $intersect = true )
     {
-        if (!is_array($entries)) {
+        if( !is_array( $entries ) ) {
             $entries = $this->results;
         }
-        if (!is_array($filterWith)) {
+        if( !is_array( $filterWith ) ) {
             $filterWith = $this->translations();
         }
-        $keys = array_flip(glsr_array_column($filterWith, 'id'));
+        $keys = array_flip( glsr_array_column( $filterWith, 'id' ) );
         $this->results = $intersect
-            ? array_intersect_key($entries, $keys)
-            : array_diff_key($entries, $keys);
+            ? array_intersect_key( $entries, $keys )
+            : array_diff_key( $entries, $keys );
         return $this;
     }
 
@@ -104,20 +104,20 @@ 
      * @param string $template
      * @return string
      */
-    public function render($template, array $entry)
+    public function render( $template, array $entry )
     {
         $data = array_combine(
-            array_map(function ($key) { return 'data.'.$key; }, array_keys($entry)),
+            array_map( function( $key ) { return 'data.'.$key; }, array_keys( $entry ) ),
             $entry
         );
         $data['data.class'] = $data['data.error'] = '';
-        if (false === array_search($entry['s1'], glsr_array_column($this->entries(), 'msgid'))) {
+        if( false === array_search( $entry['s1'], glsr_array_column( $this->entries(), 'msgid' ) ) ) {
             $data['data.class'] = 'is-invalid';
-            $data['data.error'] = __('This custom translation is no longer valid as the original text has been changed or removed.', 'site-reviews');
+            $data['data.error'] = __( 'This custom translation is no longer valid as the original text has been changed or removed.', 'site-reviews' );
         }
-        return glsr(Template::class)->build('partials/translations/'.$template, [
-            'context' => array_map('esc_html', $data),
-        ]);
+        return glsr( Template::class )->build( 'partials/translations/'.$template, [
+            'context' => array_map( 'esc_html', $data ),
+        ] );
     }
 
     /**
@@ -127,10 +127,10 @@ 
     public function renderAll()
     {
         $rendered = '';
-        foreach ($this->all() as $index => $entry) {
+        foreach( $this->all() as $index => $entry ) {
             $entry['index'] = $index;
             $entry['prefix'] = OptionManager::databaseKey();
-            $rendered.= $this->render($entry['type'], $entry);
+            $rendered .= $this->render( $entry['type'], $entry );
         }
         return $rendered;
     }
@@ -139,25 +139,25 @@ 
      * @param bool $resetAfterRender
      * @return string
      */
-    public function renderResults($resetAfterRender = true)
+    public function renderResults( $resetAfterRender = true )
     {
         $rendered = '';
-        foreach ($this->results as $id => $entry) {
+        foreach( $this->results as $id => $entry ) {
             $data = [
-                'desc' => $this->getEntryString($entry, 'msgctxt'),
+                'desc' => $this->getEntryString( $entry, 'msgctxt' ),
                 'id' => $id,
-                'p1' => $this->getEntryString($entry, 'msgid_plural'),
-                's1' => $this->getEntryString($entry, 'msgid'),
+                'p1' => $this->getEntryString( $entry, 'msgid_plural' ),
+                's1' => $this->getEntryString( $entry, 'msgid' ),
             ];
             $text = !empty($data['p1'])
-                ? sprintf('%s | %s', $data['s1'], $data['p1'])
+                ? sprintf( '%s | %s', $data['s1'], $data['p1'] )
                 : $data['s1'];
-            $rendered.= $this->render('result', [
-                'entry' => json_encode($data, JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_TAG | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE),
-                'text' => wp_strip_all_tags($text),
-            ]);
+            $rendered .= $this->render( 'result', [
+                'entry' => json_encode( $data, JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_TAG | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE ),
+                'text' => wp_strip_all_tags( $text ),
+            ] );
         }
-        if ($resetAfterRender) {
+        if( $resetAfterRender ) {
             $this->reset();
         }
         return $rendered;
@@ -185,18 +185,18 @@ 
      * @param string $needle
      * @return static
      */
-    public function search($needle = '')
+    public function search( $needle = '' )
     {
         $this->reset();
-        $needle = trim(strtolower($needle));
-        foreach ($this->entries() as $key => $entry) {
-            $single = strtolower($this->getEntryString($entry, 'msgid'));
-            $plural = strtolower($this->getEntryString($entry, 'msgid_plural'));
-            if (strlen($needle) < static::SEARCH_THRESHOLD) {
-                if (in_array($needle, [$single, $plural])) {
+        $needle = trim( strtolower( $needle ) );
+        foreach( $this->entries() as $key => $entry ) {
+            $single = strtolower( $this->getEntryString( $entry, 'msgid' ) );
+            $plural = strtolower( $this->getEntryString( $entry, 'msgid_plural' ) );
+            if( strlen( $needle ) < static::SEARCH_THRESHOLD ) {
+                if( in_array( $needle, [$single, $plural] ) ) {
                     $this->results[$key] = $entry;
                 }
-            } elseif (false !== strpos(sprintf('%s %s', $single, $plural), $needle)) {
+            } elseif( false !== strpos( sprintf( '%s %s', $single, $plural ), $needle ) ) {
                 $this->results[$key] = $entry;
             }
         }
@@ -210,10 +210,10 @@ 
     public function translations()
     {
         static $translations;
-        if (empty($translations)) {
-            $settings = glsr(OptionManager::class)->get('settings');
+        if( empty($translations) ) {
+            $settings = glsr( OptionManager::class )->get( 'settings' );
             $translations = isset($settings['strings'])
-                ? $this->normalizeSettings((array) $settings['strings'])
+                ? $this->normalizeSettings( (array)$settings['strings'] )
                 : [];
         }
         return $translations;
@@ -223,28 +223,28 @@ 
      * @param string $key
      * @return string
      */
-    protected function getEntryString(array $entry, $key)
+    protected function getEntryString( array $entry, $key )
     {
         return isset($entry[$key])
-            ? implode('', (array) $entry[$key])
+            ? implode( '', (array)$entry[$key] )
             : '';
     }
 
     /**
      * @return array
      */
-    protected function normalize(array $entries)
+    protected function normalize( array $entries )
     {
         $keys = [
             'msgctxt', 'msgid', 'msgid_plural', 'msgstr', 'msgstr[0]', 'msgstr[1]',
         ];
-        array_walk($entries, function (&$entry) use ($keys) {
-            foreach ($keys as $key) {
+        array_walk( $entries, function( &$entry ) use ($keys) {
+            foreach( $keys as $key ) {
                 try {
-                    $entry = $this->normalizeEntryString($entry, $key);
-                } catch (\TypeError $error) {
-                    glsr_log()->once('error', 'Translation/normalize', $error);
-                    glsr_log()->once('debug', 'Translation/normalize', $entry);
+                    $entry = $this->normalizeEntryString( $entry, $key );
+                } catch( \TypeError $error ) {
+                    glsr_log()->once( 'error', 'Translation/normalize', $error );
+                    glsr_log()->once( 'debug', 'Translation/normalize', $entry );
                 }
             }
         });
@@ -255,10 +255,10 @@ 
      * @param string $key
      * @return array
      */
-    protected function normalizeEntryString(array $entry, $key)
+    protected function normalizeEntryString( array $entry, $key )
     {
-        if (isset($entry[$key])) {
-            $entry[$key] = $this->getEntryString($entry, $key);
+        if( isset($entry[$key]) ) {
+            $entry[$key] = $this->getEntryString( $entry, $key );
         }
         return $entry;
     }
@@ -266,15 +266,15 @@ 
     /**
      * @return array
      */
-    protected function normalizeSettings(array $strings)
+    protected function normalizeSettings( array $strings )
     {
-        $defaultString = array_fill_keys(['id', 's1', 's2', 'p1', 'p2'], '');
-        $strings = array_filter($strings, 'is_array');
-        foreach ($strings as &$string) {
+        $defaultString = array_fill_keys( ['id', 's1', 's2', 'p1', 'p2'], '' );
+        $strings = array_filter( $strings, 'is_array' );
+        foreach( $strings as &$string ) {
             $string['type'] = isset($string['p1']) ? 'plural' : 'single';
-            $string = wp_parse_args($string, $defaultString);
+            $string = wp_parse_args( $string, $defaultString );
         }
-        return array_filter($strings, function ($string) {
+        return array_filter( $strings, function( $string ) {
             return !empty($string['id']);
         });
     }

plugin/Modules/Console.php

Braces +2 added lines, -1 removed lines

@@ -415,7 +415,8 @@
     {
         if ($value instanceof DateTime) {
             $value = $value->format('Y-m-d H:i:s');
-        } elseif ($this->isObjectOrArray($value)) {
+        }
+        elseif ($this->isObjectOrArray($value)) {
             $value = json_encode($value);
         }
         return (string) $value;

Indentation +429 added lines, -429 removed lines

@@ -9,433 +9,433 @@
 
 class Console
 {
-    const DEBUG = 0;      // Detailed debug information
-    const INFO = 1;       // Interesting events
-    const NOTICE = 2;     // Normal but significant events
-    const WARNING = 4;    // Exceptional occurrences that are not errors
-    const ERROR = 8;      // Runtime errors that do not require immediate action
-    const CRITICAL = 16;  // Critical conditions
-    const ALERT = 32;     // Action must be taken immediately
-    const EMERGENCY = 64; // System is unusable
-
-    protected $file;
-    protected $log;
-    protected $logOnceKey = 'glsr_log_once';
-
-    public function __construct()
-    {
-        $this->file = glsr()->path('console.log');
-        $this->log = file_exists($this->file)
-            ? file_get_contents($this->file)
-            : '';
-        $this->reset();
-    }
-
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->get();
-    }
-
-    /**
-     * Action must be taken immediately
-     * Example: Entire website down, database unavailable, etc. This should trigger the SMS alerts and wake you up.
-     * @param mixed $message
-     * @param array $context
-     * @return static
-     */
-    public function alert($message, array $context = [])
-    {
-        return $this->log(static::ALERT, $message, $context);
-    }
-
-    /**
-     * @return void
-     */
-    public function clear()
-    {
-        $this->log = '';
-        file_put_contents($this->file, $this->log);
-    }
-
-    /**
-     * Critical conditions
-     * Example: Application component unavailable, unexpected exception.
-     * @param mixed $message
-     * @param array $context
-     * @return static
-     */
-    public function critical($message, array $context = [])
-    {
-        return $this->log(static::CRITICAL, $message, $context);
-    }
-
-    /**
-     * Detailed debug information.
-     * @param mixed $message
-     * @param array $context
-     * @return static
-     */
-    public function debug($message, array $context = [])
-    {
-        return $this->log(static::DEBUG, $message, $context);
-    }
-
-    /**
-     * System is unusable.
-     * @param mixed $message
-     * @param array $context
-     * @return static
-     */
-    public function emergency($message, array $context = [])
-    {
-        return $this->log(static::EMERGENCY, $message, $context);
-    }
-
-    /**
-     * Runtime errors that do not require immediate action but should typically be logged and monitored.
-     * @param mixed $message
-     * @param array $context
-     * @return static
-     */
-    public function error($message, array $context = [])
-    {
-        return $this->log(static::ERROR, $message, $context);
-    }
-
-    /**
-     * @return string
-     */
-    public function get()
-    {
-        return empty($this->log)
-            ? __('Console is empty', 'site-reviews')
-            : $this->log;
-    }
-
-    /**
-     * @return int
-     */
-    public function getLevel()
-    {
-        return intval(apply_filters('site-reviews/console/level', static::INFO));
-    }
-
-    /**
-     * @return array
-     */
-    public function getLevels()
-    {
-        $constants = (new ReflectionClass(__CLASS__))->getConstants();
-        return array_map('strtolower', array_flip($constants));
-    }
-
-    /**
-     * @return string
-     */
-    public function humanLevel()
-    {
-        $level = $this->getLevel();
-        return sprintf('%s (%d)', strtoupper(Arr::get($this->getLevels(), $level, 'unknown')), $level);
-    }
-
-    /**
-     * @param string|null $valueIfEmpty
-     * @return string
-     */
-    public function humanSize($valueIfEmpty = null)
-    {
-        $bytes = $this->size();
-        if (empty($bytes) && is_string($valueIfEmpty)) {
-            return $valueIfEmpty;
-        }
-        $exponent = floor(log(max($bytes, 1), 1024));
-        return round($bytes / pow(1024, $exponent), 2).' '.['bytes', 'KB', 'MB', 'GB'][$exponent];
-    }
-
-    /**
-     * Interesting events
-     * Example: User logs in, SQL logs.
-     * @param mixed $message
-     * @param array $context
-     * @return static
-     */
-    public function info($message, array $context = [])
-    {
-        return $this->log(static::INFO, $message, $context);
-    }
-
-    /**
-     * @param int $level
-     * @param mixed $message
-     * @param array $context
-     * @param string $backtraceLine
-     * @return static
-     */
-    public function log($level, $message, $context = [], $backtraceLine = '')
-    {
-        if (empty($backtraceLine)) {
-            $backtraceLine = $this->getBacktraceLine();
-        }
-        if ($this->canLogEntry($level, $backtraceLine)) {
-            $levelName = Arr::get($this->getLevels(), $level);
-            $context = Arr::consolidateArray($context);
-            $backtraceLine = $this->normalizeBacktraceLine($backtraceLine);
-            $message = $this->interpolate($message, $context);
-            $entry = $this->buildLogEntry($levelName, $message, $backtraceLine);
-            file_put_contents($this->file, $entry.PHP_EOL, FILE_APPEND | LOCK_EX);
-            apply_filters('console', $message, $levelName, $backtraceLine); // Show in Blackbar plugin if installed
-            $this->reset();
-        }
-        return $this;
-    }
-
-    /**
-     * @return void
-     */
-    public function logOnce()
-    {
-        $once = Arr::consolidateArray(glsr()->{$this->logOnceKey});
-        $levels = $this->getLevels();
-        foreach ($once as $entry) {
-            $levelName = Arr::get($entry, 'level');
-            if (!in_array($levelName, $levels)) {
-                continue;
-            }
-            $level = Arr::get(array_flip($levels), $levelName);
-            $message = Arr::get($entry, 'message');
-            $backtraceLine = Arr::get($entry, 'backtrace');
-            $this->log($level, $message, [], $backtraceLine);
-        }
-        glsr()->{$this->logOnceKey} = [];
-    }
-
-    /**
-     * Normal but significant events.
-     * @param mixed $message
-     * @param array $context
-     * @return static
-     */
-    public function notice($message, array $context = [])
-    {
-        return $this->log(static::NOTICE, $message, $context);
-    }
-
-    /**
-     * @param string $levelName
-     * @param string $handle
-     * @param mixed $data
-     * @return void
-     */
-    public function once($levelName, $handle, $data)
-    {
-        $once = Arr::consolidateArray(glsr()->{$this->logOnceKey});
-        $filtered = array_filter($once, function ($entry) use ($levelName, $handle) {
-            return Arr::get($entry, 'level') == $levelName
-                && Arr::get($entry, 'handle') == $handle;
-        });
-        if (!empty($filtered)) {
-            return;
-        }
-        $once[] = [
-            'backtrace' => $this->getBacktraceLineFromData($data),
-            'handle' => $handle,
-            'level' => $levelName,
-            'message' => '[RECURRING] '.$this->getMessageFromData($data),
-        ];
-        glsr()->{$this->logOnceKey} = $once;
-    }
-
-    /**
-     * @return int
-     */
-    public function size()
-    {
-        return file_exists($this->file)
-            ? filesize($this->file)
-            : 0;
-    }
-
-    /**
-     * Exceptional occurrences that are not errors
-     * Example: Use of deprecated APIs, poor use of an API, undesirable things that are not necessarily wrong.
-     * @param mixed $message
-     * @param array $context
-     * @return static
-     */
-    public function warning($message, array $context = [])
-    {
-        return $this->log(static::WARNING, $message, $context);
-    }
-
-    /**
-     * @param array $backtrace
-     * @param int $index
-     * @return string
-     */
-    protected function buildBacktraceLine($backtrace, $index)
-    {
-        return sprintf('%s:%s',
-            Arr::get($backtrace, $index.'.file'), // realpath
-            Arr::get($backtrace, $index.'.line')
-        );
-    }
-
-    /**
-     * @param string $levelName
-     * @param mixed $message
-     * @param string $backtraceLine
-     * @return string
-     */
-    protected function buildLogEntry($levelName, $message, $backtraceLine = '')
-    {
-        return sprintf('[%s] %s [%s] %s',
-            current_time('mysql'),
-            strtoupper($levelName),
-            $backtraceLine,
-            $message
-        );
-    }
-
-    /**
-     * @param int $level
-     * @return bool
-     */
-    protected function canLogEntry($level, $backtraceLine)
-    {
-        $levelExists = array_key_exists($level, $this->getLevels());
-        if (false === strpos($backtraceLine, glsr()->path())) {
-            return $levelExists; // ignore level restriction if triggered outside of the plugin
-        }
-        return $levelExists && $level >= $this->getLevel();
-    }
-
-    /**
-     * @return void|string
-     */
-    protected function getBacktraceLine()
-    {
-        $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 6);
-        $search = array_search('log', glsr_array_column($backtrace, 'function'));
-        if (false !== $search) {
-            $index = '{closure}' == Arr::get($backtrace, ($search + 2).'.function')
-                ? $search + 4
-                : $search + 1;
-            return $this->buildBacktraceLine($backtrace, $index);
-        }
-        return 'Unknown';
-    }
-
-    /**
-     * @param mixed $data
-     * @return string
-     */
-    protected function getBacktraceLineFromData($data)
-    {
-        $backtrace = $data instanceof Throwable
-            ? $data->getTrace()
-            : debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
-        return $this->buildBacktraceLine($backtrace, 0);
-    }
-
-    /**
-     * @param mixed $data
-     * @return string
-     */
-    protected function getMessageFromData($data)
-    {
-        return $data instanceof Throwable
-            ? $this->normalizeThrowableMessage($data->getMessage())
-            : print_r($data, 1);
-    }
-
-    /**
-     * Interpolates context values into the message placeholders.
-     * @param mixed $message
-     * @param array $context
-     * @return string
-     */
-    protected function interpolate($message, $context = [])
-    {
-        if ($this->isObjectOrArray($message) || !is_array($context)) {
-            return print_r($message, true);
-        }
-        $replace = [];
-        foreach ($context as $key => $value) {
-            $replace['{'.$key.'}'] = $this->normalizeValue($value);
-        }
-        return strtr($message, $replace);
-    }
-
-    /**
-     * @param mixed $value
-     * @return bool
-     */
-    protected function isObjectOrArray($value)
-    {
-        return is_object($value) || is_array($value);
-    }
-
-    /**
-     * @param string $backtraceLine
-     * @return string
-     */
-    protected function normalizeBacktraceLine($backtraceLine)
-    {
-        $search = [
-            glsr()->path('plugin/'),
-            glsr()->path('plugin/', false),
-            trailingslashit(glsr()->path()),
-            trailingslashit(glsr()->path('', false)),
-            WP_CONTENT_DIR,
-            ABSPATH,
-        ];
-        return str_replace(array_unique($search), '', $backtraceLine);
-    }
-
-    /**
-     * @param string $message
-     * @return string
-     */
-    protected function normalizeThrowableMessage($message)
-    {
-        $calledIn = strpos($message, ', called in');
-        return false !== $calledIn
-            ? substr($message, 0, $calledIn)
-            : $message;
-    }
-
-    /**
-     * @param mixed $value
-     * @return string
-     */
-    protected function normalizeValue($value)
-    {
-        if ($value instanceof DateTime) {
-            $value = $value->format('Y-m-d H:i:s');
-        } elseif ($this->isObjectOrArray($value)) {
-            $value = json_encode($value);
-        }
-        return (string) $value;
-    }
-
-    /**
-     * @return void
-     */
-    protected function reset()
-    {
-        if ($this->size() <= pow(1024, 2) / 8) {
-            return;
-        }
-        $this->clear();
-        file_put_contents(
-            $this->file,
-            $this->buildLogEntry(
-                static::NOTICE,
-                __('Console was automatically cleared (128 KB maximum size)', 'site-reviews')
-            )
-        );
-    }
+	const DEBUG = 0;      // Detailed debug information
+	const INFO = 1;       // Interesting events
+	const NOTICE = 2;     // Normal but significant events
+	const WARNING = 4;    // Exceptional occurrences that are not errors
+	const ERROR = 8;      // Runtime errors that do not require immediate action
+	const CRITICAL = 16;  // Critical conditions
+	const ALERT = 32;     // Action must be taken immediately
+	const EMERGENCY = 64; // System is unusable
+
+	protected $file;
+	protected $log;
+	protected $logOnceKey = 'glsr_log_once';
+
+	public function __construct()
+	{
+		$this->file = glsr()->path('console.log');
+		$this->log = file_exists($this->file)
+			? file_get_contents($this->file)
+			: '';
+		$this->reset();
+	}
+
+	/**
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->get();
+	}
+
+	/**
+	 * Action must be taken immediately
+	 * Example: Entire website down, database unavailable, etc. This should trigger the SMS alerts and wake you up.
+	 * @param mixed $message
+	 * @param array $context
+	 * @return static
+	 */
+	public function alert($message, array $context = [])
+	{
+		return $this->log(static::ALERT, $message, $context);
+	}
+
+	/**
+	 * @return void
+	 */
+	public function clear()
+	{
+		$this->log = '';
+		file_put_contents($this->file, $this->log);
+	}
+
+	/**
+	 * Critical conditions
+	 * Example: Application component unavailable, unexpected exception.
+	 * @param mixed $message
+	 * @param array $context
+	 * @return static
+	 */
+	public function critical($message, array $context = [])
+	{
+		return $this->log(static::CRITICAL, $message, $context);
+	}
+
+	/**
+	 * Detailed debug information.
+	 * @param mixed $message
+	 * @param array $context
+	 * @return static
+	 */
+	public function debug($message, array $context = [])
+	{
+		return $this->log(static::DEBUG, $message, $context);
+	}
+
+	/**
+	 * System is unusable.
+	 * @param mixed $message
+	 * @param array $context
+	 * @return static
+	 */
+	public function emergency($message, array $context = [])
+	{
+		return $this->log(static::EMERGENCY, $message, $context);
+	}
+
+	/**
+	 * Runtime errors that do not require immediate action but should typically be logged and monitored.
+	 * @param mixed $message
+	 * @param array $context
+	 * @return static
+	 */
+	public function error($message, array $context = [])
+	{
+		return $this->log(static::ERROR, $message, $context);
+	}
+
+	/**
+	 * @return string
+	 */
+	public function get()
+	{
+		return empty($this->log)
+			? __('Console is empty', 'site-reviews')
+			: $this->log;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getLevel()
+	{
+		return intval(apply_filters('site-reviews/console/level', static::INFO));
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getLevels()
+	{
+		$constants = (new ReflectionClass(__CLASS__))->getConstants();
+		return array_map('strtolower', array_flip($constants));
+	}
+
+	/**
+	 * @return string
+	 */
+	public function humanLevel()
+	{
+		$level = $this->getLevel();
+		return sprintf('%s (%d)', strtoupper(Arr::get($this->getLevels(), $level, 'unknown')), $level);
+	}
+
+	/**
+	 * @param string|null $valueIfEmpty
+	 * @return string
+	 */
+	public function humanSize($valueIfEmpty = null)
+	{
+		$bytes = $this->size();
+		if (empty($bytes) && is_string($valueIfEmpty)) {
+			return $valueIfEmpty;
+		}
+		$exponent = floor(log(max($bytes, 1), 1024));
+		return round($bytes / pow(1024, $exponent), 2).' '.['bytes', 'KB', 'MB', 'GB'][$exponent];
+	}
+
+	/**
+	 * Interesting events
+	 * Example: User logs in, SQL logs.
+	 * @param mixed $message
+	 * @param array $context
+	 * @return static
+	 */
+	public function info($message, array $context = [])
+	{
+		return $this->log(static::INFO, $message, $context);
+	}
+
+	/**
+	 * @param int $level
+	 * @param mixed $message
+	 * @param array $context
+	 * @param string $backtraceLine
+	 * @return static
+	 */
+	public function log($level, $message, $context = [], $backtraceLine = '')
+	{
+		if (empty($backtraceLine)) {
+			$backtraceLine = $this->getBacktraceLine();
+		}
+		if ($this->canLogEntry($level, $backtraceLine)) {
+			$levelName = Arr::get($this->getLevels(), $level);
+			$context = Arr::consolidateArray($context);
+			$backtraceLine = $this->normalizeBacktraceLine($backtraceLine);
+			$message = $this->interpolate($message, $context);
+			$entry = $this->buildLogEntry($levelName, $message, $backtraceLine);
+			file_put_contents($this->file, $entry.PHP_EOL, FILE_APPEND | LOCK_EX);
+			apply_filters('console', $message, $levelName, $backtraceLine); // Show in Blackbar plugin if installed
+			$this->reset();
+		}
+		return $this;
+	}
+
+	/**
+	 * @return void
+	 */
+	public function logOnce()
+	{
+		$once = Arr::consolidateArray(glsr()->{$this->logOnceKey});
+		$levels = $this->getLevels();
+		foreach ($once as $entry) {
+			$levelName = Arr::get($entry, 'level');
+			if (!in_array($levelName, $levels)) {
+				continue;
+			}
+			$level = Arr::get(array_flip($levels), $levelName);
+			$message = Arr::get($entry, 'message');
+			$backtraceLine = Arr::get($entry, 'backtrace');
+			$this->log($level, $message, [], $backtraceLine);
+		}
+		glsr()->{$this->logOnceKey} = [];
+	}
+
+	/**
+	 * Normal but significant events.
+	 * @param mixed $message
+	 * @param array $context
+	 * @return static
+	 */
+	public function notice($message, array $context = [])
+	{
+		return $this->log(static::NOTICE, $message, $context);
+	}
+
+	/**
+	 * @param string $levelName
+	 * @param string $handle
+	 * @param mixed $data
+	 * @return void
+	 */
+	public function once($levelName, $handle, $data)
+	{
+		$once = Arr::consolidateArray(glsr()->{$this->logOnceKey});
+		$filtered = array_filter($once, function ($entry) use ($levelName, $handle) {
+			return Arr::get($entry, 'level') == $levelName
+				&& Arr::get($entry, 'handle') == $handle;
+		});
+		if (!empty($filtered)) {
+			return;
+		}
+		$once[] = [
+			'backtrace' => $this->getBacktraceLineFromData($data),
+			'handle' => $handle,
+			'level' => $levelName,
+			'message' => '[RECURRING] '.$this->getMessageFromData($data),
+		];
+		glsr()->{$this->logOnceKey} = $once;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function size()
+	{
+		return file_exists($this->file)
+			? filesize($this->file)
+			: 0;
+	}
+
+	/**
+	 * Exceptional occurrences that are not errors
+	 * Example: Use of deprecated APIs, poor use of an API, undesirable things that are not necessarily wrong.
+	 * @param mixed $message
+	 * @param array $context
+	 * @return static
+	 */
+	public function warning($message, array $context = [])
+	{
+		return $this->log(static::WARNING, $message, $context);
+	}
+
+	/**
+	 * @param array $backtrace
+	 * @param int $index
+	 * @return string
+	 */
+	protected function buildBacktraceLine($backtrace, $index)
+	{
+		return sprintf('%s:%s',
+			Arr::get($backtrace, $index.'.file'), // realpath
+			Arr::get($backtrace, $index.'.line')
+		);
+	}
+
+	/**
+	 * @param string $levelName
+	 * @param mixed $message
+	 * @param string $backtraceLine
+	 * @return string
+	 */
+	protected function buildLogEntry($levelName, $message, $backtraceLine = '')
+	{
+		return sprintf('[%s] %s [%s] %s',
+			current_time('mysql'),
+			strtoupper($levelName),
+			$backtraceLine,
+			$message
+		);
+	}
+
+	/**
+	 * @param int $level
+	 * @return bool
+	 */
+	protected function canLogEntry($level, $backtraceLine)
+	{
+		$levelExists = array_key_exists($level, $this->getLevels());
+		if (false === strpos($backtraceLine, glsr()->path())) {
+			return $levelExists; // ignore level restriction if triggered outside of the plugin
+		}
+		return $levelExists && $level >= $this->getLevel();
+	}
+
+	/**
+	 * @return void|string
+	 */
+	protected function getBacktraceLine()
+	{
+		$backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 6);
+		$search = array_search('log', glsr_array_column($backtrace, 'function'));
+		if (false !== $search) {
+			$index = '{closure}' == Arr::get($backtrace, ($search + 2).'.function')
+				? $search + 4
+				: $search + 1;
+			return $this->buildBacktraceLine($backtrace, $index);
+		}
+		return 'Unknown';
+	}
+
+	/**
+	 * @param mixed $data
+	 * @return string
+	 */
+	protected function getBacktraceLineFromData($data)
+	{
+		$backtrace = $data instanceof Throwable
+			? $data->getTrace()
+			: debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
+		return $this->buildBacktraceLine($backtrace, 0);
+	}
+
+	/**
+	 * @param mixed $data
+	 * @return string
+	 */
+	protected function getMessageFromData($data)
+	{
+		return $data instanceof Throwable
+			? $this->normalizeThrowableMessage($data->getMessage())
+			: print_r($data, 1);
+	}
+
+	/**
+	 * Interpolates context values into the message placeholders.
+	 * @param mixed $message
+	 * @param array $context
+	 * @return string
+	 */
+	protected function interpolate($message, $context = [])
+	{
+		if ($this->isObjectOrArray($message) || !is_array($context)) {
+			return print_r($message, true);
+		}
+		$replace = [];
+		foreach ($context as $key => $value) {
+			$replace['{'.$key.'}'] = $this->normalizeValue($value);
+		}
+		return strtr($message, $replace);
+	}
+
+	/**
+	 * @param mixed $value
+	 * @return bool
+	 */
+	protected function isObjectOrArray($value)
+	{
+		return is_object($value) || is_array($value);
+	}
+
+	/**
+	 * @param string $backtraceLine
+	 * @return string
+	 */
+	protected function normalizeBacktraceLine($backtraceLine)
+	{
+		$search = [
+			glsr()->path('plugin/'),
+			glsr()->path('plugin/', false),
+			trailingslashit(glsr()->path()),
+			trailingslashit(glsr()->path('', false)),
+			WP_CONTENT_DIR,
+			ABSPATH,
+		];
+		return str_replace(array_unique($search), '', $backtraceLine);
+	}
+
+	/**
+	 * @param string $message
+	 * @return string
+	 */
+	protected function normalizeThrowableMessage($message)
+	{
+		$calledIn = strpos($message, ', called in');
+		return false !== $calledIn
+			? substr($message, 0, $calledIn)
+			: $message;
+	}
+
+	/**
+	 * @param mixed $value
+	 * @return string
+	 */
+	protected function normalizeValue($value)
+	{
+		if ($value instanceof DateTime) {
+			$value = $value->format('Y-m-d H:i:s');
+		} elseif ($this->isObjectOrArray($value)) {
+			$value = json_encode($value);
+		}
+		return (string) $value;
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function reset()
+	{
+		if ($this->size() <= pow(1024, 2) / 8) {
+			return;
+		}
+		$this->clear();
+		file_put_contents(
+			$this->file,
+			$this->buildLogEntry(
+				static::NOTICE,
+				__('Console was automatically cleared (128 KB maximum size)', 'site-reviews')
+			)
+		);
+	}
 }

Spacing +111 added lines, -111 removed lines

@@ -9,13 +9,13 @@ 
 
 class Console
 {
-    const DEBUG = 0;      // Detailed debug information
-    const INFO = 1;       // Interesting events
-    const NOTICE = 2;     // Normal but significant events
-    const WARNING = 4;    // Exceptional occurrences that are not errors
-    const ERROR = 8;      // Runtime errors that do not require immediate action
-    const CRITICAL = 16;  // Critical conditions
-    const ALERT = 32;     // Action must be taken immediately
+    const DEBUG = 0; // Detailed debug information
+    const INFO = 1; // Interesting events
+    const NOTICE = 2; // Normal but significant events
+    const WARNING = 4; // Exceptional occurrences that are not errors
+    const ERROR = 8; // Runtime errors that do not require immediate action
+    const CRITICAL = 16; // Critical conditions
+    const ALERT = 32; // Action must be taken immediately
     const EMERGENCY = 64; // System is unusable
 
     protected $file;
@@ -24,9 +24,9 @@ 
 
     public function __construct()
     {
-        $this->file = glsr()->path('console.log');
-        $this->log = file_exists($this->file)
-            ? file_get_contents($this->file)
+        $this->file = glsr()->path( 'console.log' );
+        $this->log = file_exists( $this->file )
+            ? file_get_contents( $this->file )
             : '';
         $this->reset();
     }
@@ -46,9 +46,9 @@ 
      * @param array $context
      * @return static
      */
-    public function alert($message, array $context = [])
+    public function alert( $message, array $context = [] )
     {
-        return $this->log(static::ALERT, $message, $context);
+        return $this->log( static::ALERT, $message, $context );
     }
 
     /**
@@ -57,7 +57,7 @@ 
     public function clear()
     {
         $this->log = '';
-        file_put_contents($this->file, $this->log);
+        file_put_contents( $this->file, $this->log );
     }
 
     /**
@@ -67,9 +67,9 @@ 
      * @param array $context
      * @return static
      */
-    public function critical($message, array $context = [])
+    public function critical( $message, array $context = [] )
     {
-        return $this->log(static::CRITICAL, $message, $context);
+        return $this->log( static::CRITICAL, $message, $context );
     }
 
     /**
@@ -78,9 +78,9 @@ 
      * @param array $context
      * @return static
      */
-    public function debug($message, array $context = [])
+    public function debug( $message, array $context = [] )
     {
-        return $this->log(static::DEBUG, $message, $context);
+        return $this->log( static::DEBUG, $message, $context );
     }
 
     /**
@@ -89,9 +89,9 @@ 
      * @param array $context
      * @return static
      */
-    public function emergency($message, array $context = [])
+    public function emergency( $message, array $context = [] )
     {
-        return $this->log(static::EMERGENCY, $message, $context);
+        return $this->log( static::EMERGENCY, $message, $context );
     }
 
     /**
@@ -100,9 +100,9 @@ 
      * @param array $context
      * @return static
      */
-    public function error($message, array $context = [])
+    public function error( $message, array $context = [] )
     {
-        return $this->log(static::ERROR, $message, $context);
+        return $this->log( static::ERROR, $message, $context );
     }
 
     /**
@@ -111,7 +111,7 @@ 
     public function get()
     {
         return empty($this->log)
-            ? __('Console is empty', 'site-reviews')
+            ? __( 'Console is empty', 'site-reviews' )
             : $this->log;
     }
 
@@ -120,7 +120,7 @@ 
      */
     public function getLevel()
     {
-        return intval(apply_filters('site-reviews/console/level', static::INFO));
+        return intval( apply_filters( 'site-reviews/console/level', static::INFO ) );
     }
 
     /**
@@ -128,8 +128,8 @@ 
      */
     public function getLevels()
     {
-        $constants = (new ReflectionClass(__CLASS__))->getConstants();
-        return array_map('strtolower', array_flip($constants));
+        $constants = (new ReflectionClass( __CLASS__ ))->getConstants();
+        return array_map( 'strtolower', array_flip( $constants ) );
     }
 
     /**
@@ -138,21 +138,21 @@ 
     public function humanLevel()
     {
         $level = $this->getLevel();
-        return sprintf('%s (%d)', strtoupper(Arr::get($this->getLevels(), $level, 'unknown')), $level);
+        return sprintf( '%s (%d)', strtoupper( Arr::get( $this->getLevels(), $level, 'unknown' ) ), $level );
     }
 
     /**
      * @param string|null $valueIfEmpty
      * @return string
      */
-    public function humanSize($valueIfEmpty = null)
+    public function humanSize( $valueIfEmpty = null )
     {
         $bytes = $this->size();
-        if (empty($bytes) && is_string($valueIfEmpty)) {
+        if( empty($bytes) && is_string( $valueIfEmpty ) ) {
             return $valueIfEmpty;
         }
-        $exponent = floor(log(max($bytes, 1), 1024));
-        return round($bytes / pow(1024, $exponent), 2).' '.['bytes', 'KB', 'MB', 'GB'][$exponent];
+        $exponent = floor( log( max( $bytes, 1 ), 1024 ) );
+        return round( $bytes / pow( 1024, $exponent ), 2 ).' '.['bytes', 'KB', 'MB', 'GB'][$exponent];
     }
 
     /**
@@ -162,9 +162,9 @@ 
      * @param array $context
      * @return static
      */
-    public function info($message, array $context = [])
+    public function info( $message, array $context = [] )
     {
-        return $this->log(static::INFO, $message, $context);
+        return $this->log( static::INFO, $message, $context );
     }
 
     /**
@@ -174,19 +174,19 @@ 
      * @param string $backtraceLine
      * @return static
      */
-    public function log($level, $message, $context = [], $backtraceLine = '')
+    public function log( $level, $message, $context = [], $backtraceLine = '' )
     {
-        if (empty($backtraceLine)) {
+        if( empty($backtraceLine) ) {
             $backtraceLine = $this->getBacktraceLine();
         }
-        if ($this->canLogEntry($level, $backtraceLine)) {
-            $levelName = Arr::get($this->getLevels(), $level);
-            $context = Arr::consolidateArray($context);
-            $backtraceLine = $this->normalizeBacktraceLine($backtraceLine);
-            $message = $this->interpolate($message, $context);
-            $entry = $this->buildLogEntry($levelName, $message, $backtraceLine);
-            file_put_contents($this->file, $entry.PHP_EOL, FILE_APPEND | LOCK_EX);
-            apply_filters('console', $message, $levelName, $backtraceLine); // Show in Blackbar plugin if installed
+        if( $this->canLogEntry( $level, $backtraceLine ) ) {
+            $levelName = Arr::get( $this->getLevels(), $level );
+            $context = Arr::consolidateArray( $context );
+            $backtraceLine = $this->normalizeBacktraceLine( $backtraceLine );
+            $message = $this->interpolate( $message, $context );
+            $entry = $this->buildLogEntry( $levelName, $message, $backtraceLine );
+            file_put_contents( $this->file, $entry.PHP_EOL, FILE_APPEND | LOCK_EX );
+            apply_filters( 'console', $message, $levelName, $backtraceLine ); // Show in Blackbar plugin if installed
             $this->reset();
         }
         return $this;
@@ -197,17 +197,17 @@ 
      */
     public function logOnce()
     {
-        $once = Arr::consolidateArray(glsr()->{$this->logOnceKey});
+        $once = Arr::consolidateArray( glsr()->{$this->logOnceKey});
         $levels = $this->getLevels();
-        foreach ($once as $entry) {
-            $levelName = Arr::get($entry, 'level');
-            if (!in_array($levelName, $levels)) {
+        foreach( $once as $entry ) {
+            $levelName = Arr::get( $entry, 'level' );
+            if( !in_array( $levelName, $levels ) ) {
                 continue;
             }
-            $level = Arr::get(array_flip($levels), $levelName);
-            $message = Arr::get($entry, 'message');
-            $backtraceLine = Arr::get($entry, 'backtrace');
-            $this->log($level, $message, [], $backtraceLine);
+            $level = Arr::get( array_flip( $levels ), $levelName );
+            $message = Arr::get( $entry, 'message' );
+            $backtraceLine = Arr::get( $entry, 'backtrace' );
+            $this->log( $level, $message, [], $backtraceLine );
         }
         glsr()->{$this->logOnceKey} = [];
     }
@@ -218,9 +218,9 @@ 
      * @param array $context
      * @return static
      */
-    public function notice($message, array $context = [])
+    public function notice( $message, array $context = [] )
     {
-        return $this->log(static::NOTICE, $message, $context);
+        return $this->log( static::NOTICE, $message, $context );
     }
 
     /**
@@ -229,21 +229,21 @@ 
      * @param mixed $data
      * @return void
      */
-    public function once($levelName, $handle, $data)
+    public function once( $levelName, $handle, $data )
     {
-        $once = Arr::consolidateArray(glsr()->{$this->logOnceKey});
-        $filtered = array_filter($once, function ($entry) use ($levelName, $handle) {
-            return Arr::get($entry, 'level') == $levelName
-                && Arr::get($entry, 'handle') == $handle;
+        $once = Arr::consolidateArray( glsr()->{$this->logOnceKey});
+        $filtered = array_filter( $once, function( $entry ) use ($levelName, $handle) {
+            return Arr::get( $entry, 'level' ) == $levelName
+                && Arr::get( $entry, 'handle' ) == $handle;
         });
-        if (!empty($filtered)) {
+        if( !empty($filtered) ) {
             return;
         }
         $once[] = [
-            'backtrace' => $this->getBacktraceLineFromData($data),
+            'backtrace' => $this->getBacktraceLineFromData( $data ),
             'handle' => $handle,
             'level' => $levelName,
-            'message' => '[RECURRING] '.$this->getMessageFromData($data),
+            'message' => '[RECURRING] '.$this->getMessageFromData( $data ),
         ];
         glsr()->{$this->logOnceKey} = $once;
     }
@@ -253,8 +253,8 @@ 
      */
     public function size()
     {
-        return file_exists($this->file)
-            ? filesize($this->file)
+        return file_exists( $this->file )
+            ? filesize( $this->file )
             : 0;
     }
 
@@ -265,9 +265,9 @@ 
      * @param array $context
      * @return static
      */
-    public function warning($message, array $context = [])
+    public function warning( $message, array $context = [] )
     {
-        return $this->log(static::WARNING, $message, $context);
+        return $this->log( static::WARNING, $message, $context );
     }
 
     /**
@@ -275,11 +275,11 @@ 
      * @param int $index
      * @return string
      */
-    protected function buildBacktraceLine($backtrace, $index)
+    protected function buildBacktraceLine( $backtrace, $index )
     {
-        return sprintf('%s:%s',
-            Arr::get($backtrace, $index.'.file'), // realpath
-            Arr::get($backtrace, $index.'.line')
+        return sprintf( '%s:%s',
+            Arr::get( $backtrace, $index.'.file' ), // realpath
+            Arr::get( $backtrace, $index.'.line' )
         );
     }
 
@@ -289,11 +289,11 @@ 
      * @param string $backtraceLine
      * @return string
      */
-    protected function buildLogEntry($levelName, $message, $backtraceLine = '')
+    protected function buildLogEntry( $levelName, $message, $backtraceLine = '' )
     {
-        return sprintf('[%s] %s [%s] %s',
-            current_time('mysql'),
-            strtoupper($levelName),
+        return sprintf( '[%s] %s [%s] %s',
+            current_time( 'mysql' ),
+            strtoupper( $levelName ),
             $backtraceLine,
             $message
         );
@@ -303,10 +303,10 @@ 
      * @param int $level
      * @return bool
      */
-    protected function canLogEntry($level, $backtraceLine)
+    protected function canLogEntry( $level, $backtraceLine )
     {
-        $levelExists = array_key_exists($level, $this->getLevels());
-        if (false === strpos($backtraceLine, glsr()->path())) {
+        $levelExists = array_key_exists( $level, $this->getLevels() );
+        if( false === strpos( $backtraceLine, glsr()->path() ) ) {
             return $levelExists; // ignore level restriction if triggered outside of the plugin
         }
         return $levelExists && $level >= $this->getLevel();
@@ -317,13 +317,13 @@ 
      */
     protected function getBacktraceLine()
     {
-        $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 6);
-        $search = array_search('log', glsr_array_column($backtrace, 'function'));
-        if (false !== $search) {
-            $index = '{closure}' == Arr::get($backtrace, ($search + 2).'.function')
+        $backtrace = debug_backtrace( DEBUG_BACKTRACE_IGNORE_ARGS, 6 );
+        $search = array_search( 'log', glsr_array_column( $backtrace, 'function' ) );
+        if( false !== $search ) {
+            $index = '{closure}' == Arr::get( $backtrace, ($search + 2).'.function' )
                 ? $search + 4
                 : $search + 1;
-            return $this->buildBacktraceLine($backtrace, $index);
+            return $this->buildBacktraceLine( $backtrace, $index );
         }
         return 'Unknown';
     }
@@ -332,23 +332,23 @@ 
      * @param mixed $data
      * @return string
      */
-    protected function getBacktraceLineFromData($data)
+    protected function getBacktraceLineFromData( $data )
     {
         $backtrace = $data instanceof Throwable
             ? $data->getTrace()
-            : debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
-        return $this->buildBacktraceLine($backtrace, 0);
+            : debug_backtrace( DEBUG_BACKTRACE_IGNORE_ARGS, 1 );
+        return $this->buildBacktraceLine( $backtrace, 0 );
     }
 
     /**
      * @param mixed $data
      * @return string
      */
-    protected function getMessageFromData($data)
+    protected function getMessageFromData( $data )
     {
         return $data instanceof Throwable
-            ? $this->normalizeThrowableMessage($data->getMessage())
-            : print_r($data, 1);
+            ? $this->normalizeThrowableMessage( $data->getMessage() )
+            : print_r( $data, 1 );
     }
 
     /**
@@ -357,53 +357,53 @@ 
      * @param array $context
      * @return string
      */
-    protected function interpolate($message, $context = [])
+    protected function interpolate( $message, $context = [] )
     {
-        if ($this->isObjectOrArray($message) || !is_array($context)) {
-            return print_r($message, true);
+        if( $this->isObjectOrArray( $message ) || !is_array( $context ) ) {
+            return print_r( $message, true );
         }
         $replace = [];
-        foreach ($context as $key => $value) {
-            $replace['{'.$key.'}'] = $this->normalizeValue($value);
+        foreach( $context as $key => $value ) {
+            $replace['{'.$key.'}'] = $this->normalizeValue( $value );
         }
-        return strtr($message, $replace);
+        return strtr( $message, $replace );
     }
 
     /**
      * @param mixed $value
      * @return bool
      */
-    protected function isObjectOrArray($value)
+    protected function isObjectOrArray( $value )
     {
-        return is_object($value) || is_array($value);
+        return is_object( $value ) || is_array( $value );
     }
 
     /**
      * @param string $backtraceLine
      * @return string
      */
-    protected function normalizeBacktraceLine($backtraceLine)
+    protected function normalizeBacktraceLine( $backtraceLine )
     {
         $search = [
-            glsr()->path('plugin/'),
-            glsr()->path('plugin/', false),
-            trailingslashit(glsr()->path()),
-            trailingslashit(glsr()->path('', false)),
+            glsr()->path( 'plugin/' ),
+            glsr()->path( 'plugin/', false ),
+            trailingslashit( glsr()->path() ),
+            trailingslashit( glsr()->path( '', false ) ),
             WP_CONTENT_DIR,
             ABSPATH,
         ];
-        return str_replace(array_unique($search), '', $backtraceLine);
+        return str_replace( array_unique( $search ), '', $backtraceLine );
     }
 
     /**
      * @param string $message
      * @return string
      */
-    protected function normalizeThrowableMessage($message)
+    protected function normalizeThrowableMessage( $message )
     {
-        $calledIn = strpos($message, ', called in');
+        $calledIn = strpos( $message, ', called in' );
         return false !== $calledIn
-            ? substr($message, 0, $calledIn)
+            ? substr( $message, 0, $calledIn )
             : $message;
     }
 
@@ -411,14 +411,14 @@ 
      * @param mixed $value
      * @return string
      */
-    protected function normalizeValue($value)
+    protected function normalizeValue( $value )
     {
-        if ($value instanceof DateTime) {
-            $value = $value->format('Y-m-d H:i:s');
-        } elseif ($this->isObjectOrArray($value)) {
-            $value = json_encode($value);
+        if( $value instanceof DateTime ) {
+            $value = $value->format( 'Y-m-d H:i:s' );
+        } elseif( $this->isObjectOrArray( $value ) ) {
+            $value = json_encode( $value );
         }
-        return (string) $value;
+        return (string)$value;
     }
 
     /**
@@ -426,7 +426,7 @@ 
      */
     protected function reset()
     {
-        if ($this->size() <= pow(1024, 2) / 8) {
+        if( $this->size() <= pow( 1024, 2 ) / 8 ) {
             return;
         }
         $this->clear();
@@ -434,7 +434,7 @@ 
             $this->file,
             $this->buildLogEntry(
                 static::NOTICE,
-                __('Console was automatically cleared (128 KB maximum size)', 'site-reviews')
+                __( 'Console was automatically cleared (128 KB maximum size)', 'site-reviews' )
             )
         );
     }

plugin/Modules/Schema/Thing.php

Indentation +8 added lines, -8 removed lines

@@ -19,12 +19,12 @@
  */
 class Thing extends BaseType
 {
-    /**
-     * @var array
-     * @see http://schema.org/{property_name}
-     */
-    public $allowed = [
-        'additionalType', 'alternateName', 'description', 'disambiguatingDescription', 'identifier',
-        'image', 'mainEntityOfPage', 'name', 'potentialAction', 'sameAs', 'url',
-    ];
+	/**
+	 * @var array
+	 * @see http://schema.org/{property_name}
+	 */
+	public $allowed = [
+		'additionalType', 'alternateName', 'description', 'disambiguatingDescription', 'identifier',
+		'image', 'mainEntityOfPage', 'name', 'potentialAction', 'sameAs', 'url',
+	];
 }