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

Run the phpunit-bridge from a PR #32887

Merged
merged 1 commit into from Aug 2, 2019

Conversation

@nicolas-grekas
Copy link
Member

commented Aug 2, 2019

Q A
Branch? 3.4
Bug fix? no
New feature? no
BC breaks? no
Deprecations? no
Tests pass? yes
Fixed tickets -
License MIT
Doc PR -

This PR allows testing a not-yet-merged patch on the phpunit-bridge with a PR on another. The process would be the following:

  • open a PR against branch the current feature-branch (4.4 currentlt) to make the phpunit-bridge polyfill a missing feature when needed
  • open a PR against branch e.g 3.4 with the fix applied, and with the SYMFONY_PHPUNIT_BRIDGE_PR set to the number of the previous PR in .travis.yaml
  • we'll merge 1. once things are validated, and you'll have to revert the change on .travis.yaml before we merge 2.

@nicolas-grekas nicolas-grekas added this to the 3.4 milestone Aug 2, 2019

@nicolas-grekas nicolas-grekas force-pushed the nicolas-grekas:phpunit-pr branch 10 times, most recently from 55fe51a to de3725d Aug 2, 2019

@nicolas-grekas

This comment has been minimized.

Copy link
Member Author

commented Aug 2, 2019

@nicolas-grekas nicolas-grekas force-pushed the nicolas-grekas:phpunit-pr branch from de3725d to 7bdd8ff Aug 2, 2019

@nicolas-grekas nicolas-grekas merged commit 7bdd8ff into symfony:3.4 Aug 2, 2019

2 of 3 checks passed

fabbot.io Doing some proofreading and checking your coding style.
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

nicolas-grekas added a commit that referenced this pull request Aug 2, 2019

minor #32887 Run the phpunit-bridge from a PR (nicolas-grekas)
This PR was merged into the 3.4 branch.

Discussion
----------

Run the phpunit-bridge from a PR

| Q             | A
| ------------- | ---
| Branch?       | 3.4
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Commits
-------

7bdd8ff Run the phpunit-bridge from a PR

@nicolas-grekas nicolas-grekas deleted the nicolas-grekas:phpunit-pr branch Aug 2, 2019

.travis.yml Show resolved Hide resolved

fabpot added a commit that referenced this pull request Aug 5, 2019

feature #32922 [PhpUnitBridge] make the bridge act as a polyfill for …
…newest PHPUnit features (nicolas-grekas)

This PR was merged into the 4.4 branch.

Discussion
----------

[PhpUnitBridge] make the bridge act as a polyfill for newest PHPUnit features

| Q             | A
| ------------- | ---
| Branch?       | 4.4
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

It's been quite a tunnel these days with @jderusse but here we are: the phpunit-bridge is now a fully working polyfill for newest PHPUnit features. All related PRs have been merged as "minor" but they are now ready for prime time, hence this PR that I'd like to be merged as "feature", to make it part of the changelog of Symfony 4.4.

As of version 4.4, the `simple-phpunit` script will run an augmented version of PHPUnit, that will provide the newest assertions of PHPUnit 8 even if you happen to be running PHPUnit 4.8+ (because you still need to test on PHP 5.5, as Symfony does.)

The bridge currently provides polyfills for the methods that are needed to make our tests pass on PHP 7.4 with no deprecations:
- #32878 #32907 `assertString(Not)ContainsString(IgnoringCase)`, `assertEqualsWithDelta` and `assert(Not)ContainsEquals`
- #32875 `expectException*`, which replace `@expectedException*` annotations
- #32846 `assertIs*`, which replace `assertInternalType`
- #32865 `create(Partial)Mock`
- #32931 `assert(File|Directory)(Not)(Exists|IsReadable|IsWritable)`

More polyfills might be added if you need them. PRs welcome as usual.

As of #32882, when the `SYMFONY_PHPUNIT_REMOVE_RETURN_TYPEHINT` is set to `1`, `simple-phpunit` will also [patch](https://github.com/symfony/symfony/blob/884669b83b131df8c3c41ad6517abe8cff7903b0/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php#L149) the source of PHPUnit 8 to remove the `void` return-type on `setUp*`/`tearDown*`. This is required when the same codebase must be tested against PHP 5.5 up to 7.4+ (as does our branch 3.4). For codebases that don't want or can't run their tests with `simple-phpunit` but want to run their PHP 5.5 tests with PHPUnit 8, the bridge provides a new `SetUpTearDownTrait` that allows a [smooth transition](https://github.com/php-cache/integration-tests/blob/c59a4d2dec1e462e5f5646e5fe102f403d6b8903/src/CachePoolTest.php#L21) to it.

Along the path, we also created a new tool for our CI: it's now possible to submit a new polyfill on the current feature-branch (4.4 these days) and test it with a PR on another branch. See #32887 for the patch.

All these new features have been added to achieve PHP 7.4 support on branch 3.4. There are still many deprecations that need to be fixed, all tracked in #32844. It should be a pretty nice list of "good first issues". Thank you @luispabon, @tweichart, @Alexander1000 BTW.

A big specific thank you to @jderusse for the help!

Let's rock PHP 7.4, can't wait for your PRs, see you on #32844 :)

Commits
-------

271211b [PhpUnitBridge] make the bridge act as a polyfill for newest PHPUnit features
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.