fix: condition failed if we had a bedrock project and no global wp-cli

carlalexander · carlalexander · commit 6494e6dd9b5b · 2021-09-08T16:50:23.000-04:00
diff --git a/src/Command/Project/InitializeProjectCommand.php b/src/Command/Project/InitializeProjectCommand.php
@@ -196,13 +196,15 @@ private function addEnvironmentDatabaseNodes(Collection $environments, ConsoleOu
      */
     private function checkForWordPress(ConsoleOutput $output, string $projectType)
     {
-        if (!in_array($projectType, ['bedrock', 'wordpress']) || !WpCli::isInstalledGlobally() || WpCli::isWordPressInstalled() || !$output->confirm('WordPress wasn\'t detected in the project directory. Would you like to download it?')) {
+        if (!$this->isWordPressDownloadable($projectType) || !$output->confirm('WordPress wasn\'t detected in the project directory. Would you like to download it?')) {
             return;
         }
 
         if ('bedrock' === $projectType) {
+            $output->info('Creating new Bedrock project');
             Process::runShellCommandline('composer create-project roots/bedrock .');
         } elseif ('wordpress' === $projectType) {
+            $output->info('Downloading WordPress using WP-CLI');
             WpCli::downloadWordPress();
         }
 
@@ -281,4 +283,15 @@ private function isPluginInstalled(string $projectType): bool
         return ('wordpress' === $projectType && WpCli::isYmirPluginInstalled())
             || ('bedrock' === $projectType && false !== strpos((string) file_get_contents('./composer.json'), 'ymirapp/wordpress-plugin'));
     }
+
+    /**
+     * Checks if we're able to download WordPress.
+     */
+    private function isWordPressDownloadable(string $projectType): bool
+    {
+        return in_array($projectType, ['bedrock', 'wordpress'])
+            && !WpCli::isWordPressInstalled()
+            && (('wordpress' === $projectType && WpCli::isInstalledGlobally())
+               || ('bedrock' === $projectType && !(new \FilesystemIterator($this->projectDirectory))->valid()));
+    }
 }
