Skip to content

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 <[email protected]>
…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
@adriendupuis adriendupuis force-pushed the improved_contentservice_phpdoc branch from f550ba1 to ae12de3 Compare November 13, 2024 10:31
@sonarqubecloud
Copy link

@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
@adriendupuis adriendupuis requested a review from barw4 November 13, 2024 11:05
@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