From e5e8736383b0d85b0f646fc3931d8d8379ebe6a0 Mon Sep 17 00:00:00 2001 From: polarathene Date: Tue, 5 Nov 2019 20:22:06 +1300 Subject: [PATCH 1/5] Fix: Fail fast when the project directory is not empty Avoid waiting until after `getBestCandidate()` has finished, as it can add notably delay on slow connections due to downloading megabytes of data. Only to fail if the install location is invalid. --- src/Composer/Command/CreateProjectCommand.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Composer/Command/CreateProjectCommand.php b/src/Composer/Command/CreateProjectCommand.php index 2985aa57a..e84234467 100644 --- a/src/Composer/Command/CreateProjectCommand.php +++ b/src/Composer/Command/CreateProjectCommand.php @@ -279,6 +279,11 @@ EOT $packageVersion = $requirements[0]['version']; } + $fs = new Filesystem(); + if (is_dir($directory) && !$fs->isDirEmpty($directory)) { + throw new \InvalidArgumentException("Project directory $directory is not empty."); + } + if (null === $stability) { if (preg_match('{^[^,\s]*?@('.implode('|', array_keys(BasePackage::$stabilities)).')$}i', $packageVersion, $match)) { $stability = $match[1]; From 11207a9a2ee21821fd19528bf92bf5c649cb2e94 Mon Sep 17 00:00:00 2001 From: polarathene Date: Tue, 5 Nov 2019 20:26:06 +1300 Subject: [PATCH 2/5] Fix: Check for null install directory earlier Allows for failing fast when no install directory was provided to the command(uses package name instead). --- src/Composer/Command/CreateProjectCommand.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Composer/Command/CreateProjectCommand.php b/src/Composer/Command/CreateProjectCommand.php index e84234467..7a43eb990 100644 --- a/src/Composer/Command/CreateProjectCommand.php +++ b/src/Composer/Command/CreateProjectCommand.php @@ -279,6 +279,12 @@ EOT $packageVersion = $requirements[0]['version']; } + // if no directory was specified, use the 2nd part of the package name + if (null === $directory) { + $parts = explode("/", $name, 2); + $directory = getcwd() . DIRECTORY_SEPARATOR . array_pop($parts); + } + $fs = new Filesystem(); if (is_dir($directory) && !$fs->isDirEmpty($directory)) { throw new \InvalidArgumentException("Project directory $directory is not empty."); @@ -325,11 +331,6 @@ EOT throw new \InvalidArgumentException($errorMessage .'.'); } - if (null === $directory) { - $parts = explode("/", $name, 2); - $directory = getcwd() . DIRECTORY_SEPARATOR . array_pop($parts); - } - // handler Ctrl+C for unix-like systems if (function_exists('pcntl_async_signals')) { @mkdir($directory, 0777, true); From 5987114f6ce0c26e4adb825c7156bf7367464f4e Mon Sep 17 00:00:00 2001 From: polarathene Date: Tue, 5 Nov 2019 20:29:57 +1300 Subject: [PATCH 3/5] Fix: Fail when install location is a file In the event a file has the same name as the intended install directory, fail fast too. --- src/Composer/Command/CreateProjectCommand.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Composer/Command/CreateProjectCommand.php b/src/Composer/Command/CreateProjectCommand.php index 7a43eb990..9fc9ea0d7 100644 --- a/src/Composer/Command/CreateProjectCommand.php +++ b/src/Composer/Command/CreateProjectCommand.php @@ -286,8 +286,12 @@ EOT } $fs = new Filesystem(); - if (is_dir($directory) && !$fs->isDirEmpty($directory)) { - throw new \InvalidArgumentException("Project directory $directory is not empty."); + if (file_exists($directory)) { + if (!is_dir($directory)) { + throw new \InvalidArgumentException('Cannot create project directory at "'.$directory.'", it exists as a file.'); + } elseif (!$fs->isDirEmpty($directory)) { + throw new \InvalidArgumentException('Project directory "'.$directory.'" is not empty.'); + } } if (null === $stability) { From 1b2582ff5b46b3eae8f7677268ae85b4d4069be3 Mon Sep 17 00:00:00 2001 From: polarathene Date: Tue, 5 Nov 2019 20:33:20 +1300 Subject: [PATCH 4/5] Chore: Improve create-project install UX Provides feedback output before a potentially long wait on getBestCandidate() call on slow network connections where unresponsiveness/hang may be assumed. --- src/Composer/Command/CreateProjectCommand.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Composer/Command/CreateProjectCommand.php b/src/Composer/Command/CreateProjectCommand.php index 9fc9ea0d7..02ec63c9e 100644 --- a/src/Composer/Command/CreateProjectCommand.php +++ b/src/Composer/Command/CreateProjectCommand.php @@ -285,6 +285,8 @@ EOT $directory = getcwd() . DIRECTORY_SEPARATOR . array_pop($parts); } + $io->writeError('Creating a "' . $packageName . '" project at "' . $directory . '"'); + $fs = new Filesystem(); if (file_exists($directory)) { if (!is_dir($directory)) { From 43e0321ee74aa5efb9b720f8576145c351d7f3e3 Mon Sep 17 00:00:00 2001 From: polarathene Date: Tue, 5 Nov 2019 21:14:22 +1300 Subject: [PATCH 5/5] Chore: Use consistent directory path Only when a install directory was not specified, was the CWD prepended to `$directory`. This change provides consistency in paths displayed to the user. --- src/Composer/Command/CreateProjectCommand.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Composer/Command/CreateProjectCommand.php b/src/Composer/Command/CreateProjectCommand.php index 02ec63c9e..2ebf3f8c0 100644 --- a/src/Composer/Command/CreateProjectCommand.php +++ b/src/Composer/Command/CreateProjectCommand.php @@ -282,9 +282,10 @@ EOT // if no directory was specified, use the 2nd part of the package name if (null === $directory) { $parts = explode("/", $name, 2); - $directory = getcwd() . DIRECTORY_SEPARATOR . array_pop($parts); + $directory = array_pop($parts); } + $directory = getcwd() . DIRECTORY_SEPARATOR . $directory; $io->writeError('Creating a "' . $packageName . '" project at "' . $directory . '"'); $fs = new Filesystem();