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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix typos #1154

Merged
merged 1 commit into from Apr 21, 2020
Merged

Fix typos #1154

merged 1 commit into from Apr 21, 2020

Conversation

pgrimaud
Copy link
Contributor

Hello,

This PR will fix :

  • 1 typo in ConnectionFactory.php
  • 1 typo in DependencyInjection/Configuration.php

Cheers! 馃

@greg0ire
Copy link
Member

The build breaks because of squizlabs/PHP_CodeSniffer#2937

@ostrolucky
Copy link
Member

Apply to lower branch?

@SenseException
Copy link
Member

@ostrolucky The docs only show unmaintained and one upcoming version. There was probably confusion about the target branch. A website config should be added to master in another PR.

Composer is showing "dev-master": "2.0.x-dev" on master while there is a 2.0.x branch. Am I correct that 2.0.x should be the target?

@ostrolucky
Copy link
Member

We still maintain 1.12.x. I assume this patch fits there too? But indeed, we should fix website config. Anyways feel free to merge as is, this tiny change isn't blocker in my opinion.

@ostrolucky
Copy link
Member

Yeah can't even rebase myself as target is protected, let's merge

@ostrolucky ostrolucky merged commit 97c33f7 into doctrine:master Apr 21, 2020
@ostrolucky ostrolucky added this to the 2.1.0 milestone Apr 21, 2020
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

5 participants