#4399 -- Always specify some values even if they're defaults.

.gitignore

@@ -45,6 +45,7 @@ tmp/cache/*---*
 
 # Docker files
 /docker-compose.yml
+/docker-compose.new.yml
 /docker-compose.override.yml
 /.env
 

src/Installer/EnvFiles/AbstractEnvFile.php

@@ -2,11 +2,10 @@
 
 namespace App\Installer\EnvFiles;
 
-use App\Environment;
 use App\Utilities\Strings;
 use Dotenv\Dotenv;
 use Dotenv\Exception\ExceptionInterface;
-use http\Exception\InvalidArgumentException;
+use InvalidArgumentException;
 
 abstract class AbstractEnvFile implements \ArrayAccess
 {
@@ -105,7 +104,9 @@ abstract class AbstractEnvFile implements \ArrayAccess
                 $default = '';
             }
 
-            if ((null === $value || $default === $value) && Environment::LANG !== $key) {
+            $isRequired = (bool)($keyInfo['required'] ?? false);
+
+            if (null === $value || ($default === $value && !$isRequired)) {
                 $value ??= $default;
                 $envFile[] = '# ' . $key . '=' . $value;
             } else {

src/Installer/EnvFiles/AzuraCastEnvFile.php

@@ -31,6 +31,7 @@ class AzuraCastEnvFile extends AbstractEnvFile
                 ),
                 'options' => $langOptions,
                 'default' => Locale::stripLocaleEncoding(Locale::DEFAULT_LOCALE),
+                'required' => true,
             ],
             Environment::APP_ENV => [
                 'name' => __(
@@ -41,6 +42,7 @@ class AzuraCastEnvFile extends AbstractEnvFile
                     Environment::ENV_DEVELOPMENT,
                     Environment::ENV_TESTING,
                 ],
+                'required' => true,
             ],
             Environment::LOG_LEVEL => [
                 'name' => __(
@@ -90,6 +92,7 @@ class AzuraCastEnvFile extends AbstractEnvFile
                     'Do not modify this after installation.',
                 ),
                 'default' => $dbSettings['host'],
+                'required' => true,
             ],
             Environment::DB_PORT => [
                 'name' => __('MariaDB Port'),
@@ -97,6 +100,7 @@ class AzuraCastEnvFile extends AbstractEnvFile
                     'Do not modify this after installation.',
                 ),
                 'default' => $dbSettings['port'],
+                'required' => true,
             ],
             Environment::DB_USER => [
                 'name' => __('MariaDB Username'),
@@ -104,6 +108,7 @@ class AzuraCastEnvFile extends AbstractEnvFile
                     'Do not modify this after installation.',
                 ),
                 'default' => $dbSettings['user'],
+                'required' => true,
             ],
             Environment::DB_PASSWORD => [
                 'name' => __('MariaDB Password'),
@@ -111,6 +116,7 @@ class AzuraCastEnvFile extends AbstractEnvFile
                     'Do not modify this after installation.',
                 ),
                 'default' => $dbSettings['password'],
+                'required' => true,
             ],
             Environment::DB_NAME => [
                 'name' => __('MariaDB Database Name'),
@@ -118,6 +124,7 @@ class AzuraCastEnvFile extends AbstractEnvFile
                     'Do not modify this after installation.',
                 ),
                 'default' => $dbSettings['dbname'],
+                'required' => true,
             ],
             'MYSQL_RANDOM_ROOT_PASSWORD' => [
                 'name' => __('Auto-generate Random MariaDB Root Password'),
@@ -149,15 +156,18 @@ class AzuraCastEnvFile extends AbstractEnvFile
             Environment::REDIS_HOST => [
                 'name' => __('Redis Host'),
                 'default' => $redisSettings['host'],
+                'required' => true,
             ],
             Environment::REDIS_PORT => [
                 'name' => __('Redis Port'),
                 'default' => $redisSettings['port'],
+                'required' => true,
             ],
             Environment::REDIS_DB => [
                 'name' => __('Redis Database Index'),
                 'options' => range(0, 15),
                 'default' => $redisSettings['db'],
+                'required' => true,
             ],
             'PHP_MAX_FILE_SIZE' => [
                 'name' => __('PHP Maximum POST File Size'),

src/Installer/EnvFiles/EnvFile.php

@@ -17,17 +17,20 @@ class EnvFile extends AbstractEnvFile
                     '(Docker Compose) All Docker containers are prefixed by this name. Do not change this after installation.'
                 ),
                 'default' => 'azuracast',
+                'required' => true,
             ],
             'COMPOSE_HTTP_TIMEOUT' => [
                 'name' => __(
                     '(Docker Compose) The amount of time to wait before a Docker Compose operation fails. Increase this on lower performance computers.'
                 ),
                 'default' => 300,
+                'required' => true,
             ],
             'AZURACAST_VERSION' => [
                 'name' => __('AzuraCast Release Channel'),
                 'options' => ['latest', 'stable'],
                 'default' => 'latest',
+                'required' => true,
             ],
             'AZURACAST_HTTP_PORT' => [
                 'name' => __('HTTP Port'),