Merge pull request #978 from amazeeio/small-php-fixes

better shorthand ifs
uselagoon · Mar 20, 2019 · 7c0662e · 7c0662e
2 parents 4e40681 + 5253b55
commit 7c0662e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/docs/using_lagoon/drupal/drupal7-mariadb/sites/default/settings.php b/docs/using_lagoon/drupal/drupal7-mariadb/sites/default/settings.php
@@ -37,9 +37,9 @@
     // Override search API server settings fetched from default configuration.
     $conf['search_api_override_mode'] = 'load';
     $conf['search_api_override_servers']['solr']['name'] = 'Lagoon Solr - Environment:' . getenv('LAGOON_PROJECT');
-    $conf['search_api_override_servers']['solr']['options']['host'] = getenv('SOLR_HOST') ?: 'solr';
+    $conf['search_api_override_servers']['solr']['options']['host'] = (getenv('SOLR_HOST') ?: 'solr');
     $conf['search_api_override_servers']['solr']['options']['port'] = 8983;
-    $conf['search_api_override_servers']['solr']['options']['path'] = '/solr/' . getenv('SOLR_CORE') ?: 'drupal';
+    $conf['search_api_override_servers']['solr']['options']['path'] = '/solr/' . (getenv('SOLR_CORE') ?: 'drupal');
     $conf['search_api_override_servers']['solr']['options']['http_user'] = (getenv('SOLR_USER') ?: '');
     $conf['search_api_override_servers']['solr']['options']['http_pass'] = (getenv('SOLR_PASSWORD') ?: '');
     $conf['search_api_override_servers']['solr']['options']['excerpt'] = 0;

diff --git a/docs/using_lagoon/drupal/drupal8-composer-mariadb/web/sites/default/settings.php b/docs/using_lagoon/drupal/drupal8-composer-mariadb/web/sites/default/settings.php
@@ -41,9 +41,9 @@
 // WARNING: you have to create a search_api server having "solr" machine name at
 // /admin/config/search/search-api/add-server to make this work.
 if (getenv('LAGOON') && (file_exists($app_root . '/modules/contrib/search_api_solr') || file_exists($app_root . 'modules/search_api_solr'))) {
-  $config['search_api.server.solr']['backend_config']['connector_config']['host'] = getenv('SOLR_HOST') ?: 'solr';
+  $config['search_api.server.solr']['backend_config']['connector_config']['host'] = (getenv('SOLR_HOST') ?: 'solr');
   $config['search_api.server.solr']['backend_config']['connector_config']['path'] = '/solr/';
-  $config['search_api.server.solr']['backend_config']['connector_config']['core'] = getenv('SOLR_CORE') ?: 'drupal';
+  $config['search_api.server.solr']['backend_config']['connector_config']['core'] = (getenv('SOLR_CORE') ?: 'drupal');
   $config['search_api.server.solr']['backend_config']['connector_config']['port'] = 8983;
   $config['search_api.server.solr']['backend_config']['connector_config']['http_user'] = (getenv('SOLR_USER') ?: '');
   $config['search_api.server.solr']['backend_config']['connector_config']['http']['http_user'] = (getenv('SOLR_USER') ?: '');

diff --git a/docs/using_lagoon/drupal/drupal8-composer-postgres/web/sites/default/settings.php b/docs/using_lagoon/drupal/drupal8-composer-postgres/web/sites/default/settings.php
@@ -41,9 +41,9 @@
 // // WARNING: you have to create a search_api server having "solr" machine name at
 // // /admin/config/search/search-api/add-server to make this work.
 // if (getenv('LAGOON')) {
-// $config['search_api.server.solr']['backend_config']['connector_config']['host'] = getenv('SOLR_HOST') ?: 'solr';
+// $config['search_api.server.solr']['backend_config']['connector_config']['host'] = (getenv('SOLR_HOST') ?: 'solr');
 // $config['search_api.server.solr']['backend_config']['connector_config']['path'] = '/solr/';
-// $config['search_api.server.solr']['backend_config']['connector_config']['core'] = getenv('SOLR_CORE') ?: 'drupal';
+// $config['search_api.server.solr']['backend_config']['connector_config']['core'] = (getenv('SOLR_CORE') ?: 'drupal');
 // $config['search_api.server.solr']['backend_config']['connector_config']['port'] = 8983;
 // $config['search_api.server.solr']['backend_config']['connector_config']['http_user'] = (getenv('SOLR_USER') ?: '');
 // $config['search_api.server.solr']['backend_config']['connector_config']['http']['http_user'] = (getenv('SOLR_USER') ?: '');