This repository has been archived by the owner on Jan 6, 2020. It is now read-only.
Fixed Generator::mkdir when already exists #525
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
|
👍 Status: reviewed. @HeahDude thanks for fixing this ... and I'm sorry for having introduced it :( |
xabbuh
reviewed
Nov 7, 2016
| @@ -72,8 +72,9 @@ protected function renderFile($template, $target, $parameters) | |||
| */ | |||
| public static function mkdir($dir, $mode = 0777, $recursive = true) | |||
| { | |||
| mkdir($dir, $mode, $recursive); | |||
| self::writeln(sprintf(' <fg=green>created</> %s', self::relativizePath($dir))); | |||
| if (@mkdir($dir, $mode, $recursive)) { | |||
There was a problem hiding this comment.
What about checking for existence instead of silencing the operation?
| @@ -72,7 +72,8 @@ protected function renderFile($template, $target, $parameters) | |||
| */ | |||
| public static function mkdir($dir, $mode = 0777, $recursive = true) | |||
| { | |||
| if (@mkdir($dir, $mode, $recursive)) { | |||
| if (!is_dir(dirname($dir))) { | |||
| mkdir($dir, $mode, $recursive); | |||
There was a problem hiding this comment.
Please keep the silencing operator (Symfony always does @mkdir) because eventually an error will happen here.
There was a problem hiding this comment.
tests are failing anyway, let's revert this one.
HeahDude
force-pushed
the
fix/mkdir
branch
2 times, most recently
from
2f24c9a
to
c43c993
Compare
fabpot
reviewed
Nov 7, 2016
| @@ -72,8 +70,10 @@ protected function renderFile($template, $target, $parameters) | |||
| */ | |||
| public static function mkdir($dir, $mode = 0777, $recursive = true) | |||
| { | |||
| mkdir($dir, $mode, $recursive); | |||
| self::writeln(sprintf(' <fg=green>created</> %s', self::relativizePath($dir))); | |||
| if (!is_dir(dirname($dir))) { | |||
There was a problem hiding this comment.
should be $dir, not dirname($dir), no? same on the next line as well
fabpot
reviewed
Nov 7, 2016
| if (!is_dir(dirname($target))) { | ||
| self::mkdir(dirname($target)); | ||
| } | ||
| self::mkdir($target); |
|
Thanks @fabpot we're good to go now :) |
|
Thank you @HeahDude. |
fabpot
added a commit
that referenced
this pull request
Nov 7, 2016
This PR was merged into the 3.1.x-dev branch. Discussion ---------- Fixed Generator::mkdir when already exists Closes #523. Commits ------- 18b58df Fixed Generator::mkdir when already exists
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.
Closes #523.