Simplify getCheckBoxFieldsForLayer to use getLayerById

Use ProjectInfo::getLayerById() rather than iterating $projectlayers
and doing a manual instanceof filter. The return type includes
VectorLayer, so PHPStan is happy with the narrowing. Also drop the
try/catch blocks PHPStan flags as dead and the is_array() guard on
$fieldConfiguration (declared as array).

Author: meyerlor

lizmap/modules/lizmap/lib/Request/WMSRequest.php

@@ -1390,66 +1390,39 @@ private function getCheckBoxFieldsForLayer($layerId)
     {
         $checkBoxFields = array();
 
-        try {
-            $qgisPath = $this->project->getQgisPath();
-            if (!$qgisPath || !file_exists($qgisPath)) {
-                return $checkBoxFields;
-            }
-            $projectInfo = Qgis\ProjectInfo::fromQgisPath($qgisPath);
-        } catch (\Exception $e) {
+        $qgisPath = $this->project->getQgisPath();
+        if (!$qgisPath || !file_exists($qgisPath)) {
             return $checkBoxFields;
         }
 
         try {
-            $projectLayers = $projectInfo->projectlayers;
+            $projectInfo = Qgis\ProjectInfo::fromQgisPath($qgisPath);
         } catch (\Exception $e) {
             return $checkBoxFields;
         }
-        if (!is_array($projectLayers)) {
+
+        $xmlLayer = $projectInfo->getLayerById($layerId);
+        if (!$xmlLayer instanceof Qgis\Layer\VectorLayer) {
             return $checkBoxFields;
         }
 
-        foreach ($projectLayers as $xmlLayer) {
-            if (!($xmlLayer instanceof Qgis\Layer\VectorLayer)) {
+        foreach ($xmlLayer->fieldConfiguration as $field) {
+            $editWidget = $field->editWidget;
+            if (strtolower($editWidget->type) !== 'checkbox') {
                 continue;
             }
-            try {
-                if ($xmlLayer->id !== $layerId) {
-                    continue;
-                }
-                $fieldConfig = $xmlLayer->fieldConfiguration;
-            } catch (\Exception $e) {
+            $config = $editWidget->config;
+            if (!$config instanceof Qgis\BaseQgisObject) {
                 continue;
             }
-            if (!is_array($fieldConfig)) {
-                break;
-            }
-            foreach ($fieldConfig as $field) {
-                try {
-                    if (!isset($field->editWidget) || !is_string($field->editWidget->type) || strtolower($field->editWidget->type) !== 'checkbox') {
-                        continue;
-                    }
-                    $config = $field->editWidget->config;
-                } catch (\Exception $e) {
-                    continue;
-                }
-                if ($config instanceof Qgis\BaseQgisObject) {
-                    $data = $config->getData();
-                } elseif (is_array($config)) {
-                    $data = $config;
-                } else {
-                    continue;
-                }
-                $checked = array_key_exists('CheckedState', $data) ? (string) $data['CheckedState'] : '';
-                $unchecked = array_key_exists('UncheckedState', $data) ? (string) $data['UncheckedState'] : '';
-                // Fall back to QGIS defaults (see QgisFormControl::fillCheckboxValues)
-                $checkBoxFields[(string) $field->name] = array(
-                    'CheckedState' => $checked === '' ? 't' : $checked,
-                    'UncheckedState' => $unchecked === '' ? 'f' : $unchecked,
-                );
-            }
-
-            break;
+            $data = $config->getData();
+            $checked = array_key_exists('CheckedState', $data) ? (string) $data['CheckedState'] : '';
+            $unchecked = array_key_exists('UncheckedState', $data) ? (string) $data['UncheckedState'] : '';
+            // Fall back to QGIS defaults (see QgisFormControl::fillCheckboxValues)
+            $checkBoxFields[(string) $field->name] = array(
+                'CheckedState' => $checked === '' ? 't' : $checked,
+                'UncheckedState' => $unchecked === '' ? 'f' : $unchecked,
+            );
         }
 
         return $checkBoxFields;