Skip to content

FIX Replace new FieldsValidator with SimpleFieldsValidator #2

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

Merged
GuySartorelli merged 2 commits into from
Aug 10, 2023
Merged

FIX Replace new FieldsValidator with SimpleFieldsValidator #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1ad47e
FIX Replace new FieldsValidator with SimpleFieldsValidator
GuySartorelli Aug 9, 2023
95e735c
MNT Run admin and CMS behat tests
GuySartorelli Aug 9, 2023
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
12 changes: 12 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,15 @@ jobs:
ci:
name: CI
uses: silverstripe/gha-ci/.github/workflows/ci.yml@v1
with:
extra_jobs: |
- php: 8.0
phpunit: false
endtoend: true
endtoend_suite: admin
endtoend_config: vendor/silverstripe/admin/behat.yml
- php: 8.1
phpunit: false
endtoend: true
endtoend_suite: cms
endtoend_config: vendor/silverstripe/cms/behat.yml
5 changes: 5 additions & 0 deletions _config/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,8 @@ Signify\ComposableValidators\Validators\SimpleFieldsValidator:
SilverStripe\Admin\LeftAndMain:
extra_requirements_css:
- 'guysartorelli/silverstripe-composable-validators:client/dist/left-and-main.css'

# Replace new FieldsValidator with our SimpleFieldsValidator
SilverStripe\Core\Injector\Injector:
SilverStripe\Forms\FieldsValidator:
class: Signify\ComposableValidators\Validators\SimpleFieldsValidator
3 changes: 2 additions & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,12 @@
},
"require": {
"php": "^7.3 || ^8.0",
"silverstripe/framework": "^4.10.0",
"silverstripe/framework": "^4.13.18",
"signify-nz/silverstripe-searchfilter-arraylist": "^1.0.0"
},
"require-dev": {
"silverstripe/cms": "^4.0",
"silverstripe/frameworktest": "^0.4.13",
"silverstripe/asset-admin": "^1.6",
"dnadesign/silverstripe-elemental": "^4.0",
"phpunit/phpunit": "^9.5",
Expand Down
6 changes: 3 additions & 3 deletions src/Validators/SimpleFieldsValidator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Signify\ComposableValidators\Validators;

use SilverStripe\Forms\Validator;
use SilverStripe\Forms\FieldsValidator;

/**
* A validator to ensure that all form fields are internally valid.
Expand All @@ -13,7 +13,7 @@
* This class is to avoid the use of, say, RequiredFields::create([]), which
* relies on an implementation detail to ensure that fields are validated.
*/
class SimpleFieldsValidator extends Validator
class SimpleFieldsValidator extends FieldsValidator
{
/**
* Array of FormField subclasses that shouldn't be validated in AJAX validation calls.
Expand All @@ -29,7 +29,7 @@ class SimpleFieldsValidator extends Validator
* @param array $data
* @return bool
*/
public function php($data, bool $isAjax = false)
public function php($data, bool $isAjax = false): bool
{
$valid = true;
$fields = $this->form->Fields();
Expand Down