2f3fd laravel 11 upgrade (#436)
* fix password reset bug * upgrade to laravel 11 * composer.lock * fix migration issues * use ValidationRule Contract * rename password_resets table * implemented casts as protected function * update env variables * fix optional property * fix validation issues * use <env> on php unit xml * fix pint * cmposer.lock * composer json fixes * fix composer dependencies, remove faker * remove unused class * remove test class * fix default value for mysql migration * linting * expression syntax fix --------- Co-authored-by: Julien Nahum <julien@nahum.net>
This commit is contained in:
@@ -3,9 +3,10 @@
|
||||
namespace App\Rules;
|
||||
|
||||
use App\Service\Forms\FormLogicConditionChecker;
|
||||
use Illuminate\Contracts\Validation\Rule;
|
||||
use Closure;
|
||||
use Illuminate\Contracts\Validation\ValidationRule;
|
||||
|
||||
class CustomFieldValidationRule implements Rule
|
||||
class CustomFieldValidationRule implements ValidationRule
|
||||
{
|
||||
/**
|
||||
* Create a new rule instance.
|
||||
@@ -36,6 +37,13 @@ class CustomFieldValidationRule implements Rule
|
||||
);
|
||||
}
|
||||
|
||||
public function validate(string $attribute, mixed $value, Closure $fail): void
|
||||
{
|
||||
if (!$this->passes($attribute, $value)) {
|
||||
$fail($this->message());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the validation error message.
|
||||
*
|
||||
|
||||
@@ -2,11 +2,12 @@
|
||||
|
||||
namespace App\Rules;
|
||||
|
||||
use Closure;
|
||||
use Illuminate\Contracts\Validation\DataAwareRule;
|
||||
use Illuminate\Contracts\Validation\Rule;
|
||||
use Illuminate\Contracts\Validation\ValidationRule;
|
||||
use Illuminate\Support\Str;
|
||||
|
||||
class FormPropertyLogicRule implements DataAwareRule, Rule
|
||||
class FormPropertyLogicRule implements DataAwareRule, ValidationRule
|
||||
{
|
||||
public const ACTIONS_VALUES = [
|
||||
'show-block',
|
||||
@@ -803,6 +804,13 @@ class FormPropertyLogicRule implements DataAwareRule, Rule
|
||||
return $this->isConditionCorrect && $this->isActionCorrect;
|
||||
}
|
||||
|
||||
public function validate(string $attribute, mixed $value, Closure $fail): void
|
||||
{
|
||||
if (!$this->passes($attribute, $value)) {
|
||||
$fail($this->message());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the validation error message.
|
||||
*/
|
||||
|
||||
@@ -2,10 +2,11 @@
|
||||
|
||||
namespace App\Rules;
|
||||
|
||||
use Closure;
|
||||
use Illuminate\Contracts\Validation\DataAwareRule;
|
||||
use Illuminate\Contracts\Validation\Rule;
|
||||
use Illuminate\Contracts\Validation\ValidationRule;
|
||||
|
||||
class IntegrationLogicRule implements DataAwareRule, Rule
|
||||
class IntegrationLogicRule implements DataAwareRule, ValidationRule
|
||||
{
|
||||
private $isConditionCorrect = true;
|
||||
|
||||
@@ -153,6 +154,13 @@ class IntegrationLogicRule implements DataAwareRule, Rule
|
||||
return $this->isConditionCorrect;
|
||||
}
|
||||
|
||||
public function validate(string $attribute, mixed $value, Closure $fail): void
|
||||
{
|
||||
if(!$this->passes($attribute, $value)) {
|
||||
$fail($this->message());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the validation error message.
|
||||
*/
|
||||
|
||||
@@ -2,9 +2,10 @@
|
||||
|
||||
namespace App\Rules;
|
||||
|
||||
use Illuminate\Contracts\Validation\Rule;
|
||||
use Closure;
|
||||
use Illuminate\Contracts\Validation\ValidationRule;
|
||||
|
||||
class OneEmailPerLine implements Rule
|
||||
class OneEmailPerLine implements ValidationRule
|
||||
{
|
||||
/**
|
||||
* Create a new rule instance.
|
||||
@@ -38,6 +39,13 @@ class OneEmailPerLine implements Rule
|
||||
return true;
|
||||
}
|
||||
|
||||
public function validate(string $attribute, mixed $value, Closure $fail): void
|
||||
{
|
||||
if(!$this->passes($attribute, $value)) {
|
||||
$fail($this->message());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the validation error message.
|
||||
*
|
||||
|
||||
@@ -5,11 +5,12 @@ namespace App\Rules;
|
||||
use App\Http\Controllers\Forms\PublicFormController;
|
||||
use App\Models\Forms\Form;
|
||||
use App\Service\Storage\StorageFileNameParser;
|
||||
use Illuminate\Contracts\Validation\Rule;
|
||||
use Closure;
|
||||
use Illuminate\Contracts\Validation\ValidationRule;
|
||||
use Illuminate\Support\Facades\Storage;
|
||||
use Illuminate\Support\Str;
|
||||
|
||||
class StorageFile implements Rule
|
||||
class StorageFile implements ValidationRule
|
||||
{
|
||||
public string $error = 'Invalid file.';
|
||||
|
||||
@@ -66,6 +67,13 @@ class StorageFile implements Rule
|
||||
return true;
|
||||
}
|
||||
|
||||
public function validate(string $attribute, mixed $value, Closure $fail): void
|
||||
{
|
||||
if(!$this->passes($attribute, $value)) {
|
||||
$fail($this->message());
|
||||
}
|
||||
}
|
||||
|
||||
public function message(): string
|
||||
{
|
||||
return $this->error;
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
namespace App\Rules;
|
||||
|
||||
use Closure;
|
||||
use Illuminate\Contracts\Validation\ImplicitRule;
|
||||
use Illuminate\Support\Facades\Http;
|
||||
|
||||
@@ -31,6 +32,12 @@ class ValidHCaptcha implements ImplicitRule
|
||||
'response' => $value,
|
||||
])->json('success');
|
||||
}
|
||||
public function validate(string $attribute, mixed $value, Closure $fail): void
|
||||
{
|
||||
if(!$this->passes($attribute, $value)) {
|
||||
$fail($this->message());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the validation error message.
|
||||
|
||||
@@ -2,9 +2,10 @@
|
||||
|
||||
namespace App\Rules;
|
||||
|
||||
use Illuminate\Contracts\Validation\Rule;
|
||||
use Closure;
|
||||
use Illuminate\Contracts\Validation\ValidationRule;
|
||||
|
||||
class ValidPhoneInputRule implements Rule
|
||||
class ValidPhoneInputRule implements ValidationRule
|
||||
{
|
||||
public ?int $reason = 0;
|
||||
|
||||
@@ -27,6 +28,13 @@ class ValidPhoneInputRule implements Rule
|
||||
}
|
||||
}
|
||||
|
||||
public function validate(string $attribute, mixed $value, Closure $fail): void
|
||||
{
|
||||
if (!$this->passes($attribute, $value)) {
|
||||
$fail($this->message());
|
||||
}
|
||||
}
|
||||
|
||||
public function message()
|
||||
{
|
||||
return match ($this->reason) {
|
||||
|
||||
@@ -2,9 +2,10 @@
|
||||
|
||||
namespace App\Rules;
|
||||
|
||||
use Illuminate\Contracts\Validation\Rule;
|
||||
use Closure;
|
||||
use Illuminate\Contracts\Validation\ValidationRule;
|
||||
|
||||
class ValidUrl implements Rule
|
||||
class ValidUrl implements ValidationRule
|
||||
{
|
||||
/**
|
||||
* Determine if the validation rule passes.
|
||||
@@ -21,6 +22,13 @@ class ValidUrl implements Rule
|
||||
return preg_match($pattern, $value);
|
||||
}
|
||||
|
||||
public function validate(string $attribute, mixed $value, Closure $fail): void
|
||||
{
|
||||
if (!$this->passes($attribute, $value)) {
|
||||
$fail($this->message());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the validation error message.
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user