Change usage of basename where possible #1480
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
mahagr
reviewed
Jul 9, 2018
| continue; | ||
| } | ||
|
|
||
| $lang = basename($file->getBasename(), '.yaml'); | ||
| $lang = $file->getBasename('.yaml'); |
There was a problem hiding this comment.
Didn't you say that the method is not locale friendly? How is this better than basename($file->getFilename(), '.yaml');?
There was a problem hiding this comment.
The reason that DirectoryIterator::getBasename is not locale friendly is because it calls basename underneath. getBasename passes the argument provided to the internal call to basename (See implementation). In other words:
(basename($file->getBasename(), '.yaml') === basename($file->getFilename(), '.yaml')) &&
(basename($file->getBasename(), '.yaml') === $file->getBasename('.yaml'))
mahagr
approved these changes
Jul 20, 2018
|
Looks good to me! |
|
@mahagr, whats the status of this PR? |
|
I am not sure. There is no second review, so maybe it was just accidentally missed up. I am quite busy right now, if nothing happens, please remind me in a week, ok? |
|
@mahagr, Just a reminder. It's been about 2 weeks. |
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.
DirectoryIterator::getFilenamereturns the same value asDirectoryIterator::getBasename(no argument) while being locale safe (See getgrav/grav#2087).DirectoryIterator::getBasenamecallsbasenameusing the argument provided and returns the result, so callingbasenameon the result can be replaced with passing the argument toDirectoryIterator::getBasename. I replaced one call togetBasenamewithgetFilenameas well as simplifyingbasenamecalls onDirectoryIterator::getBasename. I also simplified some usage ofpathinfo, another locale aware function.There is still an issue with locale safety (
basenameis still called byDirectoryIterator::getBasename). I have mentioned some possible solutions in my issue to the main Grav repository (getgrav/grav#2084).