From deeb4933fc11eb7e3439f7871f2184424944c7da Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Fri, 29 May 2020 06:16:42 +0200
Subject: [PATCH] Reformat for readability (PHPStorm)

---
 config/database.php | 40 ++++++++++++++++++++++++++--------------
 config/ldap.php     | 34 +++++++++++++++++++++++-----------
 2 files changed, 49 insertions(+), 25 deletions(-)

diff --git a/config/database.php b/config/database.php
index 948bb3c1fa..ea073f01e5 100644
--- a/config/database.php
+++ b/config/database.php
@@ -42,21 +42,33 @@ if (!(false === $databaseUrl)) {
 /*
  * Get SSL parameters from .env file.
  */
-$mysql_ssl_ca_dir =  envNonEmpty('MYSQL_SSL_CAPATH',             null);
-$mysql_ssl_ca_file = envNonEmpty('MYSQL_SSL_CA',                 null);
-$mysql_ssl_cert =    envNonEmpty('MYSQL_SSL_CERT',               null);
-$mysql_ssl_key =     envNonEmpty('MYSQL_SSL_KEY',                null);
-$mysql_ssl_ciphers = envNonEmpty('MYSQL_SSL_CIPHER',             null);
+$mysql_ssl_ca_dir  = envNonEmpty('MYSQL_SSL_CAPATH', null);
+$mysql_ssl_ca_file = envNonEmpty('MYSQL_SSL_CA', null);
+$mysql_ssl_cert    = envNonEmpty('MYSQL_SSL_CERT', null);
+$mysql_ssl_key     = envNonEmpty('MYSQL_SSL_KEY', null);
+$mysql_ssl_ciphers = envNonEmpty('MYSQL_SSL_CIPHER', null);
 $mysql_ssl_verify  = envNonEmpty('MYSQL_SSL_VERIFY_SERVER_CERT', null);
 
-$mysql_ssl_options = [];
-if (!(false === envNonEmpty('MYSQL_USE_SSL', false))) {
-    if ($mysql_ssl_ca_dir  !== null) $mysql_ssl_options[PDO::MYSQL_ATTR_SSL_CAPATH            ] = $mysql_ssl_ca_dir;
-    if ($mysql_ssl_ca_file !== null) $mysql_ssl_options[PDO::MYSQL_ATTR_SSL_CA                ] = $mysql_ssl_ca_file;
-    if ($mysql_ssl_cert    !== null) $mysql_ssl_options[PDO::MYSQL_ATTR_SSL_CERT              ] = $mysql_ssl_cert;
-    if ($mysql_ssl_key     !== null) $mysql_ssl_options[PDO::MYSQL_ATTR_SSL_KEY               ] = $mysql_ssl_key;
-    if ($mysql_ssl_ciphers !== null) $mysql_ssl_options[PDO::MYSQL_ATTR_SSL_CIPHER            ] = $mysql_ssl_ciphers;
-    if ($mysql_ssl_verify  !== null) $mysql_ssl_options[PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT] = $mysql_ssl_verify;
+$mySqlSSLOptions = [];
+if (false !== envNonEmpty('MYSQL_USE_SSL', false)) {
+    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 [
@@ -80,7 +92,7 @@ return [
             'prefix'      => '',
             'strict'      => true,
             'engine'      => 'InnoDB',
-            'options'     => $mysql_ssl_options,
+            'options'     => $mySqlSSLOptions,
         ],
         'pgsql'  => [
             'driver'      => 'pgsql',
diff --git a/config/ldap.php b/config/ldap.php
index 1c4c57da8b..1c2d1b52be 100644
--- a/config/ldap.php
+++ b/config/ldap.php
@@ -41,20 +41,32 @@ if ('ActiveDirectory' === envNonEmpty('ADLDAP_CONNECTION_SCHEME', 'OpenLDAP')) {
 /*
  * Get SSL parameters from .env file.
  */
-$ssl_ca_dir =  envNonEmpty('ADLDAP_SSL_CACERTDIR', null);
+$ssl_ca_dir  = envNonEmpty('ADLDAP_SSL_CACERTDIR', null);
 $ssl_ca_file = envNonEmpty('ADLDAP_SSL_CACERTFILE', null);
-$ssl_cert =    envNonEmpty('ADLDAP_SSL_CERTFILE', null);
-$ssl_key =     envNonEmpty('ADLDAP_SSL_KEYFILE', null);
+$ssl_cert    = envNonEmpty('ADLDAP_SSL_CERTFILE', null);
+$ssl_key     = envNonEmpty('ADLDAP_SSL_KEYFILE', null);
 $ssl_ciphers = envNonEmpty('ADLDAP_SSL_CIPHER_SUITE', null);
 $ssl_require = envNonEmpty('ADLDAP_SSL_REQUIRE_CERT', null);
 
-$ssl_options = [];
-if ($ssl_ca_dir  !== null) $ssl_options[LDAP_OPT_X_TLS_CACERTDIR   ] = $ssl_ca_dir;
-if ($ssl_ca_file !== null) $ssl_options[LDAP_OPT_X_TLS_CACERTFILE  ] = $ssl_ca_file;
-if ($ssl_cert    !== null) $ssl_options[LDAP_OPT_X_TLS_CERTFILE    ] = $ssl_cert;
-if ($ssl_key     !== null) $ssl_options[LDAP_OPT_X_TLS_KEYFILE     ] = $ssl_key;
-if ($ssl_ciphers !== null) $ssl_options[LDAP_OPT_X_TLS_CIPHER_SUITE] = $ssl_ciphers;
-if ($ssl_require !== null) $ssl_options[LDAP_OPT_X_TLS_REQUIRE_CERT] = $ssl_require;
+$sslOptions = [];
+if (null !== $ssl_ca_dir) {
+    $sslOptions[LDAP_OPT_X_TLS_CACERTDIR] = $ssl_ca_dir;
+}
+if (null !== $ssl_ca_file) {
+    $sslOptions[LDAP_OPT_X_TLS_CACERTFILE] = $ssl_ca_file;
+}
+if (null !== $ssl_cert) {
+    $sslOptions[LDAP_OPT_X_TLS_CERTFILE] = $ssl_cert;
+}
+if (null !== $ssl_key) {
+    $sslOptions[LDAP_OPT_X_TLS_KEYFILE] = $ssl_key;
+}
+if (null !== $ssl_ciphers) {
+    $sslOptions[LDAP_OPT_X_TLS_CIPHER_SUITE] = $ssl_ciphers;
+}
+if (null !== $ssl_require) {
+    $sslOptions[LDAP_OPT_X_TLS_REQUIRE_CERT] = $ssl_require;
+}
 
 return [
     /*
@@ -272,7 +284,7 @@ return [
                 'use_ssl' => env('ADLDAP_USE_SSL', false),
                 'use_tls' => env('ADLDAP_USE_TLS', false),
 
-                'custom_options' => $ssl_options,
+                'custom_options' => $sslOptions,
             ],
 
         ],