Add uniqueness to GitCheckoutRevisionToTemporaryPath to avoid collisions when checking out the same revision from/to #58
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
…ons when checking out the same revision from/to
…ranch (i.e. in the `push` build)
Ocramius
requested changes
May 2, 2018
|
|
||
| public function __construct(?callable $uniquenessFunction = null) | ||
| { | ||
| if ($uniquenessFunction === null) { |
There was a problem hiding this comment.
Can simply use ?? on the assignment
|
|
||
| if (file_exists($checkoutDirectory) || is_dir($checkoutDirectory)) { | ||
| throw new RuntimeException(sprintf( | ||
| 'Tried to check out revision %s to directory %s which already exists', |
There was a problem hiding this comment.
Put quotes around the %s here. Also: exception type seems to be incorrect. Can we use our own please?
There was a problem hiding this comment.
So little point in writing up a specific exception here: the chances of this happening are so slim given each directory is always unique...
There was a problem hiding this comment.
I couldn't find an assertion like fileNotExists or directoryNotExists etc., hence why I wrote that
There was a problem hiding this comment.
Can do like Assert::that(file_exists($dir))->false(); or something?
|
I think you can `Assert::that($path)->not()->directory()` and the same for
files.
…On Wed, 2 May 2018, 11:20 James Titcumb, ***@***.***> wrote:
***@***.**** commented on this pull request.
------------------------------
In src/Git/GitCheckoutRevisionToTemporaryPath.php
<#58 (comment)>
:
> */
public function remove(CheckedOutRepository $checkedOutRepository) : void
{
(new Process(['rm', '-rf', (string) $checkedOutRepository]))->mustRun();
}
+
+ /**
+ * @throws RuntimeException
+ */
+ private function generateTemporaryPathFor(Revision $revision) : string
+ {
+ $uniquePathGenerator = $this->uniquenessFunction;
+ $checkoutDirectory = sys_get_temp_dir() . '/api-compare-' . $uniquePathGenerator((string) $revision . '_');
+
+ if (file_exists($checkoutDirectory) || is_dir($checkoutDirectory)) {
+ throw new RuntimeException(sprintf(
+ 'Tried to check out revision %s to directory %s which already exists',
Can do like Assert::that(file_exists($dir))->false(); or something?
—
You are receiving this because your review was requested.
Reply to this email directly, view it on GitHub
<#58 (comment)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AAJakJv6HNVouyrZuwE0LwVWuSGvWdMWks5tuXpigaJpZM4TvCSx>
.
|
|
There's no negation thing AFAIK :s |
asgrim
force-pushed
the
feature/prevent-path-collisions-when-cloning-repo
branch
from
a98c462 to
5f20b6b
Compare
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.
Fixes #53
Maybe a little over engineered, but I think this is fairly bulletproof now 😁 at least we have tests!