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

Merged branch '4.6' into main #481

Merged
merged 3 commits into from
Feb 17, 2025
Merged

Merged branch '4.6' into main #481

merged 3 commits into from
Feb 17, 2025

Conversation

adriendupuis
Copy link
Contributor

@adriendupuis adriendupuis commented Feb 14, 2025

Maintainer update:

Merge up of:


🎫 Issue n/a

Related PRs:

Description:

Merge 4.6 into main with fixed conflicts.

The "CI / Unit tests & SQLite integration tests (8.3) (pull_request) " failure is probably already there on main. TO BE CONFIRMED

For QA:

Documentation:

adriendupuis and others added 2 commits February 13, 2025 15:55
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
updated default image variation to auto rotate
@alongosz
Copy link
Member

Note: fixing CI via #482

@alongosz alongosz mentioned this pull request Feb 14, 2025
@alongosz alongosz changed the title Merge up 4.6 into main Merged branch '4.6' into main Feb 17, 2025
@alongosz alongosz added the Fast-forward merge PR should be merged in a fast-forward way label Feb 17, 2025
@alongosz alongosz merged commit 0627a2b into main Feb 17, 2025
16 checks passed
@alongosz alongosz deleted the main+4.6 branch February 17, 2025 13:08
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.

7 participants