From 000d133af64522d65f885bb72d4cd099e69bfa75 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 11 Jul 2021 20:21:12 +0200
Subject: [PATCH] fix more missing braces on one-liners

---
 lib-php/admin/update.php                   |  4 +++-
 lib-php/admin/warm.php                     | 16 ++++++++++++----
 lib-php/lib.php                            |  4 +++-
 lib-php/log.php                            |  8 ++++++--
 lib-php/migration/PhraseSettingsToJson.php |  6 ++++--
 lib-php/template/address-geojson.php       |  4 +++-
 6 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/lib-php/admin/update.php b/lib-php/admin/update.php
index ea58f37c..3075070a 100644
--- a/lib-php/admin/update.php
+++ b/lib-php/admin/update.php
@@ -40,7 +40,9 @@ $oDB->connect();
 $fPostgresVersion = $oDB->getPostgresVersion();
 
 $aDSNInfo = Nominatim\DB::parseDSN(getSetting('DATABASE_DSN'));
-if (!isset($aDSNInfo['port']) || !$aDSNInfo['port']) $aDSNInfo['port'] = 5432;
+if (!isset($aDSNInfo['port']) || !$aDSNInfo['port']) {
+    $aDSNInfo['port'] = 5432;
+}
 
 // cache memory to be used by osm2pgsql, should not be more than the available memory
 $iCacheMemory = (isset($aResult['osm2pgsql-cache'])?$aResult['osm2pgsql-cache']:2000);
diff --git a/lib-php/admin/warm.php b/lib-php/admin/warm.php
index d6aa3d9b..39a37506 100644
--- a/lib-php/admin/warm.php
+++ b/lib-php/admin/warm.php
@@ -62,11 +62,15 @@ if (!$aResult['search-only']) {
     $oPlaceLookup->setLanguagePreference(array('en'));
 
     echo 'Warm reverse: ';
-    if ($bVerbose) echo "\n";
+    if ($bVerbose) {
+        echo "\n";
+    }
     for ($i = 0; $i < 1000; $i++) {
         $fLat = rand(-9000, 9000) / 100;
         $fLon = rand(-18000, 18000) / 100;
-        if ($bVerbose) echo "$fLat, $fLon = ";
+        if ($bVerbose) {
+            echo "$fLat, $fLon = ";
+        }
 
         $oLookup = $oReverseGeocode->lookup($fLat, $fLon);
         $aSearchResults = $oLookup ? $oPlaceLookup->lookup(array($oLookup->iId => $oLookup)) : null;
@@ -79,10 +83,14 @@ if (!$aResult['reverse-only']) {
     $oGeocode = new Nominatim\Geocode($oDB);
 
     echo 'Warm search: ';
-    if ($bVerbose) echo "\n";
+    if ($bVerbose) {
+        echo "\n";
+    }
     $sSQL = 'SELECT word FROM word WHERE word is not null ORDER BY search_name_count DESC LIMIT 1000';
     foreach ($oDB->getCol($sSQL) as $sWord) {
-        if ($bVerbose) echo "$sWord = ";
+        if ($bVerbose) {
+            echo "$sWord = ";
+        }
 
         $oGeocode->setLanguagePreference(array('en'));
         $oGeocode->setQuery($sWord);
diff --git a/lib-php/lib.php b/lib-php/lib.php
index 6c1fddd0..d95ad4ee 100644
--- a/lib-php/lib.php
+++ b/lib-php/lib.php
@@ -221,6 +221,8 @@ function closestHouseNumber($aRow)
 if (!function_exists('array_key_last')) {
     function array_key_last(array $array)
     {
-        if (!empty($array)) return key(array_slice($array, -1, 1, true));
+        if (!empty($array)) {
+            return key(array_slice($array, -1, 1, true));
+        }
     }
 }
diff --git a/lib-php/log.php b/lib-php/log.php
index 723b38ef..d7e14932 100644
--- a/lib-php/log.php
+++ b/lib-php/log.php
@@ -16,8 +16,12 @@ function logStart(&$oDB, $sType = '', $sQuery = '', $aLanguageList = array())
 
     if ($sType == 'reverse') {
         $sOutQuery = (isset($_GET['lat'])?$_GET['lat']:'').'/';
-        if (isset($_GET['lon'])) $sOutQuery .= $_GET['lon'];
-        if (isset($_GET['zoom'])) $sOutQuery .= '/'.$_GET['zoom'];
+        if (isset($_GET['lon'])) {
+            $sOutQuery .= $_GET['lon'];
+        }
+        if (isset($_GET['zoom'])) {
+            $sOutQuery .= '/'.$_GET['zoom'];
+        }
     } else {
         $sOutQuery = $sQuery;
     }
diff --git a/lib-php/migration/PhraseSettingsToJson.php b/lib-php/migration/PhraseSettingsToJson.php
index 15c49f0a..ac6e6213 100644
--- a/lib-php/migration/PhraseSettingsToJson.php
+++ b/lib-php/migration/PhraseSettingsToJson.php
@@ -8,10 +8,12 @@ if (file_exists($phpPhraseSettingsFile) && !file_exists($jsonPhraseSettingsFile)
 
     $data = array();
 
-    if (isset($aTagsBlacklist))
+    if (isset($aTagsBlacklist)) {
         $data['blackList'] = $aTagsBlacklist;
-    if (isset($aTagsWhitelist))
+    }
+    if (isset($aTagsWhitelist)) {
         $data['whiteList'] = $aTagsWhitelist;
+    }
 
     $jsonFile = fopen($jsonPhraseSettingsFile, 'w');
     fwrite($jsonFile, json_encode($data));
diff --git a/lib-php/template/address-geojson.php b/lib-php/template/address-geojson.php
index 135504d3..0dd96f21 100644
--- a/lib-php/template/address-geojson.php
+++ b/lib-php/template/address-geojson.php
@@ -15,7 +15,9 @@ if (empty($aPlace)) {
                         'properties' => array()
                        );
 
-    if (isset($aPlace['place_id'])) $aFilteredPlaces['properties']['place_id'] = $aPlace['place_id'];
+    if (isset($aPlace['place_id'])) {
+        $aFilteredPlaces['properties']['place_id'] = $aPlace['place_id'];
+    }
     $sOSMType = formatOSMType($aPlace['osm_type']);
     if ($sOSMType) {
         $aFilteredPlaces['properties']['osm_type'] = $sOSMType;
-- 
2.43.2