Use index based string access for substr with length of 1 #8054
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
MorrisJobke
force-pushed
the
substr-use-index
branch
from
6f4251f to
8b0b44a
Compare
rullzer
previously requested changes
Jan 26, 2018
| if (isset($params['root'])){ | ||
| $root = $params['root']; | ||
| if (substr($root, 0, 1) !== '/'){ | ||
| if ($root[0] !== '/'){ |
Member
There was a problem hiding this comment.
This is not 100% the same.
substr('', 0, 1) === ''but
$a = '';
$a[0];fails.
Member
There was a problem hiding this comment.
So you should then first check if it is actually set?
Member
Author
There was a problem hiding this comment.
I checked all cases and added this only to the ones, that needed it. In this case there is always something in the string. See the code above.
Member
There was a problem hiding this comment.
otherwise just use strpos($root, '/') !== 0
| } | ||
|
|
||
| if (substr($this->root, -1, 1) !== '/') { | ||
| if ($this->root[strlen($this->root) - 1] !== '/') { |
Member
There was a problem hiding this comment.
could also rtrim? More obvious what it does?
| break; | ||
| } | ||
| if(substr($firstVersion, 0, 1) === '>') { | ||
| if($firstVersion !== '' && $firstVersion[0] === '>') { |
Member
There was a problem hiding this comment.
do strpos, I think its better and more obvious
MorrisJobke
force-pushed
the
substr-use-index
branch
from
8b0b44a to
6e441d6
Compare
Codecov Report
@@ Coverage Diff @@
## master #8054 +/- ##
============================================
- Coverage 51.71% 51.71% -0.01%
+ Complexity 25437 25430 -7
============================================
Files 1599 1599
Lines 95272 95264 -8
Branches 1376 1376
============================================
- Hits 49270 49265 -5
+ Misses 46002 45999 -3
|
Member
Author
|
I improved a bit the overall code flow. Please have another look at it. |
MorrisJobke
force-pushed
the
substr-use-index
branch
from
6e441d6 to
0a1371d
Compare
Member
Author
|
This is now ready for review. @nickvergessen @ChristophWurst @blizzz |
| $this->root = '/' . $this->root; | ||
| } | ||
| if (substr($this->root, -1, 1) !== '/') { | ||
| if ($this->root[strlen($this->root) - 1] !== '/') { |
Member
There was a problem hiding this comment.
$this->root = rtrim($this->root, '/') . '/';
lib/private/Archive/TAR.php
Outdated
| public function addFolder($path) { | ||
| $tmpBase = \OC::$server->getTempManager()->getTemporaryFolder(); | ||
| if (substr($path, -1, 1) != '/') { | ||
| if (substr($path, -1) !== '/') { |
Member
There was a problem hiding this comment.
$path = rtrim($path, '/') . '/';
lib/private/Archive/TAR.php
Outdated
| } else { | ||
| $folderPath = $path; | ||
| if (substr($folderPath, -1, 1) != '/') { | ||
| if (substr($folderPath, -1) !== '/') { |
Member
There was a problem hiding this comment.
$folderPath = rtrim($folderPath, '/') . '/';
MorrisJobke
force-pushed
the
substr-use-index
branch
from
0a1371d to
00b2954
Compare
Member
Author
|
@nickvergessen Addressed your comments. |
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
MorrisJobke
force-pushed
the
substr-use-index
branch
from
00b2954 to
9ff51aa
Compare
nickvergessen
approved these changes
Jan 26, 2018
rullzer
approved these changes
Jan 26, 2018
rullzer
added
4. to release
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.
Found by PHP inspections and makes the code more readable and performant.