pryley / site-reviews

helpers.php

Spacing +6 added lines, -6 removed lines

@@ -6,7 +6,7 @@ 
  */
 function glsr( $alias = null ) {
 	$app = \GeminiLabs\SiteReviews\Application::load();
-	return !empty( $alias )
+	return !empty($alias)
 		? $app->make( $alias )
 		: $app;
 }
@@ -15,7 +15,7 @@ 
  * @return false|\GeminiLabs\SiteReviews\Review
  */
 function glsr_create_review( array $reviewValues = [] ) {
-	if( empty( $reviewValues )) {
+	if( empty($reviewValues) ) {
 		return false;
 	}
 	$review = new \GeminiLabs\SiteReviews\Commands\CreateReview( $reviewValues );
@@ -26,10 +26,10 @@ 
  * @return \WP_Screen|object
  */
 function glsr_current_screen() {
-	if( function_exists( 'get_current_screen' )) {
+	if( function_exists( 'get_current_screen' ) ) {
 		$screen = get_current_screen();
 	}
-	return empty( $screen )
+	return empty($screen)
 		? (object)array_fill_keys( ['base', 'id', 'post_type'], null )
 		: $screen;
 }
@@ -92,11 +92,11 @@ 
  */
 function glsr_log() {
 	$args = func_get_args();
-	$context = isset( $args[1] )
+	$context = isset($args[1])
 		? $args[1]
 		: [];
 	$console = glsr( 'Modules\Console' );
-	return !empty( $args )
+	return !empty($args)
 		? $console->log( 'debug', $args[0], $context )
 		: $console;
 }

plugin/Actions.php

Spacing +49 added lines, -49 removed lines

@@ -51,55 +51,55 @@
 	 */
 	public function run()
 	{
-		add_action( 'admin_enqueue_scripts',                        [$this->admin, 'enqueueAssets'] );
-		add_action( 'admin_init',                                   [$this->admin, 'registerTinymcePopups'] );
-		add_action( 'edit_form_after_title',                        [$this->admin, 'renderReviewEditor'] );
-		add_action( 'edit_form_top',                                [$this->admin, 'renderReviewNotice'] );
-		add_action( 'media_buttons',                                [$this->admin, 'renderTinymceButton'], 11 );
-		add_action( 'plugins_loaded',                               [$this->app, 'getDefaults'], 11 );
-		add_action( 'plugins_loaded',                               [$this->app, 'registerAddons'] );
-		add_action( 'plugins_loaded',                               [$this->app, 'registerLanguages'] );
-		add_action( 'plugins_loaded',                               [$this->app, 'registerReviewTypes'] );
-		add_action( 'upgrader_process_complete',                    [$this->app, 'upgraded'], 10, 2 );
-		add_action( 'admin_enqueue_scripts',                        [$this->editor, 'customizePostStatusLabels'] );
-		add_action( 'add_meta_boxes',                               [$this->editor, 'registerMetaBoxes'] );
-		add_action( 'admin_print_scripts',                          [$this->editor, 'removeAutosave'], 999 );
-		add_action( 'admin_menu',                                   [$this->editor, 'removeMetaBoxes'] );
-		add_action( 'post_submitbox_misc_actions',                  [$this->editor, 'renderPinnedInPublishMetaBox'] );
-		add_action( 'admin_action_revert',                          [$this->editor, 'revertReview'] );
-		add_action( 'save_post_'.Application::POST_TYPE,            [$this->editor, 'saveMetaboxes'] );
-		add_action( 'admin_action_approve',                         [$this->listtable, 'approve'] );
-		add_action( 'bulk_edit_custom_box',                         [$this->listtable, 'renderBulkEditFields'], 10, 2 );
-		add_action( 'restrict_manage_posts',                        [$this->listtable, 'renderColumnFilters'] );
-		add_action( 'manage_posts_custom_column',                   [$this->listtable, 'renderColumnValues'], 10, 2 );
-		add_action( 'save_post_'.Application::POST_TYPE,            [$this->listtable, 'saveBulkEditFields'] );
-		add_action( 'pre_get_posts',                                [$this->listtable, 'setQueryForColumn'] );
-		add_action( 'admin_action_unapprove',                       [$this->listtable, 'unapprove'] );
-		add_action( 'init',                                         [$this->main, 'registerPostType'], 8 );
-		add_action( 'init',                                         [$this->main, 'registerShortcodes'] );
-		add_action( 'init',                                         [$this->main, 'registerTaxonomy'] );
-		add_action( 'widgets_init',                                 [$this->main, 'registerWidgets'] );
-		add_action( 'admin_menu',                                   [$this->menu, 'registerMenuCount'] );
-		add_action( 'admin_menu',                                   [$this->menu, 'registerSubMenus'] );
-		add_action( 'admin_init',                                   [$this->menu, 'setCustomPermissions'], 999 );
-		add_action( 'wp_enqueue_scripts',                           [$this->public, 'enqueueAssets'], 999 );
-		add_filter( 'site-reviews/builder',                         [$this->public, 'modifyBuilder'] );
-		add_action( 'wp_footer',                                    [$this->public, 'renderSchema'] );
-		add_action( 'set_object_terms',                             [$this->review, 'onAfterChangeCategory'], 10, 6 );
-		add_action( 'site-reviews/create/review',                   [$this->review, 'onAfterCreate'], 10, 3 );
-		add_action( 'before_delete_post',                           [$this->review, 'onBeforeDelete'] );
-		add_action( 'update_postmeta',                              [$this->review, 'onBeforeUpdate'], 10, 4 );
-		add_action( 'transition_post_status',                       [$this->review, 'onChangeStatus'], 10, 3 );
-		add_action( 'admin_init',                                   [$this->router, 'routeAdminPostRequest'] );
-		add_action( 'wp_ajax_'.Application::PREFIX.'action',        [$this->router, 'routeAjaxRequest'] );
+		add_action( 'admin_enqueue_scripts', [$this->admin, 'enqueueAssets'] );
+		add_action( 'admin_init', [$this->admin, 'registerTinymcePopups'] );
+		add_action( 'edit_form_after_title', [$this->admin, 'renderReviewEditor'] );
+		add_action( 'edit_form_top', [$this->admin, 'renderReviewNotice'] );
+		add_action( 'media_buttons', [$this->admin, 'renderTinymceButton'], 11 );
+		add_action( 'plugins_loaded', [$this->app, 'getDefaults'], 11 );
+		add_action( 'plugins_loaded', [$this->app, 'registerAddons'] );
+		add_action( 'plugins_loaded', [$this->app, 'registerLanguages'] );
+		add_action( 'plugins_loaded', [$this->app, 'registerReviewTypes'] );
+		add_action( 'upgrader_process_complete', [$this->app, 'upgraded'], 10, 2 );
+		add_action( 'admin_enqueue_scripts', [$this->editor, 'customizePostStatusLabels'] );
+		add_action( 'add_meta_boxes', [$this->editor, 'registerMetaBoxes'] );
+		add_action( 'admin_print_scripts', [$this->editor, 'removeAutosave'], 999 );
+		add_action( 'admin_menu', [$this->editor, 'removeMetaBoxes'] );
+		add_action( 'post_submitbox_misc_actions', [$this->editor, 'renderPinnedInPublishMetaBox'] );
+		add_action( 'admin_action_revert', [$this->editor, 'revertReview'] );
+		add_action( 'save_post_'.Application::POST_TYPE, [$this->editor, 'saveMetaboxes'] );
+		add_action( 'admin_action_approve', [$this->listtable, 'approve'] );
+		add_action( 'bulk_edit_custom_box', [$this->listtable, 'renderBulkEditFields'], 10, 2 );
+		add_action( 'restrict_manage_posts', [$this->listtable, 'renderColumnFilters'] );
+		add_action( 'manage_posts_custom_column', [$this->listtable, 'renderColumnValues'], 10, 2 );
+		add_action( 'save_post_'.Application::POST_TYPE, [$this->listtable, 'saveBulkEditFields'] );
+		add_action( 'pre_get_posts', [$this->listtable, 'setQueryForColumn'] );
+		add_action( 'admin_action_unapprove', [$this->listtable, 'unapprove'] );
+		add_action( 'init', [$this->main, 'registerPostType'], 8 );
+		add_action( 'init', [$this->main, 'registerShortcodes'] );
+		add_action( 'init', [$this->main, 'registerTaxonomy'] );
+		add_action( 'widgets_init', [$this->main, 'registerWidgets'] );
+		add_action( 'admin_menu', [$this->menu, 'registerMenuCount'] );
+		add_action( 'admin_menu', [$this->menu, 'registerSubMenus'] );
+		add_action( 'admin_init', [$this->menu, 'setCustomPermissions'], 999 );
+		add_action( 'wp_enqueue_scripts', [$this->public, 'enqueueAssets'], 999 );
+		add_filter( 'site-reviews/builder', [$this->public, 'modifyBuilder'] );
+		add_action( 'wp_footer', [$this->public, 'renderSchema'] );
+		add_action( 'set_object_terms', [$this->review, 'onAfterChangeCategory'], 10, 6 );
+		add_action( 'site-reviews/create/review', [$this->review, 'onAfterCreate'], 10, 3 );
+		add_action( 'before_delete_post', [$this->review, 'onBeforeDelete'] );
+		add_action( 'update_postmeta', [$this->review, 'onBeforeUpdate'], 10, 4 );
+		add_action( 'transition_post_status', [$this->review, 'onChangeStatus'], 10, 3 );
+		add_action( 'admin_init', [$this->router, 'routeAdminPostRequest'] );
+		add_action( 'wp_ajax_'.Application::PREFIX.'action', [$this->router, 'routeAjaxRequest'] );
 		add_action( 'wp_ajax_nopriv_'.Application::PREFIX.'action', [$this->router, 'routeAjaxRequest'] );
-		add_action( 'init',                                         [$this->router, 'routePublicPostRequest'] );
-		add_action( 'site-reviews/schedule/session/purge',          [$this->session, 'deleteExpiredSessions'] );
-		add_action( 'admin_init',                                   [$this->settings, 'registerSettings'] );
-		add_action( Application::TAXONOMY.'_term_edit_form_top',    [$this->taxonomy, 'disableParents'] );
-		add_action( Application::TAXONOMY.'_term_new_form_tag',     [$this->taxonomy, 'disableParents'] );
-		add_action( Application::TAXONOMY.'_add_form_fields',       [$this->taxonomy, 'enableParents'] );
-		add_action( Application::TAXONOMY.'_edit_form',             [$this->taxonomy, 'enableParents'] );
-		add_action( 'restrict_manage_posts',                        [$this->taxonomy, 'renderTaxonomyFilter'], 9 );
+		add_action( 'init', [$this->router, 'routePublicPostRequest'] );
+		add_action( 'site-reviews/schedule/session/purge', [$this->session, 'deleteExpiredSessions'] );
+		add_action( 'admin_init', [$this->settings, 'registerSettings'] );
+		add_action( Application::TAXONOMY.'_term_edit_form_top', [$this->taxonomy, 'disableParents'] );
+		add_action( Application::TAXONOMY.'_term_new_form_tag', [$this->taxonomy, 'disableParents'] );
+		add_action( Application::TAXONOMY.'_add_form_fields', [$this->taxonomy, 'enableParents'] );
+		add_action( Application::TAXONOMY.'_edit_form', [$this->taxonomy, 'enableParents'] );
+		add_action( 'restrict_manage_posts', [$this->taxonomy, 'renderTaxonomyFilter'], 9 );
 	}
 }

plugin/Controllers/AdminController.php

Spacing +32 added lines, -32 removed lines

@@ -25,7 +25,7 @@ 
 	 */
 	public function enqueueAssets()
 	{
-		$command = new EnqueueAdminAssets([
+		$command = new EnqueueAdminAssets( [
 			'pointers' => [[
 				'content' => __( 'You can pin exceptional reviews so that they are always shown first.', 'site-reviews' ),
 				'id' => 'glsr-pointer-pinned',
@@ -37,7 +37,7 @@ 
 				'target' => '#misc-pub-pinned',
 				'title' => __( 'Pin Your Reviews', 'site-reviews' ),
 			]],
-		]);
+		] );
 		$this->execute( $command );
 	}
 
@@ -49,7 +49,7 @@ 
 	{
 		$links['settings'] = glsr( Builder::class )->a( __( 'Settings', 'site-reviews' ), [
 			'href' => admin_url( 'edit.php?post_type='.Application::POST_TYPE.'&page=settings' ),
-		]);
+		] );
 		return $links;
 	}
 
@@ -60,19 +60,19 @@ 
 	public function filterDashboardGlanceItems( array $items )
 	{
 		$postCount = wp_count_posts( Application::POST_TYPE );
-		if( empty( $postCount->publish )) {
+		if( empty($postCount->publish) ) {
 			return $items;
 		}
 		$text = _n( '%s Review', '%s Reviews', $postCount->publish, 'site-reviews' );
-		$text = sprintf( $text, number_format_i18n( $postCount->publish ));
+		$text = sprintf( $text, number_format_i18n( $postCount->publish ) );
 		$items[] = current_user_can( get_post_type_object( Application::POST_TYPE )->cap->edit_posts )
 			? glsr( Builder::class )->a( $text, [
 				'class' => 'glsr-review-count',
 				'href' => 'edit.php?post_type='.Application::POST_TYPE,
-			])
+			] )
 			: glsr( Builder::class )->span( $text, [
 				'class' => 'glsr-review-count',
-			]);
+			] );
 		return $items;
 	}
 
@@ -82,7 +82,7 @@ 
 	 */
 	public function filterTinymcePlugins( array $plugins )
 	{
-		if( current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' )) {
+		if( current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' ) ) {
 			$plugins['glsr_shortcode'] = glsr()->url( 'assets/scripts/mce-plugin.js' );
 		}
 		return $plugins;
@@ -94,11 +94,11 @@ 
 	 */
 	public function registerTinymcePopups()
 	{
-		$command = new RegisterTinymcePopups([
+		$command = new RegisterTinymcePopups( [
 			'site_reviews' => esc_html__( 'Recent Reviews', 'site-reviews' ),
 			'site_reviews_form' => esc_html__( 'Submit a Review', 'site-reviews' ),
 			'site_reviews_summary' => esc_html__( 'Summary of Reviews', 'site-reviews' ),
-		]);
+		] );
 		$this->execute( $command );
 	}
 
@@ -108,10 +108,10 @@ 
 	 */
 	public function renderReviewEditor( WP_Post $post )
 	{
-		if( !$this->isReviewPostType( $post ) || $this->isReviewEditable( $post ))return;
+		if( !$this->isReviewPostType( $post ) || $this->isReviewEditable( $post ) )return;
 		glsr()->render( 'partials/editor/review', [
 			'post' => $post,
-		]);
+		] );
 	}
 
 	/**
@@ -120,13 +120,13 @@ 
 	 */
 	public function renderReviewNotice( WP_Post $post )
 	{
-		if( !$this->isReviewPostType( $post ) || $this->isReviewEditable( $post ))return;
-		glsr( Notice::class )->addWarning( __( 'This review is read-only.', 'site-reviews' ));
+		if( !$this->isReviewPostType( $post ) || $this->isReviewEditable( $post ) )return;
+		glsr( Notice::class )->addWarning( __( 'This review is read-only.', 'site-reviews' ) );
 		glsr( Template::class )->render( 'partials/editor/notice', [
 			'context' => [
 				'notices' => glsr( Notice::class )->get(),
 			],
-		]);
+		] );
 	}
 
 	/**
@@ -140,10 +140,10 @@ 
 		foreach( glsr()->mceShortcodes as $shortcode => $values ) {
 			$shortcodes[$shortcode] = $values;
 		}
-		if( empty( $shortcodes ))return;
+		if( empty($shortcodes) )return;
 		glsr()->render( 'partials/editor/tinymce', [
 			'shortcodes' => $shortcodes,
-		]);
+		] );
 	}
 
 	/**
@@ -152,7 +152,7 @@ 
 	public function routerClearConsole()
 	{
 		glsr( Console::class )->clear();
-		glsr( Notice::class )->addSuccess( __( 'Console cleared.', 'site-reviews' ));
+		glsr( Notice::class )->addSuccess( __( 'Console cleared.', 'site-reviews' ) );
 	}
 
 	/**
@@ -160,7 +160,7 @@ 
 	 */
 	public function routerFetchConsole()
 	{
-		glsr( Notice::class )->addSuccess( __( 'Console reloaded.', 'site-reviews' ));
+		glsr( Notice::class )->addSuccess( __( 'Console reloaded.', 'site-reviews' ) );
 	}
 
 	/**
@@ -170,20 +170,20 @@ 
 	public function routerCountReviews( $showNotice = true )
 	{
 		$countManager = glsr( CountsManager::class );
-		$terms = get_terms([
+		$terms = get_terms( [
 			'hide_empty' => true,
 			'taxonomy' => Application::TAXONOMY,
-		]);
+		] );
 		foreach( $terms as $term ) {
-			$countManager->setTermCounts( $term->term_id, $countManager->buildTermCounts( $term->term_id ));
+			$countManager->setTermCounts( $term->term_id, $countManager->buildTermCounts( $term->term_id ) );
 		}
 		$postIds = glsr( SqlQueries::class )->getReviewsMeta( 'assigned_to' );
 		foreach( $postIds as $postId ) {
-			$countManager->setPostCounts( $postId, $countManager->buildPostCounts( $postId ));
+			$countManager->setPostCounts( $postId, $countManager->buildPostCounts( $postId ) );
 		}
 		$countManager->setCounts( $countManager->buildCounts() );
 		if( $showNotice ) {
-			glsr( Notice::class )->clear()->addSuccess( __( 'Recalculated rating counts.', 'site-reviews' ));
+			glsr( Notice::class )->clear()->addSuccess( __( 'Recalculated rating counts.', 'site-reviews' ) );
 		}
 	}
 
@@ -218,17 +218,17 @@ 
 	{
 		$file = $_FILES['import-file'];
 		if( $file['error'] !== UPLOAD_ERR_OK ) {
-			return glsr( Notice::class )->addError( $this->getUploadError( $file['error'] ));
+			return glsr( Notice::class )->addError( $this->getUploadError( $file['error'] ) );
 		}
-		if( $file['type'] !== 'application/json' || !glsr( Helper::class )->endsWith( '.json', $file['name'] )) {
-			return glsr( Notice::class )->addError( __( 'Please use a valid Site Reviews settings file.', 'site-reviews' ));
+		if( $file['type'] !== 'application/json' || !glsr( Helper::class )->endsWith( '.json', $file['name'] ) ) {
+			return glsr( Notice::class )->addError( __( 'Please use a valid Site Reviews settings file.', 'site-reviews' ) );
 		}
 		$settings = json_decode( file_get_contents( $file['tmp_name'] ), true );
-		if( empty( $settings )) {
-			return glsr( Notice::class )->addWarning( __( 'There were no settings found to import.', 'site-reviews' ));
+		if( empty($settings) ) {
+			return glsr( Notice::class )->addWarning( __( 'There were no settings found to import.', 'site-reviews' ) );
 		}
-		glsr( OptionManager::class )->set( glsr( OptionManager::class )->normalize( $settings ));
-		glsr( Notice::class )->addSuccess( __( 'Settings imported.', 'site-reviews' ));
+		glsr( OptionManager::class )->set( glsr( OptionManager::class )->normalize( $settings ) );
+		glsr( Notice::class )->addSuccess( __( 'Settings imported.', 'site-reviews' ) );
 	}
 
 	/**
@@ -246,7 +246,7 @@ 
 			UPLOAD_ERR_CANT_WRITE => __( 'Failed to write file to disk.', 'site-reviews' ),
 			UPLOAD_ERR_EXTENSION => __( 'A PHP extension stopped the file upload.', 'site-reviews' ),
 		];
-		return !isset( $errors[$errorCode] )
+		return !isset($errors[$errorCode])
 			? __( 'Unknown upload error.', 'site-reviews' )
 			: $errors[$errorCode];
 	}

plugin/Shortcodes/SiteReviewsPopup.php

Spacing +23 added lines, -23 removed lines

@@ -13,15 +13,15 @@ 
 	public function fields()
 	{
 		return [[
-			'html' => sprintf( '<p class="strong">%s</p>', esc_html__( 'All settings are optional.', 'site-reviews' )),
+			'html' => sprintf( '<p class="strong">%s</p>', esc_html__( 'All settings are optional.', 'site-reviews' ) ),
 			'minWidth' => 320,
 			'type' => 'container',
-		],[
+		], [
 			'label' => esc_html__( 'Title', 'site-reviews' ),
 			'name' => 'title',
 			'tooltip' => __( 'Enter a custom shortcode heading.', 'site-reviews' ),
 			'type' => 'textbox',
-		],[
+		], [
 			'label' => esc_html__( 'Count', 'site-reviews' ),
 			'maxLength' => 5,
 			'name' => 'count',
@@ -29,20 +29,20 @@ 
 			'text' => '10',
 			'tooltip' => __( 'How many reviews would you like to display (default: 10)?', 'site-reviews' ),
 			'type' => 'textbox',
-		],[
+		], [
 			'label' => esc_html__( 'Rating', 'site-reviews' ),
 			'name' => 'rating',
 			'options' => [
-				'5' => esc_html( sprintf( _n( '%s star', '%s stars', 5, 'site-reviews' ), 5 )),
-				'4' => esc_html( sprintf( _n( '%s star', '%s stars', 4, 'site-reviews' ), 4 )),
-				'3' => esc_html( sprintf( _n( '%s star', '%s stars', 3, 'site-reviews' ), 3 )),
-				'2' => esc_html( sprintf( _n( '%s star', '%s stars', 2, 'site-reviews' ), 2 )),
-				'1' => esc_html( sprintf( _n( '%s star', '%s stars', 1, 'site-reviews' ), 1 )),
-				'0' => esc_html( __( 'Unrated', 'site-reviews' )),
+				'5' => esc_html( sprintf( _n( '%s star', '%s stars', 5, 'site-reviews' ), 5 ) ),
+				'4' => esc_html( sprintf( _n( '%s star', '%s stars', 4, 'site-reviews' ), 4 ) ),
+				'3' => esc_html( sprintf( _n( '%s star', '%s stars', 3, 'site-reviews' ), 3 ) ),
+				'2' => esc_html( sprintf( _n( '%s star', '%s stars', 2, 'site-reviews' ), 2 ) ),
+				'1' => esc_html( sprintf( _n( '%s star', '%s stars', 1, 'site-reviews' ), 1 ) ),
+				'0' => esc_html( __( 'Unrated', 'site-reviews' ) ),
 			],
 			'tooltip' => __( 'What is the minimum rating to display (default: 1 star)?', 'site-reviews' ),
 			'type' => 'listbox',
-		],[
+		], [
 			'label' => esc_html__( 'Pagination', 'site-reviews' ),
 			'name' => 'pagination',
 			'options' => [
@@ -60,7 +60,7 @@ 
 			'name' => 'assigned_to',
 			'tooltip' => __( 'Limit reviews to those assigned to this post ID (separate multiple IDs with a comma). You can also enter "post_id" to use the ID of the current page.', 'site-reviews' ),
 			'type' => 'textbox',
-		],[
+		], [
 			'label' => esc_html__( 'Schema', 'site-reviews' ),
 			'name' => 'schema',
 			'options' => [
@@ -69,49 +69,49 @@ 
 			],
 			'tooltip' => __( 'Rich snippets are disabled by default.', 'site-reviews' ),
 			'type' => 'listbox',
-		],[
+		], [
 			'label' => esc_html__( 'Classes', 'site-reviews' ),
 			'name' => 'class',
 			'tooltip' => __( 'Add custom CSS classes to the shortcode.', 'site-reviews' ),
 			'type' => 'textbox',
-		],[
+		], [
 			'columns' => 2,
 			'items' => [[
 				'name' => 'hide_assigned_to',
 				'text' => esc_html__( 'Assigned To', 'site-reviews' ),
 				'tooltip' => __( 'Hide the assigned to link?', 'site-reviews' ),
 				'type' => 'checkbox',
-			],[
+			], [
 				'name' => 'hide_author',
 				'text' => esc_html__( 'Author', 'site-reviews' ),
 				'tooltip' => __( 'Hide the review author?', 'site-reviews' ),
 				'type' => 'checkbox',
-			],[
+			], [
 				'name' => 'hide_avatar',
 				'text' => esc_html__( 'Avatar', 'site-reviews' ),
 				'tooltip' => __( 'Hide the reviewer avatar if shown?', 'site-reviews' ),
 				'type' => 'checkbox',
-			],[
+			], [
 				'name' => 'hide_content',
 				'text' => esc_html__( 'Content', 'site-reviews' ),
 				'tooltip' => __( 'Hide the review content?', 'site-reviews' ),
 				'type' => 'checkbox',
-			],[
+			], [
 				'name' => 'hide_date',
 				'text' => esc_html__( 'Date', 'site-reviews' ),
 				'tooltip' => __( 'Hide the review date?', 'site-reviews' ),
 				'type' => 'checkbox',
-			],[
+			], [
 				'name' => 'hide_rating',
 				'text' => esc_html__( 'Rating', 'site-reviews' ),
 				'tooltip' => __( 'Hide the review rating?', 'site-reviews' ),
 				'type' => 'checkbox',
-			],[
+			], [
 				'name' => 'hide_response',
 				'text' => esc_html__( 'Response', 'site-reviews' ),
 				'tooltip' => __( 'Hide the review response?', 'site-reviews' ),
 				'type' => 'checkbox',
-			],[
+			], [
 				'name' => 'hide_title',
 				'text' => esc_html__( 'Title', 'site-reviews' ),
 				'tooltip' => __( 'Hide the review title?', 'site-reviews' ),
@@ -121,7 +121,7 @@ 
 			'label' => esc_html__( 'Hide', 'site-reviews' ),
 			'spacing' => 5,
 			'type' => 'container',
-		],[
+		], [
 			'hidden' => true,
 			'name' => 'id',
 			'type' => 'textbox',
@@ -134,7 +134,7 @@ 
 	public function getTerms()
 	{
 		$terms = glsr( Database::class )->getTerms();
-		if( empty( $terms )) {
+		if( empty($terms) ) {
 			return [];
 		}
 		return [

plugin/Shortcodes/SiteReviewsFormPopup.php

Spacing +11 added lines, -11 removed lines

@@ -15,12 +15,12 @@ 
 		return [[
 			'type' => 'container',
 			'html' => '<p class="strong">'.esc_html__( 'All settings are optional.', 'site-reviews' ).'</p>',
-		],[
+		], [
 			'label' => esc_html__( 'Title', 'site-reviews' ),
 			'name' => 'title',
 			'tooltip' => __( 'Enter a custom shortcode heading.', 'site-reviews' ),
 			'type' => 'textbox',
-		],[
+		], [
 			'label' => esc_html__( 'Description', 'site-reviews' ),
 			'minHeight' => 60,
 			'minWidth' => 240,
@@ -35,39 +35,39 @@ 
 			'name' => 'assign_to',
 			'tooltip' => __( 'Assign submitted reviews to a custom page/post ID. You can also enter "post_id" to assign reviews to the ID of the current page.', 'site-reviews' ),
 			'type' => 'textbox',
-		],[
+		], [
 			'label' => esc_html__( 'Classes', 'site-reviews' ),
 			'name' => 'class',
 			'tooltip' => __( 'Add custom CSS classes to the shortcode.', 'site-reviews' ),
 			'type' => 'textbox',
-		],[
+		], [
 			'columns' => 2,
 			'items' => [[
 				'name' => 'hide_content',
 				'text' => esc_html__( 'Content', 'site-reviews' ),
 				'tooltip' => __( 'Hide the content field?', 'site-reviews' ),
 				'type' => 'checkbox',
-			],[
+			], [
 				'name' => 'hide_email',
 				'text' => esc_html__( 'Email', 'site-reviews' ),
 				'tooltip' => __( 'Hide the email field?', 'site-reviews' ),
 				'type' => 'checkbox',
-			],[
+			], [
 				'name' => 'hide_name',
 				'text' => esc_html__( 'Name', 'site-reviews' ),
 				'tooltip' => __( 'Hide the name field?', 'site-reviews' ),
 				'type' => 'checkbox',
-			],[
+			], [
 				'name' => 'hide_rating',
 				'text' => esc_html__( 'Rating', 'site-reviews' ),
 				'tooltip' => __( 'Hide the rating field?', 'site-reviews' ),
 				'type' => 'checkbox',
-			],[
+			], [
 				'name' => 'hide_terms',
 				'text' => esc_html__( 'Terms', 'site-reviews' ),
 				'tooltip' => __( 'Hide the terms field?', 'site-reviews' ),
 				'type' => 'checkbox',
-			],[
+			], [
 				'name' => 'hide_title',
 				'text' => esc_html__( 'Title', 'site-reviews' ),
 				'tooltip' => __( 'Hide the title field?', 'site-reviews' ),
@@ -77,7 +77,7 @@ 
 			'layout' => 'grid',
 			'spacing' => 5,
 			'type' => 'container',
-		],[
+		], [
 			'hidden' => true,
 			'name' => 'id',
 			'type' => 'textbox',
@@ -90,7 +90,7 @@ 
 	public function getTerms()
 	{
 		$terms = glsr( Database::class )->getTerms();
-		if( empty( $terms )) {
+		if( empty($terms) ) {
 			return [];
 		}
 		return [

plugin/Shortcodes/TinymcePopupGenerator.php

Spacing +24 added lines, -24 removed lines

@@ -47,7 +47,7 @@ 
 			'label' => '['.$tag.']',
 			'required' => $this->required,
 			'title' => esc_html__( 'Shortcode', 'site-reviews' ),
-		]);
+		] );
 		return $this;
 	}
 
@@ -57,12 +57,12 @@ 
 	protected function generateFields( array $fields )
 	{
 		$generatedFields = array_map( function( $field ) {
-			if( empty( $field ))return;
+			if( empty($field) )return;
 			$field = $this->normalize( $field );
-			if( !method_exists( $this, $method = 'normalize'.ucfirst( $field['type'] )))return;
+			if( !method_exists( $this, $method = 'normalize'.ucfirst( $field['type'] ) ) )return;
 			return $this->$method( $field );
 		}, $fields );
-		return array_values( array_filter( $generatedFields ));
+		return array_values( array_filter( $generatedFields ) );
 	}
 
 	/**
@@ -71,15 +71,15 @@ 
 	protected function getFields()
 	{
 		$fields = $this->generateFields( $this->fields() );
-		if( !empty( $this->errors )) {
+		if( !empty($this->errors) ) {
 			$errors = [];
 			foreach( $this->required as $name => $alert ) {
-				if( false !== array_search( $name, array_column( $fields, 'name' )))continue;
+				if( false !== array_search( $name, array_column( $fields, 'name' ) ) )continue;
 				$errors[] = $this->errors[$name];
 			}
 			$this->errors = $errors;
 		}
-		return empty( $this->errors )
+		return empty($this->errors)
 			? $fields
 			: $this->errors;
 	}
@@ -92,7 +92,7 @@ 
 		return wp_parse_args( $field, [
 			'items' => [],
 			'type' => '',
-		]);
+		] );
 	}
 
 	/**
@@ -110,7 +110,7 @@ 
 			'tooltip' => '',
 			'type' => '',
 			'value' => '',
-		]);
+		] );
 	}
 
 	/**
@@ -118,7 +118,7 @@ 
 	 */
 	protected function normalizeContainer( array $field )
 	{
-		if( !array_key_exists( 'html', $field ) && !array_key_exists( 'items', $field ))return;
+		if( !array_key_exists( 'html', $field ) && !array_key_exists( 'items', $field ) )return;
 		$field['items'] = $this->generateFields( $field['items'] );
 		return $field;
 	}
@@ -128,7 +128,7 @@ 
 	 */
 	protected function normalizeField( array $field, array $defaults )
 	{
-		if( !$this->validate( $field ))return;
+		if( !$this->validate( $field ) )return;
 		return array_filter( shortcode_atts( $defaults, $field ), function( $value ) {
 			return $value !== '';
 		});
@@ -148,9 +148,9 @@ 
 			'tooltip' => '',
 			'type' => '',
 			'value' => '',
-		]);
-		if( !is_array( $listbox ))return;
-		if( !array_key_exists( '', $listbox['options'] )) {
+		] );
+		if( !is_array( $listbox ) )return;
+		if( !array_key_exists( '', $listbox['options'] ) ) {
 			$listbox['options'] = ['' => $listbox['placeholder']] + $listbox['options'];
 		}
 		foreach( $listbox['options'] as $value => $text ) {
@@ -167,7 +167,7 @@ 
 	 */
 	protected function normalizePost( array $field )
 	{
-		if( !is_array( $field['query_args'] )) {
+		if( !is_array( $field['query_args'] ) ) {
 			$field['query_args'] = [];
 		}
 		$posts = get_posts( wp_parse_args( $field['query_args'], [
@@ -175,8 +175,8 @@ 
 			'orderby' => 'title',
 			'post_type' => 'post',
 			'posts_per_page' => 30,
-		]));
-		if( !empty( $posts )) {
+		] ) );
+		if( !empty($posts) ) {
 			$options = [];
 			foreach( $posts as $post ) {
 				$options[$post->ID] = esc_html( $post->post_title );
@@ -206,7 +206,7 @@ 
 			'tooltip' => '',
 			'type' => '',
 			'value' => '',
-		]);
+		] );
 	}
 
 	/**
@@ -214,7 +214,7 @@ 
 	 */
 	protected function validate( array $field )
 	{
-		$args = shortcode_atts([
+		$args = shortcode_atts( [
 			'label' => '',
 			'name' => false,
 			'required' => false,
@@ -230,13 +230,13 @@ 
 	 */
 	protected function validateErrors( array $args )
 	{
-		if( !isset( $args['required']['error'] )) {
+		if( !isset($args['required']['error']) ) {
 			return true;
 		}
-		$this->errors[$args['name']] = $this->normalizeContainer([
+		$this->errors[$args['name']] = $this->normalizeContainer( [
 			'html' => $args['required']['error'],
 			'type' => 'container',
-		]);
+		] );
 		return false;
 	}
 
@@ -249,10 +249,10 @@ 
 			return true;
 		}
 		$alert = esc_html__( 'Some of the shortcode options are required.', 'site-reviews' );
-		if( isset( $args['required']['alert'] )) {
+		if( isset($args['required']['alert']) ) {
 			$alert = $args['required']['alert'];
 		}
-		else if( !empty( $args['label'] )) {
+		else if( !empty($args['label']) ) {
 			$alert = sprintf(
 				esc_html_x( 'The "%s" option is required.', 'the option label', 'site-reviews' ),
 				str_replace( ':', '', $args['label'] )

plugin/Shortcodes/SiteReviewsSummaryPopup.php

Spacing +9 added lines, -9 removed lines

@@ -12,10 +12,10 @@ 
 	public function fields()
 	{
 		return [[
-			'html' => sprintf( '<p class="strong">%s</p>', esc_html__( 'All settings are optional.', 'site-reviews' )),
+			'html' => sprintf( '<p class="strong">%s</p>', esc_html__( 'All settings are optional.', 'site-reviews' ) ),
 			'minWidth' => 320,
 			'type' => 'container',
-		],[
+		], [
 			'label' => esc_html__( 'Title', 'site-reviews' ),
 			'name' => 'title',
 			'tooltip' => __( 'Enter a custom shortcode heading.', 'site-reviews' ),
@@ -28,7 +28,7 @@ 
 			'name' => 'assigned_to',
 			'tooltip' => __( 'Limit reviews to those assigned to this post ID (separate multiple IDs with a comma). You can also enter "post_id" to use the ID of the current page.', 'site-reviews' ),
 			'type' => 'textbox',
-		],[
+		], [
 			'label' => esc_html__( 'Schema', 'site-reviews' ),
 			'name' => 'schema',
 			'options' => [
@@ -37,34 +37,34 @@ 
 			],
 			'tooltip' => __( 'Rich snippets are disabled by default.', 'site-reviews' ),
 			'type' => 'listbox',
-		],[
+		], [
 			'label' => esc_html__( 'Classes', 'site-reviews' ),
 			'name' => 'class',
 			'tooltip' => __( 'Add custom CSS classes to the shortcode.', 'site-reviews' ),
 			'type' => 'textbox',
-		],[
+		], [
 			'columns' => 2,
 			'items' => [[
 				'type' => 'checkbox',
 				'name' => 'hide_bars',
 				'text' => esc_html__( 'Bars', 'site-reviews' ),
 				'tooltip' => __( 'Hide the percentage bars?', 'site-reviews' ),
-			],[
+			], [
 				'type' => 'checkbox',
 				'name' => 'hide_if_empty',
 				'text' => esc_html__( 'If Empty', 'site-reviews' ),
 				'tooltip' => __( 'Hide the summary if no reviews are found?', 'site-reviews' ),
-			],[
+			], [
 				'type' => 'checkbox',
 				'name' => 'hide_rating',
 				'text' => esc_html__( 'Rating', 'site-reviews' ),
 				'tooltip' => __( 'Hide the rating?', 'site-reviews' ),
-			],[
+			], [
 				'type' => 'checkbox',
 				'name' => 'hide_stars',
 				'text' => esc_html__( 'Stars', 'site-reviews' ),
 				'tooltip' => __( 'Hide the stars?', 'site-reviews' ),
-			],[
+			], [
 				'type' => 'checkbox',
 				'name' => 'hide_summary',
 				'text' => esc_html__( 'Summary', 'site-reviews' ),

plugin/Modules/Validator/ValidateReview.php

Spacing +23 added lines, -23 removed lines

@@ -67,7 +67,7 @@ 
 		$this->validateBlacklist();
 		$this->validateAkismet();
 		$this->validateRecaptcha();
-		if( !empty( $this->error )) {
+		if( !empty($this->error) ) {
 			$this->setSessionValues( 'message', $this->error );
 		}
 		return $this;
@@ -91,8 +91,8 @@ 
 		if( !glsr( OptionManager::class )->isRecaptchaEnabled() ) {
 			return static::RECAPTCHA_DISABLED;
 		}
-		if( empty( $this->request['recaptcha-token'] )) {
-			return $this->request['counter'] < intval( apply_filters( 'site-reviews/recaptcha/timeout', 5 ))
+		if( empty($this->request['recaptcha-token']) ) {
+			return $this->request['counter'] < intval( apply_filters( 'site-reviews/recaptcha/timeout', 5 ) )
 				? static::RECAPTCHA_EMPTY
 				: static::RECAPTCHA_FAILED;
 		}
@@ -104,17 +104,17 @@ 
 	 */
 	protected function getRecaptchaTokenStatus()
 	{
-		$endpoint = add_query_arg([
+		$endpoint = add_query_arg( [
 			'remoteip' => glsr( Helper::class )->getIpAddress(),
 			'response' => $this->request['recaptcha-token'],
 			'secret' => $this->getOption( 'settings.submissions.recaptcha.secret' ),
 		], static::RECAPTCHA_ENDPOINT );
-		if( is_wp_error( $response = wp_remote_get( $endpoint ))) {
+		if( is_wp_error( $response = wp_remote_get( $endpoint ) ) ) {
 			glsr_log()->error( $response->get_error_message() );
 			return static::RECAPTCHA_FAILED;
 		}
-		$response = json_decode( wp_remote_retrieve_body( $response ));
-		if( !empty( $response->success )) {
+		$response = json_decode( wp_remote_retrieve_body( $response ) );
+		if( !empty($response->success) ) {
 			return boolval( $response->success )
 				? static::RECAPTCHA_VALID
 				: static::RECAPTCHA_INVALID;
@@ -132,12 +132,12 @@ 
 	{
 		$rules = array_intersect_key(
 			apply_filters( 'site-reviews/validation/rules', static::VALIDATION_RULES, $request ),
-			array_flip( $this->getOption( 'settings.submissions.required', [] ))
+			array_flip( $this->getOption( 'settings.submissions.required', [] ) )
 		);
-		$excluded = isset( $request['excluded'] )
+		$excluded = isset($request['excluded'])
 			? explode( ',', $request['excluded'] )
 			: [];
-		return array_diff_key( $rules, array_flip( $excluded ));
+		return array_diff_key( $rules, array_flip( $excluded ) );
 	}
 
 	/**
@@ -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 = $this->getOption( '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/custom', 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;
 		$status = $this->getRecaptchaStatus();
-		if( in_array( $status, [static::RECAPTCHA_DISABLED, static::RECAPTCHA_VALID] ))return;
+		if( in_array( $status, [static::RECAPTCHA_DISABLED, static::RECAPTCHA_VALID] ) )return;
 		if( $status == static::RECAPTCHA_EMPTY ) {
 			$this->setSessionValues( 'recaptcha', 'unset' );
 			$this->recaptchaIsUnset = true;
@@ -250,11 +250,11 @@ 
 	 */
 	protected 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 );

plugin/Modules/Html/Partials/SiteReviewsForm.php

Spacing +33 added lines, -33 removed lines

@@ -65,7 +65,7 @@ 
 				'response' => $this->buildResponse(),
 				'submit_button' => $this->buildSubmitButton().$this->buildRecaptcha(),
 			],
-		]);
+		] );
 	}
 
 	/**
@@ -77,7 +77,7 @@ 
 			'context' => [
 				'text' => trim( $this->getLoginText().' '.$this->getRegisterText() ),
 			],
-		]);
+		] );
 	}
 
 	/**
@@ -86,12 +86,12 @@ 
 	protected function buildRecaptcha()
 	{
 		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-sitekey' => sanitize_text_field( glsr( OptionManager::class )->get( 'settings.submissions.recaptcha.key' ) ),
 			'data-size' => 'invisible',
-		]);
+		] );
 	}
 
 	/**
@@ -99,7 +99,7 @@ 
 	 */
 	protected function buildResponse()
 	{
-		$classes = !empty( $this->errors )
+		$classes = !empty($this->errors)
 			? glsr( StyleValidationDefaults::class )->defaults()['message_error_class']
 			: '';
 		return glsr( Template::class )->build( 'templates/form/response', [
@@ -107,8 +107,8 @@ 
 				'class' => $classes,
 				'message' => wpautop( $this->message ),
 			],
-			'has_errors' => !empty( $this->errors ),
-		]);
+			'has_errors' => !empty($this->errors),
+		] );
 	}
 
 	/**
@@ -120,7 +120,7 @@ 
 			'context' => [
 				'text' => __( 'Submit your review', 'site-reviews' ),
 			],
-		]);
+		] );
 	}
 
 	/**
@@ -139,7 +139,7 @@ 
 		$fields = array_merge(
 			$this->getHiddenFields(),
 			[$this->getHoneypotField()],
-			$this->normalizeFields( glsr( Form::class )->getFields( 'submission-form' ))
+			$this->normalizeFields( glsr( Form::class )->getFields( 'submission-form' ) )
 		);
 		return $fields;
 	}
@@ -149,10 +149,10 @@ 
 	 */
 	protected function getLoginText()
 	{
-		$loginLink = glsr( Builder::class )->a([
-			'href' => wp_login_url( strval( get_permalink() )),
+		$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 );
 	}
 
@@ -162,10 +162,10 @@ 
 	protected function getRegisterText()
 	{
 		if( !get_option( 'users_can_register' ) || glsr( OptionManager::class )->get( 'settings.general.require.login' ) != 'yes' )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 );
 	}
 
@@ -177,32 +177,32 @@ 
 		$fields = [[
 			'name' => 'action',
 			'value' => 'submit-review',
-		],[
+		], [
 			'name' => 'assign_to',
 			'value' => $this->args['assign_to'],
-		],[
+		], [
 			'name' => 'category',
 			'value' => $this->args['category'],
-		],[
+		], [
 			'name' => 'counter',
-		],[
+		], [
 			'name' => 'excluded',
 			'value' => $this->args['hide'],
-		],[
+		], [
 			'name' => 'form_id',
 			'value' => $this->args['id'],
-		],[
+		], [
 			'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' )),
+			'value' => wp_unslash( filter_input( INPUT_SERVER, 'REQUEST_URI' ) ),
 		]];
 		return array_map( function( $field ) {
-			return new Field( wp_parse_args( $field, ['type' => 'hidden'] ));
+			return new Field( wp_parse_args( $field, ['type' => 'hidden'] ) );
 		}, $fields );
 	}
 
@@ -211,10 +211,10 @@ 
 	 */
 	protected function getHoneypotField()
 	{
-		return new Field([
+		return new Field( [
 			'name' => 'gotcha',
 			'type' => 'honeypot',
-		]);
+		] );
 	}
 
 	/**
@@ -222,7 +222,7 @@ 
 	 */
 	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' );
@@ -233,7 +233,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']];
 	}
 
@@ -242,7 +242,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;
 	}
 
@@ -253,7 +253,7 @@ 
 	{
 		$normalizedFields = [];
 		foreach( $fields as $field ) {
-			if( in_array( $field->field['path'], $this->args['hide'] ))continue;
+			if( in_array( $field->field['path'], $this->args['hide'] ) )continue;
 			$field->field['is_public'] = true;
 			$this->normalizeFieldClass( $field );
 			$this->normalizeFieldErrors( $field );
@@ -269,8 +269,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 {