Merge release 2.2.0 into 3.0.x #178
Merged
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
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
This file is not needed for a end user
Upgrade to Psalm 4.3.1 and use ramsey/composer-install
Psalm is reporting an apparenlty unexistent issue reported in vimeo/psalm#5193, for now this ignores those issues.
Fix psalm issue
Merge up
Co-authored-by: Grégoire Paris <postmaster@greg0ire.fr>
Co-authored-by: Alexander M. Turek <me@derrabus.de>
Deprecate using doctrine/cache in favour of PSR-6
Instead of returning strings, TestFileDriver::loadMappingFile now returns array<string, ClassMetadata> as the interface says.
Analyze tests directory with Psalm
Remove unnecessary github actions branch filters
Define `Proxy` as generic
Add class-string typehint for getAssociationTargetClass
Describe $orderBy more accurately
|
@greg0ire does the 3.0.x branch still make sense at this point? |
|
One thing is for sure, it shouldn't be the default branch From what I see here, it seems to be mostly about type declarations: 2.2.x...3.0.x I can try performing the merge up with imerge like last time, and then we should start thinking about releasing 3.0 so that it's not a pain every time 😅 |
|
I updated the default branch. |
greg0ire
force-pushed
the
2.2.x-merge-up-into-3.0.x_60a019593b1c08.06542033
branch
5 times, most recently
from
1c1f752 to
3fde89b
Compare
greg0ire
force-pushed
the
2.2.x-merge-up-into-3.0.x_60a019593b1c08.06542033
branch
from
3fde89b to
a38ed90
Compare
There is only one directory for which this will work.
alcaeus
force-pushed
the
2.2.x-merge-up-into-3.0.x_60a019593b1c08.06542033
branch
from
a38ed90 to
2fe30da
Compare
We have found that there were lots of conflicts during the last merge up to 3.0. Reaching level 7 on lower branches reduces differences between them and thus the amount of conflits for future merges. It should also ensure that no new PHPStan error are discovered when merging up because they are detected at level 7 and not at level 5.
|
Let's merge #180 before proceeding with this one. |
Phpstan lvl 7
|
Done, let me merge 2.2.x it into this branch now. |
greg0ire
force-pushed
the
2.2.x-merge-up-into-3.0.x_60a019593b1c08.06542033
branch
4 times, most recently
from
634f836 to
fdea89e
Compare
greg0ire
previously approved these changes
May 16, 2021
…3.0.x_60a019593b1c08.06542033
greg0ire
force-pushed
the
2.2.x-merge-up-into-3.0.x_60a019593b1c08.06542033
branch
from
fdea89e to
89319ee
Compare
greg0ire
approved these changes
May 16, 2021
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.
Release Notes for 2.2.0
This release introduces compatibility with doctrine/cache 2.0, adds support for PSR-6 caching in metadata factories, and adds support for proxy class name resolvers to reduce coupling to doctrine/common proxies.
2.2.0
Improvement
177: Merge release 2.1.1 into 2.2.x thanks to @github-actions[bot]
171: Make Classmetadata generic thanks to @franmomu
169: Use psalm errorLevel 3 thanks to @franmomu
168: Use class-string for parameters thanks to @franmomu
167: Generics for cmf thanks to @greg0ire
166: Make getCache method internal thanks to @alcaeus
165: Describe $orderBy more accurately thanks to @greg0ire
164: Define
Proxyas generic thanks to @franmomu173: Fix annotation template and add more phpdoc thanks to @franmomu
Enhancement
Deprecation,Improvement