Fix database DSN definition for Phinx

package-health · Aug 24, 2023 · 4ebb221 · 4ebb221
1 parent 2c81c1c
commit 4ebb221
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 6 deletions.
diff --git a/app/settings.php b/app/settings.php
@@ -16,15 +16,34 @@
             'cache' => [
               'enabled' => PHP_SAPI !== 'cli',
               'redis' => [
-                'enabled' => true,
-                'dsn' => "redis://{$_ENV['REDIS_USERNAME']}:{$_ENV['REDIS_PASSWORD']}@{$_ENV['REDIS_HOST']}:{$_ENV['REDIS_PORT']}"
+                'enabled' => extension_loaded('redis') === true,
+                'dsn' => sprintf(
+                  'redis://%s:%s@%s:%d',
+                  $_ENV['REDIS_USERNAME'],
+                  $_ENV['REDIS_PASSWORD'],
+                  $_ENV['REDIS_HOST'],
+                  $_ENV['REDIS_PORT'] ?? 6379
+                )
               ]
             ],
             'db' => [
-              'dsn' => "pgsql://{$_ENV['POSTGRES_USER']}:{$_ENV['POSTGRES_PASSWORD']}@{$_ENV['POSTGRES_HOST']}:{$_ENV['POSTGRES_PORT']}/{$_ENV['POSTGRES_DB']}"
+              'dsn' => sprintf(
+                'pgsql://%s:%s@%s:%d/%s',
+                $_ENV['POSTGRES_USER'],
+                $_ENV['POSTGRES_PASSWORD'],
+                $_ENV['POSTGRES_HOST'],
+                $_ENV['POSTGRES_PORT'] ?? 5432,
+                $_ENV['POSTGRES_DB']
+              )
             ],
             'queue' => [
-              'dsn'      => "amqp://{$_ENV['AMQP_USER']}:{$_ENV['AMQP_PASS']}@{$_ENV['AMQP_HOST']}:{$_ENV['AMQP_PORT']}",
+              'dsn' => sprintf(
+                'amqp://%s:%s@%s:%d',
+                $_ENV['AMQP_USER'],
+                $_ENV['AMQP_PASS'],
+                $_ENV['AMQP_HOST'],
+                $_ENV['AMQP_PORT'] ?? 5672
+              ),
               'prefetch' => 100
             ],
             'displayErrorDetails' => (isset($_ENV['PHP_ENV']) === false || $_ENV['PHP_ENV'] === 'dev'),

diff --git a/phinx.php b/phinx.php
@@ -15,10 +15,24 @@
     'default_migration_table' => 'phinxlog',
     'default_environment' => 'dev',
     'prod' => [
-      'dsn' => "pgsql://{$_ENV['POSTGRES_USER']}:{$_ENV['POSTGRES_PASSWORD']}@{$_ENV['POSTGRES_HOST']}/{$_ENV['POSTGRES_DB']}"
+      'dsn' => sprintf(
+        'pgsql://%s:%s@%s:%d/%s',
+        $_ENV['POSTGRES_USER'],
+        $_ENV['POSTGRES_PASSWORD'],
+        $_ENV['POSTGRES_HOST'],
+        $_ENV['POSTGRES_PORT'] ?? 5432,
+        $_ENV['POSTGRES_DB']
+      )
     ],
     'dev' => [
-      'dsn' => "pgsql://{$_ENV['POSTGRES_USER']}:{$_ENV['POSTGRES_PASSWORD']}@{$_ENV['POSTGRES_HOST']}/{$_ENV['POSTGRES_DB']}"
+      'dsn' => sprintf(
+        'pgsql://%s:%s@%s:%d/%s',
+        $_ENV['POSTGRES_USER'],
+        $_ENV['POSTGRES_PASSWORD'],
+        $_ENV['POSTGRES_HOST'],
+        $_ENV['POSTGRES_PORT'] ?? 5432,
+        $_ENV['POSTGRES_DB']
+      )
     ],
     'test' => []
   ],