diff --git a/config/database.php b/config/database.php index cb181adbd7..d4461b1166 100644 --- a/config/database.php +++ b/config/database.php @@ -51,26 +51,26 @@ $mysql_ssl_verify = envNonEmpty('MYSQL_SSL_VERIFY_SERVER_CERT', null); $mySqlSSLOptions = []; $useSSL = envNonEmpty('MYSQL_USE_SSL', false); -if (false !== $useSSL && null !== $useSSL) { - if (null !== $mysql_ssl_ca_dir) { - $mySqlSSLOptions[PDO::MYSQL_ATTR_SSL_CAPATH] = $mysql_ssl_ca_dir; - } - if (null !== $mysql_ssl_ca_file) { - $mySqlSSLOptions[PDO::MYSQL_ATTR_SSL_CA] = $mysql_ssl_ca_file; - } - if (null !== $mysql_ssl_cert) { - $mySqlSSLOptions[PDO::MYSQL_ATTR_SSL_CERT] = $mysql_ssl_cert; - } - if (null !== $mysql_ssl_key) { - $mySqlSSLOptions[PDO::MYSQL_ATTR_SSL_KEY] = $mysql_ssl_key; - } - if (null !== $mysql_ssl_ciphers) { - $mySqlSSLOptions[PDO::MYSQL_ATTR_SSL_CIPHER] = $mysql_ssl_ciphers; - } - if (null !== $mysql_ssl_verify) { - $mySqlSSLOptions[PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT] = $mysql_ssl_verify; - } -} +//if (false !== $useSSL && null !== $useSSL && '' !== $useSSL) { +// if (null !== $mysql_ssl_ca_dir) { +// $mySqlSSLOptions[PDO::MYSQL_ATTR_SSL_CAPATH] = $mysql_ssl_ca_dir; +// } +// if (null !== $mysql_ssl_ca_file) { +// $mySqlSSLOptions[PDO::MYSQL_ATTR_SSL_CA] = $mysql_ssl_ca_file; +// } +// if (null !== $mysql_ssl_cert) { +// $mySqlSSLOptions[PDO::MYSQL_ATTR_SSL_CERT] = $mysql_ssl_cert; +// } +// if (null !== $mysql_ssl_key) { +// $mySqlSSLOptions[PDO::MYSQL_ATTR_SSL_KEY] = $mysql_ssl_key; +// } +// if (null !== $mysql_ssl_ciphers) { +// $mySqlSSLOptions[PDO::MYSQL_ATTR_SSL_CIPHER] = $mysql_ssl_ciphers; +// } +// if (null !== $mysql_ssl_verify) { +// $mySqlSSLOptions[PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT] = $mysql_ssl_verify; +// } +//} return [ 'default' => envNonEmpty('DB_CONNECTION', 'mysql'), @@ -138,7 +138,7 @@ return [ 'client' => env('REDIS_CLIENT', 'predis'), 'options' => [ 'cluster' => env('REDIS_CLUSTER', 'predis'), - 'prefix' => env('REDIS_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_') . '_database_'), + //'prefix' => env('REDIS_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_') . '_database_'), ], 'default' => [ 'scheme' => envNonEmpty('REDIS_SCHEME', 'tcp'), diff --git a/config/user_roles.php b/config/user_roles.php index e7c057a2b4..3e7ecca8e8 100644 --- a/config/user_roles.php +++ b/config/user_roles.php @@ -28,7 +28,7 @@ use FireflyIII\Enums\UserRoleEnum; $result = []; -foreach (UserRoleEnum::cases() as $role) { - $result[$role->value] = []; -} +//foreach (UserRoleEnum::cases() as $role) { +// $result[$role->value] = []; +//} return $result; diff --git a/phpunit.xml b/phpunit.xml index d5008da502..0c9c6a3a42 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -1,23 +1,4 @@ - - - - -