pryley / site-reviews

plugin/Database/SqlQueries.php

Spacing +15 added lines, -15 removed lines

@@ -23,11 +23,11 @@ 
 	 */
 	public function deleteAllSessions( $sessionCookiePrefix )
 	{
-		return $this->db->query("
+		return $this->db->query( "
 			DELETE
 			FROM {$this->db->options}
 			WHERE option_name LIKE '{$sessionCookiePrefix}_%'
-		");
+		" );
 	}
 
 	/**
@@ -36,11 +36,11 @@ 
 	 */
 	public function deleteExpiredSessions( $expiredSessions )
 	{
-		return $this->db->query("
+		return $this->db->query( "
 			DELETE
 			FROM {$this->db->options}
 			WHERE option_name IN ('{$expiredSessions}')
-		");
+		" );
 	}
 
 	/**
@@ -49,13 +49,13 @@ 
 	 */
 	public function getReviewCounts( $metaKey )
 	{
-		return (array) $this->db->get_results("
+		return (array)$this->db->get_results( "
 			SELECT m.meta_value AS name, COUNT(*) num_posts
 			FROM {$this->db->posts} AS p
 			INNER JOIN {$this->db->postmeta} AS m ON p.ID = m.post_id
 			WHERE p.post_type = '{$this->postType}' AND m.meta_key = '{$metaKey}'
 			GROUP BY name
-		");
+		" );
 	}
 
 	/**
@@ -65,13 +65,13 @@ 
 	 */
 	public function getExpiredSessions( $sessionCookiePrefix, $limit )
 	{
-		return $this->db->get_results("
+		return $this->db->get_results( "
 			SELECT option_name AS name, option_value AS expiration
 			FROM {$this->db->options}
 			WHERE option_name LIKE '{$sessionCookiePrefix}_expires_%'
 			ORDER BY option_value ASC
 			LIMIT 0, {$limit}
-		");
+		" );
 	}
 
 	/**
@@ -80,14 +80,14 @@ 
 	 */
 	public function getReviewPostId( $metaReviewId )
 	{
-		$postId = $this->db->get_var("
+		$postId = $this->db->get_var( "
 			SELECT p.ID
 			FROM {$this->db->posts} AS p
 			INNER JOIN {$this->db->postmeta} AS pm ON p.ID = pm.post_id
 			WHERE p.post_type = '{$this->postType}'
 			AND pm.meta_key = 'review_id'
 			AND pm.meta_value = '{$metaReviewId}'
-		");
+		" );
 		return intval( $postId );
 	}
 
@@ -97,7 +97,7 @@ 
 	 */
 	public function getReviewIdsByType( $metaReviewType )
 	{
-		$query = $this->db->get_col("
+		$query = $this->db->get_col( "
 			SELECT m1.meta_value AS review_id
 			FROM {$this->db->posts} AS p
 			INNER JOIN {$this->db->postmeta} AS m1 ON p.ID = m1.post_id
@@ -106,8 +106,8 @@ 
 			AND m1.meta_key = 'review_id'
 			AND m2.meta_key = 'review_type'
 			AND m2.meta_value = '{$metaReviewType}'
-		");
-		return array_keys( array_flip( $query ));
+		" );
+		return array_keys( array_flip( $query ) );
 	}
 
 	/**
@@ -120,13 +120,13 @@ 
 		$queryBuilder = glsr( QueryBuilder::class );
 		$keys = $queryBuilder->buildSqlOr( $keys, "pm.meta_key = '%s'" );
 		$status = $queryBuilder->buildSqlOr( $status, "p.post_status = '%s'" );
-		return $this->db->get_col("
+		return $this->db->get_col( "
 			SELECT DISTINCT pm.meta_value FROM {$this->db->postmeta} pm
 			LEFT JOIN {$this->db->posts} p ON p.ID = pm.post_id
 			WHERE p.post_type = '{$this->postType}'
 			AND ({$keys})
 			AND ({$status})
 			ORDER BY pm.meta_value
-		");
+		" );
 	}
 }

plugin/Modules/Html/Partials/FormResults.php

Spacing +3 added lines, -3 removed lines

@@ -19,10 +19,10 @@ 
 	public function build( array $args = [] )
 	{
 		$this->errors = $args['errors'];
-		if( empty( $args['message'] ))return;
+		if( empty($args['message']) )return;
 		return glsr( Builder::class )->div( wpautop( $args['message'] ), [
 			'class' => $this->getClass(),
-		]);
+		] );
 	}
 
 	/**
@@ -30,7 +30,7 @@ 
 	 */
 	protected function getClass()
 	{
-		$errorClass = !empty( $this->errors )
+		$errorClass = !empty($this->errors)
 			? 'glsr-has-errors'
 			: '';
 		return trim( 'glsr-form-messages '.$errorClass );

Braces +3 added lines, -1 removed lines

@@ -19,7 +19,9 @@
 	public function build( array $args = [] )
 	{
 		$this->errors = $args['errors'];
-		if( empty( $args['message'] ))return;
+		if( empty( $args['message'] )) {
+			return;
+		}
 		return glsr( Builder::class )->div( wpautop( $args['message'] ), [
 			'class' => $this->getClass(),
 		]);

plugin/Modules/Html/Partials/SiteReviewsForm.php

Spacing +18 added lines, -18 removed lines

@@ -57,7 +57,7 @@ 
 				'submit_button' => $this->buildSubmitButton(),
 			],
 			'fields' => $this->getFields(),
-		]);
+		] );
 	}
 
 	/**
@@ -68,7 +68,7 @@ 
 		return glsr( Partial::class )->build( 'form-results', [
 			'errors' => $this->errors,
 			'message' => $this->message,
-		]);
+		] );
 	}
 
 	/**
@@ -78,7 +78,7 @@ 
 	{
 		return glsr( Builder::class )->button( '<span></span>'.__( 'Submit your review', 'site-reviews' ), [
 			'type' => 'submit',
-		]);
+		] );
 	}
 
 	/**
@@ -98,7 +98,7 @@ 
 		$fields = array_merge(
 			$this->getHiddenFields(),
 			[$this->getHoneypotField()],
-			$this->normalizeFields( glsr( Form::class )->getFields( 'submission-form' ))
+			$this->normalizeFields( glsr( Form::class )->getFields( 'submission-form' ) )
 		);
 		// glsr_debug( $fields );
 		return $fields;
@@ -112,27 +112,27 @@ 
 		$fields = [[
 			'name' => 'action',
 			'value' => 'submit-review',
-		],[
+		], [
 			'name' => 'assign_to',
 			'value' => $this->args['assign_to'],
-		],[
+		], [
 			'name' => 'category',
 			'value' => $this->args['category'],
-		],[
+		], [
 			'name' => 'excluded',
 			'value' => $this->args['excluded'], // @todo should default to "[]"
-		],[
+		], [
 			'name' => 'form_id',
 			'value' => $this->args['id'],
-		],[
+		], [
 			'name' => '_wp_http_referer',
-			'value' => wp_unslash( filter_input( INPUT_SERVER, 'REQUEST_URI' )), // @todo this doesn't work, maybe need to get this on submit
-		],[
+			'value' => wp_unslash( filter_input( INPUT_SERVER, 'REQUEST_URI' ) ), // @todo this doesn't work, maybe need to get this on submit
+		], [
 			'name' => '_wpnonce',
 			'value' => wp_create_nonce( 'submit-review' ),
 		]];
 		return array_map( function( $field ) {
-			return new Field( wp_parse_args( $field, ['type' => 'hidden'] ));
+			return new Field( wp_parse_args( $field, ['type' => 'hidden'] ) );
 		}, $fields );
 	}
 
@@ -141,10 +141,10 @@ 
 	 */
 	protected function getHoneypotField()
 	{
-		return new Field([
+		return new Field( [
 			'name' => 'gotcha',
 			'type' => 'honeypot',
-		]);
+		] );
 	}
 
 	/**
@@ -152,7 +152,7 @@ 
 	 */
 	protected function normalizeFieldErrors( Field &$field )
 	{
-		if( !array_key_exists( $field->field['path'], $this->errors ))return;
+		if( !array_key_exists( $field->field['path'], $this->errors ) )return;
 		$field->field['errors'] = $this->errors[$field->field['path']];
 	}
 
@@ -161,7 +161,7 @@ 
 	 */
 	protected function normalizeFieldRequired( Field &$field )
 	{
-		if( !in_array( $field->field['path'], $this->required ))return;
+		if( !in_array( $field->field['path'], $this->required ) )return;
 		$field->field['required'] = true;
 	}
 
@@ -183,8 +183,8 @@ 
 	 */
 	protected function normalizeFieldValue( Field &$field )
 	{
-		if( !array_key_exists( $field->field['path'], $this->values ))return;
-		if( in_array( $field->field['type'], ['radio', 'checkbox'] )) {
+		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 {

Braces +9 added lines, -3 removed lines

@@ -152,7 +152,9 @@ 
 	 */
 	protected function normalizeFieldErrors( Field &$field )
 	{
-		if( !array_key_exists( $field->field['path'], $this->errors ))return;
+		if( !array_key_exists( $field->field['path'], $this->errors )) {
+			return;
+		}
 		$field->field['errors'] = $this->errors[$field->field['path']];
 	}
 
@@ -161,7 +163,9 @@ 
 	 */
 	protected function normalizeFieldRequired( Field &$field )
 	{
-		if( !in_array( $field->field['path'], $this->required ))return;
+		if( !in_array( $field->field['path'], $this->required )) {
+			return;
+		}
 		$field->field['required'] = true;
 	}
 
@@ -183,7 +187,9 @@ 
 	 */
 	protected function normalizeFieldValue( Field &$field )
 	{
-		if( !array_key_exists( $field->field['path'], $this->values ))return;
+		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']];
 		}

plugin/Modules/Html/Settings.php

Spacing +14 added lines, -14 removed lines

@@ -23,7 +23,7 @@ 
 			: $this->$method( $id );
 		return glsr( Template::class )->build( 'pages/settings/'.$id, [
 			'context' => $context,
-		]);
+		] );
 	}
 
 	/**
@@ -31,7 +31,7 @@ 
 	 */
 	protected function getFieldDefault( array $field )
 	{
-		return isset( $field['default'] )
+		return isset($field['default'])
 			? $field['default']
 			: '';
 	}
@@ -42,7 +42,7 @@ 
 	protected function getSettingFields( $path )
 	{
 		$settings = glsr( DefaultsManager::class )->settings();
-		return array_filter( $settings, function( $key ) use( $path ) {
+		return array_filter( $settings, function( $key ) use($path) {
 			return glsr( Helper::class )->startsWith( $path, $key );
 		}, ARRAY_FILTER_USE_KEY );
 	}
@@ -53,14 +53,14 @@ 
 	 */
 	protected function getTemplateContext( $id )
 	{
-		$fields = $this->getSettingFields( $this->normalizeSettingPath( $id ));
+		$fields = $this->getSettingFields( $this->normalizeSettingPath( $id ) );
 		$rows = '';
 		foreach( $fields as $name => $field ) {
 			$field = wp_parse_args( $field, [
 				'is_setting' => true,
 				'name' => $name,
-			]);
-			$rows.= new Field( $this->normalize( $field ));
+			] );
+			$rows .= new Field( $this->normalize( $field ) );
 		}
 		return [
 			'rows' => $rows,
@@ -73,7 +73,7 @@ 
 	protected function getTemplateContextForTranslations()
 	{
 		$translations = glsr( Translator::class )->renderAll();
-		$class = empty( $translations )
+		$class = empty($translations)
 			? 'glsr-hidden'
 			: '';
 		return [
@@ -94,7 +94,7 @@ 
 			$path,
 			glsr( Helper::class )->getPathValue( $path, glsr()->defaults )
 		);
-		if( is_array( $expectedValue )) {
+		if( is_array( $expectedValue ) ) {
 			return !in_array( $optionValue, $expectedValue );
 		}
 		return $optionValue != $expectedValue;
@@ -116,13 +116,13 @@ 
 	 */
 	protected function normalizeDependsOn( array $field )
 	{
-		if( !empty( $field['depends_on'] ) && is_array( $field['depends_on'] )) {
+		if( !empty($field['depends_on']) && is_array( $field['depends_on'] ) ) {
 			$path = key( $field['depends_on'] );
 			$expectedValue = $field['depends_on'][$path];
-			$field['data-depends'] = json_encode([
+			$field['data-depends'] = json_encode( [
 				'name' => glsr( Helper::class )->convertPathToName( $path, OptionManager::databaseKey() ),
 				'value' => $expectedValue,
-			], JSON_HEX_APOS|JSON_HEX_QUOT );
+			], JSON_HEX_APOS | JSON_HEX_QUOT );
 			$field['is_hidden'] = $this->isFieldHidden( $path, $expectedValue );
 		}
 		return $field;
@@ -133,9 +133,9 @@ 
 	 */
 	protected function normalizeLabelAndLegend( array $field )
 	{
-		if( !empty( $field['label'] )) {
+		if( !empty($field['label']) ) {
 			$field['legend'] = $field['label'];
-			unset( $field['label'] );
+			unset($field['label']);
 		}
 		else {
 			$field['is_valid'] = false;
@@ -149,7 +149,7 @@ 
 	 */
 	protected function normalizeValue( array $field )
 	{
-		if( !isset( $field['value'] )) {
+		if( !isset($field['value']) ) {
 			$field['value'] = glsr( OptionManager::class )->get(
 				$field['name'],
 				$this->getFieldDefault( $field )

plugin/Modules/Html/Field.php

Spacing +18 added lines, -18 removed lines

@@ -26,7 +26,7 @@ 
 			'is_valid' => true,
 			'is_widget' => false,
 			'path' => '',
-		]);
+		] );
 		$this->normalize();
 	}
 
@@ -45,7 +45,7 @@ 
 	{
 		if( !$this->field['is_valid'] )return;
 		if( $this->field['is_raw'] ) {
-			return glsr( Builder::class )->{$this->field['type']}( $this->field );
+			return glsr( Builder::class )->{$this->field['type']}($this->field);
 		}
 		if( !$this->field['is_setting'] ) {
 			return $this->buildField();
@@ -73,9 +73,9 @@ 
 			'context' => [
 				'class' => $this->getFieldClass(),
 				'errors' => $this->getFieldErrors(),
-				'field' => glsr( Builder::class )->{$this->field['type']}( $this->field ),
+				'field' => glsr( Builder::class )->{$this->field['type']}($this->field),
 			],
-		]);
+		] );
 	}
 
 	/**
@@ -86,10 +86,10 @@ 
 		return glsr( Template::class )->build( 'partials/form/table-row', [
 			'context' => [
 				'class' => $this->getFieldClass(),
-				'field' => glsr( Builder::class )->{$this->field['type']}( $this->field ),
+				'field' => glsr( Builder::class )->{$this->field['type']}($this->field),
 				'label' => glsr( Builder::class )->label( $this->field['legend'], ['for' => $this->field['id']] ),
 			],
-		]);
+		] );
 	}
 
 	/**
@@ -98,16 +98,16 @@ 
 	protected function buildSettingMultiField()
 	{
 		$dependsOn = $this->getFieldDependsOn();
-		unset( $this->field['data-depends'] );
+		unset($this->field['data-depends']);
 		return glsr( Template::class )->build( 'partials/form/table-row-multiple', [
 			'context' => [
 				'class' => $this->getFieldClass(),
 				'depends_on' => $dependsOn,
-				'field' => glsr( Builder::class )->{$this->field['type']}( $this->field ),
+				'field' => glsr( Builder::class )->{$this->field['type']}($this->field),
 				'label' => glsr( Builder::class )->label( $this->field['legend'], ['for' => $this->field['id']] ),
 				'legend' => $this->field['legend'],
 			],
-		]);
+		] );
 	}
 
 	/**
@@ -116,13 +116,13 @@ 
 	protected function getFieldClass()
 	{
 		$classes = [];
-		if( !empty( $this->field['errors'] )) {
+		if( !empty($this->field['errors']) ) {
 			$classes[] = 'glsr-has-error';
 		}
 		if( $this->field['is_hidden'] ) {
 			$classes[] = 'hidden';
 		}
-		if( !empty( $this->field['required'] )) {
+		if( !empty($this->field['required']) ) {
 			$classes[] = 'glsr-required';
 		}
 		return implode( ' ', $classes );
@@ -133,7 +133,7 @@ 
 	 */
 	protected function getFieldDependsOn()
 	{
-		return !empty( $this->field['data-depends'] )
+		return !empty($this->field['data-depends'])
 			? $this->field['data-depends']
 			: '';
 	}
@@ -143,7 +143,7 @@ 
 	 */
 	protected function getFieldErrors()
 	{
-		if( empty( $this->field['errors'] ) || !is_array( $this->field['errors'] ))return;
+		if( empty($this->field['errors']) || !is_array( $this->field['errors'] ) )return;
 		$errors = array_reduce( $this->field['errors'], function( $carry, $error ) {
 			return $carry.glsr( Builder::class )->span( $error, ['class' => 'glsr-field-error'] );
 		});
@@ -170,13 +170,13 @@ 
 			'name', 'type',
 		];
 		foreach( $requiredValues as $value ) {
-			if( isset( $this->field[$value] ))continue;
+			if( isset($this->field[$value]) )continue;
 			$missingValues[] = $value;
 			$this->field['is_valid'] = false;
 		}
-		if( !empty( $missingValues )) {
+		if( !empty($missingValues) ) {
 			glsr_log()
-				->warning( 'Field is missing: '.implode( ', ', $missingValues ))
+				->warning( 'Field is missing: '.implode( ', ', $missingValues ) )
 				->info( $this->field );
 		}
 		return $this->field['is_valid'];
@@ -190,7 +190,7 @@ 
 		if( !$this->isFieldValid() )return;
 		$this->field['path'] = $this->field['name'];
 		$className = glsr( Helper::class )->buildClassName( $this->field['type'], __NAMESPACE__.'\Fields' );
-		if( class_exists( $className )) {
+		if( class_exists( $className ) ) {
 			$this->field = array_merge(
 				wp_parse_args( $this->field, $className::defaults() ),
 				$className::required()
@@ -205,7 +205,7 @@ 
 	 */
 	protected function normalizeFieldId()
 	{
-		if( isset( $this->field['id'] ) || $this->field['is_raw'] )return;
+		if( isset($this->field['id']) || $this->field['is_raw'] )return;
 		$this->field['id'] = glsr( Helper::class )->convertPathToId(
 			$this->field['path'],
 			$this->getFieldPrefix()

Braces +15 added lines, -5 removed lines

@@ -43,7 +43,9 @@ 
 	 */
 	public function build()
 	{
-		if( !$this->field['is_valid'] )return;
+		if( !$this->field['is_valid'] ) {
+			return;
+		}
 		if( $this->field['is_raw'] ) {
 			return glsr( Builder::class )->{$this->field['type']}( $this->field );
 		}
@@ -143,7 +145,9 @@ 
 	 */
 	protected function getFieldErrors()
 	{
-		if( empty( $this->field['errors'] ) || !is_array( $this->field['errors'] ))return;
+		if( empty( $this->field['errors'] ) || !is_array( $this->field['errors'] )) {
+			return;
+		}
 		$errors = array_reduce( $this->field['errors'], function( $carry, $error ) {
 			return $carry.glsr( Builder::class )->span( $error, ['class' => 'glsr-field-error'] );
 		});
@@ -170,7 +174,9 @@ 
 			'name', 'type',
 		];
 		foreach( $requiredValues as $value ) {
-			if( isset( $this->field[$value] ))continue;
+			if( isset( $this->field[$value] )) {
+				continue;
+			}
 			$missingValues[] = $value;
 			$this->field['is_valid'] = false;
 		}
@@ -187,7 +193,9 @@ 
 	 */
 	protected function normalize()
 	{
-		if( !$this->isFieldValid() )return;
+		if( !$this->isFieldValid() ) {
+			return;
+		}
 		$this->field['path'] = $this->field['name'];
 		$className = glsr( Helper::class )->buildClassName( $this->field['type'], __NAMESPACE__.'\Fields' );
 		if( class_exists( $className )) {
@@ -205,7 +213,9 @@ 
 	 */
 	protected function normalizeFieldId()
 	{
-		if( isset( $this->field['id'] ) || $this->field['is_raw'] )return;
+		if( isset( $this->field['id'] ) || $this->field['is_raw'] ) {
+			return;
+		}
 		$this->field['id'] = glsr( Helper::class )->convertPathToId(
 			$this->field['path'],
 			$this->getFieldPrefix()

plugin/Modules/Schema.php

Spacing +18 added lines, -18 removed lines

@@ -33,10 +33,10 @@ 
 		foreach( glsr( Database::class )->getReviews( $this->args )->reviews as $review ) {
 			$reviews[] = $this->buildReview( $review );
 		}
-		if( !empty( $reviews )) {
+		if( !empty($reviews) ) {
 			array_walk( $reviews, function( &$review ) {
-				unset( $review['@context'] );
-				unset( $review['itemReviewed'] );
+				unset($review['@context']);
+				unset($review['itemReviewed']);
 			});
 			$schema['review'] = $reviews;
 		}
@@ -50,20 +50,20 @@ 
 	public function buildReview( $review )
 	{
 		$schema = SchemaOrg::Review()
-			->doIf( !in_array( 'title', $this->args['hide'] ), function( ReviewSchema $schema ) use( $review ) {
+			->doIf( !in_array( 'title', $this->args['hide'] ), function( ReviewSchema $schema ) use($review) {
 				$schema->name( $review->title );
 			})
-			->doIf( !in_array( 'excerpt', $this->args['hide'] ), function( ReviewSchema $schema ) use( $review ) {
+			->doIf( !in_array( 'excerpt', $this->args['hide'] ), function( ReviewSchema $schema ) use($review) {
 				$schema->reviewBody( $review->content );
 			})
-			->datePublished(( new DateTime( $review->date ))->format( DateTime::ISO8601 ))
+			->datePublished( (new DateTime( $review->date ))->format( DateTime::ISO8601 ) )
 			->author( SchemaOrg::Person()
 				->name( $review->author )
 			)
 			->itemReviewed( $this->getSchemaType()
 				->name( $this->getThingName() )
 			);
-		if( !empty( $review->rating )) {
+		if( !empty($review->rating) ) {
 			$schema->reviewRating( SchemaOrg::Rating()
 				->ratingValue( $review->rating )
 				->bestRating( Rating::MAX_RATING )
@@ -79,7 +79,7 @@ 
 	 */
 	public function buildSummary( $args = null )
 	{
-		if( is_array( $args )) {
+		if( is_array( $args ) ) {
 			$this->args = $args;
 		}
 		$schema = $this->getSchemaType()
@@ -91,7 +91,7 @@ 
 			->image( $this->getThingImage() )
 			->url( $this->getThingUrl() );
 		$count = $this->getReviewCount();
-		if( !empty( $count )) {
+		if( !empty($count) ) {
 			$schema->aggregateRating( SchemaOrg::AggregateRating()
 				->ratingValue( $this->getRatingValue() )
 				->reviewCount( $count )
@@ -109,11 +109,11 @@ 
 	 */
 	public function render()
 	{
-		if( is_null( glsr()->schemas ))return;
+		if( is_null( 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
-		));
+		) );
 	}
 
 	/**
@@ -121,9 +121,9 @@ 
 	 */
 	public function store( array $schema )
 	{
-		$schemas = (array) glsr()->schemas;
+		$schemas = (array)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 ) ) );
 	}
 
 	/**
@@ -148,7 +148,7 @@ 
 	 */
 	protected function getReviews( $force = false )
 	{
-		if( !isset( $this->reviews ) || $force ) {
+		if( !isset($this->reviews) || $force ) {
 			$args = wp_parse_args( ['count' => -1], $this->args );
 			$this->reviews = glsr( Database::class )->getReviews( $args )->reviews;
 		}
@@ -162,7 +162,7 @@ 
 	 */
 	protected function getSchemaOption( $option, $fallback )
 	{
-		if( $schemaOption = trim( (string)get_post_meta( intval( get_the_ID() ), 'schema_'.$option, true ))) {
+		if( $schemaOption = trim( (string)get_post_meta( intval( get_the_ID() ), 'schema_'.$option, true ) ) ) {
 			return $schemaOption;
 		}
 		$default = glsr( OptionManager::class )->get( 'settings.reviews.schema.'.$option.'.default', $fallback );
@@ -186,11 +186,11 @@ 
 		switch( $option ) {
 			case 'description':
 				$post = get_post();
-				if( !( $post instanceof WP_Post )) {
+				if( !($post instanceof WP_Post) ) {
 					return '';
 				}
-				$text = strip_shortcodes( wp_strip_all_tags( $post->post_excerpt ));
-				return wp_trim_words( $text, apply_filters( 'excerpt_length', 55 ));
+				$text = strip_shortcodes( wp_strip_all_tags( $post->post_excerpt ) );
+				return wp_trim_words( $text, apply_filters( 'excerpt_length', 55 ) );
 			case 'image':
 				return (string)get_the_post_thumbnail_url( null, 'large' );
 			case 'name':

Braces +6 added lines, -2 removed lines

@@ -109,7 +109,9 @@ 
 	 */
 	public function render()
 	{
-		if( is_null( glsr()->schemas ))return;
+		if( is_null( 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
@@ -182,7 +184,9 @@ 
 		if( $value != $fallback ) {
 			return $value;
 		}
-		if( !is_single() && !is_page() )return;
+		if( !is_single() && !is_page() ) {
+			return;
+		}
 		switch( $option ) {
 			case 'description':
 				$post = get_post();

plugin/Modules/Validator.php

Spacing +17 added lines, -17 removed lines

@@ -73,7 +73,7 @@ 
 		foreach( $this->rules as $attribute => $rules ) {
 			foreach( $rules as $rule ) {
 				$this->validateAttribute( $attribute, $rule );
-				if( $this->shouldStopValidating( $attribute ))break;
+				if( $this->shouldStopValidating( $attribute ) )break;
 			}
 		}
 		return $this->errors;
@@ -88,13 +88,13 @@ 
 	 */
 	public function validateAttribute( $attribute, $rule )
 	{
-		list( $rule, $parameters ) = $this->parseRule( $rule );
+		list($rule, $parameters) = $this->parseRule( $rule );
 		if( $rule == '' )return;
 		$value = $this->getValue( $attribute );
-		if( !method_exists( $this, $method = 'validate'.$rule )) {
+		if( !method_exists( $this, $method = 'validate'.$rule ) ) {
 			throw new BadMethodCallException( "Method [$method] does not exist." );
 		}
-		if( !$this->$method( $attribute, $value, $parameters )) {
+		if( !$this->$method( $attribute, $value, $parameters ) ) {
 			$this->addFailure( $attribute, $rule, $parameters );
 		}
 	}
@@ -143,7 +143,7 @@ 
 	 */
 	protected function getMessage( $attribute, $rule, array $parameters )
 	{
-		if( in_array( $rule, $this->sizeRules )) {
+		if( in_array( $rule, $this->sizeRules ) ) {
 			return $this->getSizeMessage( $attribute, $rule, $parameters );
 		}
 		$lowerRule = glsr( Helper::class )->snakeCase( $rule );
@@ -158,11 +158,11 @@ 
 	 */
 	protected function getRule( $attribute, $rules )
 	{
-		if( !array_key_exists( $attribute, $this->rules ))return;
-		$rules = (array) $rules;
+		if( !array_key_exists( $attribute, $this->rules ) )return;
+		$rules = (array)$rules;
 		foreach( $this->rules[$attribute] as $rule ) {
-			list( $rule, $parameters ) = $this->parseRule( $rule );
-			if( in_array( $rule, $rules )) {
+			list($rule, $parameters) = $this->parseRule( $rule );
+			if( in_array( $rule, $rules ) ) {
 				return [$rule, $parameters];
 			}
 		}
@@ -180,7 +180,7 @@ 
 		if( is_numeric( $value ) && $hasNumeric ) {
 			return $value;
 		}
-		elseif( is_array( $value )) {
+		elseif( is_array( $value ) ) {
 			return count( $value );
 		}
 		return mb_strlen( $value );
@@ -207,7 +207,7 @@ 
 	 */
 	protected function getValue( $attribute )
 	{
-		if( isset( $this->data[$attribute] )) {
+		if( isset($this->data[$attribute]) ) {
 			return $this->data[$attribute];
 		}
 	}
@@ -220,7 +220,7 @@ 
 	 */
 	protected function hasRule( $attribute, $rules )
 	{
-		return !is_null( $this->getRule( $attribute, $rules ));
+		return !is_null( $this->getRule( $attribute, $rules ) );
 	}
 
 	/**
@@ -259,11 +259,11 @@ 
 		$parameters = [];
 		// example: {rule}:{parameters}
 		if( strpos( $rule, ':' ) !== false ) {
-			list( $rule, $parameter ) = explode( ':', $rule, 2 );
+			list($rule, $parameter) = explode( ':', $rule, 2 );
 			// example: {parameter1,parameter2,...}
 			$parameters = $this->parseParameters( $rule, $parameter );
 		}
-		$rule = ucwords( str_replace( ['-', '_'], ' ', trim( $rule )));
+		$rule = ucwords( str_replace( ['-', '_'], ' ', trim( $rule ) ) );
 		$rule = str_replace( ' ', '', $rule );
 		return [$rule, $parameters];
 	}
@@ -290,7 +290,7 @@ 
 	protected function shouldStopValidating( $attribute )
 	{
 		return $this->hasRule( $attribute, $this->implicitRules )
-			&& isset( $this->failedRules[$attribute] )
+			&& isset($this->failedRules[$attribute])
 			&& array_intersect( array_keys( $this->failedRules[$attribute] ), $this->implicitRules );
 	}
 
@@ -315,11 +315,11 @@ 
 			'regex' => __( 'The format is invalid.', 'site-reviews' ),
 			'required' => __( 'This field is required.', 'site-reviews' ),
 		];
-		$message = isset( $strings[$key] )
+		$message = isset($strings[$key])
 			? $strings[$key]
 			: false;
 		if( !$message )return;
-		if( method_exists( $this, $method = 'replace'.$rule )) {
+		if( method_exists( $this, $method = 'replace'.$rule ) ) {
 			$message = $this->$method( $message, $parameters );
 		}
 		return $message;

Braces +12 added lines, -4 removed lines

@@ -73,7 +73,9 @@ 
 		foreach( $this->rules as $attribute => $rules ) {
 			foreach( $rules as $rule ) {
 				$this->validateAttribute( $attribute, $rule );
-				if( $this->shouldStopValidating( $attribute ))break;
+				if( $this->shouldStopValidating( $attribute )) {
+					break;
+				}
 			}
 		}
 		return $this->errors;
@@ -89,7 +91,9 @@ 
 	public function validateAttribute( $attribute, $rule )
 	{
 		list( $rule, $parameters ) = $this->parseRule( $rule );
-		if( $rule == '' )return;
+		if( $rule == '' ) {
+			return;
+		}
 		$value = $this->getValue( $attribute );
 		if( !method_exists( $this, $method = 'validate'.$rule )) {
 			throw new BadMethodCallException( "Method [$method] does not exist." );
@@ -158,7 +162,9 @@ 
 	 */
 	protected function getRule( $attribute, $rules )
 	{
-		if( !array_key_exists( $attribute, $this->rules ))return;
+		if( !array_key_exists( $attribute, $this->rules )) {
+			return;
+		}
 		$rules = (array) $rules;
 		foreach( $this->rules[$attribute] as $rule ) {
 			list( $rule, $parameters ) = $this->parseRule( $rule );
@@ -318,7 +324,9 @@ 
 		$message = isset( $strings[$key] )
 			? $strings[$key]
 			: false;
-		if( !$message )return;
+		if( !$message ) {
+			return;
+		}
 		if( method_exists( $this, $method = 'replace'.$rule )) {
 			$message = $this->$method( $message, $parameters );
 		}

plugin/Modules/Validator/ValidateReview.php

Spacing +24 added lines, -24 removed lines

@@ -48,7 +48,7 @@ 
 		$this->validateBlacklist();
 		$this->validateAkismet();
 		$this->validateRecaptcha();
-		if( !empty( $this->error )) {
+		if( !empty($this->error) ) {
 			$this->setSessionValues( 'message', $this->error );
 		}
 		return $this;
@@ -59,11 +59,11 @@ 
 	 */
 	public function validateRequest( array $request )
 	{
-		if( !$this->isRequestValid( $request )) {
+		if( !$this->isRequestValid( $request ) ) {
 			$this->error = __( 'Please fix the submission errors.', 'site-reviews' );
 			return $request;
 		}
-		if( empty( $request['title'] )) {
+		if( empty($request['title']) ) {
 			$request['title'] = __( 'No Title', 'site-reviews' );
 		}
 		return array_merge( glsr( ValidateReviewDefaults::class )->defaults(), $request );
@@ -77,14 +77,14 @@ 
 		$rules = array_intersect_key(
 			apply_filters( 'site-reviews/validation/rules', static::VALIDATION_RULES ),
 			array_flip( array_merge(
-				['rating','terms'],
+				['rating', 'terms'],
 				glsr( OptionManager::class )->get( 'settings.submissions.required', [] )
-			))
+			) )
 		);
-		$excluded = isset( $request['excluded'] )
+		$excluded = isset($request['excluded'])
 			? (array)json_decode( $request['excluded'] )
 			: [];
-		return array_diff_key( $rules, array_flip( $excluded ));
+		return array_diff_key( $rules, array_flip( $excluded ) );
 	}
 
 	/**
@@ -97,14 +97,14 @@ 
 			return true;
 		}
 		$recaptchaResponse = filter_input( INPUT_POST, 'g-recaptcha-response' ); // @todo site-reviews[g-recaptcha-response]
-		if( empty( $recaptchaResponse )) {
+		if( empty($recaptchaResponse) ) {
 			return null; //if response is empty we need to return null
 		}
 		if( $integration == 'custom' ) {
 			return $this->isRecaptchaValid( $recaptchaResponse );
 		}
 		if( $integration == 'invisible-recaptcha' ) {
-			return boolval( apply_filters( 'google_invre_is_valid_request_filter', true ));
+			return boolval( apply_filters( 'google_invre_is_valid_request_filter', true ) );
 		}
 		return false;
 	}
@@ -114,17 +114,17 @@ 
 	 */
 	protected function isRecaptchaValid( $recaptchaResponse )
 	{
-		$endpoint = add_query_arg([
+		$endpoint = add_query_arg( [
 			'remoteip' => glsr( Helper::class )->getIpAddress(),
 			'response' => $recaptchaResponse,
 			'secret' => glsr( OptionManager::class )->get( 'settings.submissions.recaptcha.secret' ),
 		], 'https://www.google.com/recaptcha/api/siteverify' );
-		if( is_wp_error( $response = wp_remote_get( $endpoint ))) {
+		if( is_wp_error( $response = wp_remote_get( $endpoint ) ) ) {
 			glsr_log()->error( $response->get_error_message() );
 			return false;
 		}
-		$response = json_decode( wp_remote_retrieve_body( $response ));
-		if( !empty( $response->success )) {
+		$response = json_decode( wp_remote_retrieve_body( $response ) );
+		if( !empty($response->success) ) {
 			return boolval( $response->success );
 		}
 		$errorCodes = [
@@ -147,7 +147,7 @@ 
 	{
 		$rules = $this->getValidationRules( $request );
 		$errors = glsr( Validator::class )->validate( $request, $rules );
-		if( empty( $errors )) {
+		if( empty($errors) ) {
 			return true;
 		}
 		$this->setSessionValues( 'errors', $errors );
@@ -164,7 +164,7 @@ 
 	protected function setSessionValues( $type, $value, $loggedMessage = '' )
 	{
 		glsr( Session::class )->set( $this->form_id.$type, $value );
-		if( !empty( $loggedMessage )) {
+		if( !empty($loggedMessage) ) {
 			glsr_log()->warning( $loggedMessage );
 			glsr_log()->warning( $this->request );
 		}
@@ -175,8 +175,8 @@ 
 	 */
 	protected function validateAkismet()
 	{
-		if( !empty( $this->error ))return;
-		if( !glsr( Akismet::class )->isSpam( $this->request ))return;
+		if( !empty($this->error) )return;
+		if( !glsr( Akismet::class )->isSpam( $this->request ) )return;
 		$this->setSessionValues( 'errors', [], 'Akismet caught a spam submission:' );
 		$this->error = __( 'Your review cannot be submitted at this time. Please try again later.', 'site-reviews' );
 	}
@@ -186,8 +186,8 @@ 
 	 */
 	protected function validateBlacklist()
 	{
-		if( !empty( $this->error ))return;
-		if( !glsr( Blacklist::class )->isBlacklisted( $this->request ))return;
+		if( !empty($this->error) )return;
+		if( !glsr( Blacklist::class )->isBlacklisted( $this->request ) )return;
 		$blacklistAction = glsr( OptionManager::class )->get( 'settings.submissions.blacklist.action' );
 		if( $blacklistAction == 'reject' ) {
 			$this->setSessionValues( 'errors', [], 'Blacklisted submission detected:' );
@@ -202,7 +202,7 @@ 
 	 */
 	protected function validateCustom()
 	{
-		if( !empty( $this->error ))return;
+		if( !empty($this->error) )return;
 		$validated = apply_filters( 'site-reviews/validate/review/submission', true, $this->request );
 		if( $validated === true )return;
 		$this->setSessionValues( 'errors', [] );
@@ -217,8 +217,8 @@ 
 	 */
 	protected function validateHoneyPot()
 	{
-		if( !empty( $this->error ))return;
-		if( empty( $this->request['gotcha'] ))return;
+		if( !empty($this->error) )return;
+		if( empty($this->request['gotcha']) )return;
 		$this->setSessionValues( 'errors', [], 'The Honeypot caught a bad submission:' );
 		$this->error = __( 'The review submission failed. Please notify the site administrator.', 'site-reviews' );
 	}
@@ -228,9 +228,9 @@ 
 	 */
 	protected function validateRecaptcha()
 	{
-		if( !empty( $this->error ))return;
+		if( !empty($this->error) )return;
 		$isValid = $this->isRecaptchaResponseValid();
-		if( is_null( $isValid )) {
+		if( is_null( $isValid ) ) {
 			$this->setSessionValues( 'recaptcha', true );
 			$this->recaptchaIsUnset = true;
 		}

Braces +27 added lines, -9 removed lines

@@ -175,8 +175,12 @@ 
 	 */
 	protected function validateAkismet()
 	{
-		if( !empty( $this->error ))return;
-		if( !glsr( Akismet::class )->isSpam( $this->request ))return;
+		if( !empty( $this->error )) {
+			return;
+		}
+		if( !glsr( Akismet::class )->isSpam( $this->request )) {
+			return;
+		}
 		$this->setSessionValues( 'errors', [], 'Akismet caught a spam submission:' );
 		$this->error = __( 'Your review cannot be submitted at this time. Please try again later.', 'site-reviews' );
 	}
@@ -186,8 +190,12 @@ 
 	 */
 	protected function validateBlacklist()
 	{
-		if( !empty( $this->error ))return;
-		if( !glsr( Blacklist::class )->isBlacklisted( $this->request ))return;
+		if( !empty( $this->error )) {
+			return;
+		}
+		if( !glsr( Blacklist::class )->isBlacklisted( $this->request )) {
+			return;
+		}
 		$blacklistAction = glsr( OptionManager::class )->get( 'settings.submissions.blacklist.action' );
 		if( $blacklistAction == 'reject' ) {
 			$this->setSessionValues( 'errors', [], 'Blacklisted submission detected:' );
@@ -202,9 +210,13 @@ 
 	 */
 	protected function validateCustom()
 	{
-		if( !empty( $this->error ))return;
+		if( !empty( $this->error )) {
+			return;
+		}
 		$validated = apply_filters( 'site-reviews/validate/review/submission', true, $this->request );
-		if( $validated === true )return;
+		if( $validated === true ) {
+			return;
+		}
 		$this->setSessionValues( 'errors', [] );
 		$this->setSessionValues( 'values', $this->request );
 		$this->error = is_string( $validated )
@@ -217,8 +229,12 @@ 
 	 */
 	protected function validateHoneyPot()
 	{
-		if( !empty( $this->error ))return;
-		if( empty( $this->request['gotcha'] ))return;
+		if( !empty( $this->error )) {
+			return;
+		}
+		if( empty( $this->request['gotcha'] )) {
+			return;
+		}
 		$this->setSessionValues( 'errors', [], 'The Honeypot caught a bad submission:' );
 		$this->error = __( 'The review submission failed. Please notify the site administrator.', 'site-reviews' );
 	}
@@ -228,7 +244,9 @@ 
 	 */
 	protected function validateRecaptcha()
 	{
-		if( !empty( $this->error ))return;
+		if( !empty( $this->error )) {
+			return;
+		}
 		$isValid = $this->isRecaptchaResponseValid();
 		if( is_null( $isValid )) {
 			$this->setSessionValues( 'recaptcha', true );

plugin/Handlers/CreateReview.php

Spacing +13 added lines, -13 removed lines

@@ -82,8 +82,8 @@ 
 		if( $this->command->author ) {
 			$fields[] = ['value' => trim( $this->command->author.$this->command->email.' - '.$this->command->ip_address )];
 		}
-		$fields[] = ['value' => sprintf( '<%s|%s>', $args['notification_link'], __( 'View Review', 'site-reviews' ))];
-		return json_encode([
+		$fields[] = ['value' => sprintf( '<%s|%s>', $args['notification_link'], __( 'View Review', 'site-reviews' ) )];
+		return json_encode( [
 			'icon_url' => glsr()->url( 'assets/img/icon.png' ),
 			'username' => glsr()->name,
 			'attachments' => [[
@@ -92,7 +92,7 @@ 
 				'fallback' => $this->createEmailNotification( $args )->read( 'plaintext' ),
 				'fields' => $fields,
 			]],
-		]);
+		] );
 	}
 
 	/**
@@ -102,12 +102,12 @@ 
 	protected function sendNotification( $postId )
 	{
 		$notificationType = glsr( OptionManager::class )->get( 'settings.general.notification' );
-		if( !in_array( $notificationType, ['default','custom','webhook'] ))return;
+		if( !in_array( $notificationType, ['default', 'custom', 'webhook'] ) )return;
 		$assignedToTitle = get_the_title( (int)$this->command->assigned_to );
 		$notificationSubject = _nx(
 			'New %s-star review',
 			'New %s-star review of: %s',
-			intval( empty( $assignedToTitle )),
+			intval( empty($assignedToTitle) ),
 			'The text is different depending on whether or not the review has been assigned to a post.',
 			'site-reviews'
 		);
@@ -116,7 +116,7 @@ 
 			sprintf( $notificationSubject, $this->command->rating, $assignedToTitle )
 		);
 		$args = [
-			'notification_link' => esc_url( admin_url( sprintf( 'post.php?post=%s&action=edit', $postId ))),
+			'notification_link' => esc_url( admin_url( sprintf( 'post.php?post=%s&action=edit', $postId ) ) ),
 			'notification_title' => $notificationTitle,
 			'notification_type' => $notificationType,
 		];
@@ -134,14 +134,14 @@ 
 		$args['recipient'] = $args['notification_type'] !== 'default'
 			? glsr( OptionManager::class )->get( 'settings.general.notification_email' )
 			: get_option( 'admin_email' );
-		$result = !empty( $args['recipient'] )
+		$result = !empty($args['recipient'])
 			? $this->createEmailNotification( $args )->send()
 			: false;
-		if( !is_bool( $result )) {
-			glsr_log()->error( __( 'Email notification was not sent: missing email, subject, or message.', 'site-reviews' ));
+		if( !is_bool( $result ) ) {
+			glsr_log()->error( __( 'Email notification was not sent: missing email, subject, or message.', 'site-reviews' ) );
 		}
 		if( $result === false ) {
-			glsr_log()->error( __( 'Email notification was not sent: wp_mail() failed.', 'site-reviews' ));
+			glsr_log()->error( __( 'Email notification was not sent: wp_mail() failed.', 'site-reviews' ) );
 		}
 	}
 
@@ -150,7 +150,7 @@ 
 	 */
 	protected function sendWebhookNotification( array $args )
 	{
-		if( !( $endpoint = glsr( OptionManager::class )->get( 'settings.general.webhook_url' )))return;
+		if( !($endpoint = glsr( OptionManager::class )->get( 'settings.general.webhook_url' )) )return;
 		$notification = $this->createWebhookNotification( $args );
 		$result = wp_remote_post( $endpoint, [
 			'blocking' => false,
@@ -161,8 +161,8 @@ 
 			'redirection' => 5,
 			'sslverify' => false,
 			'timeout' => 45,
-		]);
-		if( is_wp_error( $result )) {
+		] );
+		if( is_wp_error( $result ) ) {
 			glsr_log()->error( $result->get_error_message() );
 		}
 	}

Braces +6 added lines, -2 removed lines

@@ -102,7 +102,9 @@ 
 	protected function sendNotification( $postId )
 	{
 		$notificationType = glsr( OptionManager::class )->get( 'settings.general.notification' );
-		if( !in_array( $notificationType, ['default','custom','webhook'] ))return;
+		if( !in_array( $notificationType, ['default','custom','webhook'] )) {
+			return;
+		}
 		$assignedToTitle = get_the_title( (int)$this->command->assigned_to );
 		$notificationSubject = _nx(
 			'New %s-star review',
@@ -150,7 +152,9 @@ 
 	 */
 	protected function sendWebhookNotification( array $args )
 	{
-		if( !( $endpoint = glsr( OptionManager::class )->get( 'settings.general.webhook_url' )))return;
+		if( !( $endpoint = glsr( OptionManager::class )->get( 'settings.general.webhook_url' ))) {
+			return;
+		}
 		$notification = $this->createWebhookNotification( $args );
 		$result = wp_remote_post( $endpoint, [
 			'blocking' => false,