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

Replace unmaintained SQL formatter dependency #1171

Merged
merged 1 commit into from May 22, 2020

Conversation

greg0ire
Copy link
Member

Closes #785

@greg0ire greg0ire force-pushed the drop-unmaintained-dependency branch from da86a35 to b4d75bd Compare May 22, 2020 13:07
HtmlHighlighter::HIGHLIGHT_ERROR => 'class="error"',
HtmlHighlighter::HIGHLIGHT_COMMENT => 'class="comment"',
HtmlHighlighter::HIGHLIGHT_VARIABLE => 'class="variable"',
], false));
Copy link
Member Author

Choose a reason for hiding this comment

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

With this change, I make the assumption that this isn't used in the CLI context. This allows us to add some tests.

@ostrolucky
Copy link
Member

I'm not sure it's ok to merge this into 1.12. I think at least @alcaeus would mind that. And I'm also leaning to merge this for master only, it might be too risky to do it in 1.12 while we don't have problems with current formatter. If we had some problems, eg. with php 8 compatibility, then I would be fully on board with this.

@alcaeus
Copy link
Member

alcaeus commented May 22, 2020

I'd advocate to only merge this into 2.1 for the upcoming release.

@greg0ire greg0ire force-pushed the drop-unmaintained-dependency branch from b4d75bd to 5f63db6 Compare May 22, 2020 13:31
@greg0ire
Copy link
Member Author

Fine by me.

@greg0ire greg0ire changed the base branch from 1.12.x to master May 22, 2020 13:32
@greg0ire greg0ire force-pushed the drop-unmaintained-dependency branch from 5f63db6 to 1d1fc3e Compare May 22, 2020 13:53
Tests/ProfilerTest.php Show resolved Hide resolved
@greg0ire greg0ire force-pushed the drop-unmaintained-dependency branch from 1d1fc3e to 108292b Compare May 22, 2020 15:06
@greg0ire greg0ire requested a review from ostrolucky May 22, 2020 15:08
Copy link
Member

@ostrolucky ostrolucky left a comment

Choose a reason for hiding this comment

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

Really good job @greg0ire, thx

@greg0ire greg0ire merged commit 94aac28 into doctrine:master May 22, 2020
@greg0ire greg0ire deleted the drop-unmaintained-dependency branch May 22, 2020 17:43
@greg0ire greg0ire self-assigned this May 22, 2020
@alcaeus alcaeus added this to the 2.1.0 milestone May 22, 2020
@alcaeus alcaeus changed the title Replace unmaintained dependency Replace unmaintained SQL formatter dependency May 22, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants