Merge branch '1.0' into 4.6

[glye]

Merge up of https://github.com/ibexa/post-install-ghsa-4h8f-c635-25p7/pull/1

[ViniTou]

but please avoid branch names like 1.0 for doing merges.

[glye]

@ViniTou What's preferred? "Merge remote-tracking branch 'origin/1.0' into 4.6"?

[ViniTou]

@glye
Scratch it, I didnt realise that we have 1.0 as stable branch in post-install.

Edit: But i still have my doubts, as I believe there is a chance that 1.0 branch will be deleted after this merge.

[mnocon]

I think something is wrong here.

Ibexa DXP 3.3 uses post-install 1.0:
https://github.com/ibexa/oss/blob/3.3/composer.json#L30

And the 1.0 branch should keep being a branch dedicated for 3.3

Right now it contains merged changes from 4.6:
https://github.com/ibexa/post-install/tree/1.0

So when we tag the package for 3.3 (from 1.0 branch) I think it will be incorrect!
For example, this should say https://github.com/ibexa/post-install/blob/1.0/composer.json#L63 1.0.x-dev, the PHP version is bumped to 7.4 as well

[glye]

Not sure what happened here. This PR looks OK to me, but the 1.0 branch looks borked indeed.

[ViniTou]

@glye
Didnt you maybe - merge 4.6 to 1.0, then during conflict resolution modified everything to remove changes from 4.6 and now try do merge it back again to 4.6? Anyway, this needs to be redone.

[alongosz]

@glye yes, 1.0 is essentially broken now. Moreover if you create PR merging 4.6 from 1.0, there's a chance that 1.0 gets automatically deleted after merging this PR. If you need to make a merge up PR, never use stable branch as a source, create tmp version of it.

[glye]

That's what I get from being stressed and following github instructions to the letter. Discussing fixes with Dawid & Marek

[glye]

New, separate PR for 4.6: #86