8000 Revert "bug #22925 [PhpUnitBridge] Adjust PHPUnit class_alias check by nicolas-grekas · Pull Request #22930 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

Revert "bug #22925 [PhpUnitBridge] Adjust PHPUnit class_alias check #22930

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
May 28, 2017
Merged

Revert "bug #22925 [PhpUnitBridge] Adjust PHPUnit class_alias check #22930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
F 8000 ailed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Revert "bug #22925 [PhpUnitBridge] Adjust PHPUnit class_alias check t… 
…o also check for namespaced class (GawainLynch)"

This reverts commit cfb090d, reversing
changes made to 4e8f403.
  • Loading branch information
@nicolas-grekas
nicolas-grekas committed May 28, 2017
commit 934c0c0e9c71421a36ed1fef6f2efa305548b36f
2 changes: 1 addition & 1 deletion src/Symfony/Bridge/PhpUnit/SymfonyTestsListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
use PHPUnit\Framework\TestSuite;
use PHPUnit\Framework\Warning;

if (class_exists('PHPUnit_Framework_BaseTestListener') && !class_exists('PHPUnit\Framework\BaseTestListener')) {
if (class_exists('PHPUnit_Framework_BaseTestListener')) {
class_alias('Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListener', 'Symfony\Bridge\PhpUnit\SymfonyTestsListener');

return;
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bridge/PhpUnit/TextUI/Command.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

use PHPUnit\TextUI\Command as BaseCommand;

if (class_exists('PHPUnit_TextUI_Command') && !class_exists('PHPUnit\TextUI\Command')) {
if (class_exists('PHPUnit_TextUI_Command')) {
class_alias('Symfony\Bridge\PhpUnit\Legacy\Command', 'Symfony\Bridge\PhpUnit\TextUI\Command');

return;
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bridge/PhpUnit/TextUI/TestRunner.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
use PHPUnit\TextUI\TestRunner as BaseRunner;
use Symfony\Bridge\PhpUnit\SymfonyTestsListener;

if (class_exists('PHPUnit_TextUI_Command') && !class_exists('PHPUnit\TextUI\Command')) {
if (class_exists('PHPUnit_TextUI_Command')) {
class_alias('Symfony\Bridge\PhpUnit\Legacy\TestRunner', 'Symfony\Bridge\PhpUnit\TextUI\TestRunner');

return;
Expand Down
0