This PR makes our phpunit bridge compatible with all namespaced versions of phpunit, from 4.8.35 to 6.
It takes another approach than#21668 and#21221, thus replaces them.
Tested locally : tests pass when using phpunit 5.7, and fails with v6.0 because our own test suite is not yet compatible with it - but at least it runs nice.
If this were handled as usual Symfony component, we would consider some changes to be BC breaks. But in this specific case - a phpunit bridge - it makes no sense to me to apply the bc policy here. I added@final and@internal annotations to make this clearer.

nicolas-grekas added this to the3.3 milestone

Feb 20, 2017

carsonbot added Status: Needs Review Feature labels

Feb 20, 2017

nicolas-grekas force-pushed thephpunit6-bridge branch from4c982a4 to7f12fbeCompare

February 20, 2017 21:48

Taluu reviewed

Feb 21, 2017

View reviewed changes

src/Symfony/Bridge/PhpUnit/SymfonyTestsListenerTrait.php

		\PHPUnit_Util_Blacklist::$blacklistedClassNames['\Symfony\Bridge\PhpUnit\SymfonyTestsListener'] =1;
		}else {
		Blacklist::$blacklistedClassNames['\Symfony\Bridge\PhpUnit\DeprecationErrorHandler'] =1;
		Blacklist::$blacklistedClassNames['\Symfony\Bridge\PhpUnit\SymfonyTestsListener'] =1;

Copy link

Contributor

TaluuFeb 21, 2017

Choose a reason for hiding this comment

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

why not using::class here ?

Copy link

MemberAuthor

nicolas-grekasFeb 21, 2017•
edited
Loading

Choose a reason for hiding this comment

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

In fact I fogot that the bridge needs to be PHP 5.3 compatible, so I removed all the::class

nicolas-grekas force-pushed thephpunit6-bridge branch from7f12fbe to64ef41eCompare

February 21, 2017 07:05

Copy link

Contributor

peterrehm commentedFeb 21, 2017•
edited
Loading

Awesome 👍

nicolas-grekas force-pushed thephpunit6-bridge branch from64ef41e tof6915c2Compare

February 21, 2017 08:42

[Bridge/PhpUnit] Add PHPUnit 6 support

9e0745c

nicolas-grekas force-pushed thephpunit6-bridge branch fromf6915c2 to9e0745cCompare

February 21, 2017 08:45

nicolas-grekas commented

Feb 21, 2017

View reviewed changes

src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php

		return;
		}

		$UtilPrefix =class_exists('PHPUnit_Util_ErrorHandler') ?'PHPUnit_Util_' :'PHPUnit\Util\\';

Copy link

MemberAuthor

nicolas-grekasFeb 21, 2017•
edited
Loading

Choose a reason for hiding this comment

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

Note that I used this upper-first convention in this PR for the compatibility variables that hold the class names to use

This was referencedFeb 21, 2017

[RFC][PHPUnitBridge] Cross compatibility between PHPUnit 5 and 6#21668

Closed

[PHPUnitBridge] Cross compatibility between PHPUnit 5 and 6#21221

Closed

[PhpUnitBridge] not compatible with latest phpunit#21125

Closed

Copy link

Contributor

garak commentedFeb 21, 2017

+1 for not applying BC policy

Copy link

Member

stof commentedFeb 21, 2017

What are the BC breaks here ?

Copy link

MemberAuthor

nicolas-grekas commentedFeb 21, 2017•
edited
Loading

@stof the type hints on the listener methods and the parent class of the TextUI classes - which all switch to namespaces when phpunit 6 is used

Copy link

Member

stof commentedFeb 21, 2017

Well, the typehints are OK IMO. People are not expected to extend these classes, and the calling code is PHPUnit itself. And the signature comes from PHPUnit anyway.
As long as there is no BC break for people registering the listener in their phpunit.xml config, this is fine with me.

Copy link

MemberAuthor

nicolas-grekas commentedFeb 21, 2017

Same to me, that's what is done here :)

nicolas-grekas mentioned this pull request

Feb 21, 2017

Use PHPUnit 6.0 on PHP 7.* test lines#21698

Merged

nicolas-grekas merged commit9e0745c intosymfony:master

Feb 21, 2017

nicolas-grekas added a commit that referenced this pull request

Feb 21, 2017

feature#21694[Bridge/PhpUnit] Add PHPUnit 6 support (nicolas-grekas)

6c0d5c9

This PR was merged into the 3.3-dev branch.Discussion----------[Bridge/PhpUnit] Add PHPUnit 6 support| Q             | A| ------------- | ---| Branch?       | master| Bug fix?      | no| New feature?  | yes| BC breaks?    | no| Deprecations? | no| Tests pass?   | yes| Fixed tickets |#21125| License       | MIT| Doc PR        | -This PR makes our phpunit bridge compatible with all namespaced versions of phpunit, from 4.8.35 to 6.It takes another approach than#21668 and#21221, thus replaces them.Tested locally : tests pass when using phpunit 5.7, and fails with v6.0 because our own test suite is not yet compatible with it - but at least it runs nice.If this were handled as usual Symfony component, we would consider some changes to be BC breaks. But in this specific case - a phpunit bridge - it makes no sense to me to apply the bc policy here. I added `@final` and `@internal` annotations to make this clearer.Commits-------9e0745c [Bridge/PhpUnit] Add PHPUnit 6 support

nicolas-grekas deleted the phpunit6-bridge branch

February 21, 2017 10:51

nicolas-grekas added a commit that referenced this pull request

Feb 21, 2017

minor#21698Use PHPUnit 6.0 on PHP 7.* test lines (nicolas-grekas)

9a2122d

This PR was merged into the 2.7 branch.Discussion----------Use PHPUnit 6.0 on PHP 7.* test lines| Q             | A| ------------- | ---| Branch?       | 2.7| Bug fix?      | no| New feature?  | no| BC breaks?    | no| Deprecations? | no| Tests pass?   | need#21694 first| Fixed tickets | -| License       | MIT| Doc PR        | -Commits-------96ecd3c Use PHPUnit 6.0 on PHP 7.* test lines

Copy link

Contributor

garak commentedMar 6, 2017

Just tried the latest update with phpunit 6, I'm gettingPHP Fatal error: Uncaught Error: Class 'PHPUnit_Util_ErrorHandler' not found in vendor/symfony/phpunit-bridge/DeprecationErrorHandler.php:73