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

Add Symfony 5 to the long list of supported versions #211

Merged
merged 17 commits into from Mar 2, 2020

Conversation

damienalexandre
Copy link
Contributor

@damienalexandre damienalexandre commented Nov 25, 2019

This PR supersede #209 as the logic is different, here we keep support for all versions by using class_exists a lot.

Thanks to @lyrixx I discovered that the setUp() : void from PHPUnit issue is normally managed by the PHPUnit Bridge! 馃槏

@damienalexandre
Copy link
Contributor Author

@damienalexandre damienalexandre commented Nov 25, 2019

Tests are ok on PHP 7.1+, still need to figure out why SYMFONY_PHPUNIT_REMOVE_RETURN_TYPEHINT=1 does not work as expected.

@Seldaek
Copy link
Member

@Seldaek Seldaek commented Nov 26, 2019

Thanks for the work, let me know once you figure out the build failure and I happily merge..

@damienalexandre
Copy link
Contributor Author

@damienalexandre damienalexandre commented Nov 26, 2019

Would it be okay to drop PHP 5.4?

I cannot make it work with it:

  • the phpunit bridge > 4.2 is PHP 5.5 only
  • the methods replacing "expectedException" annotations are not poly-filled in phpunit bridge <= 4.2

This is the last and only blocker for this PR.

image

@damienalexandre
Copy link
Contributor Author

@damienalexandre damienalexandre commented Nov 28, 2019

Tests are now green but PHP 5.4 has been removed. It does not mean the bundle does not work anymore, it's just we can't run the tests on this version.

Tests/Twig/IntegrationTest.php Outdated Show resolved Hide resolved
EventListener/ClickjackingListener.php Outdated Show resolved Hide resolved
CHANGELOG.md Outdated Show resolved Hide resolved
@damienalexandre
Copy link
Contributor Author

@damienalexandre damienalexandre commented Dec 3, 2019

Thanks for the review, I just switched all the return to a clear Exception message, added a test, added the final annotation and bumped PHP minimal version in composer.

@damienalexandre
Copy link
Contributor Author

@damienalexandre damienalexandre commented Dec 4, 2019

Twig is now bumped to 1.38, which is the minimal version we can use with support for the namespaced classes.

I also changed all Twig related code to use the namespaced classes to avoid some errors and make it "clean".

PHP Fatal error: Declaration of Nelmio\SecurityBundle\Twig\TokenParser\AbstractCSPParser::parse(Twig_Token $token) must be compatible with Twig\TokenParser\TokenParserInterface::parse(Twig\Token $token) in /**/NelmioSecurityBundle/Twig/TokenParser/AbstractCSPParser.php on line 57

This was referenced Dec 6, 2019
composer.json Outdated Show resolved Hide resolved
@damienalexandre
Copy link
Contributor Author

@damienalexandre damienalexandre commented Jan 20, 2020

Hi there, is there anything I can do to help going forward with this PR? It's good to go from my point of view 馃憤

Thank you!

This was referenced Feb 18, 2020
Copy link
Collaborator

@romainneutron romainneutron left a comment

I propose to merge this and release in version 3.0

@damienalexandre
Copy link
Contributor Author

@damienalexandre damienalexandre commented Mar 2, 2020

It's perfectly okay to release a minor version, there is not BC break here.

@romainneutron
Copy link
Collaborator

@romainneutron romainneutron commented Mar 2, 2020

@damienalexandre Could you rebase this one?

@damienalexandre
Copy link
Contributor Author

@damienalexandre damienalexandre commented Mar 2, 2020

Rebased 馃憤

If a squash is needed as well, let me know 馃槈

@romainneutron romainneutron merged commit a6ea1b9 into nelmio:master Mar 2, 2020
1 check failed
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