Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 63.67%. Comparing base (fd68014) to head (ff7768b).
Report is 42 commits behind head on 6.x.

@@             Coverage Diff              @@
##                6.x   #14244      +/-   ##
============================================
+ Coverage     63.64%   63.67%   +0.03%     
+ Complexity    34648    34627      -21     
============================================
  Files          2276     2276              
  Lines        103648   103580      -68     
============================================
- Hits          65965    65954      -11     
+ Misses        37683    37626      -57     

@JonasLudwig1998 can you please rebase/merge and resolve the conflits? M6-alpha will be released in January so we should focus on refactoring PRs like this one.

@escopecz Done

I like the idea. Should I change the .gitignore directly within this PR?

Yep, let's do it here. I'll merge it right after.

Not sure how to get rid of the changes in the .ddev/commands/host/phpmyadmin file. Any idea?

I chatGPTed it:

When you add a file to .gitignore, it will prevent future changes to that file from being tracked. However, if the file is already being tracked by Git (i.e., it's in the repository's history), .gitignore alone won't stop it from showing up in your PR if it's modified. That's likely why you're still seeing changes to the file permissions (100644 → 100755) in your pull request.

Here's how to resolve the issue:

1. Remove the file from the Git index but keep it in your working directory:

   git rm --cached .ddev/commands/host/phpmyadmin

   This command removes the file from the Git index (i.e., it tells Git to stop tracking it) but leaves the file intact in your working directory.

2. Commit the change:

   git commit -m "Stop tracking the phpmyadmin file"

3. Push the changes to your branch:

   git push origin <your-branch-name>

After doing this, the file should no longer show up in your PR because it's no longer tracked by Git, and your .gitignore entry will prevent it from being tracked in the future.

Note: Make sure any necessary backup of the file is done if it’s crucial, as removing it from the Git index will mean it won't be included in future commits, even if altered.

The file is already there but with different permissions. I'm wondering whether we shouldn't just let the permissions be changed.

Would be fine with me. Is it even necessary to put the file in .gitignore then. I'm currently struggling with the problem that the file is now deleted. I'll make sure that everything works properly tomorrow

@escopecz Now I changed it back as it was. Is it fine this way, or should I change the permissions for the phpmyadmin file as they were before?