[TASK] Apply Rector rule set SetList::EARLY_RETURN

bobosch · Apr 17, 2024 · 459146f · 459146f
1 parent 930e2a2
commit 459146f
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 19 deletions.
diff --git a/Classes/Provider/BaseProvider.php b/Classes/Provider/BaseProvider.php
@@ -204,9 +204,8 @@ protected function getTileUrl($layer)
         // if protocoll is missing, we add http:// or https://
         if ($layer['tile_https'] == 1) {
             return 'https://' . $layer['tile_url'];
-        } else {
-            return 'http://' . $layer['tile_url'];
         }
+        return 'http://' . $layer['tile_url'];
     }
 
     public function setContentObjectRenderer(ContentObjectRenderer $cObj): void

diff --git a/Classes/Provider/Leaflet.php b/Classes/Provider/Leaflet.php
@@ -108,12 +108,10 @@ protected function getLayerSwitcher()
         }
 
         if (empty($base) && empty($overlay)) {
-            $layerString = '';
-        } else {
-            $layerString = 'var layersControl=new L.Control.Layers({' . implode(',', $base) . '},{' . implode(',', $overlay) . '}' . ($this->config['show_layerswitcher'] == 2 ? ',{collapsed:false}' : '') . ');
-			' . $this->config['id'] . '.addControl(layersControl);';
+            return '';
         }
-        return $layerString;
+        return 'var layersControl=new L.Control.Layers({' . implode(',', $base) . '},{' . implode(',', $overlay) . '}' . ($this->config['show_layerswitcher'] == 2 ? ',{collapsed:false}' : '') . ');
+			' . $this->config['id'] . '.addControl(layersControl);';
     }
 
     /**

diff --git a/Classes/Provider/Openlayers.php b/Classes/Provider/Openlayers.php
@@ -209,7 +209,7 @@ protected function getLayer($layer, $i, $backpath = '')
         $layer['tile_url'] = strtr($this->getTileUrl($layer), ['{s}' => '{' . $layer['subdomains'] . '}']);
 
         if ($layer['overlay'] == 1) {
-            $jsLayer = $this->config['id'] . "_" . $i . "_overlayLayer =
+            return $this->config['id'] . "_" . $i . "_overlayLayer =
                     new ol.layer.Tile({
                         visible: " . ($layer['visible'] == true ? 'true' : 'false') . ",
                         opacity: 0.99,
@@ -223,8 +223,9 @@ protected function getLayer($layer, $i, $backpath = '')
                     });
                 overlaygroup.getLayers().push(" . $this->config['id'] . "_" . $i . "_overlayLayer);
             ";
-        } else {
-            $jsLayer = $this->config['id'] . "_" . $i . "_baselayergroup =
+        }
+
+        return $this->config['id'] . "_" . $i . "_baselayergroup =
                     new ol.layer.Tile({
                         type: 'base',
                         combine: 'true',
@@ -239,9 +240,6 @@ protected function getLayer($layer, $i, $backpath = '')
                     });
                 baselayergroup.getLayers().push(" . $this->config['id'] . "_" . $i . "_baselayergroup);
         ";
-        }
-
-        return $jsLayer;
     }
 
     /**

diff --git a/Classes/TceMain.php b/Classes/TceMain.php
@@ -319,11 +319,13 @@ public function processDatamap_postProcessFieldArray($status, $table, $id, &$fie
 
                                     // Update fieldArray if address is set
                                     foreach ($tc as $def => $field) {
-                                        if ($def == strtolower($def)) {
-                                            if ($address[$def]) {
-                                                $fieldArray[$field] = $address[$def];
-                                            }
+                                        if ($def != strtolower($def)) {
+                                            continue;
+                                        }
+                                        if (!$address[$def]) {
+                                            continue;
                                         }
+                                        $fieldArray[$field] = $address[$def];
                                     }
                                 }
                             }

diff --git a/Classes/Updates/FileLocationUpdater.php b/Classes/Updates/FileLocationUpdater.php
@@ -221,9 +221,8 @@ protected function falGetRecordsFromTable($countOnly = false)
 
         if ($countOnly === true) {
             return $numResults;
-        } else {
-            return $allResults;
         }
+        return $allResults;
     }