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

PSR-6 cache support #63

Merged
merged 12 commits into from
Feb 15, 2022
Merged

PSR-6 cache support #63

merged 12 commits into from
Feb 15, 2022

Conversation

boesing
Copy link
Contributor

@boesing boesing commented Feb 15, 2022

With the next major releases of doctrine/dbal and doctrine/orm, support for doctrine/cache will be dropped and only PSR-6 will be supported.

To prepare this repository for that change, I'd like to add support for PSR-6 caches in this PR.

NOTE

This also drops support for various package versions:

  • doctrine/common <3.2
  • doctrine/dbal <3.3
  • doctrine/migrations <3.4
  • doctrine/persistence <2.3

…ItemPoolInterface` instances

Signed-off-by: Maximilian Bösing <[email protected]>
Signed-off-by: Maximilian Bösing <[email protected]>
…on merges

In `Roave\PsrContainerDoctrine\ConfigurationFactory`, the `doctrine/orm` configuration is assembled. That configuration has a nested array configuration for `second_level_cache` which also have defaults.
Due to the array concatenation, nested array values are not applied and thus the configured defaults within the `ConfigurationFactory` are not applied.

Signed-off-by: Maximilian Bösing <[email protected]>
- drops support for `doctrine/common` <3.2
- drops support for `doctrine/dbal` <3.3
- drops support for `doctrine/migrations` <3.4
- drops support for `doctrine/persistence` <2.3

Signed-off-by: Maximilian Bösing <[email protected]>
doctrine already conflicts itself with versions of `doctrine/annotations` <1.13 in `doctrien/orm` 2.11.x

Signed-off-by: Maximilian Bösing <[email protected]>
psalm.xml.dist Show resolved Hide resolved
src/DriverFactory.php Outdated Show resolved Hide resolved
composer.json Outdated Show resolved Hide resolved
src/CacheFactory.php Show resolved Hide resolved
src/ConfigurationFactory.php Outdated Show resolved Hide resolved
src/AbstractFactory.php Show resolved Hide resolved
src/DriverFactory.php Outdated Show resolved Hide resolved
src/Exception/InvalidArgumentException.php Outdated Show resolved Hide resolved
test/ConfigurationFactoryTest.php Outdated Show resolved Hide resolved
This is also a requirement by `doctrine/*` components and thus can be omitted here since we do not implement that interface.

Signed-off-by: Maximilian Bösing <[email protected]>
Copy link
Member

@Ocramius Ocramius left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @boesing!

@Ocramius Ocramius added this to the 3.4.0 milestone Feb 15, 2022
@Ocramius Ocramius added the enhancement New feature or request label Feb 15, 2022
@Ocramius Ocramius self-assigned this Feb 15, 2022
@Ocramius Ocramius merged commit 9d47daf into Roave:3.4.x Feb 15, 2022
@boesing boesing deleted the feature/psr-cache branch February 15, 2022 16:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants