From d933ead2b503bd0377b1c8f7c0984f29b23ed908 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 11 Jul 2021 19:11:37 +0200
Subject: [PATCH] remove unnecessayly nested ifs

Found by Sonarqube.
---
 lib-php/AddressDetails.php  | 11 +++++------
 lib-php/Geocode.php         |  6 ++----
 lib-php/ParameterParser.php | 16 ++++++++--------
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/lib-php/AddressDetails.php b/lib-php/AddressDetails.php
index fc7fbec7..91e3d89f 100644
--- a/lib-php/AddressDetails.php
+++ b/lib-php/AddressDetails.php
@@ -79,12 +79,11 @@ class AddressDetails
                 $sName = $aLine['housenumber'];
             }
 
-            if (isset($sName)) {
-                if (!isset($aAddress[$sTypeLabel])
-                    || $aLine['class'] == 'place'
-                ) {
-                    $aAddress[$sTypeLabel] = $sName;
-                }
+            if (isset($sName)
+                && (!isset($aAddress[$sTypeLabel])
+                    || $aLine['class'] == 'place')
+            ) {
+                $aAddress[$sTypeLabel] = $sName;
             }
         }
 
diff --git a/lib-php/Geocode.php b/lib-php/Geocode.php
index fcbc2f28..14a3315e 100644
--- a/lib-php/Geocode.php
+++ b/lib-php/Geocode.php
@@ -817,10 +817,8 @@ class Geocode
 
         // No results? Done
         if (empty($aResults)) {
-            if ($this->bFallback) {
-                if ($this->fallbackStructuredQuery()) {
-                    return $this->lookup();
-                }
+            if ($this->bFallback && $this->fallbackStructuredQuery()) {
+                return $this->lookup();
             }
 
             return array();
diff --git a/lib-php/ParameterParser.php b/lib-php/ParameterParser.php
index 33624502..d4068aa3 100644
--- a/lib-php/ParameterParser.php
+++ b/lib-php/ParameterParser.php
@@ -90,16 +90,16 @@ class ParameterParser
         $aLanguages = array();
         $sLangString = $this->getString('accept-language', $sFallback);
 
-        if ($sLangString) {
-            if (preg_match_all('/(([a-z]{1,8})([-_][a-z]{1,8})?)\s*(;\s*q\s*=\s*(1|0\.[0-9]+))?/i', $sLangString, $aLanguagesParse, PREG_SET_ORDER)) {
-                foreach ($aLanguagesParse as $iLang => $aLanguage) {
-                    $aLanguages[$aLanguage[1]] = isset($aLanguage[5])?(float)$aLanguage[5]:1 - ($iLang/100);
-                    if (!isset($aLanguages[$aLanguage[2]])) {
-                        $aLanguages[$aLanguage[2]] = $aLanguages[$aLanguage[1]]/10;
-                    }
+        if ($sLangString
+            && preg_match_all('/(([a-z]{1,8})([-_][a-z]{1,8})?)\s*(;\s*q\s*=\s*(1|0\.[0-9]+))?/i', $sLangString, $aLanguagesParse, PREG_SET_ORDER)
+        ) {
+            foreach ($aLanguagesParse as $iLang => $aLanguage) {
+                $aLanguages[$aLanguage[1]] = isset($aLanguage[5])?(float)$aLanguage[5]:1 - ($iLang/100);
+                if (!isset($aLanguages[$aLanguage[2]])) {
+                    $aLanguages[$aLanguage[2]] = $aLanguages[$aLanguage[1]]/10;
                 }
-                arsort($aLanguages);
             }
+            arsort($aLanguages);
         }
         if (empty($aLanguages) && CONST_Default_Language) {
             $aLanguages[CONST_Default_Language] = 1;
-- 
2.39.5