pryley / site-reviews

plugin/Modules/Validator.php

Braces +2 added lines, -1 removed lines

@@ -185,7 +185,8 @@
         $hasNumeric = $this->hasRule($attribute, $this->numericRules);
         if (is_numeric($value) && $hasNumeric) {
             return $value;
-        } elseif (is_array($value)) {
+        }
+        elseif (is_array($value)) {
             return count($value);
         }
         return function_exists('mb_strlen')

Indentation +274 added lines, -274 removed lines

@@ -12,302 +12,302 @@
  */
 class Validator
 {
-    use ValidationRules;
+	use ValidationRules;
 
-    /**
-     * @var array
-     */
-    public $errors = [];
+	/**
+	 * @var array
+	 */
+	public $errors = [];
 
-    /**
-     * The data under validation.
-     * @var array
-     */
-    protected $data = [];
+	/**
+	 * The data under validation.
+	 * @var array
+	 */
+	protected $data = [];
 
-    /**
-     * The failed validation rules.
-     * @var array
-     */
-    protected $failedRules = [];
+	/**
+	 * The failed validation rules.
+	 * @var array
+	 */
+	protected $failedRules = [];
 
-    /**
-     * The rules to be applied to the data.
-     * @var array
-     */
-    protected $rules = [];
+	/**
+	 * The rules to be applied to the data.
+	 * @var array
+	 */
+	protected $rules = [];
 
-    /**
-     * The size related validation rules.
-     * @var array
-     */
-    protected $sizeRules = [
-        'Between', 'Max', 'Min',
-    ];
+	/**
+	 * The size related validation rules.
+	 * @var array
+	 */
+	protected $sizeRules = [
+		'Between', 'Max', 'Min',
+	];
 
-    /**
-     * The validation rules that imply the field is required.
-     * @var array
-     */
-    protected $implicitRules = [
-        'Required',
-    ];
+	/**
+	 * The validation rules that imply the field is required.
+	 * @var array
+	 */
+	protected $implicitRules = [
+		'Required',
+	];
 
-    /**
-     * The numeric related validation rules.
-     * @var array
-     */
-    protected $numericRules = [
-        'Number',
-    ];
+	/**
+	 * The numeric related validation rules.
+	 * @var array
+	 */
+	protected $numericRules = [
+		'Number',
+	];
 
-    /**
-     * Run the validator's rules against its data.
-     * @param mixed $data
-     * @return array
-     */
-    public function validate($data, array $rules = [])
-    {
-        $this->normalizeData($data);
-        $this->setRules($rules);
-        foreach ($this->rules as $attribute => $rules) {
-            foreach ($rules as $rule) {
-                $this->validateAttribute($attribute, $rule);
-                if ($this->shouldStopValidating($attribute)) {
-                    break;
-                }
-            }
-        }
-        return $this->errors;
-    }
+	/**
+	 * Run the validator's rules against its data.
+	 * @param mixed $data
+	 * @return array
+	 */
+	public function validate($data, array $rules = [])
+	{
+		$this->normalizeData($data);
+		$this->setRules($rules);
+		foreach ($this->rules as $attribute => $rules) {
+			foreach ($rules as $rule) {
+				$this->validateAttribute($attribute, $rule);
+				if ($this->shouldStopValidating($attribute)) {
+					break;
+				}
+			}
+		}
+		return $this->errors;
+	}
 
-    /**
-     * Validate a given attribute against a rule.
-     * @param string $attribute
-     * @param string $rule
-     * @return void
-     * @throws BadMethodCallException
-     */
-    public function validateAttribute($attribute, $rule)
-    {
-        list($rule, $parameters) = $this->parseRule($rule);
-        if ('' == $rule) {
-            return;
-        }
-        $value = $this->getValue($attribute);
-        if (!method_exists($this, $method = 'validate'.$rule)) {
-            throw new BadMethodCallException("Method [$method] does not exist.");
-        }
-        if (!$this->$method($value, $attribute, $parameters)) {
-            $this->addFailure($attribute, $rule, $parameters);
-        }
-    }
+	/**
+	 * Validate a given attribute against a rule.
+	 * @param string $attribute
+	 * @param string $rule
+	 * @return void
+	 * @throws BadMethodCallException
+	 */
+	public function validateAttribute($attribute, $rule)
+	{
+		list($rule, $parameters) = $this->parseRule($rule);
+		if ('' == $rule) {
+			return;
+		}
+		$value = $this->getValue($attribute);
+		if (!method_exists($this, $method = 'validate'.$rule)) {
+			throw new BadMethodCallException("Method [$method] does not exist.");
+		}
+		if (!$this->$method($value, $attribute, $parameters)) {
+			$this->addFailure($attribute, $rule, $parameters);
+		}
+	}
 
-    /**
-     * Add an error message to the validator's collection of errors.
-     * @param string $attribute
-     * @param string $rule
-     * @return void
-     */
-    protected function addError($attribute, $rule, array $parameters)
-    {
-        $message = $this->getMessage($attribute, $rule, $parameters);
-        $this->errors[$attribute][] = $message;
-    }
+	/**
+	 * Add an error message to the validator's collection of errors.
+	 * @param string $attribute
+	 * @param string $rule
+	 * @return void
+	 */
+	protected function addError($attribute, $rule, array $parameters)
+	{
+		$message = $this->getMessage($attribute, $rule, $parameters);
+		$this->errors[$attribute][] = $message;
+	}
 
-    /**
-     * Add a failed rule and error message to the collection.
-     * @param string $attribute
-     * @param string $rule
-     * @return void
-     */
-    protected function addFailure($attribute, $rule, array $parameters)
-    {
-        $this->addError($attribute, $rule, $parameters);
-        $this->failedRules[$attribute][$rule] = $parameters;
-    }
+	/**
+	 * Add a failed rule and error message to the collection.
+	 * @param string $attribute
+	 * @param string $rule
+	 * @return void
+	 */
+	protected function addFailure($attribute, $rule, array $parameters)
+	{
+		$this->addError($attribute, $rule, $parameters);
+		$this->failedRules[$attribute][$rule] = $parameters;
+	}
 
-    /**
-     * Get the data type of the given attribute.
-     * @param string $attribute
-     * @return string
-     */
-    protected function getAttributeType($attribute)
-    {
-        return !$this->hasRule($attribute, $this->numericRules)
-            ? 'length'
-            : '';
-    }
+	/**
+	 * Get the data type of the given attribute.
+	 * @param string $attribute
+	 * @return string
+	 */
+	protected function getAttributeType($attribute)
+	{
+		return !$this->hasRule($attribute, $this->numericRules)
+			? 'length'
+			: '';
+	}
 
-    /**
-     * Get the validation message for an attribute and rule.
-     * @param string $attribute
-     * @param string $rule
-     * @return string|null
-     */
-    protected function getMessage($attribute, $rule, array $parameters)
-    {
-        if (in_array($rule, $this->sizeRules)) {
-            return $this->getSizeMessage($attribute, $rule, $parameters);
-        }
-        $lowerRule = Str::snakeCase($rule);
-        return $this->translator($lowerRule, $parameters);
-    }
+	/**
+	 * Get the validation message for an attribute and rule.
+	 * @param string $attribute
+	 * @param string $rule
+	 * @return string|null
+	 */
+	protected function getMessage($attribute, $rule, array $parameters)
+	{
+		if (in_array($rule, $this->sizeRules)) {
+			return $this->getSizeMessage($attribute, $rule, $parameters);
+		}
+		$lowerRule = Str::snakeCase($rule);
+		return $this->translator($lowerRule, $parameters);
+	}
 
-    /**
-     * Get a rule and its parameters for a given attribute.
-     * @param string $attribute
-     * @param string|array $rules
-     * @return array|null
-     */
-    protected function getRule($attribute, $rules)
-    {
-        if (!array_key_exists($attribute, $this->rules)) {
-            return;
-        }
-        $rules = (array) $rules;
-        foreach ($this->rules[$attribute] as $rule) {
-            list($rule, $parameters) = $this->parseRule($rule);
-            if (in_array($rule, $rules)) {
-                return [$rule, $parameters];
-            }
-        }
-    }
+	/**
+	 * Get a rule and its parameters for a given attribute.
+	 * @param string $attribute
+	 * @param string|array $rules
+	 * @return array|null
+	 */
+	protected function getRule($attribute, $rules)
+	{
+		if (!array_key_exists($attribute, $this->rules)) {
+			return;
+		}
+		$rules = (array) $rules;
+		foreach ($this->rules[$attribute] as $rule) {
+			list($rule, $parameters) = $this->parseRule($rule);
+			if (in_array($rule, $rules)) {
+				return [$rule, $parameters];
+			}
+		}
+	}
 
-    /**
-     * Get the size of an attribute.
-     * @param string $attribute
-     * @param mixed $value
-     * @return mixed
-     */
-    protected function getSize($attribute, $value)
-    {
-        $hasNumeric = $this->hasRule($attribute, $this->numericRules);
-        if (is_numeric($value) && $hasNumeric) {
-            return $value;
-        } elseif (is_array($value)) {
-            return count($value);
-        }
-        return function_exists('mb_strlen')
-            ? mb_strlen($value)
-            : strlen($value);
-    }
+	/**
+	 * Get the size of an attribute.
+	 * @param string $attribute
+	 * @param mixed $value
+	 * @return mixed
+	 */
+	protected function getSize($attribute, $value)
+	{
+		$hasNumeric = $this->hasRule($attribute, $this->numericRules);
+		if (is_numeric($value) && $hasNumeric) {
+			return $value;
+		} elseif (is_array($value)) {
+			return count($value);
+		}
+		return function_exists('mb_strlen')
+			? mb_strlen($value)
+			: strlen($value);
+	}
 
-    /**
-     * Get the proper error message for an attribute and size rule.
-     * @param string $attribute
-     * @param string $rule
-     * @return string|null
-     */
-    protected function getSizeMessage($attribute, $rule, array $parameters)
-    {
-        $type = $this->getAttributeType($attribute);
-        $lowerRule = Str::snakeCase($rule.$type);
-        return $this->translator($lowerRule, $parameters);
-    }
+	/**
+	 * Get the proper error message for an attribute and size rule.
+	 * @param string $attribute
+	 * @param string $rule
+	 * @return string|null
+	 */
+	protected function getSizeMessage($attribute, $rule, array $parameters)
+	{
+		$type = $this->getAttributeType($attribute);
+		$lowerRule = Str::snakeCase($rule.$type);
+		return $this->translator($lowerRule, $parameters);
+	}
 
-    /**
-     * Get the value of a given attribute.
-     * @param string $attribute
-     * @return mixed
-     */
-    protected function getValue($attribute)
-    {
-        if (isset($this->data[$attribute])) {
-            return $this->data[$attribute];
-        }
-    }
+	/**
+	 * Get the value of a given attribute.
+	 * @param string $attribute
+	 * @return mixed
+	 */
+	protected function getValue($attribute)
+	{
+		if (isset($this->data[$attribute])) {
+			return $this->data[$attribute];
+		}
+	}
 
-    /**
-     * Determine if the given attribute has a rule in the given set.
-     * @param string $attribute
-     * @param string|array $rules
-     * @return bool
-     */
-    protected function hasRule($attribute, $rules)
-    {
-        return !is_null($this->getRule($attribute, $rules));
-    }
+	/**
+	 * Determine if the given attribute has a rule in the given set.
+	 * @param string $attribute
+	 * @param string|array $rules
+	 * @return bool
+	 */
+	protected function hasRule($attribute, $rules)
+	{
+		return !is_null($this->getRule($attribute, $rules));
+	}
 
-    /**
-     * Normalize the provided data to an array.
-     * @param mixed $data
-     * @return void
-     */
-    protected function normalizeData($data)
-    {
-        $this->data = is_object($data)
-            ? get_object_vars($data)
-            : $data;
-    }
+	/**
+	 * Normalize the provided data to an array.
+	 * @param mixed $data
+	 * @return void
+	 */
+	protected function normalizeData($data)
+	{
+		$this->data = is_object($data)
+			? get_object_vars($data)
+			: $data;
+	}
 
-    /**
-     * Parse a parameter list.
-     * @param string $rule
-     * @param string $parameter
-     * @return array
-     */
-    protected function parseParameters($rule, $parameter)
-    {
-        return 'regex' == strtolower($rule)
-            ? [$parameter]
-            : str_getcsv($parameter);
-    }
+	/**
+	 * Parse a parameter list.
+	 * @param string $rule
+	 * @param string $parameter
+	 * @return array
+	 */
+	protected function parseParameters($rule, $parameter)
+	{
+		return 'regex' == strtolower($rule)
+			? [$parameter]
+			: str_getcsv($parameter);
+	}
 
-    /**
-     * Extract the rule name and parameters from a rule.
-     * @param string $rule
-     * @return array
-     */
-    protected function parseRule($rule)
-    {
-        $parameters = [];
-        if (Str::contains($rule, ':')) {
-            list($rule, $parameter) = explode(':', $rule, 2);
-            $parameters = $this->parseParameters($rule, $parameter);
-        }
-        $rule = Str::camelCase($rule);
-        return [$rule, $parameters];
-    }
+	/**
+	 * Extract the rule name and parameters from a rule.
+	 * @param string $rule
+	 * @return array
+	 */
+	protected function parseRule($rule)
+	{
+		$parameters = [];
+		if (Str::contains($rule, ':')) {
+			list($rule, $parameter) = explode(':', $rule, 2);
+			$parameters = $this->parseParameters($rule, $parameter);
+		}
+		$rule = Str::camelCase($rule);
+		return [$rule, $parameters];
+	}
 
-    /**
-     * Set the validation rules.
-     * @return void
-     */
-    protected function setRules(array $rules)
-    {
-        foreach ($rules as $key => $rule) {
-            $rules[$key] = is_string($rule)
-                ? explode('|', $rule)
-                : $rule;
-        }
-        $this->rules = $rules;
-    }
+	/**
+	 * Set the validation rules.
+	 * @return void
+	 */
+	protected function setRules(array $rules)
+	{
+		foreach ($rules as $key => $rule) {
+			$rules[$key] = is_string($rule)
+				? explode('|', $rule)
+				: $rule;
+		}
+		$this->rules = $rules;
+	}
 
-    /**
-     * Check if we should stop further validations on a given attribute.
-     * @param string $attribute
-     * @return bool
-     */
-    protected function shouldStopValidating($attribute)
-    {
-        return $this->hasRule($attribute, $this->implicitRules)
-            && isset($this->failedRules[$attribute])
-            && array_intersect(array_keys($this->failedRules[$attribute]), $this->implicitRules);
-    }
+	/**
+	 * Check if we should stop further validations on a given attribute.
+	 * @param string $attribute
+	 * @return bool
+	 */
+	protected function shouldStopValidating($attribute)
+	{
+		return $this->hasRule($attribute, $this->implicitRules)
+			&& isset($this->failedRules[$attribute])
+			&& array_intersect(array_keys($this->failedRules[$attribute]), $this->implicitRules);
+	}
 
-    /**
-     * Returns a translated message for the attribute.
-     * @param string $key
-     * @param string $attribute
-     * @return void|string
-     */
-    protected function translator($key, array $parameters)
-    {
-        $strings = glsr(ValidationStringsDefaults::class)->defaults();
-        if (isset($strings[$key])) {
-            return $this->replace($strings[$key], $parameters);
-        }
-        return 'error';
-    }
+	/**
+	 * Returns a translated message for the attribute.
+	 * @param string $key
+	 * @param string $attribute
+	 * @return void|string
+	 */
+	protected function translator($key, array $parameters)
+	{
+		$strings = glsr(ValidationStringsDefaults::class)->defaults();
+		if (isset($strings[$key])) {
+			return $this->replace($strings[$key], $parameters);
+		}
+		return 'error';
+	}
 }

Spacing +70 added lines, -70 removed lines

@@ -66,14 +66,14 @@ 
      * @param mixed $data
      * @return array
      */
-    public function validate($data, array $rules = [])
+    public function validate( $data, array $rules = [] )
     {
-        $this->normalizeData($data);
-        $this->setRules($rules);
-        foreach ($this->rules as $attribute => $rules) {
-            foreach ($rules as $rule) {
-                $this->validateAttribute($attribute, $rule);
-                if ($this->shouldStopValidating($attribute)) {
+        $this->normalizeData( $data );
+        $this->setRules( $rules );
+        foreach( $this->rules as $attribute => $rules ) {
+            foreach( $rules as $rule ) {
+                $this->validateAttribute( $attribute, $rule );
+                if( $this->shouldStopValidating( $attribute ) ) {
                     break;
                 }
             }
@@ -88,18 +88,18 @@ 
      * @return void
      * @throws BadMethodCallException
      */
-    public function validateAttribute($attribute, $rule)
+    public function validateAttribute( $attribute, $rule )
     {
-        list($rule, $parameters) = $this->parseRule($rule);
-        if ('' == $rule) {
+        list($rule, $parameters) = $this->parseRule( $rule );
+        if( '' == $rule ) {
             return;
         }
-        $value = $this->getValue($attribute);
-        if (!method_exists($this, $method = 'validate'.$rule)) {
-            throw new BadMethodCallException("Method [$method] does not exist.");
+        $value = $this->getValue( $attribute );
+        if( !method_exists( $this, $method = 'validate'.$rule ) ) {
+            throw new BadMethodCallException( "Method [$method] does not exist." );
         }
-        if (!$this->$method($value, $attribute, $parameters)) {
-            $this->addFailure($attribute, $rule, $parameters);
+        if( !$this->$method( $value, $attribute, $parameters ) ) {
+            $this->addFailure( $attribute, $rule, $parameters );
         }
     }
 
@@ -109,9 +109,9 @@ 
      * @param string $rule
      * @return void
      */
-    protected function addError($attribute, $rule, array $parameters)
+    protected function addError( $attribute, $rule, array $parameters )
     {
-        $message = $this->getMessage($attribute, $rule, $parameters);
+        $message = $this->getMessage( $attribute, $rule, $parameters );
         $this->errors[$attribute][] = $message;
     }
 
@@ -121,9 +121,9 @@ 
      * @param string $rule
      * @return void
      */
-    protected function addFailure($attribute, $rule, array $parameters)
+    protected function addFailure( $attribute, $rule, array $parameters )
     {
-        $this->addError($attribute, $rule, $parameters);
+        $this->addError( $attribute, $rule, $parameters );
         $this->failedRules[$attribute][$rule] = $parameters;
     }
 
@@ -132,9 +132,9 @@ 
      * @param string $attribute
      * @return string
      */
-    protected function getAttributeType($attribute)
+    protected function getAttributeType( $attribute )
     {
-        return !$this->hasRule($attribute, $this->numericRules)
+        return !$this->hasRule( $attribute, $this->numericRules )
             ? 'length'
             : '';
     }
@@ -145,13 +145,13 @@ 
      * @param string $rule
      * @return string|null
      */
-    protected function getMessage($attribute, $rule, array $parameters)
+    protected function getMessage( $attribute, $rule, array $parameters )
     {
-        if (in_array($rule, $this->sizeRules)) {
-            return $this->getSizeMessage($attribute, $rule, $parameters);
+        if( in_array( $rule, $this->sizeRules ) ) {
+            return $this->getSizeMessage( $attribute, $rule, $parameters );
         }
-        $lowerRule = Str::snakeCase($rule);
-        return $this->translator($lowerRule, $parameters);
+        $lowerRule = Str::snakeCase( $rule );
+        return $this->translator( $lowerRule, $parameters );
     }
 
     /**
@@ -160,15 +160,15 @@ 
      * @param string|array $rules
      * @return array|null
      */
-    protected function getRule($attribute, $rules)
+    protected function getRule( $attribute, $rules )
     {
-        if (!array_key_exists($attribute, $this->rules)) {
+        if( !array_key_exists( $attribute, $this->rules ) ) {
             return;
         }
-        $rules = (array) $rules;
-        foreach ($this->rules[$attribute] as $rule) {
-            list($rule, $parameters) = $this->parseRule($rule);
-            if (in_array($rule, $rules)) {
+        $rules = (array)$rules;
+        foreach( $this->rules[$attribute] as $rule ) {
+            list($rule, $parameters) = $this->parseRule( $rule );
+            if( in_array( $rule, $rules ) ) {
                 return [$rule, $parameters];
             }
         }
@@ -180,17 +180,17 @@ 
      * @param mixed $value
      * @return mixed
      */
-    protected function getSize($attribute, $value)
+    protected function getSize( $attribute, $value )
     {
-        $hasNumeric = $this->hasRule($attribute, $this->numericRules);
-        if (is_numeric($value) && $hasNumeric) {
+        $hasNumeric = $this->hasRule( $attribute, $this->numericRules );
+        if( is_numeric( $value ) && $hasNumeric ) {
             return $value;
-        } elseif (is_array($value)) {
-            return count($value);
+        } elseif( is_array( $value ) ) {
+            return count( $value );
         }
-        return function_exists('mb_strlen')
-            ? mb_strlen($value)
-            : strlen($value);
+        return function_exists( 'mb_strlen' )
+            ? mb_strlen( $value )
+            : strlen( $value );
     }
 
     /**
@@ -199,11 +199,11 @@ 
      * @param string $rule
      * @return string|null
      */
-    protected function getSizeMessage($attribute, $rule, array $parameters)
+    protected function getSizeMessage( $attribute, $rule, array $parameters )
     {
-        $type = $this->getAttributeType($attribute);
-        $lowerRule = Str::snakeCase($rule.$type);
-        return $this->translator($lowerRule, $parameters);
+        $type = $this->getAttributeType( $attribute );
+        $lowerRule = Str::snakeCase( $rule.$type );
+        return $this->translator( $lowerRule, $parameters );
     }
 
     /**
@@ -211,9 +211,9 @@ 
      * @param string $attribute
      * @return mixed
      */
-    protected function getValue($attribute)
+    protected function getValue( $attribute )
     {
-        if (isset($this->data[$attribute])) {
+        if( isset($this->data[$attribute]) ) {
             return $this->data[$attribute];
         }
     }
@@ -224,9 +224,9 @@ 
      * @param string|array $rules
      * @return bool
      */
-    protected function hasRule($attribute, $rules)
+    protected function hasRule( $attribute, $rules )
     {
-        return !is_null($this->getRule($attribute, $rules));
+        return !is_null( $this->getRule( $attribute, $rules ) );
     }
 
     /**
@@ -234,10 +234,10 @@ 
      * @param mixed $data
      * @return void
      */
-    protected function normalizeData($data)
+    protected function normalizeData( $data )
     {
-        $this->data = is_object($data)
-            ? get_object_vars($data)
+        $this->data = is_object( $data )
+            ? get_object_vars( $data )
             : $data;
     }
 
@@ -247,11 +247,11 @@ 
      * @param string $parameter
      * @return array
      */
-    protected function parseParameters($rule, $parameter)
+    protected function parseParameters( $rule, $parameter )
     {
-        return 'regex' == strtolower($rule)
+        return 'regex' == strtolower( $rule )
             ? [$parameter]
-            : str_getcsv($parameter);
+            : str_getcsv( $parameter );
     }
 
     /**
@@ -259,14 +259,14 @@ 
      * @param string $rule
      * @return array
      */
-    protected function parseRule($rule)
+    protected function parseRule( $rule )
     {
         $parameters = [];
-        if (Str::contains($rule, ':')) {
-            list($rule, $parameter) = explode(':', $rule, 2);
-            $parameters = $this->parseParameters($rule, $parameter);
+        if( Str::contains( $rule, ':' ) ) {
+            list($rule, $parameter) = explode( ':', $rule, 2 );
+            $parameters = $this->parseParameters( $rule, $parameter );
         }
-        $rule = Str::camelCase($rule);
+        $rule = Str::camelCase( $rule );
         return [$rule, $parameters];
     }
 
@@ -274,11 +274,11 @@ 
      * Set the validation rules.
      * @return void
      */
-    protected function setRules(array $rules)
+    protected function setRules( array $rules )
     {
-        foreach ($rules as $key => $rule) {
-            $rules[$key] = is_string($rule)
-                ? explode('|', $rule)
+        foreach( $rules as $key => $rule ) {
+            $rules[$key] = is_string( $rule )
+                ? explode( '|', $rule )
                 : $rule;
         }
         $this->rules = $rules;
@@ -289,11 +289,11 @@ 
      * @param string $attribute
      * @return bool
      */
-    protected function shouldStopValidating($attribute)
+    protected function shouldStopValidating( $attribute )
     {
-        return $this->hasRule($attribute, $this->implicitRules)
+        return $this->hasRule( $attribute, $this->implicitRules )
             && isset($this->failedRules[$attribute])
-            && array_intersect(array_keys($this->failedRules[$attribute]), $this->implicitRules);
+            && array_intersect( array_keys( $this->failedRules[$attribute] ), $this->implicitRules );
     }
 
     /**
@@ -302,11 +302,11 @@ 
      * @param string $attribute
      * @return void|string
      */
-    protected function translator($key, array $parameters)
+    protected function translator( $key, array $parameters )
     {
-        $strings = glsr(ValidationStringsDefaults::class)->defaults();
-        if (isset($strings[$key])) {
-            return $this->replace($strings[$key], $parameters);
+        $strings = glsr( ValidationStringsDefaults::class )->defaults();
+        if( isset($strings[$key]) ) {
+            return $this->replace( $strings[$key], $parameters );
         }
         return 'error';
     }

plugin/Contracts/ShortcodeContract.php

Indentation +5 added lines, -5 removed lines

@@ -4,9 +4,9 @@
 
 interface ShortcodeContract
 {
-    /**
-     * @params string|array $atts
-     * @return string
-     */
-    public function buildShortcode($atts = []);
+	/**
+	 * @params string|array $atts
+	 * @return string
+	 */
+	public function buildShortcode($atts = []);
 }

Spacing +1 added lines, -1 removed lines

@@ -8,5 +8,5 @@
      * @params string|array $atts
      * @return string
      */
-    public function buildShortcode($atts = []);
+    public function buildShortcode( $atts = [] );
 }

plugin/Contracts/HooksContract.php

Indentation +4 added lines, -4 removed lines

@@ -4,8 +4,8 @@
 
 interface HooksContract
 {
-    /**
-     * @return void
-     */
-    public function run();
+	/**
+	 * @return void
+	 */
+	public function run();
 }

plugin/Contracts/ProviderContract.php

Indentation +4 added lines, -4 removed lines

@@ -6,8 +6,8 @@
 
 interface ProviderContract
 {
-    /**
-     * @return void
-     */
-    public function register(Application $app);
+	/**
+	 * @return void
+	 */
+	public function register(Application $app);
 }

Spacing +1 added lines, -1 removed lines

@@ -9,5 +9,5 @@
     /**
      * @return void
      */
-    public function register(Application $app);
+    public function register( Application $app );
 }

plugin/Blocks/SiteReviewsSummaryBlock.php

Indentation +76 added lines, -76 removed lines

@@ -6,83 +6,83 @@
 
 class SiteReviewsSummaryBlock extends BlockGenerator
 {
-    /**
-     * @return array
-     */
-    public function attributes()
-    {
-        return [
-            'assigned_to' => [
-                'default' => '',
-                'type' => 'string',
-            ],
-            'category' => [
-                'default' => '',
-                'type' => 'string',
-            ],
-            'className' => [
-                'default' => '',
-                'type' => 'string',
-            ],
-            'hide' => [
-                'default' => '',
-                'type' => 'string',
-            ],
-            'post_id' => [
-                'default' => '',
-                'type' => 'string',
-            ],
-            'rating' => [
-                'default' => '1',
-                'type' => 'number',
-            ],
-            'schema' => [
-                'default' => false,
-                'type' => 'boolean',
-            ],
-            'type' => [
-                'default' => 'local',
-                'type' => 'string',
-            ],
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	public function attributes()
+	{
+		return [
+			'assigned_to' => [
+				'default' => '',
+				'type' => 'string',
+			],
+			'category' => [
+				'default' => '',
+				'type' => 'string',
+			],
+			'className' => [
+				'default' => '',
+				'type' => 'string',
+			],
+			'hide' => [
+				'default' => '',
+				'type' => 'string',
+			],
+			'post_id' => [
+				'default' => '',
+				'type' => 'string',
+			],
+			'rating' => [
+				'default' => '1',
+				'type' => 'number',
+			],
+			'schema' => [
+				'default' => false,
+				'type' => 'boolean',
+			],
+			'type' => [
+				'default' => 'local',
+				'type' => 'string',
+			],
+		];
+	}
 
-    /**
-     * @return string
-     */
-    public function render(array $attributes)
-    {
-        $attributes['class'] = $attributes['className'];
-        $shortcode = glsr(Shortcode::class);
-        if ('edit' == filter_input(INPUT_GET, 'context')) {
-            $attributes = $this->normalize($attributes);
-            $this->filterShortcodeClass();
-            if (!$this->hasVisibleFields($shortcode, $attributes)) {
-                $this->filterInterpolation();
-            }
-        }
-        return $shortcode->buildShortcode($attributes);
-    }
+	/**
+	 * @return string
+	 */
+	public function render(array $attributes)
+	{
+		$attributes['class'] = $attributes['className'];
+		$shortcode = glsr(Shortcode::class);
+		if ('edit' == filter_input(INPUT_GET, 'context')) {
+			$attributes = $this->normalize($attributes);
+			$this->filterShortcodeClass();
+			if (!$this->hasVisibleFields($shortcode, $attributes)) {
+				$this->filterInterpolation();
+			}
+		}
+		return $shortcode->buildShortcode($attributes);
+	}
 
-    /**
-     * @return void
-     */
-    protected function filterInterpolation()
-    {
-        add_filter('site-reviews/interpolate/reviews-summary', function ($context) {
-            $context['class'] = 'glsr-default glsr-block-disabled';
-            $context['text'] = __('You have hidden all of the fields for this block.', 'site-reviews');
-            return $context;
-        });
-    }
+	/**
+	 * @return void
+	 */
+	protected function filterInterpolation()
+	{
+		add_filter('site-reviews/interpolate/reviews-summary', function ($context) {
+			$context['class'] = 'glsr-default glsr-block-disabled';
+			$context['text'] = __('You have hidden all of the fields for this block.', 'site-reviews');
+			return $context;
+		});
+	}
 
-    /**
-     * @return void
-     */
-    protected function filterShortcodeClass()
-    {
-        add_filter('site-reviews/style', function () {
-            return 'default';
-        });
-    }
+	/**
+	 * @return void
+	 */
+	protected function filterShortcodeClass()
+	{
+		add_filter('site-reviews/style', function () {
+			return 'default';
+		});
+	}
 }

Spacing +9 added lines, -9 removed lines

@@ -50,18 +50,18 @@ 
     /**
      * @return string
      */
-    public function render(array $attributes)
+    public function render( array $attributes )
     {
         $attributes['class'] = $attributes['className'];
-        $shortcode = glsr(Shortcode::class);
-        if ('edit' == filter_input(INPUT_GET, 'context')) {
-            $attributes = $this->normalize($attributes);
+        $shortcode = glsr( Shortcode::class );
+        if( 'edit' == filter_input( INPUT_GET, 'context' ) ) {
+            $attributes = $this->normalize( $attributes );
             $this->filterShortcodeClass();
-            if (!$this->hasVisibleFields($shortcode, $attributes)) {
+            if( !$this->hasVisibleFields( $shortcode, $attributes ) ) {
                 $this->filterInterpolation();
             }
         }
-        return $shortcode->buildShortcode($attributes);
+        return $shortcode->buildShortcode( $attributes );
     }
 
     /**
@@ -69,9 +69,9 @@ 
      */
     protected function filterInterpolation()
     {
-        add_filter('site-reviews/interpolate/reviews-summary', function ($context) {
+        add_filter( 'site-reviews/interpolate/reviews-summary', function( $context ) {
             $context['class'] = 'glsr-default glsr-block-disabled';
-            $context['text'] = __('You have hidden all of the fields for this block.', 'site-reviews');
+            $context['text'] = __( 'You have hidden all of the fields for this block.', 'site-reviews' );
             return $context;
         });
     }
@@ -81,7 +81,7 @@ 
      */
     protected function filterShortcodeClass()
     {
-        add_filter('site-reviews/style', function () {
+        add_filter( 'site-reviews/style', function() {
             return 'default';
         });
     }

plugin/Blocks/BlockGenerator.php

Indentation +57 added lines, -57 removed lines

@@ -6,65 +6,65 @@
 
 abstract class BlockGenerator
 {
-    /**
-     * @return array
-     */
-    public function attributes()
-    {
-        return [];
-    }
+	/**
+	 * @return array
+	 */
+	public function attributes()
+	{
+		return [];
+	}
 
-    /**
-     * @return array
-     */
-    public function normalize(array $attributes)
-    {
-        $hide = array_flip(explode(',', $attributes['hide']));
-        unset($hide['if_empty']);
-        $attributes['hide'] = implode(',', array_keys($hide));
-        if (!isset($attributes['assigned_to'])) {
-            return $attributes;
-        }
-        if ('post_id' == $attributes['assigned_to']) {
-            $attributes['assigned_to'] = $attributes['post_id'];
-        } elseif ('parent_id' == $attributes['assigned_to']) {
-            $attributes['assigned_to'] = wp_get_post_parent_id($attributes['post_id']);
-        }
-        return $attributes;
-    }
+	/**
+	 * @return array
+	 */
+	public function normalize(array $attributes)
+	{
+		$hide = array_flip(explode(',', $attributes['hide']));
+		unset($hide['if_empty']);
+		$attributes['hide'] = implode(',', array_keys($hide));
+		if (!isset($attributes['assigned_to'])) {
+			return $attributes;
+		}
+		if ('post_id' == $attributes['assigned_to']) {
+			$attributes['assigned_to'] = $attributes['post_id'];
+		} elseif ('parent_id' == $attributes['assigned_to']) {
+			$attributes['assigned_to'] = wp_get_post_parent_id($attributes['post_id']);
+		}
+		return $attributes;
+	}
 
-    /**
-     * @return void
-     */
-    public function register($block)
-    {
-        if (!function_exists('register_block_type')) {
-            return;
-        }
-        register_block_type(Application::ID.'/'.$block, [
-            'attributes' => $this->attributes(),
-            'editor_script' => Application::ID.'/blocks',
-            'editor_style' => Application::ID.'/blocks',
-            'render_callback' => [$this, 'render'],
-            'style' => Application::ID,
-        ]);
-    }
+	/**
+	 * @return void
+	 */
+	public function register($block)
+	{
+		if (!function_exists('register_block_type')) {
+			return;
+		}
+		register_block_type(Application::ID.'/'.$block, [
+			'attributes' => $this->attributes(),
+			'editor_script' => Application::ID.'/blocks',
+			'editor_style' => Application::ID.'/blocks',
+			'render_callback' => [$this, 'render'],
+			'style' => Application::ID,
+		]);
+	}
 
-    /**
-     * @return void
-     */
-    abstract public function render(array $attributes);
+	/**
+	 * @return void
+	 */
+	abstract public function render(array $attributes);
 
-    /**
-     * @param mixed $shortcode
-     * @return bool
-     */
-    protected function hasVisibleFields($shortcode, array $attributes)
-    {
-        $args = $shortcode->normalizeAtts($attributes);
-        $defaults = $shortcode->getHideOptions();
-        $hide = array_flip($args['hide']);
-        unset($defaults['if_empty'], $hide['if_empty']);
-        return !empty(array_diff_key($defaults, $hide));
-    }
+	/**
+	 * @param mixed $shortcode
+	 * @return bool
+	 */
+	protected function hasVisibleFields($shortcode, array $attributes)
+	{
+		$args = $shortcode->normalizeAtts($attributes);
+		$defaults = $shortcode->getHideOptions();
+		$hide = array_flip($args['hide']);
+		unset($defaults['if_empty'], $hide['if_empty']);
+		return !empty(array_diff_key($defaults, $hide));
+	}
 }

Spacing +16 added lines, -16 removed lines

@@ -17,18 +17,18 @@ 
     /**
      * @return array
      */
-    public function normalize(array $attributes)
+    public function normalize( array $attributes )
     {
-        $hide = array_flip(explode(',', $attributes['hide']));
+        $hide = array_flip( explode( ',', $attributes['hide'] ) );
         unset($hide['if_empty']);
-        $attributes['hide'] = implode(',', array_keys($hide));
-        if (!isset($attributes['assigned_to'])) {
+        $attributes['hide'] = implode( ',', array_keys( $hide ) );
+        if( !isset($attributes['assigned_to']) ) {
             return $attributes;
         }
-        if ('post_id' == $attributes['assigned_to']) {
+        if( 'post_id' == $attributes['assigned_to'] ) {
             $attributes['assigned_to'] = $attributes['post_id'];
-        } elseif ('parent_id' == $attributes['assigned_to']) {
-            $attributes['assigned_to'] = wp_get_post_parent_id($attributes['post_id']);
+        } elseif( 'parent_id' == $attributes['assigned_to'] ) {
+            $attributes['assigned_to'] = wp_get_post_parent_id( $attributes['post_id'] );
         }
         return $attributes;
     }
@@ -36,35 +36,35 @@ 
     /**
      * @return void
      */
-    public function register($block)
+    public function register( $block )
     {
-        if (!function_exists('register_block_type')) {
+        if( !function_exists( 'register_block_type' ) ) {
             return;
         }
-        register_block_type(Application::ID.'/'.$block, [
+        register_block_type( Application::ID.'/'.$block, [
             'attributes' => $this->attributes(),
             'editor_script' => Application::ID.'/blocks',
             'editor_style' => Application::ID.'/blocks',
             'render_callback' => [$this, 'render'],
             'style' => Application::ID,
-        ]);
+        ] );
     }
 
     /**
      * @return void
      */
-    abstract public function render(array $attributes);
+    abstract public function render( array $attributes );
 
     /**
      * @param mixed $shortcode
      * @return bool
      */
-    protected function hasVisibleFields($shortcode, array $attributes)
+    protected function hasVisibleFields( $shortcode, array $attributes )
     {
-        $args = $shortcode->normalizeAtts($attributes);
+        $args = $shortcode->normalizeAtts( $attributes );
         $defaults = $shortcode->getHideOptions();
-        $hide = array_flip($args['hide']);
+        $hide = array_flip( $args['hide'] );
         unset($defaults['if_empty'], $hide['if_empty']);
-        return !empty(array_diff_key($defaults, $hide));
+        return !empty(array_diff_key( $defaults, $hide ));
     }
 }

Braces +2 added lines, -1 removed lines

@@ -27,7 +27,8 @@
         }
         if ('post_id' == $attributes['assigned_to']) {
             $attributes['assigned_to'] = $attributes['post_id'];
-        } elseif ('parent_id' == $attributes['assigned_to']) {
+        }
+        elseif ('parent_id' == $attributes['assigned_to']) {
             $attributes['assigned_to'] = wp_get_post_parent_id($attributes['post_id']);
         }
         return $attributes;

plugin/Container.php

Braces +6 added lines, -3 removed lines

@@ -68,9 +68,11 @@ 
     {
         if (!property_exists($this, $property) || in_array($property, static::PROTECTED_PROPERTIES)) {
             $this->storage[$property] = $value;
-        } elseif (!isset($this->$property)) {
+        }
+        elseif (!isset($this->$property)) {
             $this->$property = $value;
-        } else {
+        }
+        else {
             throw new Exception(sprintf('The "%s" property cannot be changed once set.', $property));
         }
     }
@@ -165,7 +167,8 @@ 
     {
         try {
             return $this->make($parameter->getClass()->name);
-        } catch (Exception $error) {
+        }
+        catch (Exception $error) {
             if ($parameter->isOptional()) {
                 return $parameter->getDefaultValue();
             }

Indentation +222 added lines, -222 removed lines

@@ -11,226 +11,226 @@
 
 abstract class Container
 {
-    const PROTECTED_PROPERTIES = [
-        'instance',
-        'services',
-        'session',
-        'storage',
-    ];
-
-    /**
-     * @var static
-     */
-    protected static $instance;
-
-    /**
-     * The container's bound services.
-     * @var array
-     */
-    protected $services = [];
-
-    /**
-     * @var array
-     */
-    protected $session = [];
-
-    /**
-     * The container's storage items.
-     * @var array
-     */
-    protected $storage = [];
-
-    /**
-     * @return static
-     */
-    public static function load()
-    {
-        if (empty(static::$instance)) {
-            static::$instance = new static();
-        }
-        return static::$instance;
-    }
-
-    /**
-     * @param string $property
-     * @return mixed
-     */
-    public function __get($property)
-    {
-        if (property_exists($this, $property) && !in_array($property, static::PROTECTED_PROPERTIES)) {
-            return $this->$property;
-        }
-        $constant = 'static::'.strtoupper(Str::snakeCase($property));
-        if (defined($constant)) {
-            return constant($constant);
-        }
-        return Arr::get($this->storage, $property, null);
-    }
-
-    /**
-     * @param string $property
-     * @param string $value
-     * @return void
-     */
-    public function __set($property, $value)
-    {
-        if (!property_exists($this, $property) || in_array($property, static::PROTECTED_PROPERTIES)) {
-            $this->storage[$property] = $value;
-        } elseif (!isset($this->$property)) {
-            $this->$property = $value;
-        } else {
-            throw new Exception(sprintf('The "%s" property cannot be changed once set.', $property));
-        }
-    }
-
-    /**
-     * Bind a service to the container.
-     * @param string $alias
-     * @param mixed $concrete
-     * @return mixed
-     */
-    public function bind($alias, $concrete)
-    {
-        $this->services[$alias] = $concrete;
-    }
-
-    /**
-     * Request a service from the container.
-     * @param mixed $abstract
-     * @return mixed
-     */
-    public function make($abstract)
-    {
-        if (!isset($this->services[$abstract])) {
-            $abstract = $this->addNamespace($abstract);
-        }
-        if (isset($this->services[$abstract])) {
-            $abstract = $this->services[$abstract];
-        }
-        if (is_callable($abstract)) {
-            return call_user_func_array($abstract, [$this]);
-        }
-        if (is_object($abstract)) {
-            return $abstract;
-        }
-        return $this->resolve($abstract);
-    }
-
-    /**
-     * @return void
-     */
-    public function sessionClear()
-    {
-        $this->session = [];
-    }
-
-    /**
-     * @return mixed
-     */
-    public function sessionGet($key, $fallback = '')
-    {
-        $value = Arr::get($this->session, $key, $fallback);
-        unset($this->session[$key]);
-        return $value;
-    }
-
-    /**
-     * @return void
-     */
-    public function sessionSet($key, $value)
-    {
-        $this->session[$key] = $value;
-    }
-
-    /**
-     * Bind a singleton instance to the container.
-     * @param string $alias
-     * @param callable|string|null $binding
-     * @return void
-     */
-    public function singleton($alias, $binding)
-    {
-        $this->bind($alias, $this->make($binding));
-    }
-
-    /**
-     * Prefix the current namespace to the abstract if absent.
-     * @param string $abstract
-     * @return string
-     */
-    protected function addNamespace($abstract)
-    {
-        if (!Str::contains($abstract, __NAMESPACE__) && !class_exists($abstract)) {
-            $abstract = __NAMESPACE__.'\\'.$abstract;
-        }
-        return $abstract;
-    }
-
-    /**
-     * Resolve a service from the container.
-     * @param mixed $concrete
-     * @return mixed
-     * @throws Exception
-     */
-    protected function resolve($concrete)
-    {
-        if ($concrete instanceof Closure) {
-            return $concrete($this);
-        }
-        $reflector = new ReflectionClass($concrete);
-        if (!$reflector->isInstantiable()) {
-            throw new Exception('Target ['.$concrete.'] is not instantiable.');
-        }
-        $constructor = $reflector->getConstructor();
-        if (empty($constructor)) {
-            return new $concrete();
-        }
-        return $reflector->newInstanceArgs(
-            $this->resolveDependencies($constructor->getParameters())
-        );
-    }
-
-    /**
-     * Resolve a class based dependency from the container.
-     * @return mixed
-     * @throws Exception
-     */
-    protected function resolveClass(ReflectionParameter $parameter)
-    {
-        try {
-            return $this->make($parameter->getClass()->name);
-        } catch (Exception $error) {
-            if ($parameter->isOptional()) {
-                return $parameter->getDefaultValue();
-            }
-            throw $error;
-        }
-    }
-
-    /**
-     * Resolve all of the dependencies from the ReflectionParameters.
-     * @return array
-     */
-    protected function resolveDependencies(array $dependencies)
-    {
-        $results = [];
-        foreach ($dependencies as $dependency) {
-            $results[] = !is_null($class = $dependency->getClass())
-                ? $this->resolveClass($dependency)
-                : $this->resolveDependency($dependency);
-        }
-        return $results;
-    }
-
-    /**
-     * Resolve a single ReflectionParameter dependency.
-     * @return array|null
-     */
-    protected function resolveDependency(ReflectionParameter $parameter)
-    {
-        if ($parameter->isArray() && $parameter->isDefaultValueAvailable()) {
-            return $parameter->getDefaultValue();
-        }
-        return null;
-    }
+	const PROTECTED_PROPERTIES = [
+		'instance',
+		'services',
+		'session',
+		'storage',
+	];
+
+	/**
+	 * @var static
+	 */
+	protected static $instance;
+
+	/**
+	 * The container's bound services.
+	 * @var array
+	 */
+	protected $services = [];
+
+	/**
+	 * @var array
+	 */
+	protected $session = [];
+
+	/**
+	 * The container's storage items.
+	 * @var array
+	 */
+	protected $storage = [];
+
+	/**
+	 * @return static
+	 */
+	public static function load()
+	{
+		if (empty(static::$instance)) {
+			static::$instance = new static();
+		}
+		return static::$instance;
+	}
+
+	/**
+	 * @param string $property
+	 * @return mixed
+	 */
+	public function __get($property)
+	{
+		if (property_exists($this, $property) && !in_array($property, static::PROTECTED_PROPERTIES)) {
+			return $this->$property;
+		}
+		$constant = 'static::'.strtoupper(Str::snakeCase($property));
+		if (defined($constant)) {
+			return constant($constant);
+		}
+		return Arr::get($this->storage, $property, null);
+	}
+
+	/**
+	 * @param string $property
+	 * @param string $value
+	 * @return void
+	 */
+	public function __set($property, $value)
+	{
+		if (!property_exists($this, $property) || in_array($property, static::PROTECTED_PROPERTIES)) {
+			$this->storage[$property] = $value;
+		} elseif (!isset($this->$property)) {
+			$this->$property = $value;
+		} else {
+			throw new Exception(sprintf('The "%s" property cannot be changed once set.', $property));
+		}
+	}
+
+	/**
+	 * Bind a service to the container.
+	 * @param string $alias
+	 * @param mixed $concrete
+	 * @return mixed
+	 */
+	public function bind($alias, $concrete)
+	{
+		$this->services[$alias] = $concrete;
+	}
+
+	/**
+	 * Request a service from the container.
+	 * @param mixed $abstract
+	 * @return mixed
+	 */
+	public function make($abstract)
+	{
+		if (!isset($this->services[$abstract])) {
+			$abstract = $this->addNamespace($abstract);
+		}
+		if (isset($this->services[$abstract])) {
+			$abstract = $this->services[$abstract];
+		}
+		if (is_callable($abstract)) {
+			return call_user_func_array($abstract, [$this]);
+		}
+		if (is_object($abstract)) {
+			return $abstract;
+		}
+		return $this->resolve($abstract);
+	}
+
+	/**
+	 * @return void
+	 */
+	public function sessionClear()
+	{
+		$this->session = [];
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function sessionGet($key, $fallback = '')
+	{
+		$value = Arr::get($this->session, $key, $fallback);
+		unset($this->session[$key]);
+		return $value;
+	}
+
+	/**
+	 * @return void
+	 */
+	public function sessionSet($key, $value)
+	{
+		$this->session[$key] = $value;
+	}
+
+	/**
+	 * Bind a singleton instance to the container.
+	 * @param string $alias
+	 * @param callable|string|null $binding
+	 * @return void
+	 */
+	public function singleton($alias, $binding)
+	{
+		$this->bind($alias, $this->make($binding));
+	}
+
+	/**
+	 * Prefix the current namespace to the abstract if absent.
+	 * @param string $abstract
+	 * @return string
+	 */
+	protected function addNamespace($abstract)
+	{
+		if (!Str::contains($abstract, __NAMESPACE__) && !class_exists($abstract)) {
+			$abstract = __NAMESPACE__.'\\'.$abstract;
+		}
+		return $abstract;
+	}
+
+	/**
+	 * Resolve a service from the container.
+	 * @param mixed $concrete
+	 * @return mixed
+	 * @throws Exception
+	 */
+	protected function resolve($concrete)
+	{
+		if ($concrete instanceof Closure) {
+			return $concrete($this);
+		}
+		$reflector = new ReflectionClass($concrete);
+		if (!$reflector->isInstantiable()) {
+			throw new Exception('Target ['.$concrete.'] is not instantiable.');
+		}
+		$constructor = $reflector->getConstructor();
+		if (empty($constructor)) {
+			return new $concrete();
+		}
+		return $reflector->newInstanceArgs(
+			$this->resolveDependencies($constructor->getParameters())
+		);
+	}
+
+	/**
+	 * Resolve a class based dependency from the container.
+	 * @return mixed
+	 * @throws Exception
+	 */
+	protected function resolveClass(ReflectionParameter $parameter)
+	{
+		try {
+			return $this->make($parameter->getClass()->name);
+		} catch (Exception $error) {
+			if ($parameter->isOptional()) {
+				return $parameter->getDefaultValue();
+			}
+			throw $error;
+		}
+	}
+
+	/**
+	 * Resolve all of the dependencies from the ReflectionParameters.
+	 * @return array
+	 */
+	protected function resolveDependencies(array $dependencies)
+	{
+		$results = [];
+		foreach ($dependencies as $dependency) {
+			$results[] = !is_null($class = $dependency->getClass())
+				? $this->resolveClass($dependency)
+				: $this->resolveDependency($dependency);
+		}
+		return $results;
+	}
+
+	/**
+	 * Resolve a single ReflectionParameter dependency.
+	 * @return array|null
+	 */
+	protected function resolveDependency(ReflectionParameter $parameter)
+	{
+		if ($parameter->isArray() && $parameter->isDefaultValueAvailable()) {
+			return $parameter->getDefaultValue();
+		}
+		return null;
+	}
 }

Spacing +46 added lines, -46 removed lines

@@ -45,7 +45,7 @@ 
      */
     public static function load()
     {
-        if (empty(static::$instance)) {
+        if( empty(static::$instance) ) {
             static::$instance = new static();
         }
         return static::$instance;
@@ -55,16 +55,16 @@ 
      * @param string $property
      * @return mixed
      */
-    public function __get($property)
+    public function __get( $property )
     {
-        if (property_exists($this, $property) && !in_array($property, static::PROTECTED_PROPERTIES)) {
+        if( property_exists( $this, $property ) && !in_array( $property, static::PROTECTED_PROPERTIES ) ) {
             return $this->$property;
         }
-        $constant = 'static::'.strtoupper(Str::snakeCase($property));
-        if (defined($constant)) {
-            return constant($constant);
+        $constant = 'static::'.strtoupper( Str::snakeCase( $property ) );
+        if( defined( $constant ) ) {
+            return constant( $constant );
         }
-        return Arr::get($this->storage, $property, null);
+        return Arr::get( $this->storage, $property, null );
     }
 
     /**
@@ -72,14 +72,14 @@ 
      * @param string $value
      * @return void
      */
-    public function __set($property, $value)
+    public function __set( $property, $value )
     {
-        if (!property_exists($this, $property) || in_array($property, static::PROTECTED_PROPERTIES)) {
+        if( !property_exists( $this, $property ) || in_array( $property, static::PROTECTED_PROPERTIES ) ) {
             $this->storage[$property] = $value;
-        } elseif (!isset($this->$property)) {
+        } elseif( !isset($this->$property) ) {
             $this->$property = $value;
         } else {
-            throw new Exception(sprintf('The "%s" property cannot be changed once set.', $property));
+            throw new Exception( sprintf( 'The "%s" property cannot be changed once set.', $property ) );
         }
     }
 
@@ -89,7 +89,7 @@ 
      * @param mixed $concrete
      * @return mixed
      */
-    public function bind($alias, $concrete)
+    public function bind( $alias, $concrete )
     {
         $this->services[$alias] = $concrete;
     }
@@ -99,21 +99,21 @@ 
      * @param mixed $abstract
      * @return mixed
      */
-    public function make($abstract)
+    public function make( $abstract )
     {
-        if (!isset($this->services[$abstract])) {
-            $abstract = $this->addNamespace($abstract);
+        if( !isset($this->services[$abstract]) ) {
+            $abstract = $this->addNamespace( $abstract );
         }
-        if (isset($this->services[$abstract])) {
+        if( isset($this->services[$abstract]) ) {
             $abstract = $this->services[$abstract];
         }
-        if (is_callable($abstract)) {
-            return call_user_func_array($abstract, [$this]);
+        if( is_callable( $abstract ) ) {
+            return call_user_func_array( $abstract, [$this] );
         }
-        if (is_object($abstract)) {
+        if( is_object( $abstract ) ) {
             return $abstract;
         }
-        return $this->resolve($abstract);
+        return $this->resolve( $abstract );
     }
 
     /**
@@ -127,9 +127,9 @@ 
     /**
      * @return mixed
      */
-    public function sessionGet($key, $fallback = '')
+    public function sessionGet( $key, $fallback = '' )
     {
-        $value = Arr::get($this->session, $key, $fallback);
+        $value = Arr::get( $this->session, $key, $fallback );
         unset($this->session[$key]);
         return $value;
     }
@@ -137,7 +137,7 @@ 
     /**
      * @return void
      */
-    public function sessionSet($key, $value)
+    public function sessionSet( $key, $value )
     {
         $this->session[$key] = $value;
     }
@@ -148,9 +148,9 @@ 
      * @param callable|string|null $binding
      * @return void
      */
-    public function singleton($alias, $binding)
+    public function singleton( $alias, $binding )
     {
-        $this->bind($alias, $this->make($binding));
+        $this->bind( $alias, $this->make( $binding ) );
     }
 
     /**
@@ -158,9 +158,9 @@ 
      * @param string $abstract
      * @return string
      */
-    protected function addNamespace($abstract)
+    protected function addNamespace( $abstract )
     {
-        if (!Str::contains($abstract, __NAMESPACE__) && !class_exists($abstract)) {
+        if( !Str::contains( $abstract, __NAMESPACE__ ) && !class_exists( $abstract ) ) {
             $abstract = __NAMESPACE__.'\\'.$abstract;
         }
         return $abstract;
@@ -172,21 +172,21 @@ 
      * @return mixed
      * @throws Exception
      */
-    protected function resolve($concrete)
+    protected function resolve( $concrete )
     {
-        if ($concrete instanceof Closure) {
-            return $concrete($this);
+        if( $concrete instanceof Closure ) {
+            return $concrete( $this );
         }
-        $reflector = new ReflectionClass($concrete);
-        if (!$reflector->isInstantiable()) {
-            throw new Exception('Target ['.$concrete.'] is not instantiable.');
+        $reflector = new ReflectionClass( $concrete );
+        if( !$reflector->isInstantiable() ) {
+            throw new Exception( 'Target ['.$concrete.'] is not instantiable.' );
         }
         $constructor = $reflector->getConstructor();
-        if (empty($constructor)) {
+        if( empty($constructor) ) {
             return new $concrete();
         }
         return $reflector->newInstanceArgs(
-            $this->resolveDependencies($constructor->getParameters())
+            $this->resolveDependencies( $constructor->getParameters() )
         );
     }
 
@@ -195,12 +195,12 @@ 
      * @return mixed
      * @throws Exception
      */
-    protected function resolveClass(ReflectionParameter $parameter)
+    protected function resolveClass( ReflectionParameter $parameter )
     {
         try {
-            return $this->make($parameter->getClass()->name);
-        } catch (Exception $error) {
-            if ($parameter->isOptional()) {
+            return $this->make( $parameter->getClass()->name );
+        } catch( Exception $error ) {
+            if( $parameter->isOptional() ) {
                 return $parameter->getDefaultValue();
             }
             throw $error;
@@ -211,13 +211,13 @@ 
      * Resolve all of the dependencies from the ReflectionParameters.
      * @return array
      */
-    protected function resolveDependencies(array $dependencies)
+    protected function resolveDependencies( array $dependencies )
     {
         $results = [];
-        foreach ($dependencies as $dependency) {
-            $results[] = !is_null($class = $dependency->getClass())
-                ? $this->resolveClass($dependency)
-                : $this->resolveDependency($dependency);
+        foreach( $dependencies as $dependency ) {
+            $results[] = !is_null( $class = $dependency->getClass() )
+                ? $this->resolveClass( $dependency )
+                : $this->resolveDependency( $dependency );
         }
         return $results;
     }
@@ -226,9 +226,9 @@ 
      * Resolve a single ReflectionParameter dependency.
      * @return array|null
      */
-    protected function resolveDependency(ReflectionParameter $parameter)
+    protected function resolveDependency( ReflectionParameter $parameter )
     {
-        if ($parameter->isArray() && $parameter->isDefaultValueAvailable()) {
+        if( $parameter->isArray() && $parameter->isDefaultValueAvailable() ) {
             return $parameter->getDefaultValue();
         }
         return null;

plugin/Handlers/RegisterTaxonomy.php

Indentation +8 added lines, -8 removed lines

@@ -7,12 +7,12 @@
 
 class RegisterTaxonomy
 {
-    /**
-     * @return void
-     */
-    public function handle(Command $command)
-    {
-        register_taxonomy(Application::TAXONOMY, Application::POST_TYPE, $command->args);
-        register_taxonomy_for_object_type(Application::TAXONOMY, Application::POST_TYPE);
-    }
+	/**
+	 * @return void
+	 */
+	public function handle(Command $command)
+	{
+		register_taxonomy(Application::TAXONOMY, Application::POST_TYPE, $command->args);
+		register_taxonomy_for_object_type(Application::TAXONOMY, Application::POST_TYPE);
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -10,9 +10,9 @@
     /**
      * @return void
      */
-    public function handle(Command $command)
+    public function handle( Command $command )
     {
-        register_taxonomy(Application::TAXONOMY, Application::POST_TYPE, $command->args);
-        register_taxonomy_for_object_type(Application::TAXONOMY, Application::POST_TYPE);
+        register_taxonomy( Application::TAXONOMY, Application::POST_TYPE, $command->args );
+        register_taxonomy_for_object_type( Application::TAXONOMY, Application::POST_TYPE );
     }
 }

plugin/Handlers/RegisterPostType.php

Indentation +12 added lines, -12 removed lines

@@ -6,16 +6,16 @@
 
 class RegisterPostType
 {
-    /**
-     * @return void
-     */
-    public function handle(Command $command)
-    {
-        if (!in_array($command->postType, get_post_types(['_builtin' => true]))) {
-            register_post_type($command->postType, $command->args);
-            glsr()->postTypeColumns = wp_parse_args(glsr()->postTypeColumns, [
-                $command->postType => $command->columns,
-            ]);
-        }
-    }
+	/**
+	 * @return void
+	 */
+	public function handle(Command $command)
+	{
+		if (!in_array($command->postType, get_post_types(['_builtin' => true]))) {
+			register_post_type($command->postType, $command->args);
+			glsr()->postTypeColumns = wp_parse_args(glsr()->postTypeColumns, [
+				$command->postType => $command->columns,
+			]);
+		}
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -9,13 +9,13 @@
     /**
      * @return void
      */
-    public function handle(Command $command)
+    public function handle( Command $command )
     {
-        if (!in_array($command->postType, get_post_types(['_builtin' => true]))) {
-            register_post_type($command->postType, $command->args);
-            glsr()->postTypeColumns = wp_parse_args(glsr()->postTypeColumns, [
+        if( !in_array( $command->postType, get_post_types( ['_builtin' => true] ) ) ) {
+            register_post_type( $command->postType, $command->args );
+            glsr()->postTypeColumns = wp_parse_args( glsr()->postTypeColumns, [
                 $command->postType => $command->columns,
-            ]);
+            ] );
         }
     }
 }