Skip to content

Commit 33bae93

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '2.7' into 2.8
* 2.7: Update to PHPUnit namespaces remove translation data collector when not usable
2 parents 2fee5bc + c9684ad commit 33bae93

File tree

666 files changed

+1526
-710
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

666 files changed

+1526
-710
lines changed

‎composer.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@
3030
"symfony/polyfill-php70": "~1.0",
3131
"symfony/polyfill-util": "~1.0"
3232
},
33+
"conflict": {
34+
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
35+
},
3336
"replace": {
3437
"symfony/asset": "self.version",
3538
"symfony/browser-kit": "self.version",

‎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/4f2aa873d2872a3b9782b25879fd628a0c418bc9
4+
// Cache-Id: https://github.com/symfony/phpunit-bridge/commit/d3157d942a4590121dfd23f9cadf519ca6ad4ac7
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/Doctrine/Test/DoctrineTestHelper.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use Doctrine\Common\Annotations\AnnotationReader;
1515
use Doctrine\ORM\Mapping\Driver\AnnotationDriver;
1616
use Doctrine\ORM\EntityManager;
17+
use PHPUnit\Framework\TestCase;
1718

1819
/**
1920
* Provides utility functions needed in tests.
@@ -30,7 +31,7 @@ class DoctrineTestHelper
3031
public static function createTestEntityManager()
3132
{
3233
if (!extension_loaded('pdo_sqlite')) {
33-
\PHPUnit_Framework_TestCase::markTestSkipped('Extension pdo_sqlite is required.');
34+
TestCase::markTestSkipped('Extension pdo_sqlite is required.');
3435
}
3536

3637
$config = new \Doctrine\ORM\Configuration();

‎src/Symfony/Bridge/Doctrine/Tests/ContainerAwareEventManagerTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@
1111

1212
namespace Symfony\Bridge\Doctrine\Tests;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Bridge\Doctrine\ContainerAwareEventManager;
1516
use Symfony\Component\DependencyInjection\Container;
1617

17-
class ContainerAwareEventManagerTest extends \PHPUnit_Framework_TestCase
18+
class ContainerAwareEventManagerTest extends TestCase
1819
{
1920
private $container;
2021
private $evm;

‎src/Symfony/Bridge/Doctrine/Tests/DataCollector/DoctrineDataCollectorTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@
1212
namespace Symfony\Bridge\Doctrine\Tests\DataCollector;
1313

1414
use Doctrine\DBAL\Platforms\MySqlPlatform;
15+
use PHPUnit\Framework\TestCase;
1516
use Symfony\Bridge\Doctrine\DataCollector\DoctrineDataCollector;
1617
use Symfony\Component\HttpFoundation\Request;
1718
use Symfony\Component\HttpFoundation\Response;
1819

19-
class DoctrineDataCollectorTest extends \PHPUnit_Framework_TestCase
20+
class DoctrineDataCollectorTest extends TestCase
2021
{
2122
public function testCollectConnections()
2223
{

‎src/Symfony/Bridge/Doctrine/Tests/DataFixtures/ContainerAwareLoaderTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@
1111

1212
namespace Symfony\Bridge\Doctrine\Tests\DataFixtures;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Bridge\Doctrine\DataFixtures\ContainerAwareLoader;
1516
use Symfony\Bridge\Doctrine\Tests\Fixtures\ContainerAwareFixture;
1617

17-
class ContainerAwareLoaderTest extends \PHPUnit_Framework_TestCase
18+
class ContainerAwareLoaderTest extends TestCase
1819
{
1920
public function testShouldSetContainerOnContainerAwareFixture()
2021
{

‎src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPassTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@
1111

1212
namespace Symfony\Bridge\Doctrine\Tests\DependencyInjection\CompilerPass;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Bridge\Doctrine\DependencyInjection\CompilerPass\RegisterEventListenersAndSubscribersPass;
1516
use Symfony\Component\DependencyInjection\ContainerBuilder;
1617
use Symfony\Component\DependencyInjection\Definition;
1718

18-
class RegisterEventListenersAndSubscribersPassTest extends \PHPUnit_Framework_TestCase
19+
class RegisterEventListenersAndSubscribersPassTest extends TestCase
1920
{
2021
/**
2122
* @expectedException \InvalidArgumentException

‎src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,15 @@
1111

1212
namespace Symfony\Bridge\Doctrine\Tests\DependencyInjection;
1313

14+
use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
1415
use Symfony\Component\DependencyInjection\Definition;
1516
use Symfony\Component\DependencyInjection\ContainerBuilder;
1617
use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
1718

1819
/**
1920
* @author Fabio B. Silva <fabio.bat.silva@gmail.com>
2021
*/
21-
class DoctrineExtensionTest extends \PHPUnit_Framework_TestCase
22+
class DoctrineExtensionTest extends TestCase
2223
{
2324
/**
2425
* @var \Symfony\Bridge\Doctrine\DependencyInjection\AbstractDoctrineExtension

‎src/Symfony/Bridge/Doctrine/Tests/DoctrineOrmTestCase.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
@trigger_error('The '.__NAMESPACE__.'\DoctrineOrmTestCase class is deprecated since version 2.4 and will be removed in 3.0. Use Symfony\Bridge\Doctrine\Test\DoctrineTestHelper class instead.', E_USER_DEPRECATED);
1515

1616
use Doctrine\ORM\EntityManager;
17+
use PHPUnit\Framework\TestCase;
1718
use Symfony\Bridge\Doctrine\Test\DoctrineTestHelper;
1819

1920
/**
@@ -22,7 +23,7 @@
2223
* @deprecated since version 2.4, to be removed in 3.0.
2324
* Use {@link DoctrineTestHelper} instead.
2425
*/
25-
abstract class DoctrineOrmTestCase extends \PHPUnit_Framework_TestCase
26+
abstract class DoctrineOrmTestCase extends TestCase
2627
{
2728
/**
2829
* @return EntityManager

‎src/Symfony/Bridge/Doctrine/Tests/ExpressionLanguage/DoctrineParserCacheTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@
1111

1212
namespace Symfony\Bridge\Doctrine\Tests\ExpressionLanguage;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Bridge\Doctrine\ExpressionLanguage\DoctrineParserCache;
1516

16-
class DoctrineParserCacheTest extends \PHPUnit_Framework_TestCase
17+
class DoctrineParserCacheTest extends TestCase
1718
{
1819
public function testFetch()
1920
{

0 commit comments

Comments
 (0)