feat: ask for project type instead of a confirmation message

carlalexander · carlalexander · commit 833e4ae09320 · 2020-09-27T18:03:33.000-04:00
diff --git a/src/Command/Project/InitializeProjectCommand.php b/src/Command/Project/InitializeProjectCommand.php
@@ -103,14 +103,8 @@ protected function perform(InputInterface $input, OutputStyle $output)
             return;
         }
 
-        $projectType = $this->getProjectType();
-
-        if (empty($projectType)
-            && !$output->confirm('No WordPress installation detected in this directory. Do you want to proceed?', false)) {
-            return;
-        }
-
         $name = $this->determineName($input, $output);
+        $projectType = $this->determineProjectType($output);
         $providerId = $this->determineCloudProvider($input, $output, 'Enter the ID of the cloud provider that the project will use');
         $region = $this->determineRegion($input, $output, $providerId, 'Enter the name of the region that the project will be in');
 
@@ -138,6 +132,7 @@ private function determineDatabaseName(OutputStyle $output): string
         $databases = $this->apiClient->getDatabases($this->cliConfiguration->getActiveTeamId());
 
         if (!$databases->isEmpty() && $output->confirm('Would you like to use an existing database for this project?')) {
+            // TODO: This looks ugly. Add more info.
             $databaseName = (string) $output->choice('Which database would you like to use?', $databases->pluck('name')->all());
         } elseif (
             (!$databases->isEmpty() && $output->confirm('Would you like to create a new one for this project instead?'))
@@ -166,6 +161,28 @@ private function determineName(InputInterface $input, OutputStyle $output): stri
         return (string) $name;
     }
 
+    /**
+     * Determine the type of project being initialized.
+     */
+    private function determineProjectType(OutputStyle $output): string
+    {
+        $type = '';
+
+        if ($this->filesystem->exists($this->projectDirectory.'/wp-config.php')) {
+            $type = 'wordpress';
+        } elseif ($this->filesystem->exists(array_map(function (string $path) {
+            return $this->projectDirectory.$path;
+        }, ['/web/app/', '/web/wp-config.php', '/config/application.php']))) {
+            $type = 'bedrock';
+        }
+
+        if (empty($type)) {
+            $type = strtolower($output->choice('Please select the type of project to initialize', ['Bedrock', 'WordPress']));
+        }
+
+        return $type;
+    }
+
     /**
      * Get the database name from the console input.
      */
@@ -186,24 +203,6 @@ private function getDatabaseName(InputInterface $input): ?string
         return $databaseName;
     }
 
-    /**
-     * Get the project type that we're initializing.
-     */
-    private function getProjectType(): string
-    {
-        $type = '';
-
-        if ($this->filesystem->exists($this->projectDirectory.'/wp-config.php')) {
-            $type = 'wordpress';
-        } elseif ($this->filesystem->exists($this->projectDirectory.'/composer.json')
-            && false !== strpos((string) file_get_contents($this->projectDirectory.'/composer.json'), 'roots/wordpress')
-        ) {
-            $type = 'bedrock';
-        }
-
-        return $type;
-    }
-
     /**
      * Checks if the plugin is already installed.
      */
