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

Allow psr/log 2 and 3 #1184

Merged
merged 1 commit into from Jul 29, 2021
Merged

Allow psr/log 2 and 3 #1184

merged 1 commit into from Jul 29, 2021

Conversation

derrabus
Copy link
Member

Q A
Type improvement
BC Break no
Fixed issues N/A

@greg0ire
Copy link
Member

greg0ire commented Jul 18, 2021

The build is still using psr/log 1:

composer why-not psr/log 2
symfony/cache  v5.3.3  requires  psr/log (^1.1)

@derrabus
Copy link
Member Author

The build is still using psr/log 1:

Yes, because your CI tests against stable packages only. You can try this out locally by allowing a dev version of symfony/cache.

@greg0ire
Copy link
Member

Looks like waiting for the next patch version of Symfony would be enough to be sure it actually works: symfony/symfony#42174

Let's do that?

@derrabus
Copy link
Member Author

Sure, there's no need to rush anything, I guess.

weaverryan added a commit to symfony/maker-bundle that referenced this pull request Jul 19, 2021
This PR was squashed before being merged into the 1.0-dev branch.

Discussion
----------

[ci] handle new 5.4 branch & make dev tests green

- We don't have a `5.x` branch anymore on `symfony/symfony` - let's use the `dev` version specified in `versions.json` in place of the `5.x` branch.
- `SYMFONY_REQUIRE` env param in CI overrides the stability version specified for the run, resulting in a mixed set of versioned packages for each test. e.g. `symfony/http === v5.3.0` && `symfony/twig-bridge === v5.4.x-dev` even though `SYMFONY_SKELETON_STABILITY=dev` is set.
- some symfony components now use `psr/log` `^1 || ^2 || ^3` but `doctrine/migrations` still uses `^1`. For migrations tests, because `doctrine/orm` is required after the skeleton has been built, there is a version conflict w/ the locked, `psr/log:2.0` and `doctrine/migrations`. Calling `psr/log:^1.1.4` resolves this issue and allows the tests to run.

_contains ``@legacy`` tags for internal use:_
- Remove `psr/log:^1.1.4` as extraDependency in `MakeMigrationsTest` once doctrine/migrations#1184 is merged, tagged, and released.

Commits
-------

e6b691f [ci] handle new 5.4 branch & make dev tests green
@derrabus derrabus closed this Jul 27, 2021
@derrabus derrabus reopened this Jul 27, 2021
@derrabus
Copy link
Member Author

The PHPUnit job on PHP 8.0 passes with psr/log 3.0.0 now.

@goetas goetas added this to the 3.2.1 milestone Jul 27, 2021
@goetas
Copy link
Member

goetas commented Jul 28, 2021

@greg0ire since this is marked as improvement, shouldn't target 3.3.x?

@derrabus
Copy link
Member Author

I'm not familiar with the process here, sorry. Shall I relabel it as a bugfix? I don't think that simply widening the version range of a dependency really requires a minor version bump.

@greg0ire
Copy link
Member

It's more about stability than anything else: huge changes in the tests directory could go to the stable branch. If @derrabus says this change is not a big deal, then I think it's fine to merge it here.

@greg0ire greg0ire merged commit c13e866 into doctrine:3.2.x Jul 29, 2021
@greg0ire
Copy link
Member

Thanks @derrabus!

@derrabus derrabus deleted the allow/psr-log-2-3 branch July 29, 2021 08:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants