Fix #11132 - trim warning in Cake\View\Helper::addClass #11133
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
markstory
requested changes
Aug 31, 2017
src/View/Helper.php
Outdated
| @@ -197,7 +197,9 @@ protected function _confirm($message, $okCode, $cancelCode = '', $options = []) | |||
| */ | |||
| public function addClass(array $options = [], $class = null, $key = 'class') | |||
| { | |||
| if (isset($options[$key]) && trim($options[$key])) { | |||
| if (is_array($options[$key])) { | |||
There was a problem hiding this comment.
I think you need an isset() here as well.
There was a problem hiding this comment.
Yeah, it was a quick patch - I'll have a look at writing a test.
Thank you for offering help - if I get stuck, I'll ask! :)
|
This looks like sth that might need a test case to prevent regressions in the future. |
ADmad
reviewed
Aug 31, 2017
src/View/Helper.php
Outdated
| if (isset($options[$key]) && trim($options[$key])) { | ||
| if (is_array($options[$key])) { | ||
| $options[$key][] = $class; | ||
| } else if (isset($options[$key]) && trim($options[$key])) { |
Fix coding style
Codecov Report
@@ Coverage Diff @@
## master #11133 +/- ##
============================================
+ Coverage 94.88% 94.9% +0.01%
- Complexity 12850 12854 +4
============================================
Files 437 437
Lines 32767 32771 +4
============================================
+ Hits 31092 31101 +9
+ Misses 1675 1670 -5
Continue to review full report at Codecov.
|
ADmad
requested changes
Aug 31, 2017
tests/TestCase/View/HelperTest.php
Outdated
| public function testAddClassArray() | ||
| { | ||
| $Helper = new TestHelper($this->View); | ||
| $input = array('class' => [ |
There was a problem hiding this comment.
Use short array syntax everywhere please.
o0h
pushed a commit
to o0h/cakephp
that referenced
this pull request
Nov 16, 2017
Refs cakephp#11133
o0h
pushed a commit
to o0h/cakephp
that referenced
this pull request
Dec 30, 2017
Refs cakephp#11133
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.
Fixes #11132 .
Adds support for the
classelement of an$optionsarray to also be an array.