fix: validation custom error with asterisk field #6352

ping-yee · 2022-08-06T14:06:22Z

Description
Fixes #6245
Supersedes #6340

Checklist:

Securely signed commits
Component(s) with PHPDoc blocks, only if necessary or adds value
Unit testing, with >80% coverage
User guide updated
Conforms to style guide

…et up custom errors.

iRedds · 2022-08-06T14:42:14Z

I would like to ask you to change the declaration of methods according to PSR-12 (there is an example here: https://www.php-fig.org/psr/psr-12/#45-method-and-function-arguments). Because the string is longer than 120 characters.

iRedds · 2022-08-06T14:45:16Z

@kenjis @MGatner What do you think if the three arguments ($field, $label, $originalField) are replaced with an array or a DTO?

Improve CSRF protection (for Shield CSRF security fix)

docs: the session_id acquisition method that is not described codeigniter4#5586

kenjis · 2022-08-06T21:29:52Z

tests/system/Validation/StrictRules/ValidationTest.php

+ 'foo.0.bar' => 'Required',
+ 'foo.1.bar' => 'Required',


Are you really okay with key like 'foo.0.bar'?
It seems a bit difficult to use.

But as I known, validation service change the asterisk field to like 'foo.0.bar'.
As Issue #6245 show that.

Co-authored-by: kenjis <kenji.uui@gmail.com>

Prep for 4.2.3 release

4.2.3 Ready code

kenjis · 2022-08-07T01:10:22Z

system/Validation/Validation.php

@@ -203,7 +203,7 @@ public function check($value, string $rule, array $errors = []): bool
 * @param array|null $rules
 * @param array $data


Suggested change

* @param array $data

* @param array $data The array of data to validate, with `DBGroup`.

* @param string|null $originalField The original asterisk field name like "foo.*.bar".

kenjis · 2022-08-07T01:17:07Z

What do you think if the three arguments ($field, $label, $originalField) are replaced with an array or a DTO?

It seems this fix needs BC break, so I'm fine with the change.

WARNING: document isn't included in any toctree

`--prefer-source` does not change the file contents.

It is not needed.

kenjis · 2022-08-11T08:49:53Z

v4.2.3 has been released. See https://github.com/codeigniter4/CodeIgniter4/releases
This change will be included in v4.2.4.

Please rebase and add changelog v4.2.4.
See https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/workflow.md#updating-your-branch

E.g., Check User Guide syntax: user_guide_src/source/libraries/caching.rst#L182 duplicate object description of increment, other instance in /github/workspace/user_guide_src/source/database/query_builder.rst

docs: fix Sphinx errors

….rst docs: improve controllers.rst

…et up custom errors.

…-yee/CodeIgniter4 into fix-validation-custom-error

ping-yee · 2022-08-12T17:54:34Z

@kenjis Is this normal? or I do the wrong thing when I rebase my branch...
If I do the wrong thing, please tell me how can I fix it :(

kenjis · 2022-08-12T19:09:39Z

@ping-yee This is not normal. You did something wrong.
What commands did you run?
And please don't use git merge.

ping-yee · 2022-08-13T07:19:03Z

@kenjis I use sourcetree to manage my git flow.
I syncing my repository first, and run rebase onto devlop branch.
After I resolve the conflicts, run rebase onto devlop branch again(Maybe there is a problem with this step).
Then I push the commit fa442b4 and get the results.
Should I re-open the new PR or do something to fix this?
I feel so sorry, this is my first time to contribute :(

kenjis · 2022-08-13T08:02:57Z

I syncing your repository first, and run rebase onto devlop branch.

My repository? Do you mean https://github.com/kenjis/Codeigniter4 ?
If so, my repository has nothing to do with you.

After I resolve the conflicts, run rebase onto devlop branch again(Maybe there is a problem with this step).

You did rebase onto develop twice.
I don't know why your branch is like this.

Should I re-open the new PR or do something to fix this?

If you drop the commits other than you did for this PR (the commits marked below) with git rebase -i,
you can revert the branch state. Then rebase again correctly.

But you don't use git command, I can't support you.

If you can re-open the new PR, that is also fine.

ping-yee · 2022-08-13T09:18:26Z

I syncing your repository first, and run rebase onto devlop branch.

@kenjis I say the wrong word. Not your repository, my repository is right word.
Thanks for your help and I'll use command to rebase my git flow!

kenjis · 2022-08-13T09:28:17Z

Okay, if syncing your repository means this https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/workflow.md#syncing-your-repository , you just did rebase twice.

In my understanding, if you did rebase twice, the result is the same. The second rebase does nothing.
So I still have no clue for the status of your mess branch.

ping-yee · 2022-08-13T09:54:00Z

Would it be that I don't syncing my repo before I commit my change?
I'll try to fix the git flow later.

kenjis · 2022-08-13T10:37:39Z

Would it be that I don't syncing my repo before I commit my change?

Sorry, I don't get your situation.
I thought you synced your repository, and did rebase twice.
But you say you did not sync?

After all, the current your branch is abnormal state.
There are two commits that are the same content.
git rebase never creates a new commit. It just change the existing commits.

Either you did something I couldn't anticipate, or Sourcetree ran strange commands that I couldn't anticipate.
In any case, I do not know of any way to get the branch into this state.

ping-yee · 2022-08-15T08:18:20Z

I think my git flow is too mess to fixed, so I decide to re-open the PR.
Thanks for your help and teach again! @kenjis

ping-yee and others added 9 commits August 5, 2022 18:42

fix: add judge if validation fields have asterisk when user want to s…

c0a782b

…et up custom errors.

test: add test for validation error with asterisk field.

340c752

cs: run cs-fix and static analysis

9fc2b7a

feat: add public method to regenerate CSRF token

4441fd1

docs: add changelog and note

23d71d6

docs: the session_id acquisition method that is not described

f1db96b

fix: add a new param in processRules and getErrorMessage function.

4a6527a

add: validation testing add label field

a8453e2

fix: cs-fixer

3648faa

ping-yee mentioned this pull request Aug 6, 2022

Bug: Custom validation error for a field with an asterisk. #6245

Closed

MGatner added 3 commits August 6, 2022 14:56

Merge pull request from GHSA-6gch-wjxj-hc2w

4632602

Improve CSRF protection (for Shield CSRF security fix)

Prep for 4.2.3 release

cb71f73

Merge pull request codeigniter4#6349 from naente/develop

01dac95

docs: the session_id acquisition method that is not described codeigniter4#5586

kenjis added bug Verified issues on the current code behavior or pull requests that will fix them breaking change Pull requests that may break existing functionalities labels Aug 6, 2022

kenjis reviewed Aug 6, 2022

View reviewed changes

MGatner and others added 4 commits August 6, 2022 18:28

Update CHANGELOG.md

1be14e7

Co-authored-by: kenjis <kenji.uui@gmail.com>

Merge pull request codeigniter4#6353 from codeigniter4/release-4.2.3

d77883e

Prep for 4.2.3 release

Merge pull request codeigniter4#6354 from codeigniter4/develop

9c0c695

4.2.3 Ready code

docs: add @Property to Session

68ad806

kenjis reviewed Aug 7, 2022

View reviewed changes

kenjis added 6 commits August 7, 2022 18:41

docs: add Prefious and Next button

55f3c23

docs: add upgrade_423 in upgrading.rst

dc84e94

WARNING: document isn't included in any toctree

docs: remove space

ab6aa3c

docs: add missing command prompt

a42651b

docs: remove out-of-dated? description

b2aac31

`--prefer-source` does not change the file contents.

docs: remove --prefer-source

d75dabd

It is not needed.

add : add a description to the changelog.

cb7b565

kenjis added the stale Pull requests with conflicts label Aug 11, 2022

kenjis and others added 15 commits August 11, 2022 20:02

docs: fix duplicate object description of ...

7c12af8

E.g., Check User Guide syntax: user_guide_src/source/libraries/caching.rst#L182 duplicate object description of increment, other instance in /github/workspace/user_guide_src/source/database/query_builder.rst

Merge pull request codeigniter4#6369 from kenjis/fix-docs-sphinx-errors

6d3a24b

docs: fix Sphinx errors

docs: update explanation for private methods

34a1f5b

docs: add about initController()

f9d93ce

Merge pull request codeigniter4#6368 from kenjis/fix-docs-controllers…

00c6596

….rst docs: improve controllers.rst

rebase: reslove conflicts

eb6e943

fix: add judge if validation fields have asterisk when user want to s…

fe010ba

…et up custom errors.

test: add test for validation error with asterisk field.

dba4bee

cs: run cs-fix and static analysis

713d6bb

fix: add a new param in processRules and getErrorMessage function.

748bad7

add: validation testing add label field

3320fdb

fix: cs-fixer

c5d8cb2

fix: change the declaration of methods according to PSR-12.

9bdf852

Merge branch 'fix-validation-custom-error' of https://github.com/ping…

3b9e662

…-yee/CodeIgniter4 into fix-validation-custom-error

add : add a description to the changelog in v4.2.4.

fa442b4

ping-yee closed this Aug 15, 2022

ping-yee mentioned this pull request Aug 15, 2022

Fix validation custom error asterisk field #6378

Merged

5 tasks

ping-yee deleted the fix-validation-custom-error branch September 12, 2022 07:42

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: validation custom error with asterisk field #6352

fix: validation custom error with asterisk field #6352

ping-yee commented Aug 6, 2022 •

edited

Loading

iRedds commented Aug 6, 2022

iRedds commented Aug 6, 2022

kenjis Aug 6, 2022 •

edited

Loading

ping-yee Aug 8, 2022

kenjis Aug 7, 2022

kenjis commented Aug 7, 2022

kenjis commented Aug 11, 2022

ping-yee commented Aug 12, 2022 •

edited

Loading

kenjis commented Aug 12, 2022

ping-yee commented Aug 13, 2022 •

edited

Loading

kenjis commented Aug 13, 2022

ping-yee commented Aug 13, 2022 •

edited

Loading

kenjis commented Aug 13, 2022

ping-yee commented Aug 13, 2022 •

edited

Loading

kenjis commented Aug 13, 2022

ping-yee commented Aug 15, 2022

		@@ -203,7 +203,7 @@ public function check($value, string $rule, array $errors = []): bool
		* @param array\|null $rules
		* @param array $data

	* @param array $data
	* @param array $data The array of data to validate, with `DBGroup`.
	* @param string\|null $originalField The original asterisk field name like "foo.*.bar".

fix: validation custom error with asterisk field #6352

fix: validation custom error with asterisk field #6352

Conversation

ping-yee commented Aug 6, 2022 • edited Loading

iRedds commented Aug 6, 2022

iRedds commented Aug 6, 2022

kenjis Aug 6, 2022 • edited Loading

Choose a reason for hiding this comment

ping-yee Aug 8, 2022

Choose a reason for hiding this comment

kenjis Aug 7, 2022

Choose a reason for hiding this comment

kenjis commented Aug 7, 2022

kenjis commented Aug 11, 2022

ping-yee commented Aug 12, 2022 • edited Loading

kenjis commented Aug 12, 2022

ping-yee commented Aug 13, 2022 • edited Loading

kenjis commented Aug 13, 2022

ping-yee commented Aug 13, 2022 • edited Loading

kenjis commented Aug 13, 2022

ping-yee commented Aug 13, 2022 • edited Loading

kenjis commented Aug 13, 2022

ping-yee commented Aug 15, 2022

ping-yee commented Aug 6, 2022 •

edited

Loading

kenjis Aug 6, 2022 •

edited

Loading

ping-yee commented Aug 12, 2022 •

edited

Loading

ping-yee commented Aug 13, 2022 •

edited

Loading

ping-yee commented Aug 13, 2022 •

edited

Loading

ping-yee commented Aug 13, 2022 •

edited

Loading