Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/github_actions/amannn/action-se…
Browse files Browse the repository at this point in the history
…mantic-pull-request-5.2.0
  • Loading branch information
bytestream committed Oct 10, 2023
2 parents 74da895 + 436f6e1 commit 4d314f6
Show file tree
Hide file tree
Showing 11 changed files with 51 additions and 51 deletions.
6 changes: 3 additions & 3 deletions src/Javascript/JavascriptRulesTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ abstract public function parseNamedParameters($parameters);
/**
* Confirmed rule is applied to confirmed attribute.
*
* @param $attribute
* @param $attribute
* @param array $parameters
* @return array
*/
Expand All @@ -38,7 +38,7 @@ protected function ruleConfirmed($attribute, array $parameters)
/**
* Returns Javascript parameters for After rule.
*
* @param $attribute
* @param $attribute
* @param array $parameters
* @return array
*/
Expand All @@ -54,7 +54,7 @@ protected function ruleAfter($attribute, array $parameters)
/**
* Returns Javascript parameters for Before rule.
*
* @param $attribute
* @param $attribute
* @param array $parameters
* @return array
*/
Expand Down
4 changes: 2 additions & 2 deletions src/Javascript/JavascriptValidator.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public function __construct(ValidatorHandler $validator, $options = [])
/**
* Set default parameters.
*
* @param $options
* @param $options
* @return void
*/
protected function setDefaults($options)
Expand Down Expand Up @@ -116,7 +116,7 @@ public function __toString()
/**
* Gets value from view data.
*
* @param $name
* @param $name
* @return string
*
* @throws \Proengsoft\JsValidation\Exceptions\PropertyNotFoundException
Expand Down
12 changes: 6 additions & 6 deletions src/Javascript/MessageParser.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public function getMessage($attribute, $rule, $parameters)
*
* @param string $attribute
* @param string $rule
* @param $parameters
* @param $parameters
* @return array
*/
protected function fakeValidationData($attribute, $rule, $parameters)
Expand All @@ -74,9 +74,9 @@ protected function fakeValidationData($attribute, $rule, $parameters)
/**
* Generate fake data to get RequiredIf message.
*
* @param $data
* @param $rule
* @param $parameters
* @param $data
* @param $rule
* @param $parameters
* @return void
*/
private function fakeRequiredIfData($data, $rule, $parameters)
Expand All @@ -93,8 +93,8 @@ private function fakeRequiredIfData($data, $rule, $parameters)
/**
* Generate fake data to get file type messages.
*
* @param $data
* @param $attribute
* @param $data
* @param $attribute
* @return void
*/
private function fakeFileData($data, $attribute)
Expand Down
6 changes: 3 additions & 3 deletions src/Javascript/RuleParser.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ public function __construct(DelegatedValidator $validator, $remoteToken = null)
*
* @param string $attribute
* @param string $rule
* @param $parameters
* @param $rawRule
* @param $parameters
* @param $rawRule
* @return array
*/
public function getRule($attribute, $rule, $parameters, $rawRule)
Expand Down Expand Up @@ -130,7 +130,7 @@ protected function isConditionalRule($attribute, $rule)
*
* @param string $attribute
* @param string $rule
* @param $parameters
* @param $parameters
* @return array
*/
protected function clientRule($attribute, $rule, $parameters)
Expand Down
8 changes: 4 additions & 4 deletions src/Javascript/ValidatorHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ protected function generateJavascriptValidations()
/**
* Make Laravel Validations compatible with JQuery Validation Plugin.
*
* @param $attribute
* @param $rules
* @param $attribute
* @param $rules
* @param bool $includeRemote
* @return array
*/
Expand All @@ -119,7 +119,7 @@ protected function jsConvertRules($attribute, $rules, $includeRemote)
/**
* Check if rule should be validated with javascript.
*
* @param $jsRule
* @param $jsRule
* @param bool $includeRemote
* @return bool
*/
Expand All @@ -131,7 +131,7 @@ protected function isValidatable($jsRule, $includeRemote)
/**
* Check if JS Validation is disabled for attribute.
*
* @param $attribute
* @param $attribute
* @return bool
*/
public function jsValidationEnabled($attribute)
Expand Down
4 changes: 2 additions & 2 deletions src/JsValidatorFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public function __construct($app, array $options = [])
}

/**
* @param $options
* @param $options
* @return void
*/
protected function setOptions($options)
Expand Down Expand Up @@ -121,7 +121,7 @@ protected function getValidationData(array $rules, array $customAttributes = [])
/**
* Creates JsValidator instance based on FormRequest.
*
* @param $formRequest
* @param $formRequest
* @param null|string $selector
* @return \Proengsoft\JsValidation\Javascript\JavascriptValidator
*
Expand Down
24 changes: 12 additions & 12 deletions src/Remote/Resolver.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public function __construct(ValidationFactory $factory, $escape = false)
/**
* Closure used to resolve Validator instance.
*
* @param $field
* @param $field
* @return \Closure
*/
public function resolver($field)
Expand All @@ -57,12 +57,12 @@ public function resolver($field)
/**
* Resolves Validator instance.
*
* @param $translator
* @param $data
* @param $rules
* @param $messages
* @param $customAttributes
* @param $field
* @param $translator
* @param $data
* @param $rules
* @param $messages
* @param $customAttributes
* @param $field
* @return \Illuminate\Validation\Validator
*/
protected function resolve($translator, $data, $rules, $messages, $customAttributes, $field)
Expand All @@ -78,11 +78,11 @@ protected function resolve($translator, $data, $rules, $messages, $customAttribu
/**
* Create new validator instance.
*
* @param $translator
* @param $data
* @param $rules
* @param $messages
* @param $customAttributes
* @param $translator
* @param $data
* @param $rules
* @param $messages
* @param $customAttributes
* @return \Illuminate\Validation\Validator
*/
protected function createValidator($translator, $data, $rules, $messages, $customAttributes)
Expand Down
14 changes: 7 additions & 7 deletions src/Remote/Validator.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ public function __construct(BaseValidator $validator, $escape = false)
/**
* Validate request.
*
* @param $field
* @param $parameters
* @param $field
* @param $parameters
* @return void
*
* @throws \Illuminate\Validation\ValidationException
Expand Down Expand Up @@ -86,7 +86,7 @@ protected function throwValidationException($result, $validator)
/**
* Parse Validation input request data.
*
* @param $data
* @param $data
* @return array
*/
protected function parseAttributeName($data)
Expand All @@ -101,7 +101,7 @@ protected function parseAttributeName($data)
/**
* Parse Validation parameters.
*
* @param $parameters
* @param $parameters
* @return array
*/
protected function parseParameters($parameters)
Expand All @@ -117,7 +117,7 @@ protected function parseParameters($parameters)
/**
* Validate remote Javascript Validations.
*
* @param $attribute
* @param $attribute
* @param array $parameters
* @return array|bool
*/
Expand All @@ -144,7 +144,7 @@ protected function validateJsRemoteRequest($attribute, $parameters)
/**
* Sets data for validate remote rules.
*
* @param $attribute
* @param $attribute
* @param bool $validateAll
* @return void
*/
Expand All @@ -167,7 +167,7 @@ protected function setRemoteValidation($attribute, $validateAll = false)
/**
* Remove rules that should not be validated remotely.
*
* @param $rules
* @param $rules
* @param BaseValidator $validator
* @return mixed
*/
Expand Down
10 changes: 5 additions & 5 deletions src/Support/AccessProtectedTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ trait AccessProtectedTrait
/**
* Create closure to call inaccessible method.
*
* @param $instance
* @param $instance
* @return \Closure
*/
protected function createProtectedCaller($instance)
Expand All @@ -26,8 +26,8 @@ protected function createProtectedCaller($instance)
/**
* Gets inaccessible property.
*
* @param $instance
* @param $property
* @param $instance
* @param $property
* @return \Closure
*/
protected function getProtected($instance, $property)
Expand All @@ -44,8 +44,8 @@ protected function getProtected($instance, $property)
* Calls inaccessible method.
*
* @param object|\Closure $instance
* @param $method
* @param $args
* @param $method
* @param $args
* @return mixed
*/
protected function callProtected($instance, $method, $args = [])
Expand Down
4 changes: 2 additions & 2 deletions src/Support/DelegatedValidator.php
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,8 @@ public function sometimes($attribute, $rules, callable $callback)
/**
* Delegate method calls to validator instance.
*
* @param $method
* @param $params
* @param $method
* @param $params
* @return mixed
*/
public function __call($method, $params)
Expand Down
10 changes: 5 additions & 5 deletions src/Support/RuleListTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ trait RuleListTrait
/**
* Returns if rule is validated using Javascript.
*
* @param $rule
* @param $rule
* @return bool
*/
protected function isImplemented($rule)
Expand All @@ -56,7 +56,7 @@ protected function isImplemented($rule)
/**
* Check if rule must be validated in server-side.
*
* @param $rule
* @param $rule
* @return bool
*/
protected function isRemoteRule($rule)
Expand All @@ -79,7 +79,7 @@ protected function isFormRequestRule($rule)
/**
* Check if rule disables rule processing.
*
* @param $rule
* @param $rule
* @return bool
*/
protected function isDisableRule($rule)
Expand All @@ -90,7 +90,7 @@ protected function isDisableRule($rule)
/**
* Check if rules should be validated.
*
* @param $rules
* @param $rules
* @return bool
*/
protected function validationDisabled($rules)
Expand All @@ -103,7 +103,7 @@ protected function validationDisabled($rules)
/**
* Check if rules is for input file type.
*
* @param $rule
* @param $rule
* @return bool
*/
protected function isFileRule($rule)
Expand Down

0 comments on commit 4d314f6

Please sign in to comment.