This repository has been archived by the owner on Jan 31, 2020. It is now read-only.
Don't show prefix and postfix if there is no placeholder items. #133
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
froschdesign
suggested changes
Aug 17, 2017
| @@ -118,6 +118,10 @@ public function toString($indent = null) | |||
| : $this->getIndent(); | |||
|
|
|||
| $items = $this->getArrayCopy(); | |||
| // If we don't have items - do not show prefix and postfix | |||
There was a problem hiding this comment.
If no item is present, then this check should the first step in this method. You can use $this->count().
There was a problem hiding this comment.
Please provide also an unit test for this new behaviour. Thanks!
AndyDune
commented
Aug 22, 2017
froschdesign
suggested changes
Sep 2, 2017
| // If we don't have items - do not show prefix and postfix | ||
| if (!count($items)) { | ||
| if (!$this->count()) { |
There was a problem hiding this comment.
Please move this check before $indent = ($indent !== null) (line 116) and add a whitespace after !.
| return ''; | ||
| } | ||
|
|
||
| $itemsToString = implode($this->getSeparator(), $this->getArrayCopy()); | ||
| // todo check empty $itemsToString after trim() to return '' |
There was a problem hiding this comment.
If items with whitespace are added, then there is a reason for it and we should allow the rendering. Please undo this changes.
AndyDune
commented
Sep 4, 2017
malukenho
reviewed
Sep 4, 2017
| // If we don't have items - do not show prefix and postfix | ||
| if (!$this->count()) { | ||
| return ''; | ||
| } | ||
|
|
||
| $itemsToString = implode($this->getSeparator(), $this->getArrayCopy()); | ||
| // todo check empty $itemsToString after trim() to return '' | ||
| $indent = ($indent !== null) |
There was a problem hiding this comment.
May be we should avoid the negative check:
$indent = $indent === null
? $this->getIndent()
: $this->getWhitespace($indent);| @@ -113,8 +113,7 @@ public function __toString() | |||
| */ | |||
| public function toString($indent = null) | |||
| { | |||
| // If we don't have items - do not show prefix and postfix | |||
froschdesign
approved these changes
Sep 15, 2017
weierophinney
added a commit
that referenced
this pull request
Jan 17, 2018
Don't show prefix and postfix if there is no placeholder items.
weierophinney
added a commit
that referenced
this pull request
Jan 17, 2018
weierophinney
added a commit
that referenced
this pull request
Jan 17, 2018
|
Thanks, @AndyDune; merged to develop for release with 2.10.0, as it is a slight change in behavior. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
For show h1 in layout with set in view file.