[Disposable] Enhanced contracts PHPDoc #479
Conversation
For more details see #463 Key changes: * Enhance `DateMetadata::TRASHED` phpdoc * Enhance `Criterion::getSpecifications()` phpdoc * Enhance `Specifications` phpdoc * Capable.php: Fix phpdoc summary * VersionBuilder.php: Fix phpdoc summary, arrays and self usages * ConstraintViolationAdapter's PHPDoc: Add a summary, reword description * Enhance `Criterion::getSpecifications()` phpdoc * Enhance `DateMetadata::TRASHED` phpdoc * Enhance `DateMetadata` phpdoc * Enhance `UserMetadata` phpdoc * Enhance `DateMetadata` phpdoc * Enhance `Capable` phpdoc * Enhance `Criterion` phpdoc * Enhance `UserMetadata` phpdoc (fix typo) * Enhance `UserMetadata` phpdoc * Enhance `FieldType\Generic\Type` phpdoc * Enhance `Limitation\Type` phpdoc * LocationService: Fix count() phpdoc * Enhance `LocationService` phpdoc * Enhance `Location` phpdoc * Enhance `Location` phpdoc: @deprecated can't be nested nor used inline. * Enhance `Location` phpdoc: Add an internal link * Enhance `ValueObject` phpdoc * Enhance `FieldType\Generic\Type` phpdoc: Fix internal links * Enhance `FieldType\FieldType` phpdoc: Fix code blocks * `Limitation\Type`: type array keys * ValueObject: Format desc
There was a problem hiding this comment.
@adriendupuis Product packages undergo Ibexa GitFlow. We merge up the changes, instead of cherry-picking them, so we keep consistent chain of changes history and avoid re-introducing the same change multiple times.
What you need to do is:
- checkout current version of
4.6andmainbranches
in your local checkout of ibexa/core:
git checkout 4.6
git pull
git status # make sure it's clean
git checkout main
git pull
git status # make sure it's clean- merge 4.6
git merge 4.6- Resolve conflicts - if these are not just yours conflict, but coming from other devs - ask for help.
- Commit changes with the commit message
Merged branch '4.6' - Either
a) push directly
git push origin mainb) if you're not sure if you did it right, you can update this PR to be a merging PR, meaning including your merge commit from point 4. Then I can merge it in a fast forward way
git push origin --force-with-lease enh-phpdoc
|
adriendupuis
changed the title
@alongosz This is a disposable PR just to study the conflicts for incoming #480 |
|
I think I manage to solve conflicts. Solution used in #481 |
Related PRs:
Description:
See #463
For QA:
Documentation: