pryley / site-reviews

plugin/Modules/Schema.php

Indentation +296 added lines, -296 removed lines

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

Spacing +96 added lines, -96 removed lines

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

plugin/Handlers/EnqueuePublicAssets.php

Indentation +136 added lines, -136 removed lines

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

Spacing +36 added lines, -36 removed lines

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

plugin/Defaults/StyleValidationDefaults.php

Indentation +19 added lines, -19 removed lines

@@ -6,23 +6,23 @@
 
 class StyleValidationDefaults extends Defaults
 {
-    /**
-     * @return array
-     */
-    protected function defaults()
-    {
-        return [
-            'error_tag' => 'div',
-            'error_tag_class' => 'glsr-field-error',
-            'field_class' => 'glsr-field',
-            'field_error_class' => 'glsr-has-error',
-            'input_error_class' => 'glsr-is-invalid',
-            'input_valid_class' => 'glsr-is-valid',
-            'message_error_class' => 'glsr-has-errors',
-            'message_initial_class' => 'glsr-is-visible',
-            'message_success_class' => 'glsr-has-success',
-            'message_tag' => 'div',
-            'message_tag_class' => 'glsr-form-message',
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	protected function defaults()
+	{
+		return [
+			'error_tag' => 'div',
+			'error_tag_class' => 'glsr-field-error',
+			'field_class' => 'glsr-field',
+			'field_error_class' => 'glsr-has-error',
+			'input_error_class' => 'glsr-is-invalid',
+			'input_valid_class' => 'glsr-is-valid',
+			'message_error_class' => 'glsr-has-errors',
+			'message_initial_class' => 'glsr-is-visible',
+			'message_success_class' => 'glsr-has-success',
+			'message_tag' => 'div',
+			'message_tag_class' => 'glsr-form-message',
+		];
+	}
 }