8000 Merge branch '3.3' into 3.4 · weaverryan/symfony@154b004 · GitHub
[go: up one dir, main page]
Skip to content

Commit 154b004

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '3.3' into 3.4
* 3.3: [Bridge/PhpUnit] Fix blacklist Force phpunit-bridge update Update github PR template
2 parents 125934a + e64b8d3 commit 154b004

File tree

4 files changed

+5
-8
lines changed

4 files changed

+5
-8
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
| Q | A
22
| ------------- | ---
3-
| Branch? | master / 2.7, 2.8, 3.3, or 3.4 <!-- see comment below -->
3+
| Branch? | master for features / 2.7 up to 4.0 for bug fixes <!-- see below -->
44
| Bug fix? | yes/no
55
| New feature? | yes/no <!-- don't forget to 10000 update src/**/CHANGELOG.md files -->
66
| BC breaks? | yes/no
@@ -14,6 +14,5 @@
1414
- Bug fixes must be submitted against the lowest branch where they apply
1515
(lowest branches are regularly merged to upper ones so they get the fixes too).
1616
- Features and deprecations must be submitted against the master branch.
17-
- Please fill in this template according to the PR you're about to submit.
1817
- Replace this comment by a description of what your PR is solving.
1918
-->

‎phpunit

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env php
22
<?php
33

4-
// Cache-Id: https://github.com/symfony/phpunit-bridge/commit/6d344ad9be7566f875488aa14d905449716c06cf
4+
// Cache-Id: https://github.com/symfony/phpunit-bridge/commit/3646664aa952fe13e9a612a726cbb38e02249793
55

66
if (!file_exists(__DIR__.'/vendor/symfony/phpunit-bridge/bin/simple-phpunit')) {
77
echo "Unable to find the `simple-phpunit` script in `vendor/symfony/phpunit-bridge/bin/`.\nPlease run `composer update` before running this command.\n";

‎src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,9 @@ class SymfonyTestsListenerTrait
4747
public function __construct(array $mockedNamespaces = array())
4848
{
4949
if (class_exists('PHPUnit_Util_Blacklist')) {
50-
\PHPUnit_Util_Blacklist::$blacklistedClassNames['\Symfony\Bridge\PhpUnit\SymfonyTestsListener'] = 1;
51-
\PHPUnit_Util_Blacklist::$blacklistedClassNames['\Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListener'] = 1;
50+
\PHPUnit_Util_Blacklist::$blacklistedClassNames['\Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListenerTrait'] = 2;
5251
} else {
53-
Blacklist::$blacklistedClassNames['\Symfony\Bridge\PhpUnit\SymfonyTestsListener'] = 1;
54-
Blacklist::$blacklistedClassNames['\Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListener'] = 1;
52+
Blacklist::$blacklistedClassNames['\Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListenerTrait'] = 2;
5553
}
5654

5755
$warn = false;

‎src/Symfony/Bridge/PhpUnit/bin/simple-phpunit

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*/
1212

1313
// Please update when phpunit needs to be reinstalled with fresh deps:
14-
// Cache-Id-Version: 2016-10-20 14:00 UTC
14+
// Cache-Id-Version: 2017-11-22 09:00 UTC
1515

1616
error_reporting(-1);
1717

0 commit comments

Comments
 (0)
0