Simplify test config

Author: theodorejb

.github/workflows/php.yml

@@ -39,8 +39,6 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          tools: psalm
-          extensions: sqlsrv-5.10.1
 
       - name: Setup problem matchers for PHPUnit
         run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"

.gitignore

@@ -1,6 +1,7 @@
-/.idea/
-/vendor/
-/composer.lock
-/test/src/LocalConfig.php
+.idea/
 .phpunit.result.cache
 .php-cs-fixer.cache
+
+/vendor/
+/composer.lock
+/test/config.php

test/MssqlDbTest.php

@@ -17,9 +17,9 @@ public static function dbProvider(): PeachySql
     {
         if (!self::$db) {
             $c = App::$config;
-            $server = $c->getMssqlServer();
-            $username = $c->getMssqlUsername();
-            $password = $c->getMssqlPassword();
+            $server = $c->mssqlServer;
+            $username = $c->mssqlUsername;
+            $password = $c->mssqlPassword;
 
             $pdo = new PDO("sqlsrv:Server=$server;Database=PeachySQL", $username, $password, [
                 PDO::ATTR_EMULATE_PREPARES => false,

test/MysqlDbTest.php

@@ -18,7 +18,7 @@ public static function dbProvider(): PeachySql
         if (!self::$db) {
             $c = App::$config;
 
-            $pdo = new PDO($c->getMysqlDsn(), $c->getMysqlUser(), $c->getMysqlPassword(), [
+            $pdo = new PDO($c->mysqlDsn, $c->mysqlUser, $c->mysqlPassword, [
                 PDO::ATTR_EMULATE_PREPARES => false,
             ]);
 

test/PgsqlDbTest.php

@@ -19,7 +19,7 @@ public static function dbProvider(): PeachySql
             $c = App::$config;
             $dbName = getenv('POSTGRES_HOST') !== false ? 'postgres' : 'PeachySQL';
 
-            $pdo = new PDO($c->getPgsqlDsn($dbName), $c->getPgsqlUser(), $c->getPgsqlPassword(), [
+            $pdo = new PDO($c->getPgsqlDsn($dbName), $c->pgsqlUser, $c->pgsqlPassword, [
                 PDO::ATTR_EMULATE_PREPARES => false,
             ]);
 

test/bootstrap.php

@@ -1,13 +1,19 @@
 <?php
 
-use DevTheorem\Phaster\Test\src\{App, Config, LocalConfig};
+use DevTheorem\Phaster\Test\src\{App, Config};
 
 require 'vendor/autoload.php';
 
-if (class_exists(LocalConfig::class)) {
-    // suppress error when LocalConfig doesn't exist
-    /** @psalm-suppress MixedAssignment */
-    App::$config = new LocalConfig();
+$configFile = __DIR__ . '/config.php';
+
+if (file_exists($configFile)) {
+    $config = require $configFile;
+
+    if (!$config instanceof Config) {
+        throw new Exception('Expected config file to return Config instance');
+    }
+
+    App::$config = $config;
 } else {
     App::$config = new Config();
 }

test/src/Config.php

@@ -2,53 +2,21 @@
 
 namespace DevTheorem\Phaster\Test\src;
 
-/**
- * Default test config. Values can be overridden with a LocalConfig child class.
- */
 class Config
 {
-    public function getMysqlDsn(): string
-    {
-        return "mysql:host=127.0.0.1;port=3306;dbname=Phaster";
-    }
+    public string $mssqlServer = '(local)\SQLEXPRESS';
+    public string $mssqlUsername = '';
+    public string $mssqlPassword = '';
 
-    public function getMysqlUser(): string
-    {
-        return 'root';
-    }
+    public string $mysqlDsn = 'mysql:host=127.0.0.1;port=3306;dbname=Phaster';
+    public string $mysqlUser = 'root';
+    public string $mysqlPassword = '';
 
-    public function getMysqlPassword(): string
-    {
-        return '';
-    }
+    public string $pgsqlUser = 'postgres';
+    public string $pgsqlPassword = 'postgres';
 
     public function getPgsqlDsn(string $database): string
     {
         return "pgsql:host=localhost;dbname=$database";
     }
-
-    public function getPgsqlUser(): string
-    {
-        return 'postgres';
-    }
-
-    public function getPgsqlPassword(): string
-    {
-        return 'postgres';
-    }
-
-    public function getMssqlServer(): string
-    {
-        return '(local)\SQLEXPRESS';
-    }
-
-    public function getMssqlUsername(): string
-    {
-        return '';
-    }
-
-    public function getMssqlPassword(): string
-    {
-        return '';
-    }
 }