pryley / site-reviews

plugin/Database/OptionManager.php

Indentation +138 added lines, -138 removed lines

@@ -9,153 +9,153 @@
 
 class OptionManager
 {
-    /**
-     * @var array
-     */
-    protected $options;
+	/**
+	 * @var array
+	 */
+	protected $options;
 
-    /**
-     * @return string
-     */
-    public static function databaseKey($version = null)
-    {
-        if (null === $version) {
-            $version = explode('.', glsr()->version);
-            $version = array_shift($version);
-        }
-        return Str::snakeCase(
-            Application::ID.'-v'.intval($version)
-        );
-    }
+	/**
+	 * @return string
+	 */
+	public static function databaseKey($version = null)
+	{
+		if (null === $version) {
+			$version = explode('.', glsr()->version);
+			$version = array_shift($version);
+		}
+		return Str::snakeCase(
+			Application::ID.'-v'.intval($version)
+		);
+	}
 
-    /**
-     * @return array
-     */
-    public function all()
-    {
-        if (empty($this->options)) {
-            $this->reset();
-        }
-        return $this->options;
-    }
+	/**
+	 * @return array
+	 */
+	public function all()
+	{
+		if (empty($this->options)) {
+			$this->reset();
+		}
+		return $this->options;
+	}
 
-    /**
-     * @param string $path
-     * @return bool
-     */
-    public function delete($path)
-    {
-        $keys = explode('.', $path);
-        $last = array_pop($keys);
-        $options = $this->all();
-        $pointer = &$options;
-        foreach ($keys as $key) {
-            if (!isset($pointer[$key]) || !is_array($pointer[$key])) {
-                continue;
-            }
-            $pointer = &$pointer[$key];
-        }
-        unset($pointer[$last]);
-        return $this->set($options);
-    }
+	/**
+	 * @param string $path
+	 * @return bool
+	 */
+	public function delete($path)
+	{
+		$keys = explode('.', $path);
+		$last = array_pop($keys);
+		$options = $this->all();
+		$pointer = &$options;
+		foreach ($keys as $key) {
+			if (!isset($pointer[$key]) || !is_array($pointer[$key])) {
+				continue;
+			}
+			$pointer = &$pointer[$key];
+		}
+		unset($pointer[$last]);
+		return $this->set($options);
+	}
 
-    /**
-     * @param string $path
-     * @param mixed $fallback
-     * @param string $cast
-     * @return mixed
-     */
-    public function get($path = '', $fallback = '', $cast = '')
-    {
-        $result = Arr::get($this->all(), $path, $fallback);
-        return Helper::castTo($cast, $result);
-    }
+	/**
+	 * @param string $path
+	 * @param mixed $fallback
+	 * @param string $cast
+	 * @return mixed
+	 */
+	public function get($path = '', $fallback = '', $cast = '')
+	{
+		$result = Arr::get($this->all(), $path, $fallback);
+		return Helper::castTo($cast, $result);
+	}
 
-    /**
-     * @param string $path
-     * @return bool
-     */
-    public function getBool($path)
-    {
-        return Helper::castTo('bool', $this->get($path));
-    }
+	/**
+	 * @param string $path
+	 * @return bool
+	 */
+	public function getBool($path)
+	{
+		return Helper::castTo('bool', $this->get($path));
+	}
 
-    /**
-     * @param string $path
-     * @param mixed $fallback
-     * @param string $cast
-     * @return mixed
-     */
-    public function getWP($path, $fallback = '', $cast = '')
-    {
-        $option = get_option($path, $fallback);
-        if (empty($option)) {
-            $option = $fallback;
-        }
-        return Helper::castTo($cast, $option);
-    }
+	/**
+	 * @param string $path
+	 * @param mixed $fallback
+	 * @param string $cast
+	 * @return mixed
+	 */
+	public function getWP($path, $fallback = '', $cast = '')
+	{
+		$option = get_option($path, $fallback);
+		if (empty($option)) {
+			$option = $fallback;
+		}
+		return Helper::castTo($cast, $option);
+	}
 
-    /**
-     * @return string
-     */
-    public function json()
-    {
-        return json_encode($this->all());
-    }
+	/**
+	 * @return string
+	 */
+	public function json()
+	{
+		return json_encode($this->all());
+	}
 
-    /**
-     * @return array
-     */
-    public function normalize(array $options = [])
-    {
-        $options = wp_parse_args(
-            Arr::flattenArray($options),
-            glsr(DefaultsManager::class)->defaults()
-        );
-        array_walk($options, function (&$value) {
-            if (!is_string($value)) {
-                return;
-            }
-            $value = wp_kses($value, wp_kses_allowed_html('post'));
-        });
-        return Arr::convertDotNotationArray($options);
-    }
+	/**
+	 * @return array
+	 */
+	public function normalize(array $options = [])
+	{
+		$options = wp_parse_args(
+			Arr::flattenArray($options),
+			glsr(DefaultsManager::class)->defaults()
+		);
+		array_walk($options, function (&$value) {
+			if (!is_string($value)) {
+				return;
+			}
+			$value = wp_kses($value, wp_kses_allowed_html('post'));
+		});
+		return Arr::convertDotNotationArray($options);
+	}
 
-    /**
-     * @return bool
-     */
-    public function isRecaptchaEnabled()
-    {
-        $integration = $this->get('settings.submissions.recaptcha.integration');
-        return 'all' == $integration || ('guest' == $integration && !is_user_logged_in());
-    }
+	/**
+	 * @return bool
+	 */
+	public function isRecaptchaEnabled()
+	{
+		$integration = $this->get('settings.submissions.recaptcha.integration');
+		return 'all' == $integration || ('guest' == $integration && !is_user_logged_in());
+	}
 
-    /**
-     * @return array
-     */
-    public function reset()
-    {
-        $options = $this->getWP(static::databaseKey(), []);
-        if (!is_array($options) || empty($options)) {
-            delete_option(static::databaseKey());
-            $options = glsr()->defaults ?: [];
-        }
-        $this->options = $options;
-    }
+	/**
+	 * @return array
+	 */
+	public function reset()
+	{
+		$options = $this->getWP(static::databaseKey(), []);
+		if (!is_array($options) || empty($options)) {
+			delete_option(static::databaseKey());
+			$options = glsr()->defaults ?: [];
+		}
+		$this->options = $options;
+	}
 
-    /**
-     * @param string|array $pathOrOptions
-     * @param mixed $value
-     * @return bool
-     */
-    public function set($pathOrOptions, $value = '')
-    {
-        if (is_string($pathOrOptions)) {
-            $pathOrOptions = Arr::set($this->all(), $pathOrOptions, $value);
-        }
-        if ($result = update_option(static::databaseKey(), (array) $pathOrOptions)) {
-            $this->reset();
-        }
-        return $result;
-    }
+	/**
+	 * @param string|array $pathOrOptions
+	 * @param mixed $value
+	 * @return bool
+	 */
+	public function set($pathOrOptions, $value = '')
+	{
+		if (is_string($pathOrOptions)) {
+			$pathOrOptions = Arr::set($this->all(), $pathOrOptions, $value);
+		}
+		if ($result = update_option(static::databaseKey(), (array) $pathOrOptions)) {
+			$this->reset();
+		}
+		return $result;
+	}
 }

Spacing +37 added lines, -37 removed lines

@@ -17,14 +17,14 @@ 
     /**
      * @return string
      */
-    public static function databaseKey($version = null)
+    public static function databaseKey( $version = null )
     {
-        if (null === $version) {
-            $version = explode('.', glsr()->version);
-            $version = array_shift($version);
+        if( null === $version ) {
+            $version = explode( '.', glsr()->version );
+            $version = array_shift( $version );
         }
         return Str::snakeCase(
-            Application::ID.'-v'.intval($version)
+            Application::ID.'-v'.intval( $version )
         );
     }
 
@@ -33,7 +33,7 @@ 
      */
     public function all()
     {
-        if (empty($this->options)) {
+        if( empty($this->options) ) {
             $this->reset();
         }
         return $this->options;
@@ -43,20 +43,20 @@ 
      * @param string $path
      * @return bool
      */
-    public function delete($path)
+    public function delete( $path )
     {
-        $keys = explode('.', $path);
-        $last = array_pop($keys);
+        $keys = explode( '.', $path );
+        $last = array_pop( $keys );
         $options = $this->all();
         $pointer = &$options;
-        foreach ($keys as $key) {
-            if (!isset($pointer[$key]) || !is_array($pointer[$key])) {
+        foreach( $keys as $key ) {
+            if( !isset($pointer[$key]) || !is_array( $pointer[$key] ) ) {
                 continue;
             }
             $pointer = &$pointer[$key];
         }
         unset($pointer[$last]);
-        return $this->set($options);
+        return $this->set( $options );
     }
 
     /**
@@ -65,19 +65,19 @@ 
      * @param string $cast
      * @return mixed
      */
-    public function get($path = '', $fallback = '', $cast = '')
+    public function get( $path = '', $fallback = '', $cast = '' )
     {
-        $result = Arr::get($this->all(), $path, $fallback);
-        return Helper::castTo($cast, $result);
+        $result = Arr::get( $this->all(), $path, $fallback );
+        return Helper::castTo( $cast, $result );
     }
 
     /**
      * @param string $path
      * @return bool
      */
-    public function getBool($path)
+    public function getBool( $path )
     {
-        return Helper::castTo('bool', $this->get($path));
+        return Helper::castTo( 'bool', $this->get( $path ) );
     }
 
     /**
@@ -86,13 +86,13 @@ 
      * @param string $cast
      * @return mixed
      */
-    public function getWP($path, $fallback = '', $cast = '')
+    public function getWP( $path, $fallback = '', $cast = '' )
     {
-        $option = get_option($path, $fallback);
-        if (empty($option)) {
+        $option = get_option( $path, $fallback );
+        if( empty($option) ) {
             $option = $fallback;
         }
-        return Helper::castTo($cast, $option);
+        return Helper::castTo( $cast, $option );
     }
 
     /**
@@ -100,25 +100,25 @@ 
      */
     public function json()
     {
-        return json_encode($this->all());
+        return json_encode( $this->all() );
     }
 
     /**
      * @return array
      */
-    public function normalize(array $options = [])
+    public function normalize( array $options = [] )
     {
         $options = wp_parse_args(
-            Arr::flattenArray($options),
-            glsr(DefaultsManager::class)->defaults()
+            Arr::flattenArray( $options ),
+            glsr( DefaultsManager::class )->defaults()
         );
-        array_walk($options, function (&$value) {
-            if (!is_string($value)) {
+        array_walk( $options, function( &$value ) {
+            if( !is_string( $value ) ) {
                 return;
             }
-            $value = wp_kses($value, wp_kses_allowed_html('post'));
+            $value = wp_kses( $value, wp_kses_allowed_html( 'post' ) );
         });
-        return Arr::convertDotNotationArray($options);
+        return Arr::convertDotNotationArray( $options );
     }
 
     /**
@@ -126,7 +126,7 @@ 
      */
     public function isRecaptchaEnabled()
     {
-        $integration = $this->get('settings.submissions.recaptcha.integration');
+        $integration = $this->get( 'settings.submissions.recaptcha.integration' );
         return 'all' == $integration || ('guest' == $integration && !is_user_logged_in());
     }
 
@@ -135,9 +135,9 @@ 
      */
     public function reset()
     {
-        $options = $this->getWP(static::databaseKey(), []);
-        if (!is_array($options) || empty($options)) {
-            delete_option(static::databaseKey());
+        $options = $this->getWP( static::databaseKey(), [] );
+        if( !is_array( $options ) || empty($options) ) {
+            delete_option( static::databaseKey() );
             $options = glsr()->defaults ?: [];
         }
         $this->options = $options;
@@ -148,12 +148,12 @@ 
      * @param mixed $value
      * @return bool
      */
-    public function set($pathOrOptions, $value = '')
+    public function set( $pathOrOptions, $value = '' )
     {
-        if (is_string($pathOrOptions)) {
-            $pathOrOptions = Arr::set($this->all(), $pathOrOptions, $value);
+        if( is_string( $pathOrOptions ) ) {
+            $pathOrOptions = Arr::set( $this->all(), $pathOrOptions, $value );
         }
-        if ($result = update_option(static::databaseKey(), (array) $pathOrOptions)) {
+        if( $result = update_option( static::databaseKey(), (array)$pathOrOptions ) ) {
             $this->reset();
         }
         return $result;

plugin/Commands/RegisterPostType.php

Indentation +69 added lines, -69 removed lines

@@ -9,77 +9,77 @@
 
 class RegisterPostType
 {
-    public $args;
-    public $columns;
-    public $plural;
-    public $postType;
-    public $single;
+	public $args;
+	public $columns;
+	public $plural;
+	public $postType;
+	public $single;
 
-    public function __construct($input)
-    {
-        $args = glsr(PostTypeDefaults::class)->merge($input);
-        $this->normalize($args);
-        $this->normalizeColumns();
-        $this->normalizeLabels();
-    }
+	public function __construct($input)
+	{
+		$args = glsr(PostTypeDefaults::class)->merge($input);
+		$this->normalize($args);
+		$this->normalizeColumns();
+		$this->normalizeLabels();
+	}
 
-    /**
-     * @return void
-     */
-    protected function normalize(array $args)
-    {
-        foreach ($args as $key => $value) {
-            $property = Helper::buildPropertyName($key);
-            if (!property_exists($this, $property)) {
-                continue;
-            }
-            $this->$property = $value;
-            unset($args[$key]);
-        }
-        $this->args = wp_parse_args($args, [
-            'menu_name' => $this->plural,
-        ]);
-    }
+	/**
+	 * @return void
+	 */
+	protected function normalize(array $args)
+	{
+		foreach ($args as $key => $value) {
+			$property = Helper::buildPropertyName($key);
+			if (!property_exists($this, $property)) {
+				continue;
+			}
+			$this->$property = $value;
+			unset($args[$key]);
+		}
+		$this->args = wp_parse_args($args, [
+			'menu_name' => $this->plural,
+		]);
+	}
 
-    /**
-     * @return void
-     */
-    protected function normalizeLabels()
-    {
-        $this->args['labels'] = wp_parse_args($this->args['labels'], [
-            'add_new_item' => sprintf(_x('Add New %s', 'Add New Post', 'site-reviews'), $this->plural),
-            'all_items' => sprintf(_x('All %s', 'All Posts', 'site-reviews'), $this->plural),
-            'archives' => sprintf(_x('%s Archives', 'Post Archives', 'site-reviews'), $this->single),
-            'edit_item' => sprintf(_x('Edit %s', 'Edit Post', 'site-reviews'), $this->single),
-            'insert_into_item' => sprintf(_x('Insert into %s', 'Insert into Post', 'site-reviews'), $this->single),
-            'menu_name' => $this->args['menu_name'],
-            'name' => $this->plural,
-            'new_item' => sprintf(_x('New %s', 'New Post', 'site-reviews'), $this->single),
-            'not_found' => sprintf(_x('No %s found', 'No Posts found', 'site-reviews'), $this->plural),
-            'not_found_in_trash' => sprintf(_x('No %s found in Trash', 'No Posts found in Trash', 'site-reviews'), $this->plural),
-            'search_items' => sprintf(_x('Search %s', 'Search Posts', 'site-reviews'), $this->plural),
-            'singular_name' => $this->single,
-            'uploaded_to_this_item' => sprintf(_x('Uploaded to this %s', 'Uploaded to this Post', 'site-reviews'), $this->single),
-            'view_item' => sprintf(_x('View %s', 'View Post', 'site-reviews'), $this->single),
-        ]);
-        unset($this->args['menu_name']);
-    }
+	/**
+	 * @return void
+	 */
+	protected function normalizeLabels()
+	{
+		$this->args['labels'] = wp_parse_args($this->args['labels'], [
+			'add_new_item' => sprintf(_x('Add New %s', 'Add New Post', 'site-reviews'), $this->plural),
+			'all_items' => sprintf(_x('All %s', 'All Posts', 'site-reviews'), $this->plural),
+			'archives' => sprintf(_x('%s Archives', 'Post Archives', 'site-reviews'), $this->single),
+			'edit_item' => sprintf(_x('Edit %s', 'Edit Post', 'site-reviews'), $this->single),
+			'insert_into_item' => sprintf(_x('Insert into %s', 'Insert into Post', 'site-reviews'), $this->single),
+			'menu_name' => $this->args['menu_name'],
+			'name' => $this->plural,
+			'new_item' => sprintf(_x('New %s', 'New Post', 'site-reviews'), $this->single),
+			'not_found' => sprintf(_x('No %s found', 'No Posts found', 'site-reviews'), $this->plural),
+			'not_found_in_trash' => sprintf(_x('No %s found in Trash', 'No Posts found in Trash', 'site-reviews'), $this->plural),
+			'search_items' => sprintf(_x('Search %s', 'Search Posts', 'site-reviews'), $this->plural),
+			'singular_name' => $this->single,
+			'uploaded_to_this_item' => sprintf(_x('Uploaded to this %s', 'Uploaded to this Post', 'site-reviews'), $this->single),
+			'view_item' => sprintf(_x('View %s', 'View Post', 'site-reviews'), $this->single),
+		]);
+		unset($this->args['menu_name']);
+	}
 
-    /**
-     * @return void
-     */
-    protected function normalizeColumns()
-    {
-        $this->columns = ['cb' => ''] + $this->columns;
-        if (array_key_exists('category', $this->columns)) {
-            $keys = array_keys($this->columns);
-            $keys[array_search('category', $keys)] = 'taxonomy-'.Application::TAXONOMY;
-            $this->columns = array_combine($keys, $this->columns);
-        }
-        if (array_key_exists('pinned', $this->columns)) {
-            $this->columns['pinned'] = glsr(Builder::class)->span('<span>'.$this->columns['pinned'].'</span>',
-                ['class' => 'pinned-icon']
-            );
-        }
-    }
+	/**
+	 * @return void
+	 */
+	protected function normalizeColumns()
+	{
+		$this->columns = ['cb' => ''] + $this->columns;
+		if (array_key_exists('category', $this->columns)) {
+			$keys = array_keys($this->columns);
+			$keys[array_search('category', $keys)] = 'taxonomy-'.Application::TAXONOMY;
+			$this->columns = array_combine($keys, $this->columns);
+		}
+		if (array_key_exists('pinned', $this->columns)) {
+			$this->columns['pinned'] = glsr(Builder::class)->span('<span>'.$this->columns['pinned'].'</span>',
+				['class' => 'pinned-icon']
+			);
+		}
+	}
 }

Spacing +28 added lines, -28 removed lines

@@ -15,10 +15,10 @@ 
     public $postType;
     public $single;
 
-    public function __construct($input)
+    public function __construct( $input )
     {
-        $args = glsr(PostTypeDefaults::class)->merge($input);
-        $this->normalize($args);
+        $args = glsr( PostTypeDefaults::class )->merge( $input );
+        $this->normalize( $args );
         $this->normalizeColumns();
         $this->normalizeLabels();
     }
@@ -26,19 +26,19 @@ 
     /**
      * @return void
      */
-    protected function normalize(array $args)
+    protected function normalize( array $args )
     {
-        foreach ($args as $key => $value) {
-            $property = Helper::buildPropertyName($key);
-            if (!property_exists($this, $property)) {
+        foreach( $args as $key => $value ) {
+            $property = Helper::buildPropertyName( $key );
+            if( !property_exists( $this, $property ) ) {
                 continue;
             }
             $this->$property = $value;
             unset($args[$key]);
         }
-        $this->args = wp_parse_args($args, [
+        $this->args = wp_parse_args( $args, [
             'menu_name' => $this->plural,
-        ]);
+        ] );
     }
 
     /**
@@ -46,22 +46,22 @@ 
      */
     protected function normalizeLabels()
     {
-        $this->args['labels'] = wp_parse_args($this->args['labels'], [
-            'add_new_item' => sprintf(_x('Add New %s', 'Add New Post', 'site-reviews'), $this->plural),
-            'all_items' => sprintf(_x('All %s', 'All Posts', 'site-reviews'), $this->plural),
-            'archives' => sprintf(_x('%s Archives', 'Post Archives', 'site-reviews'), $this->single),
-            'edit_item' => sprintf(_x('Edit %s', 'Edit Post', 'site-reviews'), $this->single),
-            'insert_into_item' => sprintf(_x('Insert into %s', 'Insert into Post', 'site-reviews'), $this->single),
+        $this->args['labels'] = wp_parse_args( $this->args['labels'], [
+            'add_new_item' => sprintf( _x( 'Add New %s', 'Add New Post', 'site-reviews' ), $this->plural ),
+            'all_items' => sprintf( _x( 'All %s', 'All Posts', 'site-reviews' ), $this->plural ),
+            'archives' => sprintf( _x( '%s Archives', 'Post Archives', 'site-reviews' ), $this->single ),
+            'edit_item' => sprintf( _x( 'Edit %s', 'Edit Post', 'site-reviews' ), $this->single ),
+            'insert_into_item' => sprintf( _x( 'Insert into %s', 'Insert into Post', 'site-reviews' ), $this->single ),
             'menu_name' => $this->args['menu_name'],
             'name' => $this->plural,
-            'new_item' => sprintf(_x('New %s', 'New Post', 'site-reviews'), $this->single),
-            'not_found' => sprintf(_x('No %s found', 'No Posts found', 'site-reviews'), $this->plural),
-            'not_found_in_trash' => sprintf(_x('No %s found in Trash', 'No Posts found in Trash', 'site-reviews'), $this->plural),
-            'search_items' => sprintf(_x('Search %s', 'Search Posts', 'site-reviews'), $this->plural),
+            'new_item' => sprintf( _x( 'New %s', 'New Post', 'site-reviews' ), $this->single ),
+            'not_found' => sprintf( _x( 'No %s found', 'No Posts found', 'site-reviews' ), $this->plural ),
+            'not_found_in_trash' => sprintf( _x( 'No %s found in Trash', 'No Posts found in Trash', 'site-reviews' ), $this->plural ),
+            'search_items' => sprintf( _x( 'Search %s', 'Search Posts', 'site-reviews' ), $this->plural ),
             'singular_name' => $this->single,
-            'uploaded_to_this_item' => sprintf(_x('Uploaded to this %s', 'Uploaded to this Post', 'site-reviews'), $this->single),
-            'view_item' => sprintf(_x('View %s', 'View Post', 'site-reviews'), $this->single),
-        ]);
+            'uploaded_to_this_item' => sprintf( _x( 'Uploaded to this %s', 'Uploaded to this Post', 'site-reviews' ), $this->single ),
+            'view_item' => sprintf( _x( 'View %s', 'View Post', 'site-reviews' ), $this->single ),
+        ] );
         unset($this->args['menu_name']);
     }
 
@@ -71,13 +71,13 @@ 
     protected function normalizeColumns()
     {
         $this->columns = ['cb' => ''] + $this->columns;
-        if (array_key_exists('category', $this->columns)) {
-            $keys = array_keys($this->columns);
-            $keys[array_search('category', $keys)] = 'taxonomy-'.Application::TAXONOMY;
-            $this->columns = array_combine($keys, $this->columns);
+        if( array_key_exists( 'category', $this->columns ) ) {
+            $keys = array_keys( $this->columns );
+            $keys[array_search( 'category', $keys )] = 'taxonomy-'.Application::TAXONOMY;
+            $this->columns = array_combine( $keys, $this->columns );
         }
-        if (array_key_exists('pinned', $this->columns)) {
-            $this->columns['pinned'] = glsr(Builder::class)->span('<span>'.$this->columns['pinned'].'</span>',
+        if( array_key_exists( 'pinned', $this->columns ) ) {
+            $this->columns['pinned'] = glsr( Builder::class )->span( '<span>'.$this->columns['pinned'].'</span>',
                 ['class' => 'pinned-icon']
             );
         }

plugin/Commands/CreateReview.php

Indentation +128 added lines, -128 removed lines

@@ -6,140 +6,140 @@
 
 class CreateReview
 {
-    public $ajax_request;
-    public $assigned_to;
-    public $author;
-    public $avatar;
-    public $blacklisted;
-    public $category;
-    public $content;
-    public $custom;
-    public $date;
-    public $email;
-    public $form_id;
-    public $ip_address;
-    public $post_id;
-    public $rating;
-    public $referer;
-    public $request;
-    public $response;
-    public $terms;
-    public $title;
-    public $url;
+	public $ajax_request;
+	public $assigned_to;
+	public $author;
+	public $avatar;
+	public $blacklisted;
+	public $category;
+	public $content;
+	public $custom;
+	public $date;
+	public $email;
+	public $form_id;
+	public $ip_address;
+	public $post_id;
+	public $rating;
+	public $referer;
+	public $request;
+	public $response;
+	public $terms;
+	public $title;
+	public $url;
 
-    public function __construct($input)
-    {
-        $this->request = $input;
-        $this->ajax_request = isset($input['_ajax_request']);
-        $this->assigned_to = $this->getNumeric('assign_to');
-        $this->author = sanitize_text_field($this->getUser('name'));
-        $this->avatar = $this->getAvatar();
-        $this->blacklisted = isset($input['blacklisted']);
-        $this->category = $this->getCategory();
-        $this->content = sanitize_textarea_field($this->get('content'));
-        $this->custom = $this->getCustom();
-        $this->date = $this->getDate('date');
-        $this->email = sanitize_email($this->getUser('email'));
-        $this->form_id = sanitize_key($this->get('form_id'));
-        $this->ip_address = $this->get('ip_address');
-        $this->post_id = intval($this->get('_post_id'));
-        $this->rating = intval($this->get('rating'));
-        $this->referer = $this->get('_referer');
-        $this->response = sanitize_textarea_field($this->get('response'));
-        $this->terms = !empty($input['terms']);
-        $this->title = sanitize_text_field($this->get('title'));
-        $this->url = esc_url_raw($this->get('url'));
-    }
+	public function __construct($input)
+	{
+		$this->request = $input;
+		$this->ajax_request = isset($input['_ajax_request']);
+		$this->assigned_to = $this->getNumeric('assign_to');
+		$this->author = sanitize_text_field($this->getUser('name'));
+		$this->avatar = $this->getAvatar();
+		$this->blacklisted = isset($input['blacklisted']);
+		$this->category = $this->getCategory();
+		$this->content = sanitize_textarea_field($this->get('content'));
+		$this->custom = $this->getCustom();
+		$this->date = $this->getDate('date');
+		$this->email = sanitize_email($this->getUser('email'));
+		$this->form_id = sanitize_key($this->get('form_id'));
+		$this->ip_address = $this->get('ip_address');
+		$this->post_id = intval($this->get('_post_id'));
+		$this->rating = intval($this->get('rating'));
+		$this->referer = $this->get('_referer');
+		$this->response = sanitize_textarea_field($this->get('response'));
+		$this->terms = !empty($input['terms']);
+		$this->title = sanitize_text_field($this->get('title'));
+		$this->url = esc_url_raw($this->get('url'));
+	}
 
-    /**
-     * @param string $key
-     * @return string
-     */
-    protected function get($key)
-    {
-        return (string) Arr::get($this->request, $key);
-    }
+	/**
+	 * @param string $key
+	 * @return string
+	 */
+	protected function get($key)
+	{
+		return (string) Arr::get($this->request, $key);
+	}
 
-    /**
-     * @return string
-     */
-    protected function getAvatar()
-    {
-        $avatar = $this->get('avatar');
-        return !filter_var($avatar, FILTER_VALIDATE_URL, FILTER_FLAG_PATH_REQUIRED)
-            ? (string) get_avatar_url($this->get('email'))
-            : $avatar;
-    }
+	/**
+	 * @return string
+	 */
+	protected function getAvatar()
+	{
+		$avatar = $this->get('avatar');
+		return !filter_var($avatar, FILTER_VALIDATE_URL, FILTER_FLAG_PATH_REQUIRED)
+			? (string) get_avatar_url($this->get('email'))
+			: $avatar;
+	}
 
-    /**
-     * @return string
-     */
-    protected function getCategory()
-    {
-        $categories = Arr::convertStringToArray($this->get('category'));
-        return sanitize_key(Arr::get($categories, 0));
-    }
+	/**
+	 * @return string
+	 */
+	protected function getCategory()
+	{
+		$categories = Arr::convertStringToArray($this->get('category'));
+		return sanitize_key(Arr::get($categories, 0));
+	}
 
-    /**
-     * @return array
-     */
-    protected function getCustom()
-    {
-        $unset = [
-            '_action', '_ajax_request', '_counter', '_nonce', '_post_id', '_recaptcha-token',
-            '_referer', 'assign_to', 'category', 'content', 'date', 'email', 'excluded', 'form_id',
-            'gotcha', 'ip_address', 'name', 'rating', 'response', 'terms', 'title', 'url',
-        ];
-        $unset = apply_filters('site-reviews/create/unset-keys-from-custom', $unset);
-        $custom = $this->request;
-        foreach ($unset as $value) {
-            unset($custom[$value]);
-        }
-        return $custom;
-    }
+	/**
+	 * @return array
+	 */
+	protected function getCustom()
+	{
+		$unset = [
+			'_action', '_ajax_request', '_counter', '_nonce', '_post_id', '_recaptcha-token',
+			'_referer', 'assign_to', 'category', 'content', 'date', 'email', 'excluded', 'form_id',
+			'gotcha', 'ip_address', 'name', 'rating', 'response', 'terms', 'title', 'url',
+		];
+		$unset = apply_filters('site-reviews/create/unset-keys-from-custom', $unset);
+		$custom = $this->request;
+		foreach ($unset as $value) {
+			unset($custom[$value]);
+		}
+		return $custom;
+	}
 
-    /**
-     * @param string $key
-     * @return string
-     */
-    protected function getDate($key)
-    {
-        $date = strtotime($this->get($key));
-        if (false === $date) {
-            $date = time();
-        }
-        return get_date_from_gmt(gmdate('Y-m-d H:i:s', $date));
-    }
+	/**
+	 * @param string $key
+	 * @return string
+	 */
+	protected function getDate($key)
+	{
+		$date = strtotime($this->get($key));
+		if (false === $date) {
+			$date = time();
+		}
+		return get_date_from_gmt(gmdate('Y-m-d H:i:s', $date));
+	}
 
-    /**
-     * @param string $key
-     * @return string
-     */
-    protected function getUser($key)
-    {
-        $value = $this->get($key);
-        if (empty($value)) {
-            $user = wp_get_current_user();
-            $userValues = [
-                'email' => 'user_email',
-                'name' => 'display_name',
-            ];
-            if ($user->exists() && array_key_exists($key, $userValues)) {
-                return $user->{$userValues[$key]};
-            }
-        }
-        return $value;
-    }
+	/**
+	 * @param string $key
+	 * @return string
+	 */
+	protected function getUser($key)
+	{
+		$value = $this->get($key);
+		if (empty($value)) {
+			$user = wp_get_current_user();
+			$userValues = [
+				'email' => 'user_email',
+				'name' => 'display_name',
+			];
+			if ($user->exists() && array_key_exists($key, $userValues)) {
+				return $user->{$userValues[$key]};
+			}
+		}
+		return $value;
+	}
 
-    /**
-     * @param string $key
-     * @return string
-     */
-    protected function getNumeric($key)
-    {
-        $value = $this->get($key);
-        return is_numeric($value)
-            ? $value
-            : '';
-    }
+	/**
+	 * @param string $key
+	 * @return string
+	 */
+	protected function getNumeric($key)
+	{
+		$value = $this->get($key);
+		return is_numeric($value)
+			? $value
+			: '';
+	}
 }

Spacing +34 added lines, -34 removed lines

@@ -27,37 +27,37 @@ 
     public $title;
     public $url;
 
-    public function __construct($input)
+    public function __construct( $input )
     {
         $this->request = $input;
         $this->ajax_request = isset($input['_ajax_request']);
-        $this->assigned_to = $this->getNumeric('assign_to');
-        $this->author = sanitize_text_field($this->getUser('name'));
+        $this->assigned_to = $this->getNumeric( 'assign_to' );
+        $this->author = sanitize_text_field( $this->getUser( 'name' ) );
         $this->avatar = $this->getAvatar();
         $this->blacklisted = isset($input['blacklisted']);
         $this->category = $this->getCategory();
-        $this->content = sanitize_textarea_field($this->get('content'));
+        $this->content = sanitize_textarea_field( $this->get( 'content' ) );
         $this->custom = $this->getCustom();
-        $this->date = $this->getDate('date');
-        $this->email = sanitize_email($this->getUser('email'));
-        $this->form_id = sanitize_key($this->get('form_id'));
-        $this->ip_address = $this->get('ip_address');
-        $this->post_id = intval($this->get('_post_id'));
-        $this->rating = intval($this->get('rating'));
-        $this->referer = $this->get('_referer');
-        $this->response = sanitize_textarea_field($this->get('response'));
+        $this->date = $this->getDate( 'date' );
+        $this->email = sanitize_email( $this->getUser( 'email' ) );
+        $this->form_id = sanitize_key( $this->get( 'form_id' ) );
+        $this->ip_address = $this->get( 'ip_address' );
+        $this->post_id = intval( $this->get( '_post_id' ) );
+        $this->rating = intval( $this->get( 'rating' ) );
+        $this->referer = $this->get( '_referer' );
+        $this->response = sanitize_textarea_field( $this->get( 'response' ) );
         $this->terms = !empty($input['terms']);
-        $this->title = sanitize_text_field($this->get('title'));
-        $this->url = esc_url_raw($this->get('url'));
+        $this->title = sanitize_text_field( $this->get( 'title' ) );
+        $this->url = esc_url_raw( $this->get( 'url' ) );
     }
 
     /**
      * @param string $key
      * @return string
      */
-    protected function get($key)
+    protected function get( $key )
     {
-        return (string) Arr::get($this->request, $key);
+        return (string)Arr::get( $this->request, $key );
     }
 
     /**
@@ -65,9 +65,9 @@ 
      */
     protected function getAvatar()
     {
-        $avatar = $this->get('avatar');
-        return !filter_var($avatar, FILTER_VALIDATE_URL, FILTER_FLAG_PATH_REQUIRED)
-            ? (string) get_avatar_url($this->get('email'))
+        $avatar = $this->get( 'avatar' );
+        return !filter_var( $avatar, FILTER_VALIDATE_URL, FILTER_FLAG_PATH_REQUIRED )
+            ? (string)get_avatar_url( $this->get( 'email' ) )
             : $avatar;
     }
 
@@ -76,8 +76,8 @@ 
      */
     protected function getCategory()
     {
-        $categories = Arr::convertStringToArray($this->get('category'));
-        return sanitize_key(Arr::get($categories, 0));
+        $categories = Arr::convertStringToArray( $this->get( 'category' ) );
+        return sanitize_key( Arr::get( $categories, 0 ) );
     }
 
     /**
@@ -90,9 +90,9 @@ 
             '_referer', 'assign_to', 'category', 'content', 'date', 'email', 'excluded', 'form_id',
             'gotcha', 'ip_address', 'name', 'rating', 'response', 'terms', 'title', 'url',
         ];
-        $unset = apply_filters('site-reviews/create/unset-keys-from-custom', $unset);
+        $unset = apply_filters( 'site-reviews/create/unset-keys-from-custom', $unset );
         $custom = $this->request;
-        foreach ($unset as $value) {
+        foreach( $unset as $value ) {
             unset($custom[$value]);
         }
         return $custom;
@@ -102,29 +102,29 @@ 
      * @param string $key
      * @return string
      */
-    protected function getDate($key)
+    protected function getDate( $key )
     {
-        $date = strtotime($this->get($key));
-        if (false === $date) {
+        $date = strtotime( $this->get( $key ) );
+        if( false === $date ) {
             $date = time();
         }
-        return get_date_from_gmt(gmdate('Y-m-d H:i:s', $date));
+        return get_date_from_gmt( gmdate( 'Y-m-d H:i:s', $date ) );
     }
 
     /**
      * @param string $key
      * @return string
      */
-    protected function getUser($key)
+    protected function getUser( $key )
     {
-        $value = $this->get($key);
-        if (empty($value)) {
+        $value = $this->get( $key );
+        if( empty($value) ) {
             $user = wp_get_current_user();
             $userValues = [
                 'email' => 'user_email',
                 'name' => 'display_name',
             ];
-            if ($user->exists() && array_key_exists($key, $userValues)) {
+            if( $user->exists() && array_key_exists( $key, $userValues ) ) {
                 return $user->{$userValues[$key]};
             }
         }
@@ -135,10 +135,10 @@ 
      * @param string $key
      * @return string
      */
-    protected function getNumeric($key)
+    protected function getNumeric( $key )
     {
-        $value = $this->get($key);
-        return is_numeric($value)
+        $value = $this->get( $key );
+        return is_numeric( $value )
             ? $value
             : '';
     }

plugin/Router.php

Indentation +147 added lines, -147 removed lines

@@ -7,162 +7,162 @@
 
 class Router
 {
-    /**
-     * @var array
-     */
-    protected $unguardedActions = [];
+	/**
+	 * @var array
+	 */
+	protected $unguardedActions = [];
 
-    public function __construct()
-    {
-        $this->unguardedActions = apply_filters('site-reviews/router/unguarded-actions', [
-            'dismiss-notice',
-            'fetch-paged-reviews',
-        ]);
-    }
+	public function __construct()
+	{
+		$this->unguardedActions = apply_filters('site-reviews/router/unguarded-actions', [
+			'dismiss-notice',
+			'fetch-paged-reviews',
+		]);
+	}
 
-    /**
-     * @return void
-     */
-    public function routeAdminPostRequest()
-    {
-        $request = $this->getRequest();
-        if (!$this->isValidPostRequest($request)) {
-            return;
-        }
-        check_admin_referer($request['_action']);
-        $this->routeRequest('admin', $request['_action'], $request);
-    }
+	/**
+	 * @return void
+	 */
+	public function routeAdminPostRequest()
+	{
+		$request = $this->getRequest();
+		if (!$this->isValidPostRequest($request)) {
+			return;
+		}
+		check_admin_referer($request['_action']);
+		$this->routeRequest('admin', $request['_action'], $request);
+	}
 
-    /**
-     * @return void
-     */
-    public function routeAjaxRequest()
-    {
-        $request = $this->getRequest();
-        $this->checkAjaxRequest($request);
-        $this->checkAjaxNonce($request);
-        $this->routeRequest('ajax', $request['_action'], $request);
-        wp_die();
-    }
+	/**
+	 * @return void
+	 */
+	public function routeAjaxRequest()
+	{
+		$request = $this->getRequest();
+		$this->checkAjaxRequest($request);
+		$this->checkAjaxNonce($request);
+		$this->routeRequest('ajax', $request['_action'], $request);
+		wp_die();
+	}
 
-    /**
-     * @return void
-     */
-    public function routePublicPostRequest()
-    {
-        if (is_admin()) {
-            return;
-        }
-        $request = $this->getRequest();
-        if (!$this->isValidPostRequest($request)) {
-            return;
-        }
-        if (!$this->isValidPublicNonce($request)) {
-            return;
-        }
-        $this->routeRequest('public', $request['_action'], $request);
-    }
+	/**
+	 * @return void
+	 */
+	public function routePublicPostRequest()
+	{
+		if (is_admin()) {
+			return;
+		}
+		$request = $this->getRequest();
+		if (!$this->isValidPostRequest($request)) {
+			return;
+		}
+		if (!$this->isValidPublicNonce($request)) {
+			return;
+		}
+		$this->routeRequest('public', $request['_action'], $request);
+	}
 
-    /**
-     * @return void
-     */
-    protected function checkAjaxNonce(array $request)
-    {
-        if (!is_user_logged_in() || in_array(Arr::get($request, '_action'), $this->unguardedActions)) {
-            return;
-        }
-        if (!isset($request['_nonce'])) {
-            $this->sendAjaxError('request is missing a nonce', $request);
-        }
-        if (!wp_verify_nonce($request['_nonce'], $request['_action'])) {
-            $this->sendAjaxError('request failed the nonce check', $request, 403);
-        }
-    }
+	/**
+	 * @return void
+	 */
+	protected function checkAjaxNonce(array $request)
+	{
+		if (!is_user_logged_in() || in_array(Arr::get($request, '_action'), $this->unguardedActions)) {
+			return;
+		}
+		if (!isset($request['_nonce'])) {
+			$this->sendAjaxError('request is missing a nonce', $request);
+		}
+		if (!wp_verify_nonce($request['_nonce'], $request['_action'])) {
+			$this->sendAjaxError('request failed the nonce check', $request, 403);
+		}
+	}
 
-    /**
-     * @return void
-     */
-    protected function checkAjaxRequest(array $request)
-    {
-        if (!isset($request['_action'])) {
-            $this->sendAjaxError('request must include an action', $request);
-        }
-        if (empty($request['_ajax_request'])) {
-            $this->sendAjaxError('request is invalid', $request);
-        }
-    }
+	/**
+	 * @return void
+	 */
+	protected function checkAjaxRequest(array $request)
+	{
+		if (!isset($request['_action'])) {
+			$this->sendAjaxError('request must include an action', $request);
+		}
+		if (empty($request['_ajax_request'])) {
+			$this->sendAjaxError('request is invalid', $request);
+		}
+	}
 
-    /**
-     * All ajax requests in the plugin are triggered by a single action hook: glsr_action,
-     * while each ajax route is determined by $_POST[request][_action].
-     * @return array
-     */
-    protected function getRequest()
-    {
-        $request = Helper::filterInputArray(Application::ID);
-        if (Helper::filterInput('action') == Application::PREFIX.'action') {
-            $request['_ajax_request'] = true;
-        }
-        if ('submit-review' == Helper::filterInput('_action', $request)) {
-            $request['_recaptcha-token'] = Helper::filterInput('g-recaptcha-response');
-        }
-        return $request;
-    }
+	/**
+	 * All ajax requests in the plugin are triggered by a single action hook: glsr_action,
+	 * while each ajax route is determined by $_POST[request][_action].
+	 * @return array
+	 */
+	protected function getRequest()
+	{
+		$request = Helper::filterInputArray(Application::ID);
+		if (Helper::filterInput('action') == Application::PREFIX.'action') {
+			$request['_ajax_request'] = true;
+		}
+		if ('submit-review' == Helper::filterInput('_action', $request)) {
+			$request['_recaptcha-token'] = Helper::filterInput('g-recaptcha-response');
+		}
+		return $request;
+	}
 
-    /**
-     * @return bool
-     */
-    protected function isValidPostRequest(array $request = [])
-    {
-        return !empty($request['_action']) && empty($request['_ajax_request']);
-    }
+	/**
+	 * @return bool
+	 */
+	protected function isValidPostRequest(array $request = [])
+	{
+		return !empty($request['_action']) && empty($request['_ajax_request']);
+	}
 
-    /**
-     * @return bool
-     */
-    protected function isValidPublicNonce(array $request)
-    {
-        if (is_user_logged_in() && !wp_verify_nonce($request['_nonce'], $request['_action'])) {
-            glsr_log()->error('nonce check failed for public request')->debug($request);
-            return false;
-        }
-        return true;
-    }
+	/**
+	 * @return bool
+	 */
+	protected function isValidPublicNonce(array $request)
+	{
+		if (is_user_logged_in() && !wp_verify_nonce($request['_nonce'], $request['_action'])) {
+			glsr_log()->error('nonce check failed for public request')->debug($request);
+			return false;
+		}
+		return true;
+	}
 
-    /**
-     * @param string $type
-     * @param string $action
-     * @return void
-     */
-    protected function routeRequest($type, $action, array $request = [])
-    {
-        $actionHook = 'site-reviews/route/'.$type.'/request';
-        $controller = glsr(Helper::buildClassName($type.'-controller', 'Controllers'));
-        $method = Helper::buildMethodName($action, 'router');
-        $request = apply_filters('site-reviews/route/request', $request, $action, $type);
-        do_action($actionHook, $action, $request);
-        if (is_callable([$controller, $method])) {
-            call_user_func([$controller, $method], $request);
-            return;
-        }
-        if (0 === did_action($actionHook)) {
-            glsr_log('Unknown '.$type.' router request: '.$action);
-        }
-    }
+	/**
+	 * @param string $type
+	 * @param string $action
+	 * @return void
+	 */
+	protected function routeRequest($type, $action, array $request = [])
+	{
+		$actionHook = 'site-reviews/route/'.$type.'/request';
+		$controller = glsr(Helper::buildClassName($type.'-controller', 'Controllers'));
+		$method = Helper::buildMethodName($action, 'router');
+		$request = apply_filters('site-reviews/route/request', $request, $action, $type);
+		do_action($actionHook, $action, $request);
+		if (is_callable([$controller, $method])) {
+			call_user_func([$controller, $method], $request);
+			return;
+		}
+		if (0 === did_action($actionHook)) {
+			glsr_log('Unknown '.$type.' router request: '.$action);
+		}
+	}
 
-    /**
-     * @param string $error
-     * @param int $statusCode
-     * @return void
-     */
-    protected function sendAjaxError($error, array $request, $statusCode = 400)
-    {
-        glsr_log()->error($error)->debug($request);
-        glsr(Notice::class)->addError(__('There was an error (try reloading the page).', 'site-reviews').' <code>'.$error.'</code>');
-        wp_send_json_error([
-            'message' => __('The form could not be submitted. Please notify the site administrator.', 'site-reviews'),
-            'notices' => glsr(Notice::class)->get(),
-            'error' => $error,
-        ]);
-    }
+	/**
+	 * @param string $error
+	 * @param int $statusCode
+	 * @return void
+	 */
+	protected function sendAjaxError($error, array $request, $statusCode = 400)
+	{
+		glsr_log()->error($error)->debug($request);
+		glsr(Notice::class)->addError(__('There was an error (try reloading the page).', 'site-reviews').' <code>'.$error.'</code>');
+		wp_send_json_error([
+			'message' => __('The form could not be submitted. Please notify the site administrator.', 'site-reviews'),
+			'notices' => glsr(Notice::class)->get(),
+			'error' => $error,
+		]);
+	}
 }

Spacing +47 added lines, -47 removed lines

@@ -14,10 +14,10 @@ 
 
     public function __construct()
     {
-        $this->unguardedActions = apply_filters('site-reviews/router/unguarded-actions', [
+        $this->unguardedActions = apply_filters( 'site-reviews/router/unguarded-actions', [
             'dismiss-notice',
             'fetch-paged-reviews',
-        ]);
+        ] );
     }
 
     /**
@@ -26,11 +26,11 @@ 
     public function routeAdminPostRequest()
     {
         $request = $this->getRequest();
-        if (!$this->isValidPostRequest($request)) {
+        if( !$this->isValidPostRequest( $request ) ) {
             return;
         }
-        check_admin_referer($request['_action']);
-        $this->routeRequest('admin', $request['_action'], $request);
+        check_admin_referer( $request['_action'] );
+        $this->routeRequest( 'admin', $request['_action'], $request );
     }
 
     /**
@@ -39,9 +39,9 @@ 
     public function routeAjaxRequest()
     {
         $request = $this->getRequest();
-        $this->checkAjaxRequest($request);
-        $this->checkAjaxNonce($request);
-        $this->routeRequest('ajax', $request['_action'], $request);
+        $this->checkAjaxRequest( $request );
+        $this->checkAjaxNonce( $request );
+        $this->routeRequest( 'ajax', $request['_action'], $request );
         wp_die();
     }
 
@@ -50,45 +50,45 @@ 
      */
     public function routePublicPostRequest()
     {
-        if (is_admin()) {
+        if( is_admin() ) {
             return;
         }
         $request = $this->getRequest();
-        if (!$this->isValidPostRequest($request)) {
+        if( !$this->isValidPostRequest( $request ) ) {
             return;
         }
-        if (!$this->isValidPublicNonce($request)) {
+        if( !$this->isValidPublicNonce( $request ) ) {
             return;
         }
-        $this->routeRequest('public', $request['_action'], $request);
+        $this->routeRequest( 'public', $request['_action'], $request );
     }
 
     /**
      * @return void
      */
-    protected function checkAjaxNonce(array $request)
+    protected function checkAjaxNonce( array $request )
     {
-        if (!is_user_logged_in() || in_array(Arr::get($request, '_action'), $this->unguardedActions)) {
+        if( !is_user_logged_in() || in_array( Arr::get( $request, '_action' ), $this->unguardedActions ) ) {
             return;
         }
-        if (!isset($request['_nonce'])) {
-            $this->sendAjaxError('request is missing a nonce', $request);
+        if( !isset($request['_nonce']) ) {
+            $this->sendAjaxError( 'request is missing a nonce', $request );
         }
-        if (!wp_verify_nonce($request['_nonce'], $request['_action'])) {
-            $this->sendAjaxError('request failed the nonce check', $request, 403);
+        if( !wp_verify_nonce( $request['_nonce'], $request['_action'] ) ) {
+            $this->sendAjaxError( 'request failed the nonce check', $request, 403 );
         }
     }
 
     /**
      * @return void
      */
-    protected function checkAjaxRequest(array $request)
+    protected function checkAjaxRequest( array $request )
     {
-        if (!isset($request['_action'])) {
-            $this->sendAjaxError('request must include an action', $request);
+        if( !isset($request['_action']) ) {
+            $this->sendAjaxError( 'request must include an action', $request );
         }
-        if (empty($request['_ajax_request'])) {
-            $this->sendAjaxError('request is invalid', $request);
+        if( empty($request['_ajax_request']) ) {
+            $this->sendAjaxError( 'request is invalid', $request );
         }
     }
 
@@ -99,12 +99,12 @@ 
      */
     protected function getRequest()
     {
-        $request = Helper::filterInputArray(Application::ID);
-        if (Helper::filterInput('action') == Application::PREFIX.'action') {
+        $request = Helper::filterInputArray( Application::ID );
+        if( Helper::filterInput( 'action' ) == Application::PREFIX.'action' ) {
             $request['_ajax_request'] = true;
         }
-        if ('submit-review' == Helper::filterInput('_action', $request)) {
-            $request['_recaptcha-token'] = Helper::filterInput('g-recaptcha-response');
+        if( 'submit-review' == Helper::filterInput( '_action', $request ) ) {
+            $request['_recaptcha-token'] = Helper::filterInput( 'g-recaptcha-response' );
         }
         return $request;
     }
@@ -112,7 +112,7 @@ 
     /**
      * @return bool
      */
-    protected function isValidPostRequest(array $request = [])
+    protected function isValidPostRequest( array $request = [] )
     {
         return !empty($request['_action']) && empty($request['_ajax_request']);
     }
@@ -120,10 +120,10 @@ 
     /**
      * @return bool
      */
-    protected function isValidPublicNonce(array $request)
+    protected function isValidPublicNonce( array $request )
     {
-        if (is_user_logged_in() && !wp_verify_nonce($request['_nonce'], $request['_action'])) {
-            glsr_log()->error('nonce check failed for public request')->debug($request);
+        if( is_user_logged_in() && !wp_verify_nonce( $request['_nonce'], $request['_action'] ) ) {
+            glsr_log()->error( 'nonce check failed for public request' )->debug( $request );
             return false;
         }
         return true;
@@ -134,19 +134,19 @@ 
      * @param string $action
      * @return void
      */
-    protected function routeRequest($type, $action, array $request = [])
+    protected function routeRequest( $type, $action, array $request = [] )
     {
         $actionHook = 'site-reviews/route/'.$type.'/request';
-        $controller = glsr(Helper::buildClassName($type.'-controller', 'Controllers'));
-        $method = Helper::buildMethodName($action, 'router');
-        $request = apply_filters('site-reviews/route/request', $request, $action, $type);
-        do_action($actionHook, $action, $request);
-        if (is_callable([$controller, $method])) {
-            call_user_func([$controller, $method], $request);
+        $controller = glsr( Helper::buildClassName( $type.'-controller', 'Controllers' ) );
+        $method = Helper::buildMethodName( $action, 'router' );
+        $request = apply_filters( 'site-reviews/route/request', $request, $action, $type );
+        do_action( $actionHook, $action, $request );
+        if( is_callable( [$controller, $method] ) ) {
+            call_user_func( [$controller, $method], $request );
             return;
         }
-        if (0 === did_action($actionHook)) {
-            glsr_log('Unknown '.$type.' router request: '.$action);
+        if( 0 === did_action( $actionHook ) ) {
+            glsr_log( 'Unknown '.$type.' router request: '.$action );
         }
     }
 
@@ -155,14 +155,14 @@ 
      * @param int $statusCode
      * @return void
      */
-    protected function sendAjaxError($error, array $request, $statusCode = 400)
+    protected function sendAjaxError( $error, array $request, $statusCode = 400 )
     {
-        glsr_log()->error($error)->debug($request);
-        glsr(Notice::class)->addError(__('There was an error (try reloading the page).', 'site-reviews').' <code>'.$error.'</code>');
-        wp_send_json_error([
-            'message' => __('The form could not be submitted. Please notify the site administrator.', 'site-reviews'),
-            'notices' => glsr(Notice::class)->get(),
+        glsr_log()->error( $error )->debug( $request );
+        glsr( Notice::class )->addError( __( 'There was an error (try reloading the page).', 'site-reviews' ).' <code>'.$error.'</code>' );
+        wp_send_json_error( [
+            'message' => __( 'The form could not be submitted. Please notify the site administrator.', 'site-reviews' ),
+            'notices' => glsr( Notice::class )->get(),
             'error' => $error,
-        ]);
+        ] );
     }
 }

plugin/Controllers/RebusifyController.php

Braces +4 added lines, -2 removed lines

@@ -51,7 +51,8 @@ 
         }
         if ('F' === $rebusifyProductType && 'yes' === glsr_get_option('general.rebusify')) {
             $button = $this->buildUpgradeButton();
-        } else {
+        }
+        else {
             $button = $this->buildCreateButton();
         }
         $context['field'].= $button;
@@ -229,7 +230,8 @@ 
         );
         if ($rebusify->success) {
             update_option($this->rebusifyKey, Arr::get($rebusify->response, 'producttype'));
-        } else {
+        }
+        else {
             delete_option($this->rebusifyKey);
             $settings = Arr::set($settings, $this->enabledKey, 'no');
             glsr(Notice::class)->addError(sprintf(

Indentation +227 added lines, -227 removed lines

@@ -12,231 +12,231 @@
 
 class RebusifyController extends Controller
 {
-    protected $apiKey = 'settings.general.rebusify_serial';
-    protected $emailKey = 'settings.general.rebusify_email';
-    protected $enabledKey = 'settings.general.rebusify';
-    protected $rebusifyKey = '_glsr_rebusify';
-
-    /**
-     * @return array
-     * @filter site-reviews/settings/callback
-     */
-    public function filterSettingsCallback(array $settings)
-    {
-        if ('yes' !== Arr::get($settings, $this->enabledKey)) {
-            return $settings;
-        }
-        $isApiKeyModified = $this->isEmptyOrModified($this->apiKey, $settings);
-        $isEmailModified = $this->isEmptyOrModified($this->emailKey, $settings);
-        $isAccountVerified = glsr(OptionManager::class)->getWP($this->rebusifyKey, false);
-        if (!$isAccountVerified || $isApiKeyModified || $isEmailModified) {
-            $settings = $this->sanitizeRebusifySettings($settings);
-        }
-        return $settings;
-    }
-
-    /**
-     * @param string $template
-     * @return array
-     * @filter site-reviews/interpolate/partials/form/table-row-multiple
-     */
-    public function filterSettingsTableRow(array $context, $template, array $data)
-    {
-        if ($this->enabledKey !== Arr::get($data, 'field.path')) {
-            return $context;
-        }
-        $rebusifyProductType = glsr(OptionManager::class)->getWP($this->rebusifyKey);
-        if ('P' === $rebusifyProductType) {
-            return $context;
-        }
-        if ('F' === $rebusifyProductType && 'yes' === glsr_get_option('general.rebusify')) {
-            $button = $this->buildUpgradeButton();
-        } else {
-            $button = $this->buildCreateButton();
-        }
-        $context['field'].= $button;
-        return $context;
-    }
-
-    /**
-     * Triggered when a review is created.
-     * @return void
-     * @action site-reviews/review/created
-     */
-    public function onCreated(Review $review)
-    {
-        if (!$this->canPostReview($review)) {
-            return;
-        }
-        $rebusify = glsr(Rebusify::class)->sendReview($review);
-        if ($rebusify->success) {
-            glsr(Database::class)->set($review->ID, 'rebusify', $rebusify->review_id);
-        }
-    }
-
-    /**
-     * Triggered when a review is reverted to its original title/content/date_timestamp.
-     * @return void
-     * @action site-reviews/review/reverted
-     */
-    public function onReverted(Review $review)
-    {
-        if (!$this->canPostReview($review)) {
-            return;
-        }
-        $rebusify = glsr(Rebusify::class)->sendReview($review);
-        if ($rebusify->success) {
-            glsr(Database::class)->set($review->ID, 'rebusify', $rebusify->review_id);
-        }
-    }
-
-    /**
-     * Triggered when an existing review is updated.
-     * @return void
-     * @action site-reviews/review/saved
-     */
-    public function onSaved(Review $review)
-    {
-        if (!$this->canPostReview($review)) {
-            return;
-        }
-        $rebusify = glsr(Rebusify::class)->sendReview($review);
-        if ($rebusify->success) {
-            glsr(Database::class)->set($review->ID, 'rebusify', $rebusify->review_id);
-        }
-    }
-
-    /**
-     * Triggered when a review's response is added or updated.
-     * @param int $metaId
-     * @param int $postId
-     * @param string $metaKey
-     * @return void
-     * @action updated_postmeta
-     */
-    public function onUpdatedMeta($metaId, $postId, $metaKey)
-    {
-        $review = glsr_get_review($postId);
-        if (!$this->canPostResponse($review) || '_response' !== $metaKey) {
-            return;
-        }
-        $rebusify = glsr(Rebusify::class)->sendReviewResponse($review);
-        if ($rebusify->success) {
-            glsr(Database::class)->set($review->ID, 'rebusify_response', true);
-        }
-    }
-
-    /**
-     * @return string
-     */
-    protected function buildCreateButton()
-    {
-        return glsr(Builder::class)->a(__('Create Your Rebusify Account', 'site-reviews'), [
-            'class' => 'button',
-            'href' => Rebusify::WEB_URL,
-            'target' => '_blank',
-        ]);
-    }
-
-    /**
-     * @return string
-     */
-    protected function buildUpgradeButton()
-    {
-        $build = glsr(Builder::class);
-        $notice = $build->p(__('Free Rebusify accounts are limited to 500 blockchain transactions per year.', 'site-reviews'));
-        $button = $build->a(__('Upgrade Your Rebusify Plan', 'site-reviews'), [
-            'class' => 'button',
-            'href' => Rebusify::WEB_URL,
-            'target' => '_blank',
-        ]);
-        return $build->div($notice.$button, [
-            'class' => 'glsr-notice-inline notice inline notice-info',
-        ]);
-    }
-
-    /**
-     * @return bool
-     */
-    protected function canPostResponse(Review $review)
-    {
-        $requiredValues = [
-            glsr(Database::class)->get($review->ID, 'rebusify'),
-            $review->response,
-            $review->review_id,
-        ];
-        return $this->canProceed($review, 'rebusify_response')
-            && 'publish' === $review->status
-            && 3 === count(array_filter($requiredValues));
-    }
-
-    /**
-     * @return bool
-     */
-    protected function canPostReview(Review $review)
-    {
-        $requiredValues = [
-            $review->author,
-            $review->content,
-            $review->rating,
-            $review->review_id,
-            $review->title,
-        ];
-        return $this->canProceed($review)
-            && 'publish' === $review->status
-            && 5 === count(array_filter($requiredValues));
-    }
-
-    /**
-     * @param string $metaKey
-     * @return bool
-     */
-    protected function canProceed(Review $review, $metaKey = 'rebusify')
-    {
-        return glsr(OptionManager::class)->getBool($this->enabledKey)
-            && $this->isReviewPostId($review->ID)
-            && !$this->hasMetaKey($review, $metaKey);
-    }
-
-    /**
-     * @param string $metaKey
-     * @return bool
-     */
-    protected function hasMetaKey(Review $review, $metaKey = 'rebusify')
-    {
-        return '' !== glsr(Database::class)->get($review->ID, $metaKey);
-    }
-
-    /**
-     * @param string $key
-     * @return bool
-     */
-    protected function isEmptyOrModified($key, array $settings)
-    {
-        $oldValue = glsr_get_option($key);
-        $newValue = Arr::get($settings, $key);
-        return empty($newValue) || $newValue !== $oldValue;
-    }
-
-    /**
-     * @return array
-     */
-    protected function sanitizeRebusifySettings(array $settings)
-    {
-        $rebusify = glsr(Rebusify::class)->activateKey(
-            Arr::get($settings, $this->apiKey),
-            Arr::get($settings, $this->emailKey)
-        );
-        if ($rebusify->success) {
-            update_option($this->rebusifyKey, Arr::get($rebusify->response, 'producttype'));
-        } else {
-            delete_option($this->rebusifyKey);
-            $settings = Arr::set($settings, $this->enabledKey, 'no');
-            glsr(Notice::class)->addError(sprintf(
-                __('Your Rebusify account details could not be verified, please try again. %s', 'site-reviews'),
-                '('.$rebusify->message.')'
-            ));
-        }
-        return $settings;
-    }
+	protected $apiKey = 'settings.general.rebusify_serial';
+	protected $emailKey = 'settings.general.rebusify_email';
+	protected $enabledKey = 'settings.general.rebusify';
+	protected $rebusifyKey = '_glsr_rebusify';
+
+	/**
+	 * @return array
+	 * @filter site-reviews/settings/callback
+	 */
+	public function filterSettingsCallback(array $settings)
+	{
+		if ('yes' !== Arr::get($settings, $this->enabledKey)) {
+			return $settings;
+		}
+		$isApiKeyModified = $this->isEmptyOrModified($this->apiKey, $settings);
+		$isEmailModified = $this->isEmptyOrModified($this->emailKey, $settings);
+		$isAccountVerified = glsr(OptionManager::class)->getWP($this->rebusifyKey, false);
+		if (!$isAccountVerified || $isApiKeyModified || $isEmailModified) {
+			$settings = $this->sanitizeRebusifySettings($settings);
+		}
+		return $settings;
+	}
+
+	/**
+	 * @param string $template
+	 * @return array
+	 * @filter site-reviews/interpolate/partials/form/table-row-multiple
+	 */
+	public function filterSettingsTableRow(array $context, $template, array $data)
+	{
+		if ($this->enabledKey !== Arr::get($data, 'field.path')) {
+			return $context;
+		}
+		$rebusifyProductType = glsr(OptionManager::class)->getWP($this->rebusifyKey);
+		if ('P' === $rebusifyProductType) {
+			return $context;
+		}
+		if ('F' === $rebusifyProductType && 'yes' === glsr_get_option('general.rebusify')) {
+			$button = $this->buildUpgradeButton();
+		} else {
+			$button = $this->buildCreateButton();
+		}
+		$context['field'].= $button;
+		return $context;
+	}
+
+	/**
+	 * Triggered when a review is created.
+	 * @return void
+	 * @action site-reviews/review/created
+	 */
+	public function onCreated(Review $review)
+	{
+		if (!$this->canPostReview($review)) {
+			return;
+		}
+		$rebusify = glsr(Rebusify::class)->sendReview($review);
+		if ($rebusify->success) {
+			glsr(Database::class)->set($review->ID, 'rebusify', $rebusify->review_id);
+		}
+	}
+
+	/**
+	 * Triggered when a review is reverted to its original title/content/date_timestamp.
+	 * @return void
+	 * @action site-reviews/review/reverted
+	 */
+	public function onReverted(Review $review)
+	{
+		if (!$this->canPostReview($review)) {
+			return;
+		}
+		$rebusify = glsr(Rebusify::class)->sendReview($review);
+		if ($rebusify->success) {
+			glsr(Database::class)->set($review->ID, 'rebusify', $rebusify->review_id);
+		}
+	}
+
+	/**
+	 * Triggered when an existing review is updated.
+	 * @return void
+	 * @action site-reviews/review/saved
+	 */
+	public function onSaved(Review $review)
+	{
+		if (!$this->canPostReview($review)) {
+			return;
+		}
+		$rebusify = glsr(Rebusify::class)->sendReview($review);
+		if ($rebusify->success) {
+			glsr(Database::class)->set($review->ID, 'rebusify', $rebusify->review_id);
+		}
+	}
+
+	/**
+	 * Triggered when a review's response is added or updated.
+	 * @param int $metaId
+	 * @param int $postId
+	 * @param string $metaKey
+	 * @return void
+	 * @action updated_postmeta
+	 */
+	public function onUpdatedMeta($metaId, $postId, $metaKey)
+	{
+		$review = glsr_get_review($postId);
+		if (!$this->canPostResponse($review) || '_response' !== $metaKey) {
+			return;
+		}
+		$rebusify = glsr(Rebusify::class)->sendReviewResponse($review);
+		if ($rebusify->success) {
+			glsr(Database::class)->set($review->ID, 'rebusify_response', true);
+		}
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function buildCreateButton()
+	{
+		return glsr(Builder::class)->a(__('Create Your Rebusify Account', 'site-reviews'), [
+			'class' => 'button',
+			'href' => Rebusify::WEB_URL,
+			'target' => '_blank',
+		]);
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function buildUpgradeButton()
+	{
+		$build = glsr(Builder::class);
+		$notice = $build->p(__('Free Rebusify accounts are limited to 500 blockchain transactions per year.', 'site-reviews'));
+		$button = $build->a(__('Upgrade Your Rebusify Plan', 'site-reviews'), [
+			'class' => 'button',
+			'href' => Rebusify::WEB_URL,
+			'target' => '_blank',
+		]);
+		return $build->div($notice.$button, [
+			'class' => 'glsr-notice-inline notice inline notice-info',
+		]);
+	}
+
+	/**
+	 * @return bool
+	 */
+	protected function canPostResponse(Review $review)
+	{
+		$requiredValues = [
+			glsr(Database::class)->get($review->ID, 'rebusify'),
+			$review->response,
+			$review->review_id,
+		];
+		return $this->canProceed($review, 'rebusify_response')
+			&& 'publish' === $review->status
+			&& 3 === count(array_filter($requiredValues));
+	}
+
+	/**
+	 * @return bool
+	 */
+	protected function canPostReview(Review $review)
+	{
+		$requiredValues = [
+			$review->author,
+			$review->content,
+			$review->rating,
+			$review->review_id,
+			$review->title,
+		];
+		return $this->canProceed($review)
+			&& 'publish' === $review->status
+			&& 5 === count(array_filter($requiredValues));
+	}
+
+	/**
+	 * @param string $metaKey
+	 * @return bool
+	 */
+	protected function canProceed(Review $review, $metaKey = 'rebusify')
+	{
+		return glsr(OptionManager::class)->getBool($this->enabledKey)
+			&& $this->isReviewPostId($review->ID)
+			&& !$this->hasMetaKey($review, $metaKey);
+	}
+
+	/**
+	 * @param string $metaKey
+	 * @return bool
+	 */
+	protected function hasMetaKey(Review $review, $metaKey = 'rebusify')
+	{
+		return '' !== glsr(Database::class)->get($review->ID, $metaKey);
+	}
+
+	/**
+	 * @param string $key
+	 * @return bool
+	 */
+	protected function isEmptyOrModified($key, array $settings)
+	{
+		$oldValue = glsr_get_option($key);
+		$newValue = Arr::get($settings, $key);
+		return empty($newValue) || $newValue !== $oldValue;
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function sanitizeRebusifySettings(array $settings)
+	{
+		$rebusify = glsr(Rebusify::class)->activateKey(
+			Arr::get($settings, $this->apiKey),
+			Arr::get($settings, $this->emailKey)
+		);
+		if ($rebusify->success) {
+			update_option($this->rebusifyKey, Arr::get($rebusify->response, 'producttype'));
+		} else {
+			delete_option($this->rebusifyKey);
+			$settings = Arr::set($settings, $this->enabledKey, 'no');
+			glsr(Notice::class)->addError(sprintf(
+				__('Your Rebusify account details could not be verified, please try again. %s', 'site-reviews'),
+				'('.$rebusify->message.')'
+			));
+		}
+		return $settings;
+	}
 }

Spacing +69 added lines, -69 removed lines

@@ -21,16 +21,16 @@ 
      * @return array
      * @filter site-reviews/settings/callback
      */
-    public function filterSettingsCallback(array $settings)
+    public function filterSettingsCallback( array $settings )
     {
-        if ('yes' !== Arr::get($settings, $this->enabledKey)) {
+        if( 'yes' !== Arr::get( $settings, $this->enabledKey ) ) {
             return $settings;
         }
-        $isApiKeyModified = $this->isEmptyOrModified($this->apiKey, $settings);
-        $isEmailModified = $this->isEmptyOrModified($this->emailKey, $settings);
-        $isAccountVerified = glsr(OptionManager::class)->getWP($this->rebusifyKey, false);
-        if (!$isAccountVerified || $isApiKeyModified || $isEmailModified) {
-            $settings = $this->sanitizeRebusifySettings($settings);
+        $isApiKeyModified = $this->isEmptyOrModified( $this->apiKey, $settings );
+        $isEmailModified = $this->isEmptyOrModified( $this->emailKey, $settings );
+        $isAccountVerified = glsr( OptionManager::class )->getWP( $this->rebusifyKey, false );
+        if( !$isAccountVerified || $isApiKeyModified || $isEmailModified ) {
+            $settings = $this->sanitizeRebusifySettings( $settings );
         }
         return $settings;
     }
@@ -40,21 +40,21 @@ 
      * @return array
      * @filter site-reviews/interpolate/partials/form/table-row-multiple
      */
-    public function filterSettingsTableRow(array $context, $template, array $data)
+    public function filterSettingsTableRow( array $context, $template, array $data )
     {
-        if ($this->enabledKey !== Arr::get($data, 'field.path')) {
+        if( $this->enabledKey !== Arr::get( $data, 'field.path' ) ) {
             return $context;
         }
-        $rebusifyProductType = glsr(OptionManager::class)->getWP($this->rebusifyKey);
-        if ('P' === $rebusifyProductType) {
+        $rebusifyProductType = glsr( OptionManager::class )->getWP( $this->rebusifyKey );
+        if( 'P' === $rebusifyProductType ) {
             return $context;
         }
-        if ('F' === $rebusifyProductType && 'yes' === glsr_get_option('general.rebusify')) {
+        if( 'F' === $rebusifyProductType && 'yes' === glsr_get_option( 'general.rebusify' ) ) {
             $button = $this->buildUpgradeButton();
         } else {
             $button = $this->buildCreateButton();
         }
-        $context['field'].= $button;
+        $context['field'] .= $button;
         return $context;
     }
 
@@ -63,14 +63,14 @@ 
      * @return void
      * @action site-reviews/review/created
      */
-    public function onCreated(Review $review)
+    public function onCreated( Review $review )
     {
-        if (!$this->canPostReview($review)) {
+        if( !$this->canPostReview( $review ) ) {
             return;
         }
-        $rebusify = glsr(Rebusify::class)->sendReview($review);
-        if ($rebusify->success) {
-            glsr(Database::class)->set($review->ID, 'rebusify', $rebusify->review_id);
+        $rebusify = glsr( Rebusify::class )->sendReview( $review );
+        if( $rebusify->success ) {
+            glsr( Database::class )->set( $review->ID, 'rebusify', $rebusify->review_id );
         }
     }
 
@@ -79,14 +79,14 @@ 
      * @return void
      * @action site-reviews/review/reverted
      */
-    public function onReverted(Review $review)
+    public function onReverted( Review $review )
     {
-        if (!$this->canPostReview($review)) {
+        if( !$this->canPostReview( $review ) ) {
             return;
         }
-        $rebusify = glsr(Rebusify::class)->sendReview($review);
-        if ($rebusify->success) {
-            glsr(Database::class)->set($review->ID, 'rebusify', $rebusify->review_id);
+        $rebusify = glsr( Rebusify::class )->sendReview( $review );
+        if( $rebusify->success ) {
+            glsr( Database::class )->set( $review->ID, 'rebusify', $rebusify->review_id );
         }
     }
 
@@ -95,14 +95,14 @@ 
      * @return void
      * @action site-reviews/review/saved
      */
-    public function onSaved(Review $review)
+    public function onSaved( Review $review )
     {
-        if (!$this->canPostReview($review)) {
+        if( !$this->canPostReview( $review ) ) {
             return;
         }
-        $rebusify = glsr(Rebusify::class)->sendReview($review);
-        if ($rebusify->success) {
-            glsr(Database::class)->set($review->ID, 'rebusify', $rebusify->review_id);
+        $rebusify = glsr( Rebusify::class )->sendReview( $review );
+        if( $rebusify->success ) {
+            glsr( Database::class )->set( $review->ID, 'rebusify', $rebusify->review_id );
         }
     }
 
@@ -114,15 +114,15 @@ 
      * @return void
      * @action updated_postmeta
      */
-    public function onUpdatedMeta($metaId, $postId, $metaKey)
+    public function onUpdatedMeta( $metaId, $postId, $metaKey )
     {
-        $review = glsr_get_review($postId);
-        if (!$this->canPostResponse($review) || '_response' !== $metaKey) {
+        $review = glsr_get_review( $postId );
+        if( !$this->canPostResponse( $review ) || '_response' !== $metaKey ) {
             return;
         }
-        $rebusify = glsr(Rebusify::class)->sendReviewResponse($review);
-        if ($rebusify->success) {
-            glsr(Database::class)->set($review->ID, 'rebusify_response', true);
+        $rebusify = glsr( Rebusify::class )->sendReviewResponse( $review );
+        if( $rebusify->success ) {
+            glsr( Database::class )->set( $review->ID, 'rebusify_response', true );
         }
     }
 
@@ -131,11 +131,11 @@ 
      */
     protected function buildCreateButton()
     {
-        return glsr(Builder::class)->a(__('Create Your Rebusify Account', 'site-reviews'), [
+        return glsr( Builder::class )->a( __( 'Create Your Rebusify Account', 'site-reviews' ), [
             'class' => 'button',
             'href' => Rebusify::WEB_URL,
             'target' => '_blank',
-        ]);
+        ] );
     }
 
     /**
@@ -143,37 +143,37 @@ 
      */
     protected function buildUpgradeButton()
     {
-        $build = glsr(Builder::class);
-        $notice = $build->p(__('Free Rebusify accounts are limited to 500 blockchain transactions per year.', 'site-reviews'));
-        $button = $build->a(__('Upgrade Your Rebusify Plan', 'site-reviews'), [
+        $build = glsr( Builder::class );
+        $notice = $build->p( __( 'Free Rebusify accounts are limited to 500 blockchain transactions per year.', 'site-reviews' ) );
+        $button = $build->a( __( 'Upgrade Your Rebusify Plan', 'site-reviews' ), [
             'class' => 'button',
             'href' => Rebusify::WEB_URL,
             'target' => '_blank',
-        ]);
-        return $build->div($notice.$button, [
+        ] );
+        return $build->div( $notice.$button, [
             'class' => 'glsr-notice-inline notice inline notice-info',
-        ]);
+        ] );
     }
 
     /**
      * @return bool
      */
-    protected function canPostResponse(Review $review)
+    protected function canPostResponse( Review $review )
     {
         $requiredValues = [
-            glsr(Database::class)->get($review->ID, 'rebusify'),
+            glsr( Database::class )->get( $review->ID, 'rebusify' ),
             $review->response,
             $review->review_id,
         ];
-        return $this->canProceed($review, 'rebusify_response')
+        return $this->canProceed( $review, 'rebusify_response' )
             && 'publish' === $review->status
-            && 3 === count(array_filter($requiredValues));
+            && 3 === count( array_filter( $requiredValues ) );
     }
 
     /**
      * @return bool
      */
-    protected function canPostReview(Review $review)
+    protected function canPostReview( Review $review )
     {
         $requiredValues = [
             $review->author,
@@ -182,60 +182,60 @@ 
             $review->review_id,
             $review->title,
         ];
-        return $this->canProceed($review)
+        return $this->canProceed( $review )
             && 'publish' === $review->status
-            && 5 === count(array_filter($requiredValues));
+            && 5 === count( array_filter( $requiredValues ) );
     }
 
     /**
      * @param string $metaKey
      * @return bool
      */
-    protected function canProceed(Review $review, $metaKey = 'rebusify')
+    protected function canProceed( Review $review, $metaKey = 'rebusify' )
     {
-        return glsr(OptionManager::class)->getBool($this->enabledKey)
-            && $this->isReviewPostId($review->ID)
-            && !$this->hasMetaKey($review, $metaKey);
+        return glsr( OptionManager::class )->getBool( $this->enabledKey )
+            && $this->isReviewPostId( $review->ID )
+            && !$this->hasMetaKey( $review, $metaKey );
     }
 
     /**
      * @param string $metaKey
      * @return bool
      */
-    protected function hasMetaKey(Review $review, $metaKey = 'rebusify')
+    protected function hasMetaKey( Review $review, $metaKey = 'rebusify' )
     {
-        return '' !== glsr(Database::class)->get($review->ID, $metaKey);
+        return '' !== glsr( Database::class )->get( $review->ID, $metaKey );
     }
 
     /**
      * @param string $key
      * @return bool
      */
-    protected function isEmptyOrModified($key, array $settings)
+    protected function isEmptyOrModified( $key, array $settings )
     {
-        $oldValue = glsr_get_option($key);
-        $newValue = Arr::get($settings, $key);
+        $oldValue = glsr_get_option( $key );
+        $newValue = Arr::get( $settings, $key );
         return empty($newValue) || $newValue !== $oldValue;
     }
 
     /**
      * @return array
      */
-    protected function sanitizeRebusifySettings(array $settings)
+    protected function sanitizeRebusifySettings( array $settings )
     {
-        $rebusify = glsr(Rebusify::class)->activateKey(
-            Arr::get($settings, $this->apiKey),
-            Arr::get($settings, $this->emailKey)
+        $rebusify = glsr( Rebusify::class )->activateKey(
+            Arr::get( $settings, $this->apiKey ),
+            Arr::get( $settings, $this->emailKey )
         );
-        if ($rebusify->success) {
-            update_option($this->rebusifyKey, Arr::get($rebusify->response, 'producttype'));
+        if( $rebusify->success ) {
+            update_option( $this->rebusifyKey, Arr::get( $rebusify->response, 'producttype' ) );
         } else {
-            delete_option($this->rebusifyKey);
-            $settings = Arr::set($settings, $this->enabledKey, 'no');
-            glsr(Notice::class)->addError(sprintf(
-                __('Your Rebusify account details could not be verified, please try again. %s', 'site-reviews'),
+            delete_option( $this->rebusifyKey );
+            $settings = Arr::set( $settings, $this->enabledKey, 'no' );
+            glsr( Notice::class )->addError( sprintf(
+                __( 'Your Rebusify account details could not be verified, please try again. %s', 'site-reviews' ),
                 '('.$rebusify->message.')'
-            ));
+            ) );
         }
         return $settings;
     }

plugin/Controllers/TaxonomyController.php

Indentation +88 added lines, -88 removed lines

@@ -8,97 +8,97 @@
 
 class TaxonomyController
 {
-    /**
-     * @return void
-     * @action Application::TAXONOMY._add_form_fields
-     * @action Application::TAXONOMY._edit_form
-     */
-    public function disableParents()
-    {
-        global $wp_taxonomies;
-        $wp_taxonomies[Application::TAXONOMY]->hierarchical = false;
-    }
+	/**
+	 * @return void
+	 * @action Application::TAXONOMY._add_form_fields
+	 * @action Application::TAXONOMY._edit_form
+	 */
+	public function disableParents()
+	{
+		global $wp_taxonomies;
+		$wp_taxonomies[Application::TAXONOMY]->hierarchical = false;
+	}
 
-    /**
-     * @return void
-     * @action Application::TAXONOMY._term_edit_form_top
-     * @action Application::TAXONOMY._term_new_form_tag
-     */
-    public function enableParents()
-    {
-        global $wp_taxonomies;
-        $wp_taxonomies[Application::TAXONOMY]->hierarchical = true;
-    }
+	/**
+	 * @return void
+	 * @action Application::TAXONOMY._term_edit_form_top
+	 * @action Application::TAXONOMY._term_new_form_tag
+	 */
+	public function enableParents()
+	{
+		global $wp_taxonomies;
+		$wp_taxonomies[Application::TAXONOMY]->hierarchical = true;
+	}
 
-    /**
-     * @return void
-     * @action restrict_manage_posts
-     */
-    public function renderTaxonomyFilter()
-    {
-        if (!is_object_in_taxonomy(glsr_current_screen()->post_type, Application::TAXONOMY)) {
-            return;
-        }
-        echo glsr(Builder::class)->label(__('Filter by category', 'site-reviews'), [
-            'class' => 'screen-reader-text',
-            'for' => Application::TAXONOMY,
-        ]);
-        wp_dropdown_categories([
-            'depth' => 3,
-            'hide_empty' => true,
-            'hide_if_empty' => true,
-            'hierarchical' => true,
-            'name' => Application::TAXONOMY,
-            'orderby' => 'name',
-            'selected' => $this->getSelected(),
-            'show_count' => false,
-            'show_option_all' => $this->getShowOptionAll(),
-            'taxonomy' => Application::TAXONOMY,
-            'value_field' => 'slug',
-        ]);
-    }
+	/**
+	 * @return void
+	 * @action restrict_manage_posts
+	 */
+	public function renderTaxonomyFilter()
+	{
+		if (!is_object_in_taxonomy(glsr_current_screen()->post_type, Application::TAXONOMY)) {
+			return;
+		}
+		echo glsr(Builder::class)->label(__('Filter by category', 'site-reviews'), [
+			'class' => 'screen-reader-text',
+			'for' => Application::TAXONOMY,
+		]);
+		wp_dropdown_categories([
+			'depth' => 3,
+			'hide_empty' => true,
+			'hide_if_empty' => true,
+			'hierarchical' => true,
+			'name' => Application::TAXONOMY,
+			'orderby' => 'name',
+			'selected' => $this->getSelected(),
+			'show_count' => false,
+			'show_option_all' => $this->getShowOptionAll(),
+			'taxonomy' => Application::TAXONOMY,
+			'value_field' => 'slug',
+		]);
+	}
 
-    /**
-     * @param int $postId
-     * @param array $terms
-     * @param array $newTTIds
-     * @param string $taxonomy
-     * @param bool $append
-     * @param array $oldTTIds
-     * @return void
-     * @action set_object_terms
-     */
-    public function restrictTermSelection($postId, $terms, $newTTIds, $taxonomy, $append, $oldTTIds)
-    {
-        if (Application::TAXONOMY != $taxonomy || count($newTTIds) <= 1) {
-            return;
-        }
-        $diff = array_diff($newTTIds, $oldTTIds);
-        if (empty($newTerm = array_shift($diff))) {
-            $newTerm = array_shift($newTTIds);
-        }
-        if ($newTerm) {
-            wp_set_object_terms($postId, intval($newTerm), $taxonomy);
-        }
-    }
+	/**
+	 * @param int $postId
+	 * @param array $terms
+	 * @param array $newTTIds
+	 * @param string $taxonomy
+	 * @param bool $append
+	 * @param array $oldTTIds
+	 * @return void
+	 * @action set_object_terms
+	 */
+	public function restrictTermSelection($postId, $terms, $newTTIds, $taxonomy, $append, $oldTTIds)
+	{
+		if (Application::TAXONOMY != $taxonomy || count($newTTIds) <= 1) {
+			return;
+		}
+		$diff = array_diff($newTTIds, $oldTTIds);
+		if (empty($newTerm = array_shift($diff))) {
+			$newTerm = array_shift($newTTIds);
+		}
+		if ($newTerm) {
+			wp_set_object_terms($postId, intval($newTerm), $taxonomy);
+		}
+	}
 
-    /**
-     * @return string
-     */
-    protected function getSelected()
-    {
-        global $wp_query;
-        return Arr::get($wp_query->query, Application::TAXONOMY);
-    }
+	/**
+	 * @return string
+	 */
+	protected function getSelected()
+	{
+		global $wp_query;
+		return Arr::get($wp_query->query, Application::TAXONOMY);
+	}
 
-    /**
-     * @return string
-     */
-    protected function getShowOptionAll()
-    {
-        $taxonomy = get_taxonomy(Application::TAXONOMY);
-        return $taxonomy
-            ? ucfirst(strtolower($taxonomy->labels->all_items))
-            : '';
-    }
+	/**
+	 * @return string
+	 */
+	protected function getShowOptionAll()
+	{
+		$taxonomy = get_taxonomy(Application::TAXONOMY);
+		return $taxonomy
+			? ucfirst(strtolower($taxonomy->labels->all_items))
+			: '';
+	}
 }

Spacing +15 added lines, -15 removed lines

@@ -36,14 +36,14 @@ 
      */
     public function renderTaxonomyFilter()
     {
-        if (!is_object_in_taxonomy(glsr_current_screen()->post_type, Application::TAXONOMY)) {
+        if( !is_object_in_taxonomy( glsr_current_screen()->post_type, Application::TAXONOMY ) ) {
             return;
         }
-        echo glsr(Builder::class)->label(__('Filter by category', 'site-reviews'), [
+        echo glsr( Builder::class )->label( __( 'Filter by category', 'site-reviews' ), [
             'class' => 'screen-reader-text',
             'for' => Application::TAXONOMY,
-        ]);
-        wp_dropdown_categories([
+        ] );
+        wp_dropdown_categories( [
             'depth' => 3,
             'hide_empty' => true,
             'hide_if_empty' => true,
@@ -55,7 +55,7 @@ 
             'show_option_all' => $this->getShowOptionAll(),
             'taxonomy' => Application::TAXONOMY,
             'value_field' => 'slug',
-        ]);
+        ] );
     }
 
     /**
@@ -68,17 +68,17 @@ 
      * @return void
      * @action set_object_terms
      */
-    public function restrictTermSelection($postId, $terms, $newTTIds, $taxonomy, $append, $oldTTIds)
+    public function restrictTermSelection( $postId, $terms, $newTTIds, $taxonomy, $append, $oldTTIds )
     {
-        if (Application::TAXONOMY != $taxonomy || count($newTTIds) <= 1) {
+        if( Application::TAXONOMY != $taxonomy || count( $newTTIds ) <= 1 ) {
             return;
         }
-        $diff = array_diff($newTTIds, $oldTTIds);
-        if (empty($newTerm = array_shift($diff))) {
-            $newTerm = array_shift($newTTIds);
+        $diff = array_diff( $newTTIds, $oldTTIds );
+        if( empty($newTerm = array_shift( $diff )) ) {
+            $newTerm = array_shift( $newTTIds );
         }
-        if ($newTerm) {
-            wp_set_object_terms($postId, intval($newTerm), $taxonomy);
+        if( $newTerm ) {
+            wp_set_object_terms( $postId, intval( $newTerm ), $taxonomy );
         }
     }
 
@@ -88,7 +88,7 @@ 
     protected function getSelected()
     {
         global $wp_query;
-        return Arr::get($wp_query->query, Application::TAXONOMY);
+        return Arr::get( $wp_query->query, Application::TAXONOMY );
     }
 
     /**
@@ -96,9 +96,9 @@ 
      */
     protected function getShowOptionAll()
     {
-        $taxonomy = get_taxonomy(Application::TAXONOMY);
+        $taxonomy = get_taxonomy( Application::TAXONOMY );
         return $taxonomy
-            ? ucfirst(strtolower($taxonomy->labels->all_items))
+            ? ucfirst( strtolower( $taxonomy->labels->all_items ) )
             : '';
     }
 }

plugin/Controllers/AdminController.php

Indentation +218 added lines, -218 removed lines

@@ -16,222 +16,222 @@
 
 class AdminController extends Controller
 {
-    /**
-     * @return void
-     * @action admin_enqueue_scripts
-     */
-    public function enqueueAssets()
-    {
-        $command = new EnqueueAdminAssets([
-            'pointers' => [[
-                'content' => __('You can pin exceptional reviews so that they are always shown first.', 'site-reviews'),
-                'id' => 'glsr-pointer-pinned',
-                'position' => [
-                    'edge' => 'right',
-                    'align' => 'middle',
-                ],
-                'screen' => Application::POST_TYPE,
-                'target' => '#misc-pub-pinned',
-                'title' => __('Pin Your Reviews', 'site-reviews'),
-            ]],
-        ]);
-        $this->execute($command);
-    }
-
-    /**
-     * @return array
-     * @filter plugin_action_links_site-reviews/site-reviews.php
-     */
-    public function filterActionLinks(array $links)
-    {
-        $links['documentation'] = glsr(Builder::class)->a(__('Help', 'site-reviews'), [
-            'href' => admin_url('edit.php?post_type='.Application::POST_TYPE.'&page=documentation'),
-        ]);
-        $links['settings'] = glsr(Builder::class)->a(__('Settings', 'site-reviews'), [
-            'href' => admin_url('edit.php?post_type='.Application::POST_TYPE.'&page=settings'),
-        ]);
-        return $links;
-    }
-
-    /**
-     * @param array $capabilities
-     * @param string $capability
-     * @return array
-     * @filter map_meta_cap
-     */
-    public function filterCreateCapability($capabilities, $capability)
-    {
-        if ($capability == 'create_'.Application::POST_TYPE) {
-            $capabilities[] = 'do_not_allow';
-        }
-        return $capabilities;
-    }
-
-    /**
-     * @param array $items
-     * @return array
-     * @filter dashboard_glance_items
-     */
-    public function filterDashboardGlanceItems($items)
-    {
-        $postCount = wp_count_posts(Application::POST_TYPE);
-        if (empty($postCount->publish)) {
-            return $items;
-        }
-        $text = _n('%s Review', '%s Reviews', $postCount->publish, 'site-reviews');
-        $text = sprintf($text, number_format_i18n($postCount->publish));
-        $items = Arr::consolidateArray($items);
-        $items[] = current_user_can(get_post_type_object(Application::POST_TYPE)->cap->edit_posts)
-            ? glsr(Builder::class)->a($text, [
-                'class' => 'glsr-review-count',
-                'href' => 'edit.php?post_type='.Application::POST_TYPE,
-            ])
-            : glsr(Builder::class)->span($text, [
-                'class' => 'glsr-review-count',
-            ]);
-        return $items;
-    }
-
-    /**
-     * @param array $plugins
-     * @return array
-     * @filter mce_external_plugins
-     */
-    public function filterTinymcePlugins($plugins)
-    {
-        if (current_user_can('edit_posts') || current_user_can('edit_pages')) {
-            $plugins = Arr::consolidateArray($plugins);
-            $plugins['glsr_shortcode'] = glsr()->url('assets/scripts/mce-plugin.js');
-        }
-        return $plugins;
-    }
-
-    /**
-     * @return void
-     * @action admin_init
-     */
-    public function registerTinymcePopups()
-    {
-        $command = new RegisterTinymcePopups([
-            'site_reviews' => esc_html__('Recent Reviews', 'site-reviews'),
-            'site_reviews_form' => esc_html__('Submit a Review', 'site-reviews'),
-            'site_reviews_summary' => esc_html__('Summary of Reviews', 'site-reviews'),
-        ]);
-        $this->execute($command);
-    }
-
-    /**
-     * @param string $editorId
-     * @return void|null
-     * @action media_buttons
-     */
-    public function renderTinymceButton($editorId)
-    {
-        $allowedEditors = apply_filters('site-reviews/tinymce/editor-ids', ['content'], $editorId);
-        if ('post' != glsr_current_screen()->base || !in_array($editorId, $allowedEditors)) {
-            return;
-        }
-        $shortcodes = [];
-        foreach (glsr()->mceShortcodes as $shortcode => $values) {
-            $shortcodes[$shortcode] = $values;
-        }
-        if (empty($shortcodes)) {
-            return;
-        }
-        glsr()->render('partials/editor/tinymce', [
-            'shortcodes' => $shortcodes,
-        ]);
-    }
-
-    /**
-     * @return void
-     */
-    public function routerClearConsole()
-    {
-        glsr(Console::class)->clear();
-        glsr(Notice::class)->addSuccess(__('Console cleared.', 'site-reviews'));
-    }
-
-    /**
-     * @return void
-     */
-    public function routerFetchConsole()
-    {
-        glsr(Notice::class)->addSuccess(__('Console reloaded.', 'site-reviews'));
-    }
-
-    /**
-     * @param bool $showNotice
-     * @return void
-     */
-    public function routerCountReviews($showNotice = true)
-    {
-        glsr(CountsManager::class)->countAll();
-        glsr(OptionManager::class)->set('last_review_count', current_time('timestamp'));
-        if ($showNotice) {
-            glsr(Notice::class)->clear()->addSuccess(__('Recalculated rating counts.', 'site-reviews'));
-        }
-    }
-
-    /**
-     * @return void
-     */
-    public function routerDownloadConsole()
-    {
-        $this->download(Application::ID.'-console.txt', glsr(Console::class)->get());
-    }
-
-    /**
-     * @return void
-     */
-    public function routerDownloadSystemInfo()
-    {
-        $this->download(Application::ID.'-system-info.txt', glsr(System::class)->get());
-    }
-
-    /**
-     * @return void
-     */
-    public function routerExportSettings()
-    {
-        $this->download(Application::ID.'-settings.json', glsr(OptionManager::class)->json());
-    }
-
-    /**
-     * @return void
-     */
-    public function routerImportSettings()
-    {
-        $file = $_FILES['import-file'];
-        if (UPLOAD_ERR_OK !== $file['error']) {
-            return glsr(Notice::class)->addError($this->getUploadError($file['error']));
-        }
-        if ('application/json' !== $file['type'] || !Str::endsWith('.json', $file['name'])) {
-            return glsr(Notice::class)->addError(__('Please use a valid Site Reviews settings file.', 'site-reviews'));
-        }
-        $settings = json_decode(file_get_contents($file['tmp_name']), true);
-        if (empty($settings)) {
-            return glsr(Notice::class)->addWarning(__('There were no settings found to import.', 'site-reviews'));
-        }
-        glsr(OptionManager::class)->set(glsr(OptionManager::class)->normalize($settings));
-        glsr(Notice::class)->addSuccess(__('Settings imported.', 'site-reviews'));
-    }
-
-    /**
-     * @param int $errorCode
-     * @return string
-     */
-    protected function getUploadError($errorCode)
-    {
-        $errors = [
-            UPLOAD_ERR_INI_SIZE => __('The uploaded file exceeds the upload_max_filesize directive in php.ini.', 'site-reviews'),
-            UPLOAD_ERR_FORM_SIZE => __('The uploaded file is too big.', 'site-reviews'),
-            UPLOAD_ERR_PARTIAL => __('The uploaded file was only partially uploaded.', 'site-reviews'),
-            UPLOAD_ERR_NO_FILE => __('No file was uploaded.', 'site-reviews'),
-            UPLOAD_ERR_NO_TMP_DIR => __('Missing a temporary folder.', 'site-reviews'),
-            UPLOAD_ERR_CANT_WRITE => __('Failed to write file to disk.', 'site-reviews'),
-            UPLOAD_ERR_EXTENSION => __('A PHP extension stopped the file upload.', 'site-reviews'),
-        ];
-        return Arr::get($errors, $errorCode, __('Unknown upload error.', 'site-reviews'));
-    }
+	/**
+	 * @return void
+	 * @action admin_enqueue_scripts
+	 */
+	public function enqueueAssets()
+	{
+		$command = new EnqueueAdminAssets([
+			'pointers' => [[
+				'content' => __('You can pin exceptional reviews so that they are always shown first.', 'site-reviews'),
+				'id' => 'glsr-pointer-pinned',
+				'position' => [
+					'edge' => 'right',
+					'align' => 'middle',
+				],
+				'screen' => Application::POST_TYPE,
+				'target' => '#misc-pub-pinned',
+				'title' => __('Pin Your Reviews', 'site-reviews'),
+			]],
+		]);
+		$this->execute($command);
+	}
+
+	/**
+	 * @return array
+	 * @filter plugin_action_links_site-reviews/site-reviews.php
+	 */
+	public function filterActionLinks(array $links)
+	{
+		$links['documentation'] = glsr(Builder::class)->a(__('Help', 'site-reviews'), [
+			'href' => admin_url('edit.php?post_type='.Application::POST_TYPE.'&page=documentation'),
+		]);
+		$links['settings'] = glsr(Builder::class)->a(__('Settings', 'site-reviews'), [
+			'href' => admin_url('edit.php?post_type='.Application::POST_TYPE.'&page=settings'),
+		]);
+		return $links;
+	}
+
+	/**
+	 * @param array $capabilities
+	 * @param string $capability
+	 * @return array
+	 * @filter map_meta_cap
+	 */
+	public function filterCreateCapability($capabilities, $capability)
+	{
+		if ($capability == 'create_'.Application::POST_TYPE) {
+			$capabilities[] = 'do_not_allow';
+		}
+		return $capabilities;
+	}
+
+	/**
+	 * @param array $items
+	 * @return array
+	 * @filter dashboard_glance_items
+	 */
+	public function filterDashboardGlanceItems($items)
+	{
+		$postCount = wp_count_posts(Application::POST_TYPE);
+		if (empty($postCount->publish)) {
+			return $items;
+		}
+		$text = _n('%s Review', '%s Reviews', $postCount->publish, 'site-reviews');
+		$text = sprintf($text, number_format_i18n($postCount->publish));
+		$items = Arr::consolidateArray($items);
+		$items[] = current_user_can(get_post_type_object(Application::POST_TYPE)->cap->edit_posts)
+			? glsr(Builder::class)->a($text, [
+				'class' => 'glsr-review-count',
+				'href' => 'edit.php?post_type='.Application::POST_TYPE,
+			])
+			: glsr(Builder::class)->span($text, [
+				'class' => 'glsr-review-count',
+			]);
+		return $items;
+	}
+
+	/**
+	 * @param array $plugins
+	 * @return array
+	 * @filter mce_external_plugins
+	 */
+	public function filterTinymcePlugins($plugins)
+	{
+		if (current_user_can('edit_posts') || current_user_can('edit_pages')) {
+			$plugins = Arr::consolidateArray($plugins);
+			$plugins['glsr_shortcode'] = glsr()->url('assets/scripts/mce-plugin.js');
+		}
+		return $plugins;
+	}
+
+	/**
+	 * @return void
+	 * @action admin_init
+	 */
+	public function registerTinymcePopups()
+	{
+		$command = new RegisterTinymcePopups([
+			'site_reviews' => esc_html__('Recent Reviews', 'site-reviews'),
+			'site_reviews_form' => esc_html__('Submit a Review', 'site-reviews'),
+			'site_reviews_summary' => esc_html__('Summary of Reviews', 'site-reviews'),
+		]);
+		$this->execute($command);
+	}
+
+	/**
+	 * @param string $editorId
+	 * @return void|null
+	 * @action media_buttons
+	 */
+	public function renderTinymceButton($editorId)
+	{
+		$allowedEditors = apply_filters('site-reviews/tinymce/editor-ids', ['content'], $editorId);
+		if ('post' != glsr_current_screen()->base || !in_array($editorId, $allowedEditors)) {
+			return;
+		}
+		$shortcodes = [];
+		foreach (glsr()->mceShortcodes as $shortcode => $values) {
+			$shortcodes[$shortcode] = $values;
+		}
+		if (empty($shortcodes)) {
+			return;
+		}
+		glsr()->render('partials/editor/tinymce', [
+			'shortcodes' => $shortcodes,
+		]);
+	}
+
+	/**
+	 * @return void
+	 */
+	public function routerClearConsole()
+	{
+		glsr(Console::class)->clear();
+		glsr(Notice::class)->addSuccess(__('Console cleared.', 'site-reviews'));
+	}
+
+	/**
+	 * @return void
+	 */
+	public function routerFetchConsole()
+	{
+		glsr(Notice::class)->addSuccess(__('Console reloaded.', 'site-reviews'));
+	}
+
+	/**
+	 * @param bool $showNotice
+	 * @return void
+	 */
+	public function routerCountReviews($showNotice = true)
+	{
+		glsr(CountsManager::class)->countAll();
+		glsr(OptionManager::class)->set('last_review_count', current_time('timestamp'));
+		if ($showNotice) {
+			glsr(Notice::class)->clear()->addSuccess(__('Recalculated rating counts.', 'site-reviews'));
+		}
+	}
+
+	/**
+	 * @return void
+	 */
+	public function routerDownloadConsole()
+	{
+		$this->download(Application::ID.'-console.txt', glsr(Console::class)->get());
+	}
+
+	/**
+	 * @return void
+	 */
+	public function routerDownloadSystemInfo()
+	{
+		$this->download(Application::ID.'-system-info.txt', glsr(System::class)->get());
+	}
+
+	/**
+	 * @return void
+	 */
+	public function routerExportSettings()
+	{
+		$this->download(Application::ID.'-settings.json', glsr(OptionManager::class)->json());
+	}
+
+	/**
+	 * @return void
+	 */
+	public function routerImportSettings()
+	{
+		$file = $_FILES['import-file'];
+		if (UPLOAD_ERR_OK !== $file['error']) {
+			return glsr(Notice::class)->addError($this->getUploadError($file['error']));
+		}
+		if ('application/json' !== $file['type'] || !Str::endsWith('.json', $file['name'])) {
+			return glsr(Notice::class)->addError(__('Please use a valid Site Reviews settings file.', 'site-reviews'));
+		}
+		$settings = json_decode(file_get_contents($file['tmp_name']), true);
+		if (empty($settings)) {
+			return glsr(Notice::class)->addWarning(__('There were no settings found to import.', 'site-reviews'));
+		}
+		glsr(OptionManager::class)->set(glsr(OptionManager::class)->normalize($settings));
+		glsr(Notice::class)->addSuccess(__('Settings imported.', 'site-reviews'));
+	}
+
+	/**
+	 * @param int $errorCode
+	 * @return string
+	 */
+	protected function getUploadError($errorCode)
+	{
+		$errors = [
+			UPLOAD_ERR_INI_SIZE => __('The uploaded file exceeds the upload_max_filesize directive in php.ini.', 'site-reviews'),
+			UPLOAD_ERR_FORM_SIZE => __('The uploaded file is too big.', 'site-reviews'),
+			UPLOAD_ERR_PARTIAL => __('The uploaded file was only partially uploaded.', 'site-reviews'),
+			UPLOAD_ERR_NO_FILE => __('No file was uploaded.', 'site-reviews'),
+			UPLOAD_ERR_NO_TMP_DIR => __('Missing a temporary folder.', 'site-reviews'),
+			UPLOAD_ERR_CANT_WRITE => __('Failed to write file to disk.', 'site-reviews'),
+			UPLOAD_ERR_EXTENSION => __('A PHP extension stopped the file upload.', 'site-reviews'),
+		];
+		return Arr::get($errors, $errorCode, __('Unknown upload error.', 'site-reviews'));
+	}
 }

Spacing +71 added lines, -71 removed lines

@@ -22,9 +22,9 @@ 
      */
     public function enqueueAssets()
     {
-        $command = new EnqueueAdminAssets([
+        $command = new EnqueueAdminAssets( [
             'pointers' => [[
-                'content' => __('You can pin exceptional reviews so that they are always shown first.', 'site-reviews'),
+                'content' => __( 'You can pin exceptional reviews so that they are always shown first.', 'site-reviews' ),
                 'id' => 'glsr-pointer-pinned',
                 'position' => [
                     'edge' => 'right',
@@ -32,24 +32,24 @@ 
                 ],
                 'screen' => Application::POST_TYPE,
                 'target' => '#misc-pub-pinned',
-                'title' => __('Pin Your Reviews', 'site-reviews'),
+                'title' => __( 'Pin Your Reviews', 'site-reviews' ),
             ]],
-        ]);
-        $this->execute($command);
+        ] );
+        $this->execute( $command );
     }
 
     /**
      * @return array
      * @filter plugin_action_links_site-reviews/site-reviews.php
      */
-    public function filterActionLinks(array $links)
+    public function filterActionLinks( array $links )
     {
-        $links['documentation'] = glsr(Builder::class)->a(__('Help', 'site-reviews'), [
-            'href' => admin_url('edit.php?post_type='.Application::POST_TYPE.'&page=documentation'),
-        ]);
-        $links['settings'] = glsr(Builder::class)->a(__('Settings', 'site-reviews'), [
-            'href' => admin_url('edit.php?post_type='.Application::POST_TYPE.'&page=settings'),
-        ]);
+        $links['documentation'] = glsr( Builder::class )->a( __( 'Help', 'site-reviews' ), [
+            'href' => admin_url( 'edit.php?post_type='.Application::POST_TYPE.'&page=documentation' ),
+        ] );
+        $links['settings'] = glsr( Builder::class )->a( __( 'Settings', 'site-reviews' ), [
+            'href' => admin_url( 'edit.php?post_type='.Application::POST_TYPE.'&page=settings' ),
+        ] );
         return $links;
     }
 
@@ -59,9 +59,9 @@ 
      * @return array
      * @filter map_meta_cap
      */
-    public function filterCreateCapability($capabilities, $capability)
+    public function filterCreateCapability( $capabilities, $capability )
     {
-        if ($capability == 'create_'.Application::POST_TYPE) {
+        if( $capability == 'create_'.Application::POST_TYPE ) {
             $capabilities[] = 'do_not_allow';
         }
         return $capabilities;
@@ -72,23 +72,23 @@ 
      * @return array
      * @filter dashboard_glance_items
      */
-    public function filterDashboardGlanceItems($items)
+    public function filterDashboardGlanceItems( $items )
     {
-        $postCount = wp_count_posts(Application::POST_TYPE);
-        if (empty($postCount->publish)) {
+        $postCount = wp_count_posts( Application::POST_TYPE );
+        if( empty($postCount->publish) ) {
             return $items;
         }
-        $text = _n('%s Review', '%s Reviews', $postCount->publish, 'site-reviews');
-        $text = sprintf($text, number_format_i18n($postCount->publish));
-        $items = Arr::consolidateArray($items);
-        $items[] = current_user_can(get_post_type_object(Application::POST_TYPE)->cap->edit_posts)
-            ? glsr(Builder::class)->a($text, [
+        $text = _n( '%s Review', '%s Reviews', $postCount->publish, 'site-reviews' );
+        $text = sprintf( $text, number_format_i18n( $postCount->publish ) );
+        $items = Arr::consolidateArray( $items );
+        $items[] = current_user_can( get_post_type_object( Application::POST_TYPE )->cap->edit_posts )
+            ? glsr( Builder::class )->a( $text, [
                 'class' => 'glsr-review-count',
                 'href' => 'edit.php?post_type='.Application::POST_TYPE,
-            ])
-            : glsr(Builder::class)->span($text, [
+            ] )
+            : glsr( Builder::class )->span( $text, [
                 'class' => 'glsr-review-count',
-            ]);
+            ] );
         return $items;
     }
 
@@ -97,11 +97,11 @@ 
      * @return array
      * @filter mce_external_plugins
      */
-    public function filterTinymcePlugins($plugins)
+    public function filterTinymcePlugins( $plugins )
     {
-        if (current_user_can('edit_posts') || current_user_can('edit_pages')) {
-            $plugins = Arr::consolidateArray($plugins);
-            $plugins['glsr_shortcode'] = glsr()->url('assets/scripts/mce-plugin.js');
+        if( current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' ) ) {
+            $plugins = Arr::consolidateArray( $plugins );
+            $plugins['glsr_shortcode'] = glsr()->url( 'assets/scripts/mce-plugin.js' );
         }
         return $plugins;
     }
@@ -112,12 +112,12 @@ 
      */
     public function registerTinymcePopups()
     {
-        $command = new RegisterTinymcePopups([
-            'site_reviews' => esc_html__('Recent Reviews', 'site-reviews'),
-            'site_reviews_form' => esc_html__('Submit a Review', 'site-reviews'),
-            'site_reviews_summary' => esc_html__('Summary of Reviews', 'site-reviews'),
-        ]);
-        $this->execute($command);
+        $command = new RegisterTinymcePopups( [
+            'site_reviews' => esc_html__( 'Recent Reviews', 'site-reviews' ),
+            'site_reviews_form' => esc_html__( 'Submit a Review', 'site-reviews' ),
+            'site_reviews_summary' => esc_html__( 'Summary of Reviews', 'site-reviews' ),
+        ] );
+        $this->execute( $command );
     }
 
     /**
@@ -125,22 +125,22 @@ 
      * @return void|null
      * @action media_buttons
      */
-    public function renderTinymceButton($editorId)
+    public function renderTinymceButton( $editorId )
     {
-        $allowedEditors = apply_filters('site-reviews/tinymce/editor-ids', ['content'], $editorId);
-        if ('post' != glsr_current_screen()->base || !in_array($editorId, $allowedEditors)) {
+        $allowedEditors = apply_filters( 'site-reviews/tinymce/editor-ids', ['content'], $editorId );
+        if( 'post' != glsr_current_screen()->base || !in_array( $editorId, $allowedEditors ) ) {
             return;
         }
         $shortcodes = [];
-        foreach (glsr()->mceShortcodes as $shortcode => $values) {
+        foreach( glsr()->mceShortcodes as $shortcode => $values ) {
             $shortcodes[$shortcode] = $values;
         }
-        if (empty($shortcodes)) {
+        if( empty($shortcodes) ) {
             return;
         }
-        glsr()->render('partials/editor/tinymce', [
+        glsr()->render( 'partials/editor/tinymce', [
             'shortcodes' => $shortcodes,
-        ]);
+        ] );
     }
 
     /**
@@ -148,8 +148,8 @@ 
      */
     public function routerClearConsole()
     {
-        glsr(Console::class)->clear();
-        glsr(Notice::class)->addSuccess(__('Console cleared.', 'site-reviews'));
+        glsr( Console::class )->clear();
+        glsr( Notice::class )->addSuccess( __( 'Console cleared.', 'site-reviews' ) );
     }
 
     /**
@@ -157,19 +157,19 @@ 
      */
     public function routerFetchConsole()
     {
-        glsr(Notice::class)->addSuccess(__('Console reloaded.', 'site-reviews'));
+        glsr( Notice::class )->addSuccess( __( 'Console reloaded.', 'site-reviews' ) );
     }
 
     /**
      * @param bool $showNotice
      * @return void
      */
-    public function routerCountReviews($showNotice = true)
+    public function routerCountReviews( $showNotice = true )
     {
-        glsr(CountsManager::class)->countAll();
-        glsr(OptionManager::class)->set('last_review_count', current_time('timestamp'));
-        if ($showNotice) {
-            glsr(Notice::class)->clear()->addSuccess(__('Recalculated rating counts.', 'site-reviews'));
+        glsr( CountsManager::class )->countAll();
+        glsr( OptionManager::class )->set( 'last_review_count', current_time( 'timestamp' ) );
+        if( $showNotice ) {
+            glsr( Notice::class )->clear()->addSuccess( __( 'Recalculated rating counts.', 'site-reviews' ) );
         }
     }
 
@@ -178,7 +178,7 @@ 
      */
     public function routerDownloadConsole()
     {
-        $this->download(Application::ID.'-console.txt', glsr(Console::class)->get());
+        $this->download( Application::ID.'-console.txt', glsr( Console::class )->get() );
     }
 
     /**
@@ -186,7 +186,7 @@ 
      */
     public function routerDownloadSystemInfo()
     {
-        $this->download(Application::ID.'-system-info.txt', glsr(System::class)->get());
+        $this->download( Application::ID.'-system-info.txt', glsr( System::class )->get() );
     }
 
     /**
@@ -194,7 +194,7 @@ 
      */
     public function routerExportSettings()
     {
-        $this->download(Application::ID.'-settings.json', glsr(OptionManager::class)->json());
+        $this->download( Application::ID.'-settings.json', glsr( OptionManager::class )->json() );
     }
 
     /**
@@ -203,35 +203,35 @@ 
     public function routerImportSettings()
     {
         $file = $_FILES['import-file'];
-        if (UPLOAD_ERR_OK !== $file['error']) {
-            return glsr(Notice::class)->addError($this->getUploadError($file['error']));
+        if( UPLOAD_ERR_OK !== $file['error'] ) {
+            return glsr( Notice::class )->addError( $this->getUploadError( $file['error'] ) );
         }
-        if ('application/json' !== $file['type'] || !Str::endsWith('.json', $file['name'])) {
-            return glsr(Notice::class)->addError(__('Please use a valid Site Reviews settings file.', 'site-reviews'));
+        if( 'application/json' !== $file['type'] || !Str::endsWith( '.json', $file['name'] ) ) {
+            return glsr( Notice::class )->addError( __( 'Please use a valid Site Reviews settings file.', 'site-reviews' ) );
         }
-        $settings = json_decode(file_get_contents($file['tmp_name']), true);
-        if (empty($settings)) {
-            return glsr(Notice::class)->addWarning(__('There were no settings found to import.', 'site-reviews'));
+        $settings = json_decode( file_get_contents( $file['tmp_name'] ), true );
+        if( empty($settings) ) {
+            return glsr( Notice::class )->addWarning( __( 'There were no settings found to import.', 'site-reviews' ) );
         }
-        glsr(OptionManager::class)->set(glsr(OptionManager::class)->normalize($settings));
-        glsr(Notice::class)->addSuccess(__('Settings imported.', 'site-reviews'));
+        glsr( OptionManager::class )->set( glsr( OptionManager::class )->normalize( $settings ) );
+        glsr( Notice::class )->addSuccess( __( 'Settings imported.', 'site-reviews' ) );
     }
 
     /**
      * @param int $errorCode
      * @return string
      */
-    protected function getUploadError($errorCode)
+    protected function getUploadError( $errorCode )
     {
         $errors = [
-            UPLOAD_ERR_INI_SIZE => __('The uploaded file exceeds the upload_max_filesize directive in php.ini.', 'site-reviews'),
-            UPLOAD_ERR_FORM_SIZE => __('The uploaded file is too big.', 'site-reviews'),
-            UPLOAD_ERR_PARTIAL => __('The uploaded file was only partially uploaded.', 'site-reviews'),
-            UPLOAD_ERR_NO_FILE => __('No file was uploaded.', 'site-reviews'),
-            UPLOAD_ERR_NO_TMP_DIR => __('Missing a temporary folder.', 'site-reviews'),
-            UPLOAD_ERR_CANT_WRITE => __('Failed to write file to disk.', 'site-reviews'),
-            UPLOAD_ERR_EXTENSION => __('A PHP extension stopped the file upload.', 'site-reviews'),
+            UPLOAD_ERR_INI_SIZE => __( 'The uploaded file exceeds the upload_max_filesize directive in php.ini.', 'site-reviews' ),
+            UPLOAD_ERR_FORM_SIZE => __( 'The uploaded file is too big.', 'site-reviews' ),
+            UPLOAD_ERR_PARTIAL => __( 'The uploaded file was only partially uploaded.', 'site-reviews' ),
+            UPLOAD_ERR_NO_FILE => __( 'No file was uploaded.', 'site-reviews' ),
+            UPLOAD_ERR_NO_TMP_DIR => __( 'Missing a temporary folder.', 'site-reviews' ),
+            UPLOAD_ERR_CANT_WRITE => __( 'Failed to write file to disk.', 'site-reviews' ),
+            UPLOAD_ERR_EXTENSION => __( 'A PHP extension stopped the file upload.', 'site-reviews' ),
         ];
-        return Arr::get($errors, $errorCode, __('Unknown upload error.', 'site-reviews'));
+        return Arr::get( $errors, $errorCode, __( 'Unknown upload error.', 'site-reviews' ) );
     }
 }

plugin/Modules/ReviewLimits.php

Indentation +91 added lines, -91 removed lines

@@ -8,103 +8,103 @@
 
 class ReviewLimits
 {
-    protected $request;
+	protected $request;
 
-    /**
-     * @return array
-     * @filter site-reviews/get/reviews/query
-     */
-    public function filterReviewsQuery(array $parameters, array $args)
-    {
-        if ($authorId = get_current_user_id()) {
-            $parameters['author'] = $authorId;
-        }
-        $parameters['post_status'] = ['pending', 'publish'];
-        return apply_filters('site-reviews/reviews-limits/query', $parameters, $args);
-    }
+	/**
+	 * @return array
+	 * @filter site-reviews/get/reviews/query
+	 */
+	public function filterReviewsQuery(array $parameters, array $args)
+	{
+		if ($authorId = get_current_user_id()) {
+			$parameters['author'] = $authorId;
+		}
+		$parameters['post_status'] = ['pending', 'publish'];
+		return apply_filters('site-reviews/reviews-limits/query', $parameters, $args);
+	}
 
-    /**
-     * @return bool
-     */
-    public function hasReachedLimit(array $request = [])
-    {
-        $this->request = $request;
-        $method = Helper::buildMethodName(
-            glsr(OptionManager::class)->get('settings.submissions.limit'), 'validateBy'
-        );
-        return method_exists($this, $method)
-            ? !call_user_func([$this, $method])
-            : false;
-    }
+	/**
+	 * @return bool
+	 */
+	public function hasReachedLimit(array $request = [])
+	{
+		$this->request = $request;
+		$method = Helper::buildMethodName(
+			glsr(OptionManager::class)->get('settings.submissions.limit'), 'validateBy'
+		);
+		return method_exists($this, $method)
+			? !call_user_func([$this, $method])
+			: false;
+	}
 
-    /**
-     * @param string $value
-     * @param string $whitelist
-     * @return bool
-     */
-    public function isWhitelisted($value, $whitelist)
-    {
-        if (empty($whitelist)) {
-            return false;
-        }
-        return in_array($value, array_filter(explode("\n", $whitelist), 'trim'));
-    }
+	/**
+	 * @param string $value
+	 * @param string $whitelist
+	 * @return bool
+	 */
+	public function isWhitelisted($value, $whitelist)
+	{
+		if (empty($whitelist)) {
+			return false;
+		}
+		return in_array($value, array_filter(explode("\n", $whitelist), 'trim'));
+	}
 
-    /**
-     * @param string $whitelistName
-     * @return string
-     */
-    protected function getWhitelist($whitelistName)
-    {
-        return glsr(OptionManager::class)->get('settings.submissions.limit_whitelist.'.$whitelistName);
-    }
+	/**
+	 * @param string $whitelistName
+	 * @return string
+	 */
+	protected function getWhitelist($whitelistName)
+	{
+		return glsr(OptionManager::class)->get('settings.submissions.limit_whitelist.'.$whitelistName);
+	}
 
-    /**
-     * @return bool
-     */
-    protected function validate($key, $value, $addMetaQuery = true)
-    {
-        if ($this->isWhitelisted($value, $this->getWhitelist($key))) {
-            return true;
-        }
-        add_filter('site-reviews/get/reviews/query', [$this, 'filterReviewsQuery'], 5, 2);
-        $args = ['assigned_to' => Arr::get($this->request, 'assign_to')];
-        if ($addMetaQuery) {
-            $args[$key] = $value;
-        }
-        $reviews = glsr_get_reviews($args);
-        remove_filter('site-reviews/get/reviews/query', [$this, 'filterReviewsQuery'], 5);
-        return 0 === count($reviews);
-    }
+	/**
+	 * @return bool
+	 */
+	protected function validate($key, $value, $addMetaQuery = true)
+	{
+		if ($this->isWhitelisted($value, $this->getWhitelist($key))) {
+			return true;
+		}
+		add_filter('site-reviews/get/reviews/query', [$this, 'filterReviewsQuery'], 5, 2);
+		$args = ['assigned_to' => Arr::get($this->request, 'assign_to')];
+		if ($addMetaQuery) {
+			$args[$key] = $value;
+		}
+		$reviews = glsr_get_reviews($args);
+		remove_filter('site-reviews/get/reviews/query', [$this, 'filterReviewsQuery'], 5);
+		return 0 === count($reviews);
+	}
 
-    /**
-     * @return bool
-     */
-    protected function validateByEmail()
-    {
-        glsr_log()->debug('Email is: '.Arr::get($this->request, 'email'));
-        return $this->validate('email', Arr::get($this->request, 'email'));
-    }
+	/**
+	 * @return bool
+	 */
+	protected function validateByEmail()
+	{
+		glsr_log()->debug('Email is: '.Arr::get($this->request, 'email'));
+		return $this->validate('email', Arr::get($this->request, 'email'));
+	}
 
-    /**
-     * @return bool
-     */
-    protected function validateByIpAddress()
-    {
-        glsr_log()->debug('IP Address is: '.Arr::get($this->request, 'ip_address'));
-        return $this->validate('ip_address', Arr::get($this->request, 'ip_address'));
-    }
+	/**
+	 * @return bool
+	 */
+	protected function validateByIpAddress()
+	{
+		glsr_log()->debug('IP Address is: '.Arr::get($this->request, 'ip_address'));
+		return $this->validate('ip_address', Arr::get($this->request, 'ip_address'));
+	}
 
-    /**
-     * @return bool
-     */
-    protected function validateByUsername()
-    {
-        $user = wp_get_current_user();
-        if (!$user->exists()) {
-            return true;
-        }
-        glsr_log()->debug('Username is: '.$user->user_login);
-        return $this->validate('username', $user->user_login, false);
-    }
+	/**
+	 * @return bool
+	 */
+	protected function validateByUsername()
+	{
+		$user = wp_get_current_user();
+		if (!$user->exists()) {
+			return true;
+		}
+		glsr_log()->debug('Username is: '.$user->user_login);
+		return $this->validate('username', $user->user_login, false);
+	}
 }

Spacing +27 added lines, -27 removed lines

@@ -14,26 +14,26 @@ 
      * @return array
      * @filter site-reviews/get/reviews/query
      */
-    public function filterReviewsQuery(array $parameters, array $args)
+    public function filterReviewsQuery( array $parameters, array $args )
     {
-        if ($authorId = get_current_user_id()) {
+        if( $authorId = get_current_user_id() ) {
             $parameters['author'] = $authorId;
         }
         $parameters['post_status'] = ['pending', 'publish'];
-        return apply_filters('site-reviews/reviews-limits/query', $parameters, $args);
+        return apply_filters( 'site-reviews/reviews-limits/query', $parameters, $args );
     }
 
     /**
      * @return bool
      */
-    public function hasReachedLimit(array $request = [])
+    public function hasReachedLimit( array $request = [] )
     {
         $this->request = $request;
         $method = Helper::buildMethodName(
-            glsr(OptionManager::class)->get('settings.submissions.limit'), 'validateBy'
+            glsr( OptionManager::class )->get( 'settings.submissions.limit' ), 'validateBy'
         );
-        return method_exists($this, $method)
-            ? !call_user_func([$this, $method])
+        return method_exists( $this, $method )
+            ? !call_user_func( [$this, $method] )
             : false;
     }
 
@@ -42,39 +42,39 @@ 
      * @param string $whitelist
      * @return bool
      */
-    public function isWhitelisted($value, $whitelist)
+    public function isWhitelisted( $value, $whitelist )
     {
-        if (empty($whitelist)) {
+        if( empty($whitelist) ) {
             return false;
         }
-        return in_array($value, array_filter(explode("\n", $whitelist), 'trim'));
+        return in_array( $value, array_filter( explode( "\n", $whitelist ), 'trim' ) );
     }
 
     /**
      * @param string $whitelistName
      * @return string
      */
-    protected function getWhitelist($whitelistName)
+    protected function getWhitelist( $whitelistName )
     {
-        return glsr(OptionManager::class)->get('settings.submissions.limit_whitelist.'.$whitelistName);
+        return glsr( OptionManager::class )->get( 'settings.submissions.limit_whitelist.'.$whitelistName );
     }
 
     /**
      * @return bool
      */
-    protected function validate($key, $value, $addMetaQuery = true)
+    protected function validate( $key, $value, $addMetaQuery = true )
     {
-        if ($this->isWhitelisted($value, $this->getWhitelist($key))) {
+        if( $this->isWhitelisted( $value, $this->getWhitelist( $key ) ) ) {
             return true;
         }
-        add_filter('site-reviews/get/reviews/query', [$this, 'filterReviewsQuery'], 5, 2);
-        $args = ['assigned_to' => Arr::get($this->request, 'assign_to')];
-        if ($addMetaQuery) {
+        add_filter( 'site-reviews/get/reviews/query', [$this, 'filterReviewsQuery'], 5, 2 );
+        $args = ['assigned_to' => Arr::get( $this->request, 'assign_to' )];
+        if( $addMetaQuery ) {
             $args[$key] = $value;
         }
-        $reviews = glsr_get_reviews($args);
-        remove_filter('site-reviews/get/reviews/query', [$this, 'filterReviewsQuery'], 5);
-        return 0 === count($reviews);
+        $reviews = glsr_get_reviews( $args );
+        remove_filter( 'site-reviews/get/reviews/query', [$this, 'filterReviewsQuery'], 5 );
+        return 0 === count( $reviews );
     }
 
     /**
@@ -82,8 +82,8 @@ 
      */
     protected function validateByEmail()
     {
-        glsr_log()->debug('Email is: '.Arr::get($this->request, 'email'));
-        return $this->validate('email', Arr::get($this->request, 'email'));
+        glsr_log()->debug( 'Email is: '.Arr::get( $this->request, 'email' ) );
+        return $this->validate( 'email', Arr::get( $this->request, 'email' ) );
     }
 
     /**
@@ -91,8 +91,8 @@ 
      */
     protected function validateByIpAddress()
     {
-        glsr_log()->debug('IP Address is: '.Arr::get($this->request, 'ip_address'));
-        return $this->validate('ip_address', Arr::get($this->request, 'ip_address'));
+        glsr_log()->debug( 'IP Address is: '.Arr::get( $this->request, 'ip_address' ) );
+        return $this->validate( 'ip_address', Arr::get( $this->request, 'ip_address' ) );
     }
 
     /**
@@ -101,10 +101,10 @@ 
     protected function validateByUsername()
     {
         $user = wp_get_current_user();
-        if (!$user->exists()) {
+        if( !$user->exists() ) {
             return true;
         }
-        glsr_log()->debug('Username is: '.$user->user_login);
-        return $this->validate('username', $user->user_login, false);
+        glsr_log()->debug( 'Username is: '.$user->user_login );
+        return $this->validate( 'username', $user->user_login, false );
     }
 }

plugin/Modules/Schema/BaseType.php

Indentation +221 added lines, -221 removed lines

@@ -13,248 +13,248 @@
 
 abstract class BaseType implements ArrayAccess, JsonSerializable, Type
 {
-    /**
-     * @var array
-     */
-    public $allowed = [];
+	/**
+	 * @var array
+	 */
+	public $allowed = [];
 
-    /**
-     * @var array
-     */
-    public $parents = [];
+	/**
+	 * @var array
+	 */
+	public $parents = [];
 
-    /**
-     * @var array
-     */
-    protected $properties = [];
+	/**
+	 * @var array
+	 */
+	protected $properties = [];
 
-    /**
-     * @var string
-     */
-    protected $type;
+	/**
+	 * @var string
+	 */
+	protected $type;
 
-    /**
-     * @param string $method
-     * @return static
-     */
-    public function __call($method, array $arguments)
-    {
-        return $this->setProperty($method, Arr::get($arguments, 0));
-    }
+	/**
+	 * @param string $method
+	 * @return static
+	 */
+	public function __call($method, array $arguments)
+	{
+		return $this->setProperty($method, Arr::get($arguments, 0));
+	}
 
-    /**
-     * @param string $type
-     */
-    public function __construct($type = null)
-    {
-        $this->type = !is_string($type)
-            ? (new ReflectionClass($this))->getShortName()
-            : $type;
-        $this->setAllowedProperties();
-    }
+	/**
+	 * @param string $type
+	 */
+	public function __construct($type = null)
+	{
+		$this->type = !is_string($type)
+			? (new ReflectionClass($this))->getShortName()
+			: $type;
+		$this->setAllowedProperties();
+	}
 
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->toScript();
-    }
+	/**
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->toScript();
+	}
 
-    /**
-     * @return static
-     */
-    public function addProperties(array $properties)
-    {
-        foreach ($properties as $property => $value) {
-            $this->setProperty($property, $value);
-        }
-        return $this;
-    }
+	/**
+	 * @return static
+	 */
+	public function addProperties(array $properties)
+	{
+		foreach ($properties as $property => $value) {
+			$this->setProperty($property, $value);
+		}
+		return $this;
+	}
 
-    /**
-     * @return string
-     */
-    public function getContext()
-    {
-        return 'https://schema.org';
-    }
+	/**
+	 * @return string
+	 */
+	public function getContext()
+	{
+		return 'https://schema.org';
+	}
 
-    /**
-     * @return array
-     */
-    public function getProperties()
-    {
-        return $this->properties;
-    }
+	/**
+	 * @return array
+	 */
+	public function getProperties()
+	{
+		return $this->properties;
+	}
 
-    /**
-     * @param string $property
-     * @param mixed $default
-     * @return mixed
-     */
-    public function getProperty($property, $default = null)
-    {
-        return Arr::get($this->properties, $property, $default);
-    }
+	/**
+	 * @param string $property
+	 * @param mixed $default
+	 * @return mixed
+	 */
+	public function getProperty($property, $default = null)
+	{
+		return Arr::get($this->properties, $property, $default);
+	}
 
-    /**
-     * @return string
-     */
-    public function getType()
-    {
-        return $this->type;
-    }
+	/**
+	 * @return string
+	 */
+	public function getType()
+	{
+		return $this->type;
+	}
 
-    /**
-     * @param bool $condition
-     * @param mixed $callback
-     * @return static
-     */
-    public function doIf($condition, $callback)
-    {
-        if ($condition) {
-            $callback($this);
-        }
-        return $this;
-    }
+	/**
+	 * @param bool $condition
+	 * @param mixed $callback
+	 * @return static
+	 */
+	public function doIf($condition, $callback)
+	{
+		if ($condition) {
+			$callback($this);
+		}
+		return $this;
+	}
 
-    /**
-     * @return array
-     */
-    public function jsonSerialize()
-    {
-        return $this->toArray();
-    }
+	/**
+	 * @return array
+	 */
+	public function jsonSerialize()
+	{
+		return $this->toArray();
+	}
 
-    /**
-     * @param mixed $offset
-     * @return bool
-     */
-    public function offsetExists($offset)
-    {
-        return array_key_exists($offset, $this->properties);
-    }
+	/**
+	 * @param mixed $offset
+	 * @return bool
+	 */
+	public function offsetExists($offset)
+	{
+		return array_key_exists($offset, $this->properties);
+	}
 
-    /**
-     * @param string $offset
-     * @return mixed
-     */
-    public function offsetGet($offset)
-    {
-        return $this->getProperty($offset);
-    }
+	/**
+	 * @param string $offset
+	 * @return mixed
+	 */
+	public function offsetGet($offset)
+	{
+		return $this->getProperty($offset);
+	}
 
-    /**
-     * @param string $offset
-     * @param mixed $value
-     * @return void
-     */
-    public function offsetSet($offset, $value)
-    {
-        $this->setProperty($offset, $value);
-    }
+	/**
+	 * @param string $offset
+	 * @param mixed $value
+	 * @return void
+	 */
+	public function offsetSet($offset, $value)
+	{
+		$this->setProperty($offset, $value);
+	}
 
-    /**
-     * @param string $offset
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->properties[$offset]);
-    }
+	/**
+	 * @param string $offset
+	 * @return void
+	 */
+	public function offsetUnset($offset)
+	{
+		unset($this->properties[$offset]);
+	}
 
-    /**
-     * @param string $property
-     * @param mixed $value
-     * @return static
-     */
-    public function setProperty($property, $value)
-    {
-        if (!in_array($property, $this->allowed)
-            && 'UnknownType' != (new ReflectionClass($this))->getShortName()) {
-            glsr_log()->warning($this->getType().' does not allow the "'.$property.'" property');
-            return $this;
-        }
-        $this->properties[$property] = $value;
-        return $this;
-    }
+	/**
+	 * @param string $property
+	 * @param mixed $value
+	 * @return static
+	 */
+	public function setProperty($property, $value)
+	{
+		if (!in_array($property, $this->allowed)
+			&& 'UnknownType' != (new ReflectionClass($this))->getShortName()) {
+			glsr_log()->warning($this->getType().' does not allow the "'.$property.'" property');
+			return $this;
+		}
+		$this->properties[$property] = $value;
+		return $this;
+	}
 
-    /**
-     * @return array
-     */
-    public function toArray()
-    {
-        return [
-            '@context' => $this->getContext(),
-            '@type' => $this->getType(),
-        ] + $this->serializeProperty($this->getProperties());
-    }
+	/**
+	 * @return array
+	 */
+	public function toArray()
+	{
+		return [
+			'@context' => $this->getContext(),
+			'@type' => $this->getType(),
+		] + $this->serializeProperty($this->getProperties());
+	}
 
-    /**
-     * @return string
-     */
-    public function toScript()
-    {
-        return sprintf('<script type="application/ld+json">%s</script>',
-            json_encode($this->toArray(), JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES)
-        );
-    }
+	/**
+	 * @return string
+	 */
+	public function toScript()
+	{
+		return sprintf('<script type="application/ld+json">%s</script>',
+			json_encode($this->toArray(), JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES)
+		);
+	}
 
-    /**
-     * @param array|null $parents
-     * @return array
-     */
-    protected function getParents($parents = null)
-    {
-        if (!isset($parents)) {
-            $parents = $this->parents;
-        }
-        $newParents = $parents;
-        foreach ($parents as $parent) {
-            $parentClass = Helper::buildClassName($parent, __NAMESPACE__);
-            if (!class_exists($parentClass)) {
-                continue;
-            }
-            $newParents = array_merge($newParents, $this->getParents((new $parentClass())->parents));
-        }
-        return array_values(array_unique($newParents));
-    }
+	/**
+	 * @param array|null $parents
+	 * @return array
+	 */
+	protected function getParents($parents = null)
+	{
+		if (!isset($parents)) {
+			$parents = $this->parents;
+		}
+		$newParents = $parents;
+		foreach ($parents as $parent) {
+			$parentClass = Helper::buildClassName($parent, __NAMESPACE__);
+			if (!class_exists($parentClass)) {
+				continue;
+			}
+			$newParents = array_merge($newParents, $this->getParents((new $parentClass())->parents));
+		}
+		return array_values(array_unique($newParents));
+	}
 
-    /**
-     * @return void
-     */
-    protected function setAllowedProperties()
-    {
-        $parents = $this->getParents();
-        foreach ($parents as $parent) {
-            $parentClass = Helper::buildClassName($parent, __NAMESPACE__);
-            if (!class_exists($parentClass)) {
-                continue;
-            }
-            $this->allowed = array_values(array_unique(array_merge((new $parentClass())->allowed, $this->allowed)));
-        }
-    }
+	/**
+	 * @return void
+	 */
+	protected function setAllowedProperties()
+	{
+		$parents = $this->getParents();
+		foreach ($parents as $parent) {
+			$parentClass = Helper::buildClassName($parent, __NAMESPACE__);
+			if (!class_exists($parentClass)) {
+				continue;
+			}
+			$this->allowed = array_values(array_unique(array_merge((new $parentClass())->allowed, $this->allowed)));
+		}
+	}
 
-    /**
-     * @param mixed $property
-     * @return array|string
-     */
-    protected function serializeProperty($property)
-    {
-        if (is_array($property)) {
-            return array_map([$this, 'serializeProperty'], $property);
-        }
-        if ($property instanceof Type) {
-            $property = $property->toArray();
-            unset($property['@context']);
-        }
-        if ($property instanceof DateTimeInterface) {
-            $property = $property->format(DateTime::ATOM);
-        }
-        if (is_object($property)) {
-            throw new InvalidProperty();
-        }
-        return $property;
-    }
+	/**
+	 * @param mixed $property
+	 * @return array|string
+	 */
+	protected function serializeProperty($property)
+	{
+		if (is_array($property)) {
+			return array_map([$this, 'serializeProperty'], $property);
+		}
+		if ($property instanceof Type) {
+			$property = $property->toArray();
+			unset($property['@context']);
+		}
+		if ($property instanceof DateTimeInterface) {
+			$property = $property->format(DateTime::ATOM);
+		}
+		if (is_object($property)) {
+			throw new InvalidProperty();
+		}
+		return $property;
+	}
 }

Spacing +45 added lines, -45 removed lines

@@ -37,18 +37,18 @@ 
      * @param string $method
      * @return static
      */
-    public function __call($method, array $arguments)
+    public function __call( $method, array $arguments )
     {
-        return $this->setProperty($method, Arr::get($arguments, 0));
+        return $this->setProperty( $method, Arr::get( $arguments, 0 ) );
     }
 
     /**
      * @param string $type
      */
-    public function __construct($type = null)
+    public function __construct( $type = null )
     {
-        $this->type = !is_string($type)
-            ? (new ReflectionClass($this))->getShortName()
+        $this->type = !is_string( $type )
+            ? (new ReflectionClass( $this ))->getShortName()
             : $type;
         $this->setAllowedProperties();
     }
@@ -64,10 +64,10 @@ 
     /**
      * @return static
      */
-    public function addProperties(array $properties)
+    public function addProperties( array $properties )
     {
-        foreach ($properties as $property => $value) {
-            $this->setProperty($property, $value);
+        foreach( $properties as $property => $value ) {
+            $this->setProperty( $property, $value );
         }
         return $this;
     }
@@ -93,9 +93,9 @@ 
      * @param mixed $default
      * @return mixed
      */
-    public function getProperty($property, $default = null)
+    public function getProperty( $property, $default = null )
     {
-        return Arr::get($this->properties, $property, $default);
+        return Arr::get( $this->properties, $property, $default );
     }
 
     /**
@@ -111,10 +111,10 @@ 
      * @param mixed $callback
      * @return static
      */
-    public function doIf($condition, $callback)
+    public function doIf( $condition, $callback )
     {
-        if ($condition) {
-            $callback($this);
+        if( $condition ) {
+            $callback( $this );
         }
         return $this;
     }
@@ -131,18 +131,18 @@ 
      * @param mixed $offset
      * @return bool
      */
-    public function offsetExists($offset)
+    public function offsetExists( $offset )
     {
-        return array_key_exists($offset, $this->properties);
+        return array_key_exists( $offset, $this->properties );
     }
 
     /**
      * @param string $offset
      * @return mixed
      */
-    public function offsetGet($offset)
+    public function offsetGet( $offset )
     {
-        return $this->getProperty($offset);
+        return $this->getProperty( $offset );
     }
 
     /**
@@ -150,16 +150,16 @@ 
      * @param mixed $value
      * @return void
      */
-    public function offsetSet($offset, $value)
+    public function offsetSet( $offset, $value )
     {
-        $this->setProperty($offset, $value);
+        $this->setProperty( $offset, $value );
     }
 
     /**
      * @param string $offset
      * @return void
      */
-    public function offsetUnset($offset)
+    public function offsetUnset( $offset )
     {
         unset($this->properties[$offset]);
     }
@@ -169,11 +169,11 @@ 
      * @param mixed $value
      * @return static
      */
-    public function setProperty($property, $value)
+    public function setProperty( $property, $value )
     {
-        if (!in_array($property, $this->allowed)
-            && 'UnknownType' != (new ReflectionClass($this))->getShortName()) {
-            glsr_log()->warning($this->getType().' does not allow the "'.$property.'" property');
+        if( !in_array( $property, $this->allowed )
+            && 'UnknownType' != (new ReflectionClass( $this ))->getShortName() ) {
+            glsr_log()->warning( $this->getType().' does not allow the "'.$property.'" property' );
             return $this;
         }
         $this->properties[$property] = $value;
@@ -188,7 +188,7 @@ 
         return [
             '@context' => $this->getContext(),
             '@type' => $this->getType(),
-        ] + $this->serializeProperty($this->getProperties());
+        ] + $this->serializeProperty( $this->getProperties() );
     }
 
     /**
@@ -196,8 +196,8 @@ 
      */
     public function toScript()
     {
-        return sprintf('<script type="application/ld+json">%s</script>',
-            json_encode($this->toArray(), JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES)
+        return sprintf( '<script type="application/ld+json">%s</script>',
+            json_encode( $this->toArray(), JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES )
         );
     }
 
@@ -205,20 +205,20 @@ 
      * @param array|null $parents
      * @return array
      */
-    protected function getParents($parents = null)
+    protected function getParents( $parents = null )
     {
-        if (!isset($parents)) {
+        if( !isset($parents) ) {
             $parents = $this->parents;
         }
         $newParents = $parents;
-        foreach ($parents as $parent) {
-            $parentClass = Helper::buildClassName($parent, __NAMESPACE__);
-            if (!class_exists($parentClass)) {
+        foreach( $parents as $parent ) {
+            $parentClass = Helper::buildClassName( $parent, __NAMESPACE__ );
+            if( !class_exists( $parentClass ) ) {
                 continue;
             }
-            $newParents = array_merge($newParents, $this->getParents((new $parentClass())->parents));
+            $newParents = array_merge( $newParents, $this->getParents( (new $parentClass())->parents ) );
         }
-        return array_values(array_unique($newParents));
+        return array_values( array_unique( $newParents ) );
     }
 
     /**
@@ -227,12 +227,12 @@ 
     protected function setAllowedProperties()
     {
         $parents = $this->getParents();
-        foreach ($parents as $parent) {
-            $parentClass = Helper::buildClassName($parent, __NAMESPACE__);
-            if (!class_exists($parentClass)) {
+        foreach( $parents as $parent ) {
+            $parentClass = Helper::buildClassName( $parent, __NAMESPACE__ );
+            if( !class_exists( $parentClass ) ) {
                 continue;
             }
-            $this->allowed = array_values(array_unique(array_merge((new $parentClass())->allowed, $this->allowed)));
+            $this->allowed = array_values( array_unique( array_merge( (new $parentClass())->allowed, $this->allowed ) ) );
         }
     }
 
@@ -240,19 +240,19 @@ 
      * @param mixed $property
      * @return array|string
      */
-    protected function serializeProperty($property)
+    protected function serializeProperty( $property )
     {
-        if (is_array($property)) {
-            return array_map([$this, 'serializeProperty'], $property);
+        if( is_array( $property ) ) {
+            return array_map( [$this, 'serializeProperty'], $property );
         }
-        if ($property instanceof Type) {
+        if( $property instanceof Type ) {
             $property = $property->toArray();
             unset($property['@context']);
         }
-        if ($property instanceof DateTimeInterface) {
-            $property = $property->format(DateTime::ATOM);
+        if( $property instanceof DateTimeInterface ) {
+            $property = $property->format( DateTime::ATOM );
         }
-        if (is_object($property)) {
+        if( is_object( $property ) ) {
             throw new InvalidProperty();
         }
         return $property;