mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-06 08:27:42 +02:00
Code Issues Releases Wiki Activity

fix: improve the flarum validator (#4133)

Browse Source
This commit is contained in:
Sami Mazouz
2024-12-06 10:23:45 +01:00
committed by GitHub
parent e43449c32d
commit 570580dcf0
5 changed files with 95 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
extensions/package-manager/src/AllValidatorRules.php
View File

@@ -1,31 +0,0 @@
<?php
/*
* This file is part of Flarum.
*
* For detailed copyright and license information, please view the
* LICENSE file that was distributed with this source code.
*/
namespace Flarum\ExtensionManager;
use Illuminate\Validation\Validator;
/**
* @todo: fix in 2.0
*/
trait AllValidatorRules
{
protected function makeValidator(array $attributes): Validator
{
$rules = $this->getRules();
$validator = $this->validator->make($attributes, $rules, $this->getMessages());
foreach ($this->configuration as $callable) {
$callable($this, $validator);
}
return $validator;
}
}

2
extensions/package-manager/src/ConfigureAuthValidator.php
View File

@@ -13,7 +13,7 @@ use Flarum\Foundation\AbstractValidator;
class ConfigureAuthValidator extends AbstractValidator
{
use AllValidatorRules;
protected bool $validateMissingKeys = true;
protected array $rules = [
'github-oauth' => ['sometimes', 'array'],

2
extensions/package-manager/src/ConfigureComposerValidator.php
View File

@@ -13,7 +13,7 @@ use Flarum\Foundation\AbstractValidator;
class ConfigureComposerValidator extends AbstractValidator
{
use AllValidatorRules;
protected bool $validateMissingKeys = true;
protected array $rules = [
'minimum-stability' => ['sometimes', 'in:stable,RC,beta,alpha,dev'],