Update QgisProject.php

[Antoviscomi]

Ticket : fix #3809

[Antoviscomi]

@nworr this PR it's also related to #3810

[laurentj]

Thank you for this patch.

But this is not enough, there are other line of code with the same issue. I will provide an other patch.

[3liz-bot]

The backport to release_3_5 failed:

The process '/usr/bin/git' failed with exit code 128

stderr

error: commit 82e403466015ff8ff465c687251e6e4f5d98523a is a merge but no -m option was given.
fatal: cherry-pick failed

stdout

Auto-merging lizmap/modules/lizmap/lib/Project/QgisProject.php
[backport-3811-to-release_3_5 a8f6a7b30] Update QgisProject.php
 Author: Antonio Viscomi <Antoviscomi@users.noreply.github.com>
 Date: Fri Jul 28 12:24:53 2023 +0200
 1 file changed, 1 insertion(+), 1 deletion(-)

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release_3_5 release_3_5
# Navigate to the new working tree
cd .worktrees/backport-release_3_5
# Create a new branch
git switch --create backport-3811-to-release_3_5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 10cf3dd03e51798689d5bde127f1d031dcbcdcee,82e403466015ff8ff465c687251e6e4f5d98523a
# Push it to GitHub
git push --set-upstream origin backport-3811-to-release_3_5
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release_3_5

Then, create a pull request where the base branch is release_3_5 and the compare/head branch is backport-3811-to-release_3_5.

[3liz-bot]

The backport to release_3_6 failed:

The process '/usr/bin/git' failed with exit code 128

stderr

error: commit 82e403466015ff8ff465c687251e6e4f5d98523a is a merge but no -m option was given.
fatal: cherry-pick failed

stdout

Auto-merging lizmap/modules/lizmap/lib/Project/QgisProject.php
[backport-3811-to-release_3_6 93c4ca066] Update QgisProject.php
 Author: Antonio Viscomi <Antoviscomi@users.noreply.github.com>
 Date: Fri Jul 28 12:24:53 2023 +0200
 1 file changed, 1 insertion(+), 1 deletion(-)

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release_3_6 release_3_6
# Navigate to the new working tree
cd .worktrees/backport-release_3_6
# Create a new branch
git switch --create backport-3811-to-release_3_6
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 10cf3dd03e51798689d5bde127f1d031dcbcdcee,82e403466015ff8ff465c687251e6e4f5d98523a
# Push it to GitHub
git push --set-upstream origin backport-3811-to-release_3_6
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release_3_6

Then, create a pull request where the base branch is release_3_6 and the compare/head branch is backport-3811-to-release_3_6.

[Antoviscomi]

Thank you for this patch.

But this is not enough, there are other line of code with the same issue. I will provide an other patch.

Many thanks @laurentj

[laurentj]

patchs backported manually into Lizmap 3.5 and 3.6.