v2.0

README.md

@@ -24,7 +24,7 @@ Running the setup process downloads and installs both WordPress and the official
 
 ```shell
 # Options
-./vendor/bin/touchstone setup --db-host=[HOST] --db-socket=[SOCKET PATH] --db-name=[DATABASE NAME] --db-user=[DATABASE USERNAME] --db-pass=[DATABASE PASSWORD] --skip-db-creation=[TRUE/FALSE]
+./vendor/bin/touchstone setup --db-host=[HOST] --db-socket=[SOCKET PATH] --db-name=[DATABASE NAME] --db-user=[DATABASE USERNAME] --db-pass=[DATABASE PASSWORD] skip-db-creation
 ```
 
 #### Regular Connection

inc/helpers.php

@@ -2,8 +2,8 @@
 
 namespace WPTS;
 
-const NAME = 'Touchstone';
-const VERSION = '1.2.0';
+const NAME    = 'Touchstone';
+const VERSION = '2.0.0';
 
 const CMD_INTRO = [
     '<options=bold>' . NAME . ' v' . VERSION,

src/Console/Commands/Setup.php

@@ -76,7 +76,7 @@ protected function configure(): void
         $this->addOption(
             'skip-db-creation',
             null,
-            InputOption::VALUE_OPTIONAL,
+            InputOption::VALUE_NEGATABLE,
             "Skip creation of the database because it already exists?",
             false
         );
@@ -176,7 +176,7 @@ protected function connectToHost(InputInterface $input, OutputInterface &$output
             $db_string .= "host={$this->db_creds['host']};";
         }
 
-        if ($input->getOption('skip-db-creation')) {
+        if ($input->getOption('skip-db-creation') == true) {
             $db_string .= "dbname={$this->db_creds['name']};";
         }
 
@@ -194,8 +194,12 @@ protected function connectToHost(InputInterface $input, OutputInterface &$output
             $this->db_connection = $db_connection;
         } catch (\PDOException $e) {
             switch ($e->getCode()) {
-                case '1045':
-                    throw new \Exception("Couldn't connect to host. Is the username or password incorrect?");
+                case 1044:
+                case 1045:
+                    throw new \Exception("Couldn't connect to database. Is the username or password incorrect?");
+                    break;
+                case 1049:
+                    throw new \Exception("Couldn't find the database \"{$this->db_creds['name']}\".");
                     break;
                 default:
                     throw new \Exception("Couldn't connect to host. Please check the details.");

src/Consumer/ConsumerSettings.php

@@ -13,17 +13,8 @@ class ConsumerSettings
 
     public function __construct(string $root_path)
     {
-        $file = $root_path . 'config.touchstone.php';
-
-        if (!\file_exists($file)) {
-            return;
-        }
-
-        $config = include $file;
-
-        if (!\is_array($config)) {
-            return;
-        }
+        $file   = $root_path . 'config.touchstone.php';
+        $config = \file_exists($file) ? include $file : [];
 
         $this->testsDir            = $root_path . ($config['directories']['all'] ?? '');
         $this->unitTestsDir        = $root_path . ($config['directories']['unit'] ?? '');

tests-consumer/bootstrap.php

@@ -38,25 +38,27 @@
     }
 
     //---- Theme
-    $theme_dir = $settings->consumerSettings()->theme()->directoryPath();
+    $theme = $settings->consumerSettings()->theme();
 
-    if (is_dir($theme_dir)) {
-        $current_theme = $settings->consumerSettings()->theme()->directoryName();
-        $theme_root    = dirname($theme_dir);
+    if ($theme) {
+        if (is_dir($theme->directoryPath())) {
+            $current_theme = $settings->consumerSettings()->theme()->directoryName();
+            $theme_root    = dirname($theme->directoryPath());
 
-        add_filter('theme_root', function () use ($theme_root) {
-            return $theme_root;
-        });
+            add_filter('theme_root', function () use ($theme_root) {
+                return $theme_root;
+            });
 
-        register_theme_directory($theme_root);
+            register_theme_directory($theme_root);
 
-        add_filter('pre_option_template', function () use ($current_theme) {
-            return $current_theme;
-        });
+            add_filter('pre_option_template', function () use ($current_theme) {
+                return $current_theme;
+            });
 
-        add_filter('pre_option_stylesheet', function () use ($current_theme) {
-            return $current_theme;
-        });
+            add_filter('pre_option_stylesheet', function () use ($current_theme) {
+                return $current_theme;
+            });
+        }
     }
 });