[Cache] Remove silenced warning tiggered by PhpArrayAdapter #21167
Conversation
This file contains hidden or 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
xabbuh
reviewed
Jan 5, 2017
| @@ -328,7 +328,7 @@ public function commit() | |||
| */ | |||
| private function initialize() | |||
| { | |||
| $this->values = @(include $this->file) ?: array(); | |||
| $this->values = file_exists($this->file) ? include $this->file ?: array() : array(); | |||
There was a problem hiding this comment.
I would add parentheses to improve the readability of this statement.
872207c to
b7c7927
Compare
fabpot
reviewed
Jan 5, 2017
| @@ -328,7 +328,7 @@ public function commit() | |||
| */ | |||
| private function initialize() | |||
| { | |||
| $this->values = @(include $this->file) ?: array(); | |||
| $this->values = file_exists($this->file) ? (include $this->file ?: array()) : array(); | |||
There was a problem hiding this comment.
Shouldn't it be is_file instead? file_exists() returns true for directories.
There was a problem hiding this comment.
is_file is slower, and this is a mandatory path. there is no reason this is not a file but in severe mistakes, where the php warning will be enough a report
b7c7927 to
a9dfcd8
Compare
|
👍 |
nicolas-grekas
added a commit
that referenced
this pull request
Jan 5, 2017
…r (nicolas-grekas) This PR was merged into the 3.2 branch. Discussion ---------- [Cache] Remove silenced warning tiggered by PhpArrayAdapter | Q | A | ------------- | --- | Branch? | 3.2 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Because many reported this silenced warning, which happens all the time unless `cache:warmup` has been run. Commits ------- a9dfcd8 [Cache] Remove silenced warning tiggered by PhpArrayAdapter
Merged
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.
Because many reported this silenced warning, which happens all the time unless
cache:warmuphas been run.