Skip to content

Update Base64Validator.php #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ken-vdE wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update Base64Validator.php #18

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions src/Validators/Base64Validator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class Base64Validator
public function validateBase64Max(string $attribute, $value, array $parameters, Validator $validator): bool
{
return !empty($value)
? $validator->validateMax($attribute, $this->convertToFile($value), $parameters)
? $validator->validateMax($attribute, static::convertToFile($value), $parameters)
: true;
}

Expand All @@ -49,7 +49,7 @@ public function validateBase64Max(string $attribute, $value, array $parameters,
public function validateBase64Min(string $attribute, $value, array $parameters, Validator $validator): bool
{
return !empty($value)
? $validator->validateMin($attribute, $this->convertToFile($value), $parameters)
? $validator->validateMin($attribute, static::convertToFile($value), $parameters)
: true;
}

Expand All @@ -64,7 +64,7 @@ public function validateBase64Min(string $attribute, $value, array $parameters,
public function validateBase64Dimensions(string $attribute, $value, array $parameters, Validator $validator): bool
{
return !empty($value)
? $this->validateDimensions($attribute, $this->convertToFile($value), $parameters)
? $this->validateDimensions($attribute, static::convertToFile($value), $parameters)
: true;
}

Expand All @@ -79,7 +79,7 @@ public function validateBase64Dimensions(string $attribute, $value, array $param
public function validateBase64File(string $attribute, $value, array $parameters, Validator $validator): bool
{
return !empty($value)
? $validator->validateFile($attribute, $this->convertToFile($value))
? $validator->validateFile($attribute, static::convertToFile($value))
: true;
}

Expand All @@ -94,7 +94,7 @@ public function validateBase64File(string $attribute, $value, array $parameters,
public function validateBase64Image(string $attribute, $value, array $parameters, Validator $validator): bool
{
return !empty($value)
? $validator->validateImage($attribute, $this->convertToFile($value))
? $validator->validateImage($attribute, static::convertToFile($value))
: true;
}

Expand All @@ -109,7 +109,7 @@ public function validateBase64Image(string $attribute, $value, array $parameters
public function validateBase64Mimetypes(string $attribute, $value, array $parameters, Validator $validator): bool
{
return !empty($value)
? $validator->validateMimetypes($attribute, $this->convertToFile($value), $parameters)
? $validator->validateMimetypes($attribute, static::convertToFile($value), $parameters)
: true;
}

Expand All @@ -124,7 +124,7 @@ public function validateBase64Mimetypes(string $attribute, $value, array $parame
public function validateBase64Mimes(string $attribute, $value, array $parameters, Validator $validator): bool
{
return !empty($value)
? $validator->validateMimes($attribute, $this->convertToFile($value), $parameters)
? $validator->validateMimes($attribute, static::convertToFile($value), $parameters)
: true;
}

Expand All @@ -139,7 +139,7 @@ public function validateBase64Mimes(string $attribute, $value, array $parameters
public function validateBase64Between(string $attribute, $value, array $parameters, Validator $validator): bool
{
return !empty($value)
? $validator->validateBetween($attribute, $this->convertToFile($value), $parameters)
? $validator->validateBetween($attribute, static::convertToFile($value), $parameters)
: true;
}

Expand All @@ -154,7 +154,7 @@ public function validateBase64Between(string $attribute, $value, array $paramete
public function validateBase64Size(string $attribute, $value, array $parameters, Validator $validator): bool
{
return !empty($value)
? $validator->validateSize($attribute, $this->convertToFile($value), $parameters)
? $validator->validateSize($attribute, static::convertToFile($value), $parameters)
: true;
}

Expand All @@ -163,7 +163,7 @@ public function validateBase64Size(string $attribute, $value, array $parameters,
*
* @return File
*/
protected function convertToFile(string $value): File
public static function convertToFile(string $value): File
{
if (strpos($value, ';base64') !== false) {
[, $value] = explode(';', $value);
Expand Down Expand Up @@ -207,4 +207,4 @@ public function validateDimensions($attribute, $value, $parameters)

return true;
}
}
}