Merge Upstream #1
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…order() method (#2445) * [Tree] [NestedSet] Added option to reorder only direct children in reorder() method * Added entry in CHANGELOG * code style fixes * phpstan fixes
…ifying sort order separately for each field (#2446) * [Tree] [NestedSet] childrenQueryBuilder() to allow specifying sort order separately for each field * Added CHANGELOG entry * Fixed phpdoc of NestedTreeRepository::childrenQueryBuilder() * Code style fixes * childrenQueryBuilder() to allow specifying sort order separately for each field in ClosureTree as well. * [Tree] [NestedSet] [ClosureTree] Handle mismatching array sizes of sort fields and sort orders for childrenQueryBuilder() Co-authored-by: Fran Moreno <[email protected]>
…se (#2462) * Resolve Column Type when fetching Max Position from Database In SQLite it makes a difference if date columns are queried with '00:00:00' as timestring or without. MySQL seems to ignore the time completely. Unfortunately there is an asymmetry between SQL Types and PHP Objects: 'date' and 'datetime' Column point both to a DateTime Object in PHP. Therefore, we cannot derive the column type from the PHP Object. Luckily we can ask the ClassMetadata in Doctrine for the right type. * Fix CS * Update tests/Gedmo/Sortable/Fixture/ItemWithDateColumn.php Co-authored-by: Fran Moreno <[email protected]> * Update tests/Gedmo/Sortable/Fixture/ItemWithDateColumn.php Co-authored-by: Fran Moreno <[email protected]> * Update tests/Gedmo/Sortable/Fixture/ItemWithDateColumn.php Co-authored-by: Fran Moreno <[email protected]> * Update tests/Gedmo/Sortable/Fixture/ItemWithDateColumn.php Co-authored-by: Fran Moreno <[email protected]> * Update tests/Gedmo/Sortable/Fixture/ItemWithDateColumn.php Co-authored-by: Fran Moreno <[email protected]> * Add Type Hints * Add Changelog entry * Update tests/Gedmo/Sortable/SortableGroupTest.php Co-authored-by: Fran Moreno <[email protected]> * Save some CPU cycles by reducing amount of generated test data * Simplify Test by removing unnecessary Group Members Co-authored-by: Fran Moreno <[email protected]>
* Add datetime_immutable as valid type Slug fields already allow datetime and datetimez, all variations that instanciate \DateTime and DateTimeImmutable objects should work either. * Add tests for datetime_immutable fields * Remove duplicated tests * Update CHANGELOG.md Co-authored-by: Fran Moreno <[email protected]> Co-authored-by: Javier Spagnoletti <[email protected]>
…riendsofphp/php-cs-fixer" >= 3.10 in order to avoid inconsistencies with "phpdoc_order" rule
Having the main branch aliased to an older minor version causes issues. Aliasing it only for the major version makes the maintenance easier as it does not need to be updated for each minor release.
Removed an apostrophe
* Deprecate annotations support * Reverse the inheritance chain for the annotation and attribute driver interfaces * Flip the inheritance chain between annotation and attribute drivers for the extensions * Fill in links for deprecations * Refresh PHPStan
Bumps [isbang/compose-action](https://github.com/isbang/compose-action) from 2.0.0 to 2.0.1. - [Release notes](https://github.com/isbang/compose-action/releases) - [Commits](hoverkraft-tech/compose-action@v2.0.0...v2.0.1) --- updated-dependencies: - dependency-name: isbang/compose-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
* Update docs to reflect deprecated annotations * Update CHANGELOG.md Co-authored-by: Javier Spagnoletti <[email protected]> --------- Co-authored-by: Javier Spagnoletti <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.