Merge pull request #6128 from 3liz/backport-6113-to-release_3_10

[Backport release_3_10] Provide default values for *very* old qgs files with missing attributes

Author: rldhont

lizmap/modules/lizmap/lib/Project/Qgis/ProjectInfo.php

@@ -22,9 +22,9 @@
  * @property string                                    $version
  * @property string                                    $projectname
  * @property string                                    $title
- * @property null|string                               $saveDateTime
- * @property null|string                               $saveUser
- * @property null|string                               $saveUserFull
+ * @property string                                    $saveDateTime
+ * @property string                                    $saveUser
+ * @property string                                    $saveUserFull
  * @property SpatialRefSys                             $projectCrs
  * @property ProjectProperties                         $properties
  * @property LayerTreeRoot                             $layerTreeRoot
@@ -456,11 +456,11 @@ public function getLayoutsAsKeyArray()
     protected static function getAttributes($oXmlReader)
     {
         return array(
-            'version' => $oXmlReader->getAttribute('version'),
-            'projectname' => $oXmlReader->getAttribute('projectname'),
-            'saveDateTime' => $oXmlReader->getAttribute('saveDateTime'),
-            'saveUser' => $oXmlReader->getAttribute('saveUser'),
-            'saveUserFull' => $oXmlReader->getAttribute('saveUserFull'),
+            'version' => $oXmlReader->getAttribute('version') ?? '',
+            'projectname' => $oXmlReader->getAttribute('projectname') ?? '',
+            'saveDateTime' => $oXmlReader->getAttribute('saveDateTime') ?? '',
+            'saveUser' => $oXmlReader->getAttribute('saveUser') ?? '',
+            'saveUserFull' => $oXmlReader->getAttribute('saveUserFull') ?? '',
         );
     }
 

lizmap/modules/lizmap/lib/Project/QgisProject.php

@@ -1190,8 +1190,8 @@ protected function readXmlProject($qgs_path)
         $this->allProj4 = $project->getProjAsKeyArray();
         $this->themes = $project->getVisibilityPresetsAsKeyArray();
         $this->customProjectVariables = $project->properties->Variables !== null ? $project->properties->Variables->getVariablesAsKeyArray() : array();
-        $this->useLayerIDs = $project->properties->WMSUseLayerIDs !== null ? $project->properties->WMSUseLayerIDs : false;
-        $this->wfsLayerIds = $project->properties->WFSLayers !== null ? $project->properties->WFSLayers : array();
+        $this->useLayerIDs = $project->properties->WMSUseLayerIDs ?? false;
+        $this->wfsLayerIds = $project->properties->WFSLayers ?? array();
         $this->layers = $project->getLayersAsKeyArray();
         $this->relations = $project->getRelationsAsKeyArray();
         $this->relationsFields = $project->getRelationFieldsAsKeyArray();

tests/units/classes/Project/Qgis/ProjectInfoTest.php

@@ -262,4 +262,23 @@ public function testJsonEncode(): void
         $this->assertNotNull($json);
         $this->assertStringStartsWith('{"version":', $json);
     }
+
+    public function testProjetWithMissingProjetInfo(): void
+    {
+        $xml_path_invalid = __DIR__.'/../../Project/Ressources/project_empty_qgis_tag.qgs';
+
+        $oXml = App\XmlTools::xmlReaderFromFile($xml_path_invalid);
+        $project = Qgis\ProjectInfo::fromXmlReader($oXml);
+        // missing values on XML will be empty string
+        $emptyProps = array(
+            'version',
+            'projectname',
+            'saveDateTime',
+            'saveUser',
+            'saveUserFull',
+        );
+        foreach ($emptyProps as $prop ) {
+            $this->assertEmpty($project->{$prop});
+        }
+    }
 }