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

Require a polyfill instead of the cytpe extension #14267

Merged
merged 1 commit into from May 8, 2018

Conversation

@BackEndTea
Copy link
Contributor

@BackEndTea BackEndTea commented May 8, 2018

Before submitting pull request, please check that every commit:

  • Has proper Signed-Off-By
  • Has commit message which describes it
  • Is needed on it's own, if you have just minor fixes to previous commits, you can squash them

Ctype is an indirect dependency due to twig, and it isn't resolved there until a later version than we require.
By requiring the symfony polyfill for cytpe everything will still run, regardless of the ctype availability.

Twig will require this polyfill itself in a later version, but this makes sure we still allow earlier versions of twig to be used.

Signed-off-by: Gert de Pagter BackEndTea@gmail.com

Ctype is an indirect dependency due to twig,  and it isn't resolved there until a later version than we require.
By requiring the symfony polyfill for cytpe everything will still run, regardless of the ctype availability. 

Twig will require this polyfill itself in a later version, but this makes sure we still allow earlier versions of twig to be used.

Signed-off-by: Gert de Pagter <BackEndTea@gmail.com>
@mauriciofauth mauriciofauth merged commit b87f5ed into phpmyadmin:master May 8, 2018
2 of 4 checks passed
2 of 4 checks passed
DCO Expected "Gert de Pagter <backendtea@users.noreply.github.com>", but got "Gert de Pagter <BackEndTea@gmail.com>".
Details
continuous-integration/travis-ci/pr The Travis CI build failed
Details
Codacy/PR Quality Review Up to standards. A positive pull request.
Details
Scrutinizer Analysis: 7 new issues – Tests: passed
Details
@mauriciofauth
Copy link
Member

@mauriciofauth mauriciofauth commented May 8, 2018

Merged, thanks for your contribution!

@mauriciofauth mauriciofauth self-assigned this May 8, 2018
@mauriciofauth mauriciofauth added this to the 5.0.0 milestone May 8, 2018
@BackEndTea
Copy link
Contributor Author

@BackEndTea BackEndTea commented May 8, 2018

Thank you @mauriciofauth

@BackEndTea BackEndTea deleted the BackEndTea:patch-1 branch May 9, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants