Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 4.6 into main #451

Merged
merged 3 commits into from
Nov 13, 2024
Merged

Merge 4.6 into main #451

merged 3 commits into from
Nov 13, 2024

Conversation

adriendupuis
Copy link
Contributor

@adriendupuis adriendupuis commented Nov 13, 2024

🎫 Issue IBX-XXXXX

Related PRs:

Description:

Merge 4.6 into main to solve conflicts from #379 (mainly due to the removal from ContentService of deprecated functions).

For QA:

N/A

Documentation:

NOP

adriendupuis and others added 2 commits November 5, 2024 15:38
For more details see #379

Key changes:

* [PHPDoc] Aligned ContentService PHPDocs with API reference requirements

* [PHPStan] Aligned baseline with the changes-baseline*.neon


---------

Co-Authored-By: Konrad Oboza <konrad.oboza@ibexa.co>
…s ancestors (#439)

For more details see https://issues.ibexa.co/browse/IBX-8418 and #439

Key changes:

* Fixed removing orphaned draft when trashing or deleting its parent or ancestor location
# Conflicts:
#	phpstan-baseline-7.4.neon
#	phpstan-baseline-gte-8.0.neon
#	phpstan-baseline.neon
#	src/contracts/Repository/ContentService.php
Copy link

sonarcloud bot commented Nov 13, 2024

@adriendupuis adriendupuis changed the title [PHPDoc] Improved ContentService doc for API reference Merge 4.6 into main Nov 13, 2024
@alongosz alongosz added the Fast-forward merge PR should be merged in a fast-forward way label Nov 13, 2024
@adriendupuis adriendupuis marked this pull request as ready for review November 13, 2024 11:04
@alongosz alongosz merged commit ae12de3 into main Nov 13, 2024
18 checks passed
@alongosz alongosz deleted the improved_contentservice_phpdoc branch November 13, 2024 11:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Fast-forward merge PR should be merged in a fast-forward way
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants