pryley / site-reviews

plugin/Controllers/AjaxController.php

Indentation +141 added lines, -141 removed lines

@@ -12,154 +12,154 @@
 
 class AjaxController extends Controller
 {
-    /**
-     * @return void
-     */
-    public function routerChangeStatus(array $request)
-    {
-        wp_send_json_success($this->execute(new ChangeStatus($request)));
-    }
+	/**
+	 * @return void
+	 */
+	public function routerChangeStatus(array $request)
+	{
+		wp_send_json_success($this->execute(new ChangeStatus($request)));
+	}
 
-    /**
-     * @return void
-     */
-    public function routerClearConsole()
-    {
-        glsr(AdminController::class)->routerClearConsole();
-        wp_send_json_success([
-            'console' => glsr(Console::class)->get(),
-            'notices' => glsr(Notice::class)->get(),
-        ]);
-    }
+	/**
+	 * @return void
+	 */
+	public function routerClearConsole()
+	{
+		glsr(AdminController::class)->routerClearConsole();
+		wp_send_json_success([
+			'console' => glsr(Console::class)->get(),
+			'notices' => glsr(Notice::class)->get(),
+		]);
+	}
 
-    /**
-     * @return void
-     */
-    public function routerCountReviews()
-    {
-        glsr(AdminController::class)->routerCountReviews();
-        wp_send_json_success([
-            'notices' => glsr(Notice::class)->get(),
-        ]);
-    }
+	/**
+	 * @return void
+	 */
+	public function routerCountReviews()
+	{
+		glsr(AdminController::class)->routerCountReviews();
+		wp_send_json_success([
+			'notices' => glsr(Notice::class)->get(),
+		]);
+	}
 
-    /**
-     * @return void
-     */
-    public function routerMceShortcode(array $request)
-    {
-        $shortcode = $request['shortcode'];
-        $response = false;
-        if (array_key_exists($shortcode, glsr()->mceShortcodes)) {
-            $data = glsr()->mceShortcodes[$shortcode];
-            if (!empty($data['errors'])) {
-                $data['btn_okay'] = [esc_html__('Okay', 'site-reviews')];
-            }
-            $response = [
-                'body' => $data['fields'],
-                'close' => $data['btn_close'],
-                'ok' => $data['btn_okay'],
-                'shortcode' => $shortcode,
-                'title' => $data['title'],
-            ];
-        }
-        wp_send_json_success($response);
-    }
+	/**
+	 * @return void
+	 */
+	public function routerMceShortcode(array $request)
+	{
+		$shortcode = $request['shortcode'];
+		$response = false;
+		if (array_key_exists($shortcode, glsr()->mceShortcodes)) {
+			$data = glsr()->mceShortcodes[$shortcode];
+			if (!empty($data['errors'])) {
+				$data['btn_okay'] = [esc_html__('Okay', 'site-reviews')];
+			}
+			$response = [
+				'body' => $data['fields'],
+				'close' => $data['btn_close'],
+				'ok' => $data['btn_okay'],
+				'shortcode' => $shortcode,
+				'title' => $data['title'],
+			];
+		}
+		wp_send_json_success($response);
+	}
 
-    /**
-     * @return void
-     */
-    public function routerFetchConsole()
-    {
-        glsr(AdminController::class)->routerFetchConsole();
-        wp_send_json_success([
-            'console' => glsr(Console::class)->get(),
-            'notices' => glsr(Notice::class)->get(),
-        ]);
-    }
+	/**
+	 * @return void
+	 */
+	public function routerFetchConsole()
+	{
+		glsr(AdminController::class)->routerFetchConsole();
+		wp_send_json_success([
+			'console' => glsr(Console::class)->get(),
+			'notices' => glsr(Notice::class)->get(),
+		]);
+	}
 
-    /**
-     * @return void
-     */
-    public function routerSearchPosts(array $request)
-    {
-        $results = glsr(Database::class)->searchPosts($request['search']);
-        wp_send_json_success([
-            'empty' => '<div>'.__('Nothing found.', 'site-reviews').'</div>',
-            'items' => $results,
-        ]);
-    }
+	/**
+	 * @return void
+	 */
+	public function routerSearchPosts(array $request)
+	{
+		$results = glsr(Database::class)->searchPosts($request['search']);
+		wp_send_json_success([
+			'empty' => '<div>'.__('Nothing found.', 'site-reviews').'</div>',
+			'items' => $results,
+		]);
+	}
 
-    /**
-     * @return void
-     */
-    public function routerSearchTranslations(array $request)
-    {
-        if (empty($request['exclude'])) {
-            $request['exclude'] = [];
-        }
-        $results = glsr(Translation::class)
-            ->search($request['search'])
-            ->exclude()
-            ->exclude($request['exclude'])
-            ->renderResults();
-        wp_send_json_success([
-            'empty' => '<div>'.__('Nothing found.', 'site-reviews').'</div>',
-            'items' => $results,
-        ]);
-    }
+	/**
+	 * @return void
+	 */
+	public function routerSearchTranslations(array $request)
+	{
+		if (empty($request['exclude'])) {
+			$request['exclude'] = [];
+		}
+		$results = glsr(Translation::class)
+			->search($request['search'])
+			->exclude()
+			->exclude($request['exclude'])
+			->renderResults();
+		wp_send_json_success([
+			'empty' => '<div>'.__('Nothing found.', 'site-reviews').'</div>',
+			'items' => $results,
+		]);
+	}
 
-    /**
-     * @return void
-     */
-    public function routerSubmitReview(array $request)
-    {
-        $command = glsr(PublicController::class)->routerSubmitReview($request);
-        $redirect = trim(strval(get_post_meta($command->post_id, 'redirect_to', true)));
-        $redirect = apply_filters('site-reviews/review/redirect', $redirect, $command);
-        $data = [
-            'errors' => glsr()->sessionGet($command->form_id.'errors', false),
-            'message' => glsr()->sessionGet($command->form_id.'message', ''),
-            'recaptcha' => glsr()->sessionGet($command->form_id.'recaptcha', false),
-            'redirect' => $redirect,
-        ];
-        if (false === $data['errors']) {
-            glsr()->sessionClear();
-            wp_send_json_success($data);
-        }
-        wp_send_json_error($data);
-    }
+	/**
+	 * @return void
+	 */
+	public function routerSubmitReview(array $request)
+	{
+		$command = glsr(PublicController::class)->routerSubmitReview($request);
+		$redirect = trim(strval(get_post_meta($command->post_id, 'redirect_to', true)));
+		$redirect = apply_filters('site-reviews/review/redirect', $redirect, $command);
+		$data = [
+			'errors' => glsr()->sessionGet($command->form_id.'errors', false),
+			'message' => glsr()->sessionGet($command->form_id.'message', ''),
+			'recaptcha' => glsr()->sessionGet($command->form_id.'recaptcha', false),
+			'redirect' => $redirect,
+		];
+		if (false === $data['errors']) {
+			glsr()->sessionClear();
+			wp_send_json_success($data);
+		}
+		wp_send_json_error($data);
+	}
 
-    /**
-     * @return void
-     */
-    public function routerFetchPagedReviews(array $request)
-    {
-        $urlQuery = [];
-        parse_str(parse_url(glsr_get($request, 'url'), PHP_URL_QUERY), $urlQuery);
-        $args = [
-            'paged' => glsr_get($urlQuery, glsr()->constant('PAGED_QUERY_VAR'), 1),
-            'pagedUrl' => home_url(parse_url(glsr_get($request, 'url'), PHP_URL_PATH)),
-            'pagination' => 'ajax',
-            'schema' => false,
-        ];
-        $atts = (array) json_decode(glsr_get($request, 'atts'));
-        $html = glsr(SiteReviews::class)->build(wp_parse_args($args, $atts));
-        return wp_send_json_success([
-            'pagination' => $html->getPagination(),
-            'reviews' => $html->getReviews(),
-        ]);
-    }
+	/**
+	 * @return void
+	 */
+	public function routerFetchPagedReviews(array $request)
+	{
+		$urlQuery = [];
+		parse_str(parse_url(glsr_get($request, 'url'), PHP_URL_QUERY), $urlQuery);
+		$args = [
+			'paged' => glsr_get($urlQuery, glsr()->constant('PAGED_QUERY_VAR'), 1),
+			'pagedUrl' => home_url(parse_url(glsr_get($request, 'url'), PHP_URL_PATH)),
+			'pagination' => 'ajax',
+			'schema' => false,
+		];
+		$atts = (array) json_decode(glsr_get($request, 'atts'));
+		$html = glsr(SiteReviews::class)->build(wp_parse_args($args, $atts));
+		return wp_send_json_success([
+			'pagination' => $html->getPagination(),
+			'reviews' => $html->getReviews(),
+		]);
+	}
 
-    /**
-     * @return void
-     */
-    public function routerTogglePinned(array $request)
-    {
-        $isPinned = $this->execute(new TogglePinned($request));
-        wp_send_json_success([
-            'notices' => glsr(Notice::class)->get(),
-            'pinned' => $isPinned,
-        ]);
-    }
+	/**
+	 * @return void
+	 */
+	public function routerTogglePinned(array $request)
+	{
+		$isPinned = $this->execute(new TogglePinned($request));
+		wp_send_json_success([
+			'notices' => glsr(Notice::class)->get(),
+			'pinned' => $isPinned,
+		]);
+	}
 }

Spacing +57 added lines, -57 removed lines

@@ -15,9 +15,9 @@ 
     /**
      * @return void
      */
-    public function routerChangeStatus(array $request)
+    public function routerChangeStatus( array $request )
     {
-        wp_send_json_success($this->execute(new ChangeStatus($request)));
+        wp_send_json_success( $this->execute( new ChangeStatus( $request ) ) );
     }
 
     /**
@@ -25,11 +25,11 @@ 
      */
     public function routerClearConsole()
     {
-        glsr(AdminController::class)->routerClearConsole();
-        wp_send_json_success([
-            'console' => glsr(Console::class)->get(),
-            'notices' => glsr(Notice::class)->get(),
-        ]);
+        glsr( AdminController::class )->routerClearConsole();
+        wp_send_json_success( [
+            'console' => glsr( Console::class )->get(),
+            'notices' => glsr( Notice::class )->get(),
+        ] );
     }
 
     /**
@@ -37,23 +37,23 @@ 
      */
     public function routerCountReviews()
     {
-        glsr(AdminController::class)->routerCountReviews();
-        wp_send_json_success([
-            'notices' => glsr(Notice::class)->get(),
-        ]);
+        glsr( AdminController::class )->routerCountReviews();
+        wp_send_json_success( [
+            'notices' => glsr( Notice::class )->get(),
+        ] );
     }
 
     /**
      * @return void
      */
-    public function routerMceShortcode(array $request)
+    public function routerMceShortcode( array $request )
     {
         $shortcode = $request['shortcode'];
         $response = false;
-        if (array_key_exists($shortcode, glsr()->mceShortcodes)) {
+        if( array_key_exists( $shortcode, glsr()->mceShortcodes ) ) {
             $data = glsr()->mceShortcodes[$shortcode];
-            if (!empty($data['errors'])) {
-                $data['btn_okay'] = [esc_html__('Okay', 'site-reviews')];
+            if( !empty($data['errors']) ) {
+                $data['btn_okay'] = [esc_html__( 'Okay', 'site-reviews' )];
             }
             $response = [
                 'body' => $data['fields'],
@@ -63,7 +63,7 @@ 
                 'title' => $data['title'],
             ];
         }
-        wp_send_json_success($response);
+        wp_send_json_success( $response );
     }
 
     /**
@@ -71,95 +71,95 @@ 
      */
     public function routerFetchConsole()
     {
-        glsr(AdminController::class)->routerFetchConsole();
-        wp_send_json_success([
-            'console' => glsr(Console::class)->get(),
-            'notices' => glsr(Notice::class)->get(),
-        ]);
+        glsr( AdminController::class )->routerFetchConsole();
+        wp_send_json_success( [
+            'console' => glsr( Console::class )->get(),
+            'notices' => glsr( Notice::class )->get(),
+        ] );
     }
 
     /**
      * @return void
      */
-    public function routerSearchPosts(array $request)
+    public function routerSearchPosts( array $request )
     {
-        $results = glsr(Database::class)->searchPosts($request['search']);
-        wp_send_json_success([
-            'empty' => '<div>'.__('Nothing found.', 'site-reviews').'</div>',
+        $results = glsr( Database::class )->searchPosts( $request['search'] );
+        wp_send_json_success( [
+            'empty' => '<div>'.__( 'Nothing found.', 'site-reviews' ).'</div>',
             'items' => $results,
-        ]);
+        ] );
     }
 
     /**
      * @return void
      */
-    public function routerSearchTranslations(array $request)
+    public function routerSearchTranslations( array $request )
     {
-        if (empty($request['exclude'])) {
+        if( empty($request['exclude']) ) {
             $request['exclude'] = [];
         }
-        $results = glsr(Translation::class)
-            ->search($request['search'])
+        $results = glsr( Translation::class )
+            ->search( $request['search'] )
             ->exclude()
-            ->exclude($request['exclude'])
+            ->exclude( $request['exclude'] )
             ->renderResults();
-        wp_send_json_success([
-            'empty' => '<div>'.__('Nothing found.', 'site-reviews').'</div>',
+        wp_send_json_success( [
+            'empty' => '<div>'.__( 'Nothing found.', 'site-reviews' ).'</div>',
             'items' => $results,
-        ]);
+        ] );
     }
 
     /**
      * @return void
      */
-    public function routerSubmitReview(array $request)
+    public function routerSubmitReview( array $request )
     {
-        $command = glsr(PublicController::class)->routerSubmitReview($request);
-        $redirect = trim(strval(get_post_meta($command->post_id, 'redirect_to', true)));
-        $redirect = apply_filters('site-reviews/review/redirect', $redirect, $command);
+        $command = glsr( PublicController::class )->routerSubmitReview( $request );
+        $redirect = trim( strval( get_post_meta( $command->post_id, 'redirect_to', true ) ) );
+        $redirect = apply_filters( 'site-reviews/review/redirect', $redirect, $command );
         $data = [
-            'errors' => glsr()->sessionGet($command->form_id.'errors', false),
-            'message' => glsr()->sessionGet($command->form_id.'message', ''),
-            'recaptcha' => glsr()->sessionGet($command->form_id.'recaptcha', false),
+            'errors' => glsr()->sessionGet( $command->form_id.'errors', false ),
+            'message' => glsr()->sessionGet( $command->form_id.'message', '' ),
+            'recaptcha' => glsr()->sessionGet( $command->form_id.'recaptcha', false ),
             'redirect' => $redirect,
         ];
-        if (false === $data['errors']) {
+        if( false === $data['errors'] ) {
             glsr()->sessionClear();
-            wp_send_json_success($data);
+            wp_send_json_success( $data );
         }
-        wp_send_json_error($data);
+        wp_send_json_error( $data );
     }
 
     /**
      * @return void
      */
-    public function routerFetchPagedReviews(array $request)
+    public function routerFetchPagedReviews( array $request )
     {
         $urlQuery = [];
-        parse_str(parse_url(glsr_get($request, 'url'), PHP_URL_QUERY), $urlQuery);
+        parse_str( parse_url( glsr_get( $request, 'url' ), PHP_URL_QUERY ), $urlQuery );
         $args = [
-            'paged' => glsr_get($urlQuery, glsr()->constant('PAGED_QUERY_VAR'), 1),
-            'pagedUrl' => home_url(parse_url(glsr_get($request, 'url'), PHP_URL_PATH)),
+            'paged' => glsr_get( $urlQuery, glsr()->constant( 'PAGED_QUERY_VAR' ), 1 ),
+            'pagedUrl' => home_url( parse_url( glsr_get( $request, 'url' ), PHP_URL_PATH ) ),
             'pagination' => 'ajax',
             'schema' => false,
         ];
-        $atts = (array) json_decode(glsr_get($request, 'atts'));
-        $html = glsr(SiteReviews::class)->build(wp_parse_args($args, $atts));
-        return wp_send_json_success([
+        $atts = (array)json_decode( glsr_get( $request, 'atts' ) );
+        $html = glsr( SiteReviews::class )->build( wp_parse_args( $args, $atts ) );
+        return wp_send_json_success( [
             'pagination' => $html->getPagination(),
             'reviews' => $html->getReviews(),
-        ]);
+        ] );
     }
 
     /**
      * @return void
      */
-    public function routerTogglePinned(array $request)
+    public function routerTogglePinned( array $request )
     {
-        $isPinned = $this->execute(new TogglePinned($request));
-        wp_send_json_success([
-            'notices' => glsr(Notice::class)->get(),
+        $isPinned = $this->execute( new TogglePinned( $request ) );
+        wp_send_json_success( [
+            'notices' => glsr( Notice::class )->get(),
             'pinned' => $isPinned,
-        ]);
+        ] );
     }
 }

plugin/Modules/Upgrader.php

Braces +2 added lines, -1 removed lines

@@ -49,7 +49,8 @@
         if ($this->currentVersion !== glsr()->version) {
             $this->setReviewCounts();
             $this->updateVersionFrom($this->currentVersion);
-        } elseif (!glsr(OptionManager::class)->get('last_review_count', false)) {
+        }
+        elseif (!glsr(OptionManager::class)->get('last_review_count', false)) {
             $this->setReviewCounts();
         }
     }

Indentation +75 added lines, -75 removed lines

@@ -7,84 +7,84 @@
 
 class Upgrader
 {
-    /**
-     * @return string
-     */
-    public $currentVersion;
+	/**
+	 * @return string
+	 */
+	public $currentVersion;
 
-    /**
-     * @return void
-     */
-    public function run()
-    {
-        $filenames = [];
-        $iterator = new DirectoryIterator(dirname(__FILE__).'/Upgrader');
-        foreach ($iterator as $fileinfo) {
-            if ($fileinfo->isFile()) {
-                $filenames[] = $fileinfo->getFilename();
-            }
-        }
-        natsort($filenames);
-        $this->currentVersion = $this->currentVersion();
-        array_walk($filenames, function ($file) {
-            $className = str_replace('.php', '', $file);
-            $upgradeFromVersion = str_replace(['Upgrade_', '_'], ['', '.'], $className);
-            $suffix = preg_replace('/[\d.]+(.+)?/', '${1}', glsr()->version); // allow alpha/beta versions
-            if ('0.0.0' == $this->currentVersion
-                || version_compare($this->currentVersion, $upgradeFromVersion.$suffix, '>=')) {
-                return;
-            }
-            glsr('Modules\\Upgrader\\'.$className);
-            glsr_log()->notice('Completed Upgrade for v'.$upgradeFromVersion.$suffix);
-        });
-        $this->finish();
-    }
+	/**
+	 * @return void
+	 */
+	public function run()
+	{
+		$filenames = [];
+		$iterator = new DirectoryIterator(dirname(__FILE__).'/Upgrader');
+		foreach ($iterator as $fileinfo) {
+			if ($fileinfo->isFile()) {
+				$filenames[] = $fileinfo->getFilename();
+			}
+		}
+		natsort($filenames);
+		$this->currentVersion = $this->currentVersion();
+		array_walk($filenames, function ($file) {
+			$className = str_replace('.php', '', $file);
+			$upgradeFromVersion = str_replace(['Upgrade_', '_'], ['', '.'], $className);
+			$suffix = preg_replace('/[\d.]+(.+)?/', '${1}', glsr()->version); // allow alpha/beta versions
+			if ('0.0.0' == $this->currentVersion
+				|| version_compare($this->currentVersion, $upgradeFromVersion.$suffix, '>=')) {
+				return;
+			}
+			glsr('Modules\\Upgrader\\'.$className);
+			glsr_log()->notice('Completed Upgrade for v'.$upgradeFromVersion.$suffix);
+		});
+		$this->finish();
+	}
 
-    /**
-     * @return void
-     */
-    public function finish()
-    {
-        if ($this->currentVersion !== glsr()->version) {
-            $this->setReviewCounts();
-            $this->updateVersionFrom($this->currentVersion);
-        } elseif (!glsr(OptionManager::class)->get('last_review_count', false)) {
-            $this->setReviewCounts();
-        }
-    }
+	/**
+	 * @return void
+	 */
+	public function finish()
+	{
+		if ($this->currentVersion !== glsr()->version) {
+			$this->setReviewCounts();
+			$this->updateVersionFrom($this->currentVersion);
+		} elseif (!glsr(OptionManager::class)->get('last_review_count', false)) {
+			$this->setReviewCounts();
+		}
+	}
 
-    /**
-     * @return string
-     */
-    protected function currentVersion()
-    {
-        $fallback = '0.0.0';
-        $majorVersions = [4, 3, 2];
-        foreach ($majorVersions as $majorVersion) {
-            $settings = get_option(OptionManager::databaseKey($majorVersion));
-            $version = glsr_get($settings, 'version', $fallback);
-            if (version_compare($version, $fallback, '>')) {
-                return $version;
-            }
-        }
-        return $fallback;
-    }
+	/**
+	 * @return string
+	 */
+	protected function currentVersion()
+	{
+		$fallback = '0.0.0';
+		$majorVersions = [4, 3, 2];
+		foreach ($majorVersions as $majorVersion) {
+			$settings = get_option(OptionManager::databaseKey($majorVersion));
+			$version = glsr_get($settings, 'version', $fallback);
+			if (version_compare($version, $fallback, '>')) {
+				return $version;
+			}
+		}
+		return $fallback;
+	}
 
-    /**
-     * @return void
-     */
-    protected function setReviewCounts()
-    {
-        add_action('admin_init', 'glsr_calculate_ratings');
-    }
+	/**
+	 * @return void
+	 */
+	protected function setReviewCounts()
+	{
+		add_action('admin_init', 'glsr_calculate_ratings');
+	}
 
-    /**
-     * @param string $previousVersion
-     * @return void
-     */
-    protected function updateVersionFrom($previousVersion)
-    {
-        glsr(OptionManager::class)->set('version', glsr()->version);
-        glsr(OptionManager::class)->set('version_upgraded_from', $previousVersion);
-    }
+	/**
+	 * @param string $previousVersion
+	 * @return void
+	 */
+	protected function updateVersionFrom($previousVersion)
+	{
+		glsr(OptionManager::class)->set('version', glsr()->version);
+		glsr(OptionManager::class)->set('version_upgraded_from', $previousVersion);
+	}
 }

Spacing +23 added lines, -23 removed lines

@@ -18,24 +18,24 @@ 
     public function run()
     {
         $filenames = [];
-        $iterator = new DirectoryIterator(dirname(__FILE__).'/Upgrader');
-        foreach ($iterator as $fileinfo) {
-            if ($fileinfo->isFile()) {
+        $iterator = new DirectoryIterator( dirname( __FILE__ ).'/Upgrader' );
+        foreach( $iterator as $fileinfo ) {
+            if( $fileinfo->isFile() ) {
                 $filenames[] = $fileinfo->getFilename();
             }
         }
-        natsort($filenames);
+        natsort( $filenames );
         $this->currentVersion = $this->currentVersion();
-        array_walk($filenames, function ($file) {
-            $className = str_replace('.php', '', $file);
-            $upgradeFromVersion = str_replace(['Upgrade_', '_'], ['', '.'], $className);
-            $suffix = preg_replace('/[\d.]+(.+)?/', '${1}', glsr()->version); // allow alpha/beta versions
-            if ('0.0.0' == $this->currentVersion
-                || version_compare($this->currentVersion, $upgradeFromVersion.$suffix, '>=')) {
+        array_walk( $filenames, function( $file ) {
+            $className = str_replace( '.php', '', $file );
+            $upgradeFromVersion = str_replace( ['Upgrade_', '_'], ['', '.'], $className );
+            $suffix = preg_replace( '/[\d.]+(.+)?/', '${1}', glsr()->version ); // allow alpha/beta versions
+            if( '0.0.0' == $this->currentVersion
+                || version_compare( $this->currentVersion, $upgradeFromVersion.$suffix, '>=' ) ) {
                 return;
             }
-            glsr('Modules\\Upgrader\\'.$className);
-            glsr_log()->notice('Completed Upgrade for v'.$upgradeFromVersion.$suffix);
+            glsr( 'Modules\\Upgrader\\'.$className );
+            glsr_log()->notice( 'Completed Upgrade for v'.$upgradeFromVersion.$suffix );
         });
         $this->finish();
     }
@@ -45,10 +45,10 @@ 
      */
     public function finish()
     {
-        if ($this->currentVersion !== glsr()->version) {
+        if( $this->currentVersion !== glsr()->version ) {
             $this->setReviewCounts();
-            $this->updateVersionFrom($this->currentVersion);
-        } elseif (!glsr(OptionManager::class)->get('last_review_count', false)) {
+            $this->updateVersionFrom( $this->currentVersion );
+        } elseif( !glsr( OptionManager::class )->get( 'last_review_count', false ) ) {
             $this->setReviewCounts();
         }
     }
@@ -60,10 +60,10 @@ 
     {
         $fallback = '0.0.0';
         $majorVersions = [4, 3, 2];
-        foreach ($majorVersions as $majorVersion) {
-            $settings = get_option(OptionManager::databaseKey($majorVersion));
-            $version = glsr_get($settings, 'version', $fallback);
-            if (version_compare($version, $fallback, '>')) {
+        foreach( $majorVersions as $majorVersion ) {
+            $settings = get_option( OptionManager::databaseKey( $majorVersion ) );
+            $version = glsr_get( $settings, 'version', $fallback );
+            if( version_compare( $version, $fallback, '>' ) ) {
                 return $version;
             }
         }
@@ -75,16 +75,16 @@ 
      */
     protected function setReviewCounts()
     {
-        add_action('admin_init', 'glsr_calculate_ratings');
+        add_action( 'admin_init', 'glsr_calculate_ratings' );
     }
 
     /**
      * @param string $previousVersion
      * @return void
      */
-    protected function updateVersionFrom($previousVersion)
+    protected function updateVersionFrom( $previousVersion )
     {
-        glsr(OptionManager::class)->set('version', glsr()->version);
-        glsr(OptionManager::class)->set('version_upgraded_from', $previousVersion);
+        glsr( OptionManager::class )->set( 'version', glsr()->version );
+        glsr( OptionManager::class )->set( 'version_upgraded_from', $previousVersion );
     }
 }

plugin/Modules/Validator/ValidateReview.php

Indentation +241 added lines, -241 removed lines

@@ -11,265 +11,265 @@
 
 class ValidateReview
 {
-    const RECAPTCHA_ENDPOINT = 'https://www.google.com/recaptcha/api/siteverify';
+	const RECAPTCHA_ENDPOINT = 'https://www.google.com/recaptcha/api/siteverify';
 
-    const RECAPTCHA_DISABLED = 0;
-    const RECAPTCHA_EMPTY = 1;
-    const RECAPTCHA_FAILED = 2;
-    const RECAPTCHA_INVALID = 3;
-    const RECAPTCHA_VALID = 4;
+	const RECAPTCHA_DISABLED = 0;
+	const RECAPTCHA_EMPTY = 1;
+	const RECAPTCHA_FAILED = 2;
+	const RECAPTCHA_INVALID = 3;
+	const RECAPTCHA_VALID = 4;
 
-    const VALIDATION_RULES = [
-        'content' => 'required',
-        'email' => 'required|email',
-        'name' => 'required',
-        'rating' => 'required|number|between:1,5',
-        'terms' => 'accepted',
-        'title' => 'required',
-    ];
+	const VALIDATION_RULES = [
+		'content' => 'required',
+		'email' => 'required|email',
+		'name' => 'required',
+		'rating' => 'required|number|between:1,5',
+		'terms' => 'accepted',
+		'title' => 'required',
+	];
 
-    /**
-     * @var string|void
-     */
-    public $error;
+	/**
+	 * @var string|void
+	 */
+	public $error;
 
-    /**
-     * @var string
-     */
-    public $form_id;
+	/**
+	 * @var string
+	 */
+	public $form_id;
 
-    /**
-     * @var bool
-     */
-    public $recaptchaIsUnset = false;
+	/**
+	 * @var bool
+	 */
+	public $recaptchaIsUnset = false;
 
-    /**
-     * @var array
-     */
-    public $request;
+	/**
+	 * @var array
+	 */
+	public $request;
 
-    /**
-     * @var array
-     */
-    protected $options;
+	/**
+	 * @var array
+	 */
+	protected $options;
 
-    /**
-     * @return static
-     */
-    public function validate(array $request)
-    {
-        $this->form_id = $request['form_id'];
-        $this->options = glsr(OptionManager::class)->all();
-        $this->request = $this->validateRequest($request);
-        $this->validateCustom();
-        $this->validateHoneyPot();
-        $this->validateBlacklist();
-        $this->validateAkismet();
-        $this->validateRecaptcha();
-        if (!empty($this->error)) {
-            $this->setSessionValues('message', $this->error);
-        }
-        return $this;
-    }
+	/**
+	 * @return static
+	 */
+	public function validate(array $request)
+	{
+		$this->form_id = $request['form_id'];
+		$this->options = glsr(OptionManager::class)->all();
+		$this->request = $this->validateRequest($request);
+		$this->validateCustom();
+		$this->validateHoneyPot();
+		$this->validateBlacklist();
+		$this->validateAkismet();
+		$this->validateRecaptcha();
+		if (!empty($this->error)) {
+			$this->setSessionValues('message', $this->error);
+		}
+		return $this;
+	}
 
-    /**
-     * @param string $path
-     * @param mixed $fallback
-     * @return mixed
-     */
-    protected function getOption($path, $fallback = '')
-    {
-        return glsr(Helper::class)->dataGet($this->options, $path, $fallback);
-    }
+	/**
+	 * @param string $path
+	 * @param mixed $fallback
+	 * @return mixed
+	 */
+	protected function getOption($path, $fallback = '')
+	{
+		return glsr(Helper::class)->dataGet($this->options, $path, $fallback);
+	}
 
-    /**
-     * @return int
-     */
-    protected function getRecaptchaStatus()
-    {
-        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))
-                ? static::RECAPTCHA_EMPTY
-                : static::RECAPTCHA_FAILED;
-        }
-        return $this->getRecaptchaTokenStatus();
-    }
+	/**
+	 * @return int
+	 */
+	protected function getRecaptchaStatus()
+	{
+		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))
+				? static::RECAPTCHA_EMPTY
+				: static::RECAPTCHA_FAILED;
+		}
+		return $this->getRecaptchaTokenStatus();
+	}
 
-    /**
-     * @return int
-     */
-    protected function getRecaptchaTokenStatus()
-    {
-        $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))) {
-            glsr_log()->error($response->get_error_message());
-            return static::RECAPTCHA_FAILED;
-        }
-        $response = json_decode(wp_remote_retrieve_body($response));
-        if (!empty($response->success)) {
-            return boolval($response->success)
-                ? static::RECAPTCHA_VALID
-                : static::RECAPTCHA_INVALID;
-        }
-        foreach ($response->{'error-codes'} as $error) {
-            glsr_log()->error('reCAPTCHA error: '.$error);
-        }
-        return static::RECAPTCHA_INVALID;
-    }
+	/**
+	 * @return int
+	 */
+	protected function getRecaptchaTokenStatus()
+	{
+		$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))) {
+			glsr_log()->error($response->get_error_message());
+			return static::RECAPTCHA_FAILED;
+		}
+		$response = json_decode(wp_remote_retrieve_body($response));
+		if (!empty($response->success)) {
+			return boolval($response->success)
+				? static::RECAPTCHA_VALID
+				: static::RECAPTCHA_INVALID;
+		}
+		foreach ($response->{'error-codes'} as $error) {
+			glsr_log()->error('reCAPTCHA error: '.$error);
+		}
+		return static::RECAPTCHA_INVALID;
+	}
 
-    /**
-     * @return array
-     */
-    protected function getValidationRules(array $request)
-    {
-        $rules = array_intersect_key(
-            apply_filters('site-reviews/validation/rules', static::VALIDATION_RULES, $request),
-            array_flip($this->getOption('settings.submissions.required', []))
-        );
-        $excluded = explode(',', glsr_get($request, 'excluded'));
-        return array_diff_key($rules, array_flip($excluded));
-    }
+	/**
+	 * @return array
+	 */
+	protected function getValidationRules(array $request)
+	{
+		$rules = array_intersect_key(
+			apply_filters('site-reviews/validation/rules', static::VALIDATION_RULES, $request),
+			array_flip($this->getOption('settings.submissions.required', []))
+		);
+		$excluded = explode(',', glsr_get($request, 'excluded'));
+		return array_diff_key($rules, array_flip($excluded));
+	}
 
-    /**
-     * @return bool
-     */
-    protected function isRequestValid(array $request)
-    {
-        $rules = $this->getValidationRules($request);
-        $errors = glsr(Validator::class)->validate($request, $rules);
-        if (empty($errors)) {
-            return true;
-        }
-        $this->setSessionValues('errors', $errors);
-        $this->setSessionValues('values', $request);
-        return false;
-    }
+	/**
+	 * @return bool
+	 */
+	protected function isRequestValid(array $request)
+	{
+		$rules = $this->getValidationRules($request);
+		$errors = glsr(Validator::class)->validate($request, $rules);
+		if (empty($errors)) {
+			return true;
+		}
+		$this->setSessionValues('errors', $errors);
+		$this->setSessionValues('values', $request);
+		return false;
+	}
 
-    /**
-     * @param string $type
-     * @param mixed $value
-     * @param string $loggedMessage
-     * @return void
-     */
-    protected function setSessionValues($type, $value, $loggedMessage = '')
-    {
-        glsr()->sessionSet($this->form_id.$type, $value);
-        if (!empty($loggedMessage)) {
-            glsr_log()->warning($loggedMessage)->debug($this->request);
-        }
-    }
+	/**
+	 * @param string $type
+	 * @param mixed $value
+	 * @param string $loggedMessage
+	 * @return void
+	 */
+	protected function setSessionValues($type, $value, $loggedMessage = '')
+	{
+		glsr()->sessionSet($this->form_id.$type, $value);
+		if (!empty($loggedMessage)) {
+			glsr_log()->warning($loggedMessage)->debug($this->request);
+		}
+	}
 
-    /**
-     * @return void
-     */
-    protected function validateAkismet()
-    {
-        if (!empty($this->error)) {
-            return;
-        }
-        if (!glsr(Akismet::class)->isSpam($this->request)) {
-            return;
-        }
-        $this->setSessionValues('errors', [], 'Akismet caught a spam submission (consider adding the IP address to the blacklist):');
-        $this->error = __('This review has been flagged as possible spam and cannot be submitted.', 'site-reviews');
-    }
+	/**
+	 * @return void
+	 */
+	protected function validateAkismet()
+	{
+		if (!empty($this->error)) {
+			return;
+		}
+		if (!glsr(Akismet::class)->isSpam($this->request)) {
+			return;
+		}
+		$this->setSessionValues('errors', [], 'Akismet caught a spam submission (consider adding the IP address to the blacklist):');
+		$this->error = __('This review has been flagged as possible spam and cannot be submitted.', 'site-reviews');
+	}
 
-    /**
-     * @return void
-     */
-    protected function validateBlacklist()
-    {
-        if (!empty($this->error)) {
-            return;
-        }
-        if (!glsr(Blacklist::class)->isBlacklisted($this->request)) {
-            return;
-        }
-        $blacklistAction = $this->getOption('settings.submissions.blacklist.action');
-        if ('reject' == $blacklistAction) {
-            $this->setSessionValues('errors', [], 'Blacklisted submission detected:');
-            $this->error = __('Your review cannot be submitted at this time.', 'site-reviews');
-            return;
-        }
-        $this->request['blacklisted'] = true;
-    }
+	/**
+	 * @return void
+	 */
+	protected function validateBlacklist()
+	{
+		if (!empty($this->error)) {
+			return;
+		}
+		if (!glsr(Blacklist::class)->isBlacklisted($this->request)) {
+			return;
+		}
+		$blacklistAction = $this->getOption('settings.submissions.blacklist.action');
+		if ('reject' == $blacklistAction) {
+			$this->setSessionValues('errors', [], 'Blacklisted submission detected:');
+			$this->error = __('Your review cannot be submitted at this time.', 'site-reviews');
+			return;
+		}
+		$this->request['blacklisted'] = true;
+	}
 
-    /**
-     * @return void
-     */
-    protected function validateCustom()
-    {
-        if (!empty($this->error)) {
-            return;
-        }
-        $validated = apply_filters('site-reviews/validate/custom', true, $this->request);
-        if (true === $validated) {
-            return;
-        }
-        $this->setSessionValues('errors', []);
-        $this->setSessionValues('values', $this->request);
-        $this->error = is_string($validated)
-            ? $validated
-            : __('The review submission failed. Please notify the site administrator.', 'site-reviews');
-    }
+	/**
+	 * @return void
+	 */
+	protected function validateCustom()
+	{
+		if (!empty($this->error)) {
+			return;
+		}
+		$validated = apply_filters('site-reviews/validate/custom', true, $this->request);
+		if (true === $validated) {
+			return;
+		}
+		$this->setSessionValues('errors', []);
+		$this->setSessionValues('values', $this->request);
+		$this->error = is_string($validated)
+			? $validated
+			: __('The review submission failed. Please notify the site administrator.', 'site-reviews');
+	}
 
-    /**
-     * @return void
-     */
-    protected function validateHoneyPot()
-    {
-        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');
-    }
+	/**
+	 * @return void
+	 */
+	protected function validateHoneyPot()
+	{
+		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');
+	}
 
-    /**
-     * @return void
-     */
-    protected function validateRecaptcha()
-    {
-        if (!empty($this->error)) {
-            return;
-        }
-        $status = $this->getRecaptchaStatus();
-        if (in_array($status, [static::RECAPTCHA_DISABLED, static::RECAPTCHA_VALID])) {
-            return;
-        }
-        if ($status == static::RECAPTCHA_EMPTY) {
-            $this->setSessionValues('recaptcha', 'unset');
-            $this->recaptchaIsUnset = true;
-            return;
-        }
-        $this->setSessionValues('errors', []);
-        $this->setSessionValues('recaptcha', 'reset');
-        $errors = [
-            static::RECAPTCHA_FAILED => __('The reCAPTCHA failed to load, please refresh the page and try again.', 'site-reviews'),
-            static::RECAPTCHA_INVALID => __('The reCAPTCHA verification failed, please try again.', 'site-reviews'),
-        ];
-        $this->error = $errors[$status];
-    }
+	/**
+	 * @return void
+	 */
+	protected function validateRecaptcha()
+	{
+		if (!empty($this->error)) {
+			return;
+		}
+		$status = $this->getRecaptchaStatus();
+		if (in_array($status, [static::RECAPTCHA_DISABLED, static::RECAPTCHA_VALID])) {
+			return;
+		}
+		if ($status == static::RECAPTCHA_EMPTY) {
+			$this->setSessionValues('recaptcha', 'unset');
+			$this->recaptchaIsUnset = true;
+			return;
+		}
+		$this->setSessionValues('errors', []);
+		$this->setSessionValues('recaptcha', 'reset');
+		$errors = [
+			static::RECAPTCHA_FAILED => __('The reCAPTCHA failed to load, please refresh the page and try again.', 'site-reviews'),
+			static::RECAPTCHA_INVALID => __('The reCAPTCHA verification failed, please try again.', 'site-reviews'),
+		];
+		$this->error = $errors[$status];
+	}
 
-    /**
-     * @return array
-     */
-    protected function validateRequest(array $request)
-    {
-        if (!$this->isRequestValid($request)) {
-            $this->error = __('Please fix the submission errors.', 'site-reviews');
-            return $request;
-        }
-        return array_merge(glsr(ValidateReviewDefaults::class)->defaults(), $request);
-    }
+	/**
+	 * @return array
+	 */
+	protected function validateRequest(array $request)
+	{
+		if (!$this->isRequestValid($request)) {
+			$this->error = __('Please fix the submission errors.', 'site-reviews');
+			return $request;
+		}
+		return array_merge(glsr(ValidateReviewDefaults::class)->defaults(), $request);
+	}
 }

Spacing +69 added lines, -69 removed lines

@@ -56,18 +56,18 @@ 
     /**
      * @return static
      */
-    public function validate(array $request)
+    public function validate( array $request )
     {
         $this->form_id = $request['form_id'];
-        $this->options = glsr(OptionManager::class)->all();
-        $this->request = $this->validateRequest($request);
+        $this->options = glsr( OptionManager::class )->all();
+        $this->request = $this->validateRequest( $request );
         $this->validateCustom();
         $this->validateHoneyPot();
         $this->validateBlacklist();
         $this->validateAkismet();
         $this->validateRecaptcha();
-        if (!empty($this->error)) {
-            $this->setSessionValues('message', $this->error);
+        if( !empty($this->error) ) {
+            $this->setSessionValues( 'message', $this->error );
         }
         return $this;
     }
@@ -77,9 +77,9 @@ 
      * @param mixed $fallback
      * @return mixed
      */
-    protected function getOption($path, $fallback = '')
+    protected function getOption( $path, $fallback = '' )
     {
-        return glsr(Helper::class)->dataGet($this->options, $path, $fallback);
+        return glsr( Helper::class )->dataGet( $this->options, $path, $fallback );
     }
 
     /**
@@ -87,11 +87,11 @@ 
      */
     protected function getRecaptchaStatus()
     {
-        if (!glsr(OptionManager::class)->isRecaptchaEnabled()) {
+        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;
         }
@@ -103,23 +103,23 @@ 
      */
     protected function getRecaptchaTokenStatus()
     {
-        $endpoint = add_query_arg([
-            'remoteip' => glsr(Helper::class)->getIpAddress(),
+        $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))) {
-            glsr_log()->error($response->get_error_message());
+            'secret' => $this->getOption( 'settings.submissions.recaptcha.secret' ),
+        ], static::RECAPTCHA_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)) {
-            return boolval($response->success)
+        $response = json_decode( wp_remote_retrieve_body( $response ) );
+        if( !empty($response->success) ) {
+            return boolval( $response->success )
                 ? static::RECAPTCHA_VALID
                 : static::RECAPTCHA_INVALID;
         }
-        foreach ($response->{'error-codes'} as $error) {
-            glsr_log()->error('reCAPTCHA error: '.$error);
+        foreach( $response->{'error-codes'} as $error ) {
+            glsr_log()->error( 'reCAPTCHA error: '.$error );
         }
         return static::RECAPTCHA_INVALID;
     }
@@ -127,28 +127,28 @@ 
     /**
      * @return array
      */
-    protected function getValidationRules(array $request)
+    protected function getValidationRules( array $request )
     {
         $rules = array_intersect_key(
-            apply_filters('site-reviews/validation/rules', static::VALIDATION_RULES, $request),
-            array_flip($this->getOption('settings.submissions.required', []))
+            apply_filters( 'site-reviews/validation/rules', static::VALIDATION_RULES, $request ),
+            array_flip( $this->getOption( 'settings.submissions.required', [] ) )
         );
-        $excluded = explode(',', glsr_get($request, 'excluded'));
-        return array_diff_key($rules, array_flip($excluded));
+        $excluded = explode( ',', glsr_get( $request, 'excluded' ) );
+        return array_diff_key( $rules, array_flip( $excluded ) );
     }
 
     /**
      * @return bool
      */
-    protected function isRequestValid(array $request)
+    protected function isRequestValid( array $request )
     {
-        $rules = $this->getValidationRules($request);
-        $errors = glsr(Validator::class)->validate($request, $rules);
-        if (empty($errors)) {
+        $rules = $this->getValidationRules( $request );
+        $errors = glsr( Validator::class )->validate( $request, $rules );
+        if( empty($errors) ) {
             return true;
         }
-        $this->setSessionValues('errors', $errors);
-        $this->setSessionValues('values', $request);
+        $this->setSessionValues( 'errors', $errors );
+        $this->setSessionValues( 'values', $request );
         return false;
     }
 
@@ -158,11 +158,11 @@ 
      * @param string $loggedMessage
      * @return void
      */
-    protected function setSessionValues($type, $value, $loggedMessage = '')
+    protected function setSessionValues( $type, $value, $loggedMessage = '' )
     {
-        glsr()->sessionSet($this->form_id.$type, $value);
-        if (!empty($loggedMessage)) {
-            glsr_log()->warning($loggedMessage)->debug($this->request);
+        glsr()->sessionSet( $this->form_id.$type, $value );
+        if( !empty($loggedMessage) ) {
+            glsr_log()->warning( $loggedMessage )->debug( $this->request );
         }
     }
 
@@ -171,14 +171,14 @@ 
      */
     protected function validateAkismet()
     {
-        if (!empty($this->error)) {
+        if( !empty($this->error) ) {
             return;
         }
-        if (!glsr(Akismet::class)->isSpam($this->request)) {
+        if( !glsr( Akismet::class )->isSpam( $this->request ) ) {
             return;
         }
-        $this->setSessionValues('errors', [], 'Akismet caught a spam submission (consider adding the IP address to the blacklist):');
-        $this->error = __('This review has been flagged as possible spam and cannot be submitted.', 'site-reviews');
+        $this->setSessionValues( 'errors', [], 'Akismet caught a spam submission (consider adding the IP address to the blacklist):' );
+        $this->error = __( 'This review has been flagged as possible spam and cannot be submitted.', 'site-reviews' );
     }
 
     /**
@@ -186,16 +186,16 @@ 
      */
     protected function validateBlacklist()
     {
-        if (!empty($this->error)) {
+        if( !empty($this->error) ) {
             return;
         }
-        if (!glsr(Blacklist::class)->isBlacklisted($this->request)) {
+        if( !glsr( Blacklist::class )->isBlacklisted( $this->request ) ) {
             return;
         }
-        $blacklistAction = $this->getOption('settings.submissions.blacklist.action');
-        if ('reject' == $blacklistAction) {
-            $this->setSessionValues('errors', [], 'Blacklisted submission detected:');
-            $this->error = __('Your review cannot be submitted at this time.', 'site-reviews');
+        $blacklistAction = $this->getOption( 'settings.submissions.blacklist.action' );
+        if( 'reject' == $blacklistAction ) {
+            $this->setSessionValues( 'errors', [], 'Blacklisted submission detected:' );
+            $this->error = __( 'Your review cannot be submitted at this time.', 'site-reviews' );
             return;
         }
         $this->request['blacklisted'] = true;
@@ -206,18 +206,18 @@ 
      */
     protected function validateCustom()
     {
-        if (!empty($this->error)) {
+        if( !empty($this->error) ) {
             return;
         }
-        $validated = apply_filters('site-reviews/validate/custom', true, $this->request);
-        if (true === $validated) {
+        $validated = apply_filters( 'site-reviews/validate/custom', true, $this->request );
+        if( true === $validated ) {
             return;
         }
-        $this->setSessionValues('errors', []);
-        $this->setSessionValues('values', $this->request);
-        $this->error = is_string($validated)
+        $this->setSessionValues( 'errors', [] );
+        $this->setSessionValues( 'values', $this->request );
+        $this->error = is_string( $validated )
             ? $validated
-            : __('The review submission failed. Please notify the site administrator.', 'site-reviews');
+            : __( 'The review submission failed. Please notify the site administrator.', 'site-reviews' );
     }
 
     /**
@@ -225,14 +225,14 @@ 
      */
     protected function validateHoneyPot()
     {
-        if (!empty($this->error)) {
+        if( !empty($this->error) ) {
             return;
         }
-        if (empty($this->request['gotcha'])) {
+        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');
+        $this->setSessionValues( 'errors', [], 'The Honeypot caught a bad submission:' );
+        $this->error = __( 'The review submission failed. Please notify the site administrator.', 'site-reviews' );
     }
 
     /**
@@ -240,23 +240,23 @@ 
      */
     protected function validateRecaptcha()
     {
-        if (!empty($this->error)) {
+        if( !empty($this->error) ) {
             return;
         }
         $status = $this->getRecaptchaStatus();
-        if (in_array($status, [static::RECAPTCHA_DISABLED, static::RECAPTCHA_VALID])) {
+        if( in_array( $status, [static::RECAPTCHA_DISABLED, static::RECAPTCHA_VALID] ) ) {
             return;
         }
-        if ($status == static::RECAPTCHA_EMPTY) {
-            $this->setSessionValues('recaptcha', 'unset');
+        if( $status == static::RECAPTCHA_EMPTY ) {
+            $this->setSessionValues( 'recaptcha', 'unset' );
             $this->recaptchaIsUnset = true;
             return;
         }
-        $this->setSessionValues('errors', []);
-        $this->setSessionValues('recaptcha', 'reset');
+        $this->setSessionValues( 'errors', [] );
+        $this->setSessionValues( 'recaptcha', 'reset' );
         $errors = [
-            static::RECAPTCHA_FAILED => __('The reCAPTCHA failed to load, please refresh the page and try again.', 'site-reviews'),
-            static::RECAPTCHA_INVALID => __('The reCAPTCHA verification failed, please try again.', 'site-reviews'),
+            static::RECAPTCHA_FAILED => __( 'The reCAPTCHA failed to load, please refresh the page and try again.', 'site-reviews' ),
+            static::RECAPTCHA_INVALID => __( 'The reCAPTCHA verification failed, please try again.', 'site-reviews' ),
         ];
         $this->error = $errors[$status];
     }
@@ -264,12 +264,12 @@ 
     /**
      * @return array
      */
-    protected function validateRequest(array $request)
+    protected function validateRequest( array $request )
     {
-        if (!$this->isRequestValid($request)) {
-            $this->error = __('Please fix the submission errors.', 'site-reviews');
+        if( !$this->isRequestValid( $request ) ) {
+            $this->error = __( 'Please fix the submission errors.', 'site-reviews' );
             return $request;
         }
-        return array_merge(glsr(ValidateReviewDefaults::class)->defaults(), $request);
+        return array_merge( glsr( ValidateReviewDefaults::class )->defaults(), $request );
     }
 }

plugin/Provider.php

Indentation +13 added lines, -13 removed lines

@@ -10,17 +10,17 @@
 
 class Provider implements ProviderContract
 {
-    /**
-     * @return void
-     */
-    public function register(Application $app)
-    {
-        $app->bind(Application::class, $app);
-        $app->singleton(Actions::class, Actions::class);
-        $app->singleton(Filters::class, Filters::class);
-        $app->singleton(OptionManager::class, OptionManager::class);
-        $app->singleton(Translator::class, Translator::class);
-        $app->singleton(Translation::class, Translation::class);
-        $app->singleton(MainController::class, MainController::class); // this goes last
-    }
+	/**
+	 * @return void
+	 */
+	public function register(Application $app)
+	{
+		$app->bind(Application::class, $app);
+		$app->singleton(Actions::class, Actions::class);
+		$app->singleton(Filters::class, Filters::class);
+		$app->singleton(OptionManager::class, OptionManager::class);
+		$app->singleton(Translator::class, Translator::class);
+		$app->singleton(Translation::class, Translation::class);
+		$app->singleton(MainController::class, MainController::class); // this goes last
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -13,14 +13,14 @@
     /**
      * @return void
      */
-    public function register(Application $app)
+    public function register( Application $app )
     {
-        $app->bind(Application::class, $app);
-        $app->singleton(Actions::class, Actions::class);
-        $app->singleton(Filters::class, Filters::class);
-        $app->singleton(OptionManager::class, OptionManager::class);
-        $app->singleton(Translator::class, Translator::class);
-        $app->singleton(Translation::class, Translation::class);
-        $app->singleton(MainController::class, MainController::class); // this goes last
+        $app->bind( Application::class, $app );
+        $app->singleton( Actions::class, Actions::class );
+        $app->singleton( Filters::class, Filters::class );
+        $app->singleton( OptionManager::class, OptionManager::class );
+        $app->singleton( Translator::class, Translator::class );
+        $app->singleton( Translation::class, Translation::class );
+        $app->singleton( MainController::class, MainController::class ); // this goes last
     }
 }

plugin/Handlers/ChangeStatus.php

Indentation +63 added lines, -63 removed lines

@@ -8,70 +8,70 @@
 
 class ChangeStatus
 {
-    /**
-     * @return array
-     */
-    public function handle(Command $command)
-    {
-        $postId = wp_update_post([
-            'ID' => $command->id,
-            'post_status' => $command->status,
-        ]);
-        if (is_wp_error($postId)) {
-            glsr_log()->error($postId->get_error_message());
-            return [];
-        }
-        return [
-            'class' => 'status-'.$command->status,
-            'counts' => $this->getStatusLinks(),
-            'link' => $this->getPostLink($postId).$this->getPostState($postId),
-            'pending' => wp_count_posts(Application::POST_TYPE, 'readable')->pending,
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	public function handle(Command $command)
+	{
+		$postId = wp_update_post([
+			'ID' => $command->id,
+			'post_status' => $command->status,
+		]);
+		if (is_wp_error($postId)) {
+			glsr_log()->error($postId->get_error_message());
+			return [];
+		}
+		return [
+			'class' => 'status-'.$command->status,
+			'counts' => $this->getStatusLinks(),
+			'link' => $this->getPostLink($postId).$this->getPostState($postId),
+			'pending' => wp_count_posts(Application::POST_TYPE, 'readable')->pending,
+		];
+	}
 
-    /**
-     * @param int $postId
-     * @return string
-     */
-    protected function getPostLink($postId)
-    {
-        $title = _draft_or_post_title($postId);
-        return glsr(Builder::class)->a($title, [
-            'aria-label' => '“'.esc_attr($title).'” ('.__('Edit', 'site-reviews').')',
-            'class' => 'row-title',
-            'href' => get_edit_post_link($postId),
-        ]);
-    }
+	/**
+	 * @param int $postId
+	 * @return string
+	 */
+	protected function getPostLink($postId)
+	{
+		$title = _draft_or_post_title($postId);
+		return glsr(Builder::class)->a($title, [
+			'aria-label' => '“'.esc_attr($title).'” ('.__('Edit', 'site-reviews').')',
+			'class' => 'row-title',
+			'href' => get_edit_post_link($postId),
+		]);
+	}
 
-    /**
-     * @param int $postId
-     * @return string
-     */
-    protected function getPostState($postId)
-    {
-        ob_start();
-        _post_states(get_post($postId));
-        return ob_get_clean();
-    }
+	/**
+	 * @param int $postId
+	 * @return string
+	 */
+	protected function getPostState($postId)
+	{
+		ob_start();
+		_post_states(get_post($postId));
+		return ob_get_clean();
+	}
 
-    /**
-     * @return void|string
-     */
-    protected function getStatusLinks()
-    {
-        global $avail_post_stati;
-        require_once ABSPATH.'wp-admin/includes/class-wp-posts-list-table.php';
-        $hookName = 'edit-'.Application::POST_TYPE;
-        set_current_screen($hookName);
-        $avail_post_stati = get_available_post_statuses(Application::POST_TYPE);
-        $table = new \WP_Posts_List_Table(['screen' => $hookName]);
-        $views = apply_filters('views_'.$hookName, $table->get_views()); // uses compat get_views()
-        if (empty($views)) {
-            return;
-        }
-        foreach ($views as $class => $view) {
-            $views[$class] = "\t<li class='$class'>$view";
-        }
-        return implode(' |</li>', $views).'</li>';
-    }
+	/**
+	 * @return void|string
+	 */
+	protected function getStatusLinks()
+	{
+		global $avail_post_stati;
+		require_once ABSPATH.'wp-admin/includes/class-wp-posts-list-table.php';
+		$hookName = 'edit-'.Application::POST_TYPE;
+		set_current_screen($hookName);
+		$avail_post_stati = get_available_post_statuses(Application::POST_TYPE);
+		$table = new \WP_Posts_List_Table(['screen' => $hookName]);
+		$views = apply_filters('views_'.$hookName, $table->get_views()); // uses compat get_views()
+		if (empty($views)) {
+			return;
+		}
+		foreach ($views as $class => $view) {
+			$views[$class] = "\t<li class='$class'>$view";
+		}
+		return implode(' |</li>', $views).'</li>';
+	}
 }

Spacing +22 added lines, -22 removed lines

@@ -11,21 +11,21 @@ 
     /**
      * @return array
      */
-    public function handle(Command $command)
+    public function handle( Command $command )
     {
-        $postId = wp_update_post([
+        $postId = wp_update_post( [
             'ID' => $command->id,
             'post_status' => $command->status,
-        ]);
-        if (is_wp_error($postId)) {
-            glsr_log()->error($postId->get_error_message());
+        ] );
+        if( is_wp_error( $postId ) ) {
+            glsr_log()->error( $postId->get_error_message() );
             return [];
         }
         return [
             'class' => 'status-'.$command->status,
             'counts' => $this->getStatusLinks(),
-            'link' => $this->getPostLink($postId).$this->getPostState($postId),
-            'pending' => wp_count_posts(Application::POST_TYPE, 'readable')->pending,
+            'link' => $this->getPostLink( $postId ).$this->getPostState( $postId ),
+            'pending' => wp_count_posts( Application::POST_TYPE, 'readable' )->pending,
         ];
     }
 
@@ -33,24 +33,24 @@ 
      * @param int $postId
      * @return string
      */
-    protected function getPostLink($postId)
+    protected function getPostLink( $postId )
     {
-        $title = _draft_or_post_title($postId);
-        return glsr(Builder::class)->a($title, [
-            'aria-label' => '“'.esc_attr($title).'” ('.__('Edit', 'site-reviews').')',
+        $title = _draft_or_post_title( $postId );
+        return glsr( Builder::class )->a( $title, [
+            'aria-label' => '“'.esc_attr( $title ).'” ('.__( 'Edit', 'site-reviews' ).')',
             'class' => 'row-title',
-            'href' => get_edit_post_link($postId),
-        ]);
+            'href' => get_edit_post_link( $postId ),
+        ] );
     }
 
     /**
      * @param int $postId
      * @return string
      */
-    protected function getPostState($postId)
+    protected function getPostState( $postId )
     {
         ob_start();
-        _post_states(get_post($postId));
+        _post_states( get_post( $postId ) );
         return ob_get_clean();
     }
 
@@ -62,16 +62,16 @@ 
         global $avail_post_stati;
         require_once ABSPATH.'wp-admin/includes/class-wp-posts-list-table.php';
         $hookName = 'edit-'.Application::POST_TYPE;
-        set_current_screen($hookName);
-        $avail_post_stati = get_available_post_statuses(Application::POST_TYPE);
-        $table = new \WP_Posts_List_Table(['screen' => $hookName]);
-        $views = apply_filters('views_'.$hookName, $table->get_views()); // uses compat get_views()
-        if (empty($views)) {
+        set_current_screen( $hookName );
+        $avail_post_stati = get_available_post_statuses( Application::POST_TYPE );
+        $table = new \WP_Posts_List_Table( ['screen' => $hookName] );
+        $views = apply_filters( 'views_'.$hookName, $table->get_views() ); // uses compat get_views()
+        if( empty($views) ) {
             return;
         }
-        foreach ($views as $class => $view) {
+        foreach( $views as $class => $view ) {
             $views[$class] = "\t<li class='$class'>$view";
         }
-        return implode(' |</li>', $views).'</li>';
+        return implode( ' |</li>', $views ).'</li>';
     }
 }

plugin/Handlers/CreateReview.php

Indentation +35 added lines, -35 removed lines

@@ -8,40 +8,40 @@
 
 class CreateReview
 {
-    /**
-     * @return void|string
-     */
-    public function handle(Command $command)
-    {
-        $review = glsr(ReviewManager::class)->create($command);
-        if (!$review) {
-            glsr()->sessionSet($command->form_id.'errors', []);
-            glsr()->sessionSet($command->form_id.'message', __('Your review could not be submitted and the error has been logged. Please notify the site admin.', 'site-reviews'));
-            return;
-        }
-        glsr()->sessionSet($command->form_id.'message', __('Your review has been submitted!', 'site-reviews'));
-        glsr(Notification::class)->send($review);
-        if ($command->ajax_request) {
-            return;
-        }
-        wp_safe_redirect($this->getReferer($command));
-        exit;
-    }
+	/**
+	 * @return void|string
+	 */
+	public function handle(Command $command)
+	{
+		$review = glsr(ReviewManager::class)->create($command);
+		if (!$review) {
+			glsr()->sessionSet($command->form_id.'errors', []);
+			glsr()->sessionSet($command->form_id.'message', __('Your review could not be submitted and the error has been logged. Please notify the site admin.', 'site-reviews'));
+			return;
+		}
+		glsr()->sessionSet($command->form_id.'message', __('Your review has been submitted!', 'site-reviews'));
+		glsr(Notification::class)->send($review);
+		if ($command->ajax_request) {
+			return;
+		}
+		wp_safe_redirect($this->getReferer($command));
+		exit;
+	}
 
-    /**
-     * @return string
-     */
-    protected function getReferer(Command $command)
-    {
-        $referer = trim(strval(get_post_meta($command->post_id, 'redirect_to', true)));
-        $referer = apply_filters('site-reviews/review/redirect', $referer, $command);
-        if (empty($referer)) {
-            $referer = $command->referer;
-        }
-        if (empty($referer)) {
-            glsr_log()->warning('The form referer ($_SERVER[REQUEST_URI]) was empty.')->debug($command);
-            $referer = home_url();
-        }
-        return $referer;
-    }
+	/**
+	 * @return string
+	 */
+	protected function getReferer(Command $command)
+	{
+		$referer = trim(strval(get_post_meta($command->post_id, 'redirect_to', true)));
+		$referer = apply_filters('site-reviews/review/redirect', $referer, $command);
+		if (empty($referer)) {
+			$referer = $command->referer;
+		}
+		if (empty($referer)) {
+			glsr_log()->warning('The form referer ($_SERVER[REQUEST_URI]) was empty.')->debug($command);
+			$referer = home_url();
+		}
+		return $referer;
+	}
 }

Spacing +15 added lines, -15 removed lines

@@ -11,35 +11,35 @@
     /**
      * @return void|string
      */
-    public function handle(Command $command)
+    public function handle( Command $command )
     {
-        $review = glsr(ReviewManager::class)->create($command);
-        if (!$review) {
-            glsr()->sessionSet($command->form_id.'errors', []);
-            glsr()->sessionSet($command->form_id.'message', __('Your review could not be submitted and the error has been logged. Please notify the site admin.', 'site-reviews'));
+        $review = glsr( ReviewManager::class )->create( $command );
+        if( !$review ) {
+            glsr()->sessionSet( $command->form_id.'errors', [] );
+            glsr()->sessionSet( $command->form_id.'message', __( 'Your review could not be submitted and the error has been logged. Please notify the site admin.', 'site-reviews' ) );
             return;
         }
-        glsr()->sessionSet($command->form_id.'message', __('Your review has been submitted!', 'site-reviews'));
-        glsr(Notification::class)->send($review);
-        if ($command->ajax_request) {
+        glsr()->sessionSet( $command->form_id.'message', __( 'Your review has been submitted!', 'site-reviews' ) );
+        glsr( Notification::class )->send( $review );
+        if( $command->ajax_request ) {
             return;
         }
-        wp_safe_redirect($this->getReferer($command));
+        wp_safe_redirect( $this->getReferer( $command ) );
         exit;
     }
 
     /**
      * @return string
      */
-    protected function getReferer(Command $command)
+    protected function getReferer( Command $command )
     {
-        $referer = trim(strval(get_post_meta($command->post_id, 'redirect_to', true)));
-        $referer = apply_filters('site-reviews/review/redirect', $referer, $command);
-        if (empty($referer)) {
+        $referer = trim( strval( get_post_meta( $command->post_id, 'redirect_to', true ) ) );
+        $referer = apply_filters( 'site-reviews/review/redirect', $referer, $command );
+        if( empty($referer) ) {
             $referer = $command->referer;
         }
-        if (empty($referer)) {
-            glsr_log()->warning('The form referer ($_SERVER[REQUEST_URI]) was empty.')->debug($command);
+        if( empty($referer) ) {
+            glsr_log()->warning( 'The form referer ($_SERVER[REQUEST_URI]) was empty.' )->debug( $command );
             $referer = home_url();
         }
         return $referer;

deprecated.php

Indentation +82 added lines, -82 removed lines

@@ -4,131 +4,131 @@
 
 // Unprotected review meta has been deprecated
 add_filter('get_post_metadata', function ($check, $postId, $metaKey, $single) {
-    $metaKeys = array_keys(glsr('Defaults\CreateReviewDefaults')->defaults());
-    if (!in_array($metaKey, $metaKeys) || glsr()->post_type != get_post_type($postId)) {
-        return $check;
-    }
-    glsr()->deprecated[] = sprintf(
-        'The "%1$s" meta_key has been deprecated for Reviews. Please use the protected "_%1$s" meta_key instead.',
-        $metaKey
-    );
-    return get_post_meta($postId, '_'.$metaKey, $single);
+	$metaKeys = array_keys(glsr('Defaults\CreateReviewDefaults')->defaults());
+	if (!in_array($metaKey, $metaKeys) || glsr()->post_type != get_post_type($postId)) {
+		return $check;
+	}
+	glsr()->deprecated[] = sprintf(
+		'The "%1$s" meta_key has been deprecated for Reviews. Please use the protected "_%1$s" meta_key instead.',
+		$metaKey
+	);
+	return get_post_meta($postId, '_'.$metaKey, $single);
 }, 10, 4);
 
 // Modules/Html/Template.php
 add_filter('site-reviews/interpolate/reviews', function ($context, $template) {
-    $search = '{{ navigation }}';
-    if (false !== strpos($template, $search)) {
-        $context['navigation'] = $context['pagination'];
-        glsr()->deprecated[] = 'The {{ navigation }} template key in "YOUR_THEME/site-reviews/reviews.php" has been deprecated. Please use the {{ pagination }} template key instead.';
-    }
-    return $context;
+	$search = '{{ navigation }}';
+	if (false !== strpos($template, $search)) {
+		$context['navigation'] = $context['pagination'];
+		glsr()->deprecated[] = 'The {{ navigation }} template key in "YOUR_THEME/site-reviews/reviews.php" has been deprecated. Please use the {{ pagination }} template key instead.';
+	}
+	return $context;
 }, 10, 2);
 
 // Database/ReviewManager.php
 add_action('site-reviews/review/created', function ($review) {
-    if (has_action('site-reviews/local/review/create')) {
-        glsr()->deprecated[] = 'The "site-reviews/local/review/create" hook has been deprecated. Please use the "site-reviews/review/created" hook instead.';
-        do_action('site-reviews/local/review/create', (array) get_post($review->ID), (array) $review, $review->ID);
-    }
+	if (has_action('site-reviews/local/review/create')) {
+		glsr()->deprecated[] = 'The "site-reviews/local/review/create" hook has been deprecated. Please use the "site-reviews/review/created" hook instead.';
+		do_action('site-reviews/local/review/create', (array) get_post($review->ID), (array) $review, $review->ID);
+	}
 }, 9);
 
 // Handlers/CreateReview.php
 add_action('site-reviews/review/submitted', function ($review) {
-    if (has_action('site-reviews/local/review/submitted')) {
-        glsr()->deprecated[] = 'The "site-reviews/local/review/submitted" hook has been deprecated. Please use the "site-reviews/review/submitted" hook instead.';
-        do_action('site-reviews/local/review/submitted', null, $review);
-    }
-    if (has_filter('site-reviews/local/review/submitted/message')) {
-        glsr()->deprecated[] = 'The "site-reviews/local/review/submitted/message" hook has been deprecated.';
-    }
+	if (has_action('site-reviews/local/review/submitted')) {
+		glsr()->deprecated[] = 'The "site-reviews/local/review/submitted" hook has been deprecated. Please use the "site-reviews/review/submitted" hook instead.';
+		do_action('site-reviews/local/review/submitted', null, $review);
+	}
+	if (has_filter('site-reviews/local/review/submitted/message')) {
+		glsr()->deprecated[] = 'The "site-reviews/local/review/submitted/message" hook has been deprecated.';
+	}
 }, 9);
 
 // Database/ReviewManager.php
 add_filter('site-reviews/create/review-values', function ($values, $command) {
-    if (has_filter('site-reviews/local/review')) {
-        glsr()->deprecated[] = 'The "site-reviews/local/review" hook has been deprecated. Please use the "site-reviews/create/review-values" hook instead.';
-        return apply_filters('site-reviews/local/review', $values, $command);
-    }
-    return $values;
+	if (has_filter('site-reviews/local/review')) {
+		glsr()->deprecated[] = 'The "site-reviews/local/review" hook has been deprecated. Please use the "site-reviews/create/review-values" hook instead.';
+		return apply_filters('site-reviews/local/review', $values, $command);
+	}
+	return $values;
 }, 9, 2);
 
 // Handlers/EnqueuePublicAssets.php
 add_filter('site-reviews/enqueue/public/localize', function ($variables) {
-    if (has_filter('site-reviews/enqueue/localize')) {
-        glsr()->deprecated[] = 'The "site-reviews/enqueue/localize" hook has been deprecated. Please use the "site-reviews/enqueue/public/localize" hook instead.';
-        return apply_filters('site-reviews/enqueue/localize', $variables);
-    }
-    return $variables;
+	if (has_filter('site-reviews/enqueue/localize')) {
+		glsr()->deprecated[] = 'The "site-reviews/enqueue/localize" hook has been deprecated. Please use the "site-reviews/enqueue/public/localize" hook instead.';
+		return apply_filters('site-reviews/enqueue/localize', $variables);
+	}
+	return $variables;
 }, 9);
 
 // Modules/Rating.php
 add_filter('site-reviews/rating/average', function ($average) {
-    if (has_filter('site-reviews/average/rating')) {
-        glsr()->deprecated[] = 'The "site-reviews/average/rating" hook has been deprecated. Please use the "site-reviews/rating/average" hook instead.';
-    }
-    return $average;
+	if (has_filter('site-reviews/average/rating')) {
+		glsr()->deprecated[] = 'The "site-reviews/average/rating" hook has been deprecated. Please use the "site-reviews/rating/average" hook instead.';
+	}
+	return $average;
 }, 9);
 
 // Modules/Rating.php
 add_filter('site-reviews/rating/ranking', function ($ranking) {
-    if (has_filter('site-reviews/bayesian/ranking')) {
-        glsr()->deprecated[] = 'The "site-reviews/bayesian/ranking" hook has been deprecated. Please use the "site-reviews/rating/ranking" hook instead.';
-    }
-    return $ranking;
+	if (has_filter('site-reviews/bayesian/ranking')) {
+		glsr()->deprecated[] = 'The "site-reviews/bayesian/ranking" hook has been deprecated. Please use the "site-reviews/rating/ranking" hook instead.';
+	}
+	return $ranking;
 }, 9);
 
 // Modules/Html/Partials/SiteReviews.php
 add_filter('site-reviews/review/build/after', function ($renderedFields) {
-    if (has_filter('site-reviews/reviews/review/text')) {
-        glsr()->deprecated[] = 'The "site-reviews/reviews/review/text" hook has been deprecated. Please use the "site-reviews/review/build/after" hook instead.';
-    }
-    if (has_filter('site-reviews/reviews/review/title')) {
-        glsr()->deprecated[] = 'The "site-reviews/reviews/review/title" hook has been deprecated. Please use the "site-reviews/review/build/after" hook instead.';
-    }
-    return $renderedFields;
+	if (has_filter('site-reviews/reviews/review/text')) {
+		glsr()->deprecated[] = 'The "site-reviews/reviews/review/text" hook has been deprecated. Please use the "site-reviews/review/build/after" hook instead.';
+	}
+	if (has_filter('site-reviews/reviews/review/title')) {
+		glsr()->deprecated[] = 'The "site-reviews/reviews/review/title" hook has been deprecated. Please use the "site-reviews/review/build/after" hook instead.';
+	}
+	return $renderedFields;
 }, 9);
 
 // Modules/Html/Partials/SiteReviews.php
 add_filter('site-reviews/review/build/before', function ($review) {
-    if (has_filter('site-reviews/rendered/review')) {
-        glsr()->deprecated[] = 'The "site-reviews/rendered/review" hook has been deprecated. Please either use a custom "review.php" template (refer to the documentation), or use the "site-reviews/review/build/after" hook instead.';
-    }
-    if (has_filter('site-reviews/rendered/review/meta/order')) {
-        glsr()->deprecated[] = 'The "site-reviews/rendered/review/meta/order" hook has been deprecated. Please use a custom "review.php" template instead (refer to the documentation).';
-    }
-    if (has_filter('site-reviews/rendered/review/order')) {
-        glsr()->deprecated[] = 'The "site-reviews/rendered/review/order" hook has been deprecated. Please use a custom "review.php" template instead (refer to the documentation).';
-    }
-    if (has_filter('site-reviews/rendered/review-form/login-register')) {
-        glsr()->deprecated[] = 'The "site-reviews/rendered/review-form/login-register" hook has been deprecated. Please use a custom "login-register.php" template instead (refer to the documentation).';
-    }
-    if (has_filter('site-reviews/reviews/navigation_links')) {
-        glsr()->deprecated[] = 'The "site-reviews/reviews/navigation_links" hook has been deprecated. Please use a custom "pagination.php" template instead (refer to the documentation).';
-    }
-    return $review;
+	if (has_filter('site-reviews/rendered/review')) {
+		glsr()->deprecated[] = 'The "site-reviews/rendered/review" hook has been deprecated. Please either use a custom "review.php" template (refer to the documentation), or use the "site-reviews/review/build/after" hook instead.';
+	}
+	if (has_filter('site-reviews/rendered/review/meta/order')) {
+		glsr()->deprecated[] = 'The "site-reviews/rendered/review/meta/order" hook has been deprecated. Please use a custom "review.php" template instead (refer to the documentation).';
+	}
+	if (has_filter('site-reviews/rendered/review/order')) {
+		glsr()->deprecated[] = 'The "site-reviews/rendered/review/order" hook has been deprecated. Please use a custom "review.php" template instead (refer to the documentation).';
+	}
+	if (has_filter('site-reviews/rendered/review-form/login-register')) {
+		glsr()->deprecated[] = 'The "site-reviews/rendered/review-form/login-register" hook has been deprecated. Please use a custom "login-register.php" template instead (refer to the documentation).';
+	}
+	if (has_filter('site-reviews/reviews/navigation_links')) {
+		glsr()->deprecated[] = 'The "site-reviews/reviews/navigation_links" hook has been deprecated. Please use a custom "pagination.php" template instead (refer to the documentation).';
+	}
+	return $review;
 }, 9);
 
 add_filter('site-reviews/validate/custom', function ($result, $request) {
-    if (has_filter('site-reviews/validate/review/submission')) {
-        glsr_log()->warning('The "site-reviews/validate/review/submission" hook has been deprecated. Please use the "site-reviews/validate/custom" hook instead.');
-        return apply_filters('site-reviews/validate/review/submission', $result, $request);
-    }
-    return $result;
+	if (has_filter('site-reviews/validate/review/submission')) {
+		glsr_log()->warning('The "site-reviews/validate/review/submission" hook has been deprecated. Please use the "site-reviews/validate/custom" hook instead.');
+		return apply_filters('site-reviews/validate/review/submission', $result, $request);
+	}
+	return $result;
 }, 9, 2);
 
 add_filter('site-reviews/views/file', function ($file, $view, $data) {
-    if (has_filter('site-reviews/addon/views/file')) {
-        glsr()->deprecated[] = 'The "site-reviews/addon/views/file" hook has been deprecated. Please use the "site-reviews/views/file" hook instead.';
-        $file = apply_filters('site-reviews/addon/views/file', $file, $view, $data);
-    }
-    return $file;
+	if (has_filter('site-reviews/addon/views/file')) {
+		glsr()->deprecated[] = 'The "site-reviews/addon/views/file" hook has been deprecated. Please use the "site-reviews/views/file" hook instead.';
+		$file = apply_filters('site-reviews/addon/views/file', $file, $view, $data);
+	}
+	return $file;
 }, 9, 3);
 
 add_action('wp_footer', function () {
-    $notices = array_keys(array_flip(glsr()->deprecated));
-    natsort($notices);
-    foreach ($notices as $notice) {
-        glsr_log()->warning($notice);
-    }
+	$notices = array_keys(array_flip(glsr()->deprecated));
+	natsort($notices);
+	foreach ($notices as $notice) {
+		glsr_log()->warning($notice);
+	}
 });

Spacing +57 added lines, -57 removed lines

@@ -1,134 +1,134 @@
 <?php
 
-defined('WPINC') || die;
+defined( 'WPINC' ) || die;
 
 // Unprotected review meta has been deprecated
-add_filter('get_post_metadata', function ($check, $postId, $metaKey, $single) {
-    $metaKeys = array_keys(glsr('Defaults\CreateReviewDefaults')->defaults());
-    if (!in_array($metaKey, $metaKeys) || glsr()->post_type != get_post_type($postId)) {
+add_filter( 'get_post_metadata', function( $check, $postId, $metaKey, $single ) {
+    $metaKeys = array_keys( glsr( 'Defaults\CreateReviewDefaults' )->defaults() );
+    if( !in_array( $metaKey, $metaKeys ) || glsr()->post_type != get_post_type( $postId ) ) {
         return $check;
     }
     glsr()->deprecated[] = sprintf(
         'The "%1$s" meta_key has been deprecated for Reviews. Please use the protected "_%1$s" meta_key instead.',
         $metaKey
     );
-    return get_post_meta($postId, '_'.$metaKey, $single);
-}, 10, 4);
+    return get_post_meta( $postId, '_'.$metaKey, $single );
+}, 10, 4 );
 
 // Modules/Html/Template.php
-add_filter('site-reviews/interpolate/reviews', function ($context, $template) {
+add_filter( 'site-reviews/interpolate/reviews', function( $context, $template ) {
     $search = '{{ navigation }}';
-    if (false !== strpos($template, $search)) {
+    if( false !== strpos( $template, $search ) ) {
         $context['navigation'] = $context['pagination'];
         glsr()->deprecated[] = 'The {{ navigation }} template key in "YOUR_THEME/site-reviews/reviews.php" has been deprecated. Please use the {{ pagination }} template key instead.';
     }
     return $context;
-}, 10, 2);
+}, 10, 2 );
 
 // Database/ReviewManager.php
-add_action('site-reviews/review/created', function ($review) {
-    if (has_action('site-reviews/local/review/create')) {
+add_action( 'site-reviews/review/created', function( $review ) {
+    if( has_action( 'site-reviews/local/review/create' ) ) {
         glsr()->deprecated[] = 'The "site-reviews/local/review/create" hook has been deprecated. Please use the "site-reviews/review/created" hook instead.';
-        do_action('site-reviews/local/review/create', (array) get_post($review->ID), (array) $review, $review->ID);
+        do_action( 'site-reviews/local/review/create', (array)get_post( $review->ID ), (array)$review, $review->ID );
     }
-}, 9);
+}, 9 );
 
 // Handlers/CreateReview.php
-add_action('site-reviews/review/submitted', function ($review) {
-    if (has_action('site-reviews/local/review/submitted')) {
+add_action( 'site-reviews/review/submitted', function( $review ) {
+    if( has_action( 'site-reviews/local/review/submitted' ) ) {
         glsr()->deprecated[] = 'The "site-reviews/local/review/submitted" hook has been deprecated. Please use the "site-reviews/review/submitted" hook instead.';
-        do_action('site-reviews/local/review/submitted', null, $review);
+        do_action( 'site-reviews/local/review/submitted', null, $review );
     }
-    if (has_filter('site-reviews/local/review/submitted/message')) {
+    if( has_filter( 'site-reviews/local/review/submitted/message' ) ) {
         glsr()->deprecated[] = 'The "site-reviews/local/review/submitted/message" hook has been deprecated.';
     }
-}, 9);
+}, 9 );
 
 // Database/ReviewManager.php
-add_filter('site-reviews/create/review-values', function ($values, $command) {
-    if (has_filter('site-reviews/local/review')) {
+add_filter( 'site-reviews/create/review-values', function( $values, $command ) {
+    if( has_filter( 'site-reviews/local/review' ) ) {
         glsr()->deprecated[] = 'The "site-reviews/local/review" hook has been deprecated. Please use the "site-reviews/create/review-values" hook instead.';
-        return apply_filters('site-reviews/local/review', $values, $command);
+        return apply_filters( 'site-reviews/local/review', $values, $command );
     }
     return $values;
-}, 9, 2);
+}, 9, 2 );
 
 // Handlers/EnqueuePublicAssets.php
-add_filter('site-reviews/enqueue/public/localize', function ($variables) {
-    if (has_filter('site-reviews/enqueue/localize')) {
+add_filter( 'site-reviews/enqueue/public/localize', function( $variables ) {
+    if( has_filter( 'site-reviews/enqueue/localize' ) ) {
         glsr()->deprecated[] = 'The "site-reviews/enqueue/localize" hook has been deprecated. Please use the "site-reviews/enqueue/public/localize" hook instead.';
-        return apply_filters('site-reviews/enqueue/localize', $variables);
+        return apply_filters( 'site-reviews/enqueue/localize', $variables );
     }
     return $variables;
-}, 9);
+}, 9 );
 
 // Modules/Rating.php
-add_filter('site-reviews/rating/average', function ($average) {
-    if (has_filter('site-reviews/average/rating')) {
+add_filter( 'site-reviews/rating/average', function( $average ) {
+    if( has_filter( 'site-reviews/average/rating' ) ) {
         glsr()->deprecated[] = 'The "site-reviews/average/rating" hook has been deprecated. Please use the "site-reviews/rating/average" hook instead.';
     }
     return $average;
-}, 9);
+}, 9 );
 
 // Modules/Rating.php
-add_filter('site-reviews/rating/ranking', function ($ranking) {
-    if (has_filter('site-reviews/bayesian/ranking')) {
+add_filter( 'site-reviews/rating/ranking', function( $ranking ) {
+    if( has_filter( 'site-reviews/bayesian/ranking' ) ) {
         glsr()->deprecated[] = 'The "site-reviews/bayesian/ranking" hook has been deprecated. Please use the "site-reviews/rating/ranking" hook instead.';
     }
     return $ranking;
-}, 9);
+}, 9 );
 
 // Modules/Html/Partials/SiteReviews.php
-add_filter('site-reviews/review/build/after', function ($renderedFields) {
-    if (has_filter('site-reviews/reviews/review/text')) {
+add_filter( 'site-reviews/review/build/after', function( $renderedFields ) {
+    if( has_filter( 'site-reviews/reviews/review/text' ) ) {
         glsr()->deprecated[] = 'The "site-reviews/reviews/review/text" hook has been deprecated. Please use the "site-reviews/review/build/after" hook instead.';
     }
-    if (has_filter('site-reviews/reviews/review/title')) {
+    if( has_filter( 'site-reviews/reviews/review/title' ) ) {
         glsr()->deprecated[] = 'The "site-reviews/reviews/review/title" hook has been deprecated. Please use the "site-reviews/review/build/after" hook instead.';
     }
     return $renderedFields;
-}, 9);
+}, 9 );
 
 // Modules/Html/Partials/SiteReviews.php
-add_filter('site-reviews/review/build/before', function ($review) {
-    if (has_filter('site-reviews/rendered/review')) {
+add_filter( 'site-reviews/review/build/before', function( $review ) {
+    if( has_filter( 'site-reviews/rendered/review' ) ) {
         glsr()->deprecated[] = 'The "site-reviews/rendered/review" hook has been deprecated. Please either use a custom "review.php" template (refer to the documentation), or use the "site-reviews/review/build/after" hook instead.';
     }
-    if (has_filter('site-reviews/rendered/review/meta/order')) {
+    if( has_filter( 'site-reviews/rendered/review/meta/order' ) ) {
         glsr()->deprecated[] = 'The "site-reviews/rendered/review/meta/order" hook has been deprecated. Please use a custom "review.php" template instead (refer to the documentation).';
     }
-    if (has_filter('site-reviews/rendered/review/order')) {
+    if( has_filter( 'site-reviews/rendered/review/order' ) ) {
         glsr()->deprecated[] = 'The "site-reviews/rendered/review/order" hook has been deprecated. Please use a custom "review.php" template instead (refer to the documentation).';
     }
-    if (has_filter('site-reviews/rendered/review-form/login-register')) {
+    if( has_filter( 'site-reviews/rendered/review-form/login-register' ) ) {
         glsr()->deprecated[] = 'The "site-reviews/rendered/review-form/login-register" hook has been deprecated. Please use a custom "login-register.php" template instead (refer to the documentation).';
     }
-    if (has_filter('site-reviews/reviews/navigation_links')) {
+    if( has_filter( 'site-reviews/reviews/navigation_links' ) ) {
         glsr()->deprecated[] = 'The "site-reviews/reviews/navigation_links" hook has been deprecated. Please use a custom "pagination.php" template instead (refer to the documentation).';
     }
     return $review;
-}, 9);
+}, 9 );
 
-add_filter('site-reviews/validate/custom', function ($result, $request) {
-    if (has_filter('site-reviews/validate/review/submission')) {
-        glsr_log()->warning('The "site-reviews/validate/review/submission" hook has been deprecated. Please use the "site-reviews/validate/custom" hook instead.');
-        return apply_filters('site-reviews/validate/review/submission', $result, $request);
+add_filter( 'site-reviews/validate/custom', function( $result, $request ) {
+    if( has_filter( 'site-reviews/validate/review/submission' ) ) {
+        glsr_log()->warning( 'The "site-reviews/validate/review/submission" hook has been deprecated. Please use the "site-reviews/validate/custom" hook instead.' );
+        return apply_filters( 'site-reviews/validate/review/submission', $result, $request );
     }
     return $result;
-}, 9, 2);
+}, 9, 2 );
 
-add_filter('site-reviews/views/file', function ($file, $view, $data) {
-    if (has_filter('site-reviews/addon/views/file')) {
+add_filter( 'site-reviews/views/file', function( $file, $view, $data ) {
+    if( has_filter( 'site-reviews/addon/views/file' ) ) {
         glsr()->deprecated[] = 'The "site-reviews/addon/views/file" hook has been deprecated. Please use the "site-reviews/views/file" hook instead.';
-        $file = apply_filters('site-reviews/addon/views/file', $file, $view, $data);
+        $file = apply_filters( 'site-reviews/addon/views/file', $file, $view, $data );
     }
     return $file;
-}, 9, 3);
+}, 9, 3 );
 
-add_action('wp_footer', function () {
-    $notices = array_keys(array_flip(glsr()->deprecated));
-    natsort($notices);
-    foreach ($notices as $notice) {
-        glsr_log()->warning($notice);
+add_action( 'wp_footer', function() {
+    $notices = array_keys( array_flip( glsr()->deprecated ) );
+    natsort( $notices );
+    foreach( $notices as $notice ) {
+        glsr_log()->warning( $notice );
     }
 });

plugin/Widgets/SiteReviewsWidget.php

Indentation +86 added lines, -86 removed lines

@@ -7,92 +7,92 @@
 
 class SiteReviewsWidget extends Widget
 {
-    /**
-     * @param array $instance
-     * @return void
-     */
-    public function form($instance)
-    {
-        $this->widgetArgs = glsr(SiteReviewsShortcode::class)->normalizeAtts($instance);
-        $terms = glsr(Database::class)->getTerms();
-        $this->renderField('text', [
-            'class' => 'widefat',
-            'label' => __('Title', 'site-reviews'),
-            'name' => 'title',
-        ]);
-        $this->renderField('number', [
-            'class' => 'small-text',
-            'default' => 5,
-            'label' => __('How many reviews would you like to display?', 'site-reviews'),
-            'max' => 100,
-            'name' => 'count',
-        ]);
-        $this->renderField('select', [
-            'label' => __('What is the minimum rating to display?', 'site-reviews'),
-            'name' => 'rating',
-            'options' => [
-                '5' => sprintf(_n('%s star', '%s stars', 5, 'site-reviews'), 5),
-                '4' => sprintf(_n('%s star', '%s stars', 4, 'site-reviews'), 4),
-                '3' => sprintf(_n('%s star', '%s stars', 3, 'site-reviews'), 3),
-                '2' => sprintf(_n('%s star', '%s stars', 2, 'site-reviews'), 2),
-                '1' => sprintf(_n('%s star', '%s stars', 1, 'site-reviews'), 1),
-            ],
-        ]);
-        if (count(glsr()->reviewTypes) > 1) {
-            $this->renderField('select', [
-                'class' => 'widefat',
-                'label' => __('Which type of review would you like to display?', 'site-reviews'),
-                'name' => 'type',
-                'options' => ['' => __('All Reviews', 'site-reviews')] + glsr()->reviewTypes,
-            ]);
-        }
-        if (!empty($terms)) {
-            $this->renderField('select', [
-                'class' => 'widefat',
-                'label' => __('Limit reviews to this category', 'site-reviews'),
-                'name' => 'category',
-                'options' => ['' => __('All Categories', 'site-reviews')] + $terms,
-            ]);
-        }
-        $this->renderField('text', [
-            'class' => 'widefat',
-            'default' => '',
-            'description' => sprintf(__("Separate multiple ID's with a comma. You may also enter %s to automatically represent the current page/post ID.", 'site-reviews'), '<code>post_id</code>'),
-            'label' => __('Limit reviews to those assigned to this page/post ID', 'site-reviews'),
-            'name' => 'assigned_to',
-        ]);
-        $this->renderField('text', [
-            'class' => 'widefat',
-            'label' => __('Enter any custom CSS classes here', 'site-reviews'),
-            'name' => 'class',
-        ]);
-        $this->renderField('checkbox', [
-            'name' => 'hide',
-            'options' => glsr(SiteReviewsShortcode::class)->getHideOptions(),
-        ]);
-    }
+	/**
+	 * @param array $instance
+	 * @return void
+	 */
+	public function form($instance)
+	{
+		$this->widgetArgs = glsr(SiteReviewsShortcode::class)->normalizeAtts($instance);
+		$terms = glsr(Database::class)->getTerms();
+		$this->renderField('text', [
+			'class' => 'widefat',
+			'label' => __('Title', 'site-reviews'),
+			'name' => 'title',
+		]);
+		$this->renderField('number', [
+			'class' => 'small-text',
+			'default' => 5,
+			'label' => __('How many reviews would you like to display?', 'site-reviews'),
+			'max' => 100,
+			'name' => 'count',
+		]);
+		$this->renderField('select', [
+			'label' => __('What is the minimum rating to display?', 'site-reviews'),
+			'name' => 'rating',
+			'options' => [
+				'5' => sprintf(_n('%s star', '%s stars', 5, 'site-reviews'), 5),
+				'4' => sprintf(_n('%s star', '%s stars', 4, 'site-reviews'), 4),
+				'3' => sprintf(_n('%s star', '%s stars', 3, 'site-reviews'), 3),
+				'2' => sprintf(_n('%s star', '%s stars', 2, 'site-reviews'), 2),
+				'1' => sprintf(_n('%s star', '%s stars', 1, 'site-reviews'), 1),
+			],
+		]);
+		if (count(glsr()->reviewTypes) > 1) {
+			$this->renderField('select', [
+				'class' => 'widefat',
+				'label' => __('Which type of review would you like to display?', 'site-reviews'),
+				'name' => 'type',
+				'options' => ['' => __('All Reviews', 'site-reviews')] + glsr()->reviewTypes,
+			]);
+		}
+		if (!empty($terms)) {
+			$this->renderField('select', [
+				'class' => 'widefat',
+				'label' => __('Limit reviews to this category', 'site-reviews'),
+				'name' => 'category',
+				'options' => ['' => __('All Categories', 'site-reviews')] + $terms,
+			]);
+		}
+		$this->renderField('text', [
+			'class' => 'widefat',
+			'default' => '',
+			'description' => sprintf(__("Separate multiple ID's with a comma. You may also enter %s to automatically represent the current page/post ID.", 'site-reviews'), '<code>post_id</code>'),
+			'label' => __('Limit reviews to those assigned to this page/post ID', 'site-reviews'),
+			'name' => 'assigned_to',
+		]);
+		$this->renderField('text', [
+			'class' => 'widefat',
+			'label' => __('Enter any custom CSS classes here', 'site-reviews'),
+			'name' => 'class',
+		]);
+		$this->renderField('checkbox', [
+			'name' => 'hide',
+			'options' => glsr(SiteReviewsShortcode::class)->getHideOptions(),
+		]);
+	}
 
-    /**
-     * @param array $newInstance
-     * @param array $oldInstance
-     * @return array
-     */
-    public function update($newInstance, $oldInstance)
-    {
-        if (!is_numeric($newInstance['count'])) {
-            $newInstance['count'] = 10;
-        }
-        $newInstance['count'] = min(50, max(0, intval($newInstance['count'])));
-        return parent::update($newInstance, $oldInstance);
-    }
+	/**
+	 * @param array $newInstance
+	 * @param array $oldInstance
+	 * @return array
+	 */
+	public function update($newInstance, $oldInstance)
+	{
+		if (!is_numeric($newInstance['count'])) {
+			$newInstance['count'] = 10;
+		}
+		$newInstance['count'] = min(50, max(0, intval($newInstance['count'])));
+		return parent::update($newInstance, $oldInstance);
+	}
 
-    /**
-     * @param array $args
-     * @param array $instance
-     * @return void
-     */
-    public function widget($args, $instance)
-    {
-        echo glsr(SiteReviewsShortcode::class)->build($instance, $args, 'widget');
-    }
+	/**
+	 * @param array $args
+	 * @param array $instance
+	 * @return void
+	 */
+	public function widget($args, $instance)
+	{
+		echo glsr(SiteReviewsShortcode::class)->build($instance, $args, 'widget');
+	}
 }

Spacing +43 added lines, -43 removed lines

@@ -11,65 +11,65 @@ 
      * @param array $instance
      * @return void
      */
-    public function form($instance)
+    public function form( $instance )
     {
-        $this->widgetArgs = glsr(SiteReviewsShortcode::class)->normalizeAtts($instance);
-        $terms = glsr(Database::class)->getTerms();
-        $this->renderField('text', [
+        $this->widgetArgs = glsr( SiteReviewsShortcode::class )->normalizeAtts( $instance );
+        $terms = glsr( Database::class )->getTerms();
+        $this->renderField( 'text', [
             'class' => 'widefat',
-            'label' => __('Title', 'site-reviews'),
+            'label' => __( 'Title', 'site-reviews' ),
             'name' => 'title',
-        ]);
-        $this->renderField('number', [
+        ] );
+        $this->renderField( 'number', [
             'class' => 'small-text',
             'default' => 5,
-            'label' => __('How many reviews would you like to display?', 'site-reviews'),
+            'label' => __( 'How many reviews would you like to display?', 'site-reviews' ),
             'max' => 100,
             'name' => 'count',
-        ]);
-        $this->renderField('select', [
-            'label' => __('What is the minimum rating to display?', 'site-reviews'),
+        ] );
+        $this->renderField( 'select', [
+            'label' => __( 'What is the minimum rating to display?', 'site-reviews' ),
             'name' => 'rating',
             'options' => [
-                '5' => sprintf(_n('%s star', '%s stars', 5, 'site-reviews'), 5),
-                '4' => sprintf(_n('%s star', '%s stars', 4, 'site-reviews'), 4),
-                '3' => sprintf(_n('%s star', '%s stars', 3, 'site-reviews'), 3),
-                '2' => sprintf(_n('%s star', '%s stars', 2, 'site-reviews'), 2),
-                '1' => sprintf(_n('%s star', '%s stars', 1, 'site-reviews'), 1),
+                '5' => sprintf( _n( '%s star', '%s stars', 5, 'site-reviews' ), 5 ),
+                '4' => sprintf( _n( '%s star', '%s stars', 4, 'site-reviews' ), 4 ),
+                '3' => sprintf( _n( '%s star', '%s stars', 3, 'site-reviews' ), 3 ),
+                '2' => sprintf( _n( '%s star', '%s stars', 2, 'site-reviews' ), 2 ),
+                '1' => sprintf( _n( '%s star', '%s stars', 1, 'site-reviews' ), 1 ),
             ],
-        ]);
-        if (count(glsr()->reviewTypes) > 1) {
-            $this->renderField('select', [
+        ] );
+        if( count( glsr()->reviewTypes ) > 1 ) {
+            $this->renderField( 'select', [
                 'class' => 'widefat',
-                'label' => __('Which type of review would you like to display?', 'site-reviews'),
+                'label' => __( 'Which type of review would you like to display?', 'site-reviews' ),
                 'name' => 'type',
-                'options' => ['' => __('All Reviews', 'site-reviews')] + glsr()->reviewTypes,
-            ]);
+                'options' => ['' => __( 'All Reviews', 'site-reviews' )] + glsr()->reviewTypes,
+            ] );
         }
-        if (!empty($terms)) {
-            $this->renderField('select', [
+        if( !empty($terms) ) {
+            $this->renderField( 'select', [
                 'class' => 'widefat',
-                'label' => __('Limit reviews to this category', 'site-reviews'),
+                'label' => __( 'Limit reviews to this category', 'site-reviews' ),
                 'name' => 'category',
-                'options' => ['' => __('All Categories', 'site-reviews')] + $terms,
-            ]);
+                'options' => ['' => __( 'All Categories', 'site-reviews' )] + $terms,
+            ] );
         }
-        $this->renderField('text', [
+        $this->renderField( 'text', [
             'class' => 'widefat',
             'default' => '',
-            'description' => sprintf(__("Separate multiple ID's with a comma. You may also enter %s to automatically represent the current page/post ID.", 'site-reviews'), '<code>post_id</code>'),
-            'label' => __('Limit reviews to those assigned to this page/post ID', 'site-reviews'),
+            'description' => sprintf( __( "Separate multiple ID's with a comma. You may also enter %s to automatically represent the current page/post ID.", 'site-reviews' ), '<code>post_id</code>' ),
+            'label' => __( 'Limit reviews to those assigned to this page/post ID', 'site-reviews' ),
             'name' => 'assigned_to',
-        ]);
-        $this->renderField('text', [
+        ] );
+        $this->renderField( 'text', [
             'class' => 'widefat',
-            'label' => __('Enter any custom CSS classes here', 'site-reviews'),
+            'label' => __( 'Enter any custom CSS classes here', 'site-reviews' ),
             'name' => 'class',
-        ]);
-        $this->renderField('checkbox', [
+        ] );
+        $this->renderField( 'checkbox', [
             'name' => 'hide',
-            'options' => glsr(SiteReviewsShortcode::class)->getHideOptions(),
-        ]);
+            'options' => glsr( SiteReviewsShortcode::class )->getHideOptions(),
+        ] );
     }
 
     /**
@@ -77,13 +77,13 @@ 
      * @param array $oldInstance
      * @return array
      */
-    public function update($newInstance, $oldInstance)
+    public function update( $newInstance, $oldInstance )
     {
-        if (!is_numeric($newInstance['count'])) {
+        if( !is_numeric( $newInstance['count'] ) ) {
             $newInstance['count'] = 10;
         }
-        $newInstance['count'] = min(50, max(0, intval($newInstance['count'])));
-        return parent::update($newInstance, $oldInstance);
+        $newInstance['count'] = min( 50, max( 0, intval( $newInstance['count'] ) ) );
+        return parent::update( $newInstance, $oldInstance );
     }
 
     /**
@@ -91,8 +91,8 @@ 
      * @param array $instance
      * @return void
      */
-    public function widget($args, $instance)
+    public function widget( $args, $instance )
     {
-        echo glsr(SiteReviewsShortcode::class)->build($instance, $args, 'widget');
+        echo glsr( SiteReviewsShortcode::class )->build( $instance, $args, 'widget' );
     }
 }

plugin/Widgets/SiteReviewsFormWidget.php

Indentation +50 added lines, -50 removed lines

@@ -7,55 +7,55 @@
 
 class SiteReviewsFormWidget extends Widget
 {
-    /**
-     * @param array $instance
-     * @return void
-     */
-    public function form($instance)
-    {
-        $this->widgetArgs = glsr(SiteReviewsFormShortcode::class)->normalizeAtts($instance);
-        $terms = glsr(Database::class)->getTerms();
-        $this->renderField('text', [
-            'class' => 'widefat',
-            'label' => __('Title', 'site-reviews'),
-            'name' => 'title',
-        ]);
-        $this->renderField('textarea', [
-            'class' => 'widefat',
-            'label' => __('Description', 'site-reviews'),
-            'name' => 'description',
-        ]);
-        $this->renderField('select', [
-            'class' => 'widefat',
-            'label' => __('Automatically assign a category', 'site-reviews'),
-            'name' => 'category',
-            'options' => ['' => __('Do not assign a category', 'site-reviews')] + $terms,
-        ]);
-        $this->renderField('text', [
-            'class' => 'widefat',
-            'default' => '',
-            'description' => sprintf(__('You may also enter %s to assign to the current post.', 'site-reviews'), '<code>post_id</code>'),
-            'label' => __('Assign reviews to a custom page/post ID', 'site-reviews'),
-            'name' => 'assign_to',
-        ]);
-        $this->renderField('text', [
-            'class' => 'widefat',
-            'label' => __('Enter any custom CSS classes here', 'site-reviews'),
-            'name' => 'class',
-        ]);
-        $this->renderField('checkbox', [
-            'name' => 'hide',
-            'options' => glsr(SiteReviewsFormShortcode::class)->getHideOptions(),
-        ]);
-    }
+	/**
+	 * @param array $instance
+	 * @return void
+	 */
+	public function form($instance)
+	{
+		$this->widgetArgs = glsr(SiteReviewsFormShortcode::class)->normalizeAtts($instance);
+		$terms = glsr(Database::class)->getTerms();
+		$this->renderField('text', [
+			'class' => 'widefat',
+			'label' => __('Title', 'site-reviews'),
+			'name' => 'title',
+		]);
+		$this->renderField('textarea', [
+			'class' => 'widefat',
+			'label' => __('Description', 'site-reviews'),
+			'name' => 'description',
+		]);
+		$this->renderField('select', [
+			'class' => 'widefat',
+			'label' => __('Automatically assign a category', 'site-reviews'),
+			'name' => 'category',
+			'options' => ['' => __('Do not assign a category', 'site-reviews')] + $terms,
+		]);
+		$this->renderField('text', [
+			'class' => 'widefat',
+			'default' => '',
+			'description' => sprintf(__('You may also enter %s to assign to the current post.', 'site-reviews'), '<code>post_id</code>'),
+			'label' => __('Assign reviews to a custom page/post ID', 'site-reviews'),
+			'name' => 'assign_to',
+		]);
+		$this->renderField('text', [
+			'class' => 'widefat',
+			'label' => __('Enter any custom CSS classes here', 'site-reviews'),
+			'name' => 'class',
+		]);
+		$this->renderField('checkbox', [
+			'name' => 'hide',
+			'options' => glsr(SiteReviewsFormShortcode::class)->getHideOptions(),
+		]);
+	}
 
-    /**
-     * @param array $args
-     * @param array $instance
-     * @return void
-     */
-    public function widget($args, $instance)
-    {
-        echo glsr(SiteReviewsFormShortcode::class)->build($instance, $args, 'widget');
-    }
+	/**
+	 * @param array $args
+	 * @param array $instance
+	 * @return void
+	 */
+	public function widget($args, $instance)
+	{
+		echo glsr(SiteReviewsFormShortcode::class)->build($instance, $args, 'widget');
+	}
 }

Spacing +25 added lines, -25 removed lines

@@ -11,42 +11,42 @@ 
      * @param array $instance
      * @return void
      */
-    public function form($instance)
+    public function form( $instance )
     {
-        $this->widgetArgs = glsr(SiteReviewsFormShortcode::class)->normalizeAtts($instance);
-        $terms = glsr(Database::class)->getTerms();
-        $this->renderField('text', [
+        $this->widgetArgs = glsr( SiteReviewsFormShortcode::class )->normalizeAtts( $instance );
+        $terms = glsr( Database::class )->getTerms();
+        $this->renderField( 'text', [
             'class' => 'widefat',
-            'label' => __('Title', 'site-reviews'),
+            'label' => __( 'Title', 'site-reviews' ),
             'name' => 'title',
-        ]);
-        $this->renderField('textarea', [
+        ] );
+        $this->renderField( 'textarea', [
             'class' => 'widefat',
-            'label' => __('Description', 'site-reviews'),
+            'label' => __( 'Description', 'site-reviews' ),
             'name' => 'description',
-        ]);
-        $this->renderField('select', [
+        ] );
+        $this->renderField( 'select', [
             'class' => 'widefat',
-            'label' => __('Automatically assign a category', 'site-reviews'),
+            'label' => __( 'Automatically assign a category', 'site-reviews' ),
             'name' => 'category',
-            'options' => ['' => __('Do not assign a category', 'site-reviews')] + $terms,
-        ]);
-        $this->renderField('text', [
+            'options' => ['' => __( 'Do not assign a category', 'site-reviews' )] + $terms,
+        ] );
+        $this->renderField( 'text', [
             'class' => 'widefat',
             'default' => '',
-            'description' => sprintf(__('You may also enter %s to assign to the current post.', 'site-reviews'), '<code>post_id</code>'),
-            'label' => __('Assign reviews to a custom page/post ID', 'site-reviews'),
+            'description' => sprintf( __( 'You may also enter %s to assign to the current post.', 'site-reviews' ), '<code>post_id</code>' ),
+            'label' => __( 'Assign reviews to a custom page/post ID', 'site-reviews' ),
             'name' => 'assign_to',
-        ]);
-        $this->renderField('text', [
+        ] );
+        $this->renderField( 'text', [
             'class' => 'widefat',
-            'label' => __('Enter any custom CSS classes here', 'site-reviews'),
+            'label' => __( 'Enter any custom CSS classes here', 'site-reviews' ),
             'name' => 'class',
-        ]);
-        $this->renderField('checkbox', [
+        ] );
+        $this->renderField( 'checkbox', [
             'name' => 'hide',
-            'options' => glsr(SiteReviewsFormShortcode::class)->getHideOptions(),
-        ]);
+            'options' => glsr( SiteReviewsFormShortcode::class )->getHideOptions(),
+        ] );
     }
 
     /**
@@ -54,8 +54,8 @@ 
      * @param array $instance
      * @return void
      */
-    public function widget($args, $instance)
+    public function widget( $args, $instance )
     {
-        echo glsr(SiteReviewsFormShortcode::class)->build($instance, $args, 'widget');
+        echo glsr( SiteReviewsFormShortcode::class )->build( $instance, $args, 'widget' );
     }
 }