Merge BS5 into Master #366
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
`sr-only` has been renamed to `visually-hidden`.
`data-toggle` has been renamed to `data-bs-toggle`.
`data-dismiss` has been renamed to `data-bs-dismiss`.
`.input-group-append` and `.input-group-prepend` have been removed, addons now need to be placed on the same level as the inputs.
Labels now require a `form-label` class.
The `form-inline` class has been removed.
The `form-inline` class has been removed.
The `form-group` class has been removed.
It's more readable, and fixes CS line length violation.
Adapts HTML and CSS according to the updated Bootstrap 5.0 examples.
This is going to be in a new major, so we can break with the past.
Add BS5 support
Adds `aria-required`, `aria-invalid`, and error element IDs for compatibility with new ARIA attribute support added for CakePHP 4.3. Also adds support for having the help element ID as well as the error element ID set for `aria-describedby`. This helps to avoid losing the association depending on a control's error state.
Improve ARIA attribute handling.
CakePHP 4.3 compatibility
Remove comment that no longer applies.
Update dependencies.
Mitigate potential XSS issue. refs 6fe6ddb
4.x - Fix install command test.
4.x - Escape request params.
This allows to configure spacing on a helper, form, as well control basis.
Add support for configurable spacing.
4.x - Add docs for the `spacing` feature.
Codecov Report
@@ Coverage Diff @@
## master #366 +/- ##
============================================
+ Coverage 99.19% 99.22% +0.02%
- Complexity 335 360 +25
============================================
Files 20 21 +1
Lines 869 1027 +158
============================================
+ Hits 862 1019 +157
- Misses 7 8 +1
Continue to review full report at Codecov.
|
ADmad
reviewed
Apr 3, 2022
.github/workflows/ci.yml
Outdated
| @@ -14,7 +14,7 @@ jobs: | |||
| strategy: | |||
| fail-fast: false | |||
| matrix: | |||
| php-version: ['7.4', '8.0', '8.1'] | |||
There was a problem hiding this comment.
All the changes to ci.yml are regressions.
There was a problem hiding this comment.
I could've sworn I've chosen "ours" instead of "theirs" 😞
Do we care about a clean history with regards to such conflict resolution mistakes, eg should I fix on top, or should I rather rewrite the history?
There was a problem hiding this comment.
Do whatever is convenient for you :)
There was a problem hiding this comment.
Well, first rewrite attempt completely bricked the branch, but second one worked :)
# Conflicts: # .github/workflows/ci.yml # package-lock.json # package.json # src/View/Helper/FormHelper.php # templates/layout/examples/cover.php # templates/layout/examples/dashboard.php # templates/layout/examples/signin.php # tests/TestCase/View/Helper/FormHelper/AbstractFormHelperTest.php # tests/TestCase/View/Helper/FormHelper/DefaultAlign/CheckboxCustomControlTest.php # tests/TestCase/View/Helper/FormHelper/DefaultAlign/FileControlTest.php # tests/TestCase/View/Helper/FormHelper/DefaultAlign/FileCustomControlTest.php # tests/TestCase/View/Helper/FormHelper/DefaultAlign/RadioCustomControlTest.php # tests/TestCase/View/Helper/FormHelper/DefaultAlign/RangeControlTest.php # tests/TestCase/View/Helper/FormHelper/DefaultAlign/RangeCustomControlTest.php # tests/TestCase/View/Helper/FormHelper/HorizontalAlign/CheckboxCustomControlTest.php # tests/TestCase/View/Helper/FormHelper/HorizontalAlign/FileControlTest.php # tests/TestCase/View/Helper/FormHelper/HorizontalAlign/FileCustomControlTest.php # tests/TestCase/View/Helper/FormHelper/HorizontalAlign/RadioCustomControlTest.php # tests/TestCase/View/Helper/FormHelper/HorizontalAlign/RangeControlTest.php # tests/TestCase/View/Helper/FormHelper/HorizontalAlign/RangeCustomControlTest.php # tests/TestCase/View/Helper/FormHelper/InlineAlign/CheckboxControlTest.php # tests/TestCase/View/Helper/FormHelper/InlineAlign/CheckboxCustomControlTest.php # tests/TestCase/View/Helper/FormHelper/InlineAlign/DateTimeControlTest.php # tests/TestCase/View/Helper/FormHelper/InlineAlign/FileControlTest.php # tests/TestCase/View/Helper/FormHelper/InlineAlign/FileCustomControlTest.php # tests/TestCase/View/Helper/FormHelper/InlineAlign/RadioControlTest.php # tests/TestCase/View/Helper/FormHelper/InlineAlign/RadioCustomControlTest.php # tests/TestCase/View/Helper/FormHelper/InlineAlign/RangeControlTest.php # tests/TestCase/View/Helper/FormHelper/InlineAlign/RangeCustomControlTest.php # tests/TestCase/View/Helper/FormHelper/InlineAlign/StaticControlTest.php # tests/TestCase/View/Helper/FormHelper/InlineAlign/TextControlTest.php # tests/TestCase/View/Helper/FormHelperTest.php # tests/TestCase/View/Helper/PaginatorHelperTest.php
ADmad
approved these changes
Apr 4, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.