Skip to content

Commit 1254922

Browse files
Merge branch '2.8' into 3.2
* 2.8: Update to PHPUnit namespaces Minor typo fix messsagesData -> messagesData remove translation data collector when not usable
2 parents 8c71141 + 8ea05b6 commit 1254922

File tree

6 files changed

+13
-6
lines changed

6 files changed

+13
-6
lines changed

Tests/Comparator/ComparatorTest.php

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

1212
namespace Symfony\Component\Finder\Tests\Comparator;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Finder\Comparator\Comparator;
1516

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

Tests/Comparator/DateComparatorTest.php

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

1212
namespace Symfony\Component\Finder\Tests\Comparator;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Finder\Comparator\DateComparator;
1516

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

Tests/Comparator/NumberComparatorTest.php

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

1212
namespace Symfony\Component\Finder\Tests\Comparator;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Finder\Comparator\NumberComparator;
1516

16-
class NumberComparatorTest extends \PHPUnit_Framework_TestCase
17+
class NumberComparatorTest extends TestCase
1718
{
1819
/**
1920
* @dataProvider getConstructorTestData

Tests/GlobTest.php

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

1212
namespace Symfony\Component\Finder\Tests;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Finder\Glob;
1516

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

Tests/Iterator/IteratorTestCase.php

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

1212
namespace Symfony\Component\Finder\Tests\Iterator;
1313

14-
abstract class IteratorTestCase extends \PHPUnit_Framework_TestCase
14+
use PHPUnit\Framework\TestCase;
15+
16+
abstract class IteratorTestCase extends TestCase
1517
{
1618
protected function assertIterator($expected, \Traversable $iterator)
1719
{

Tests/Iterator/MultiplePcreFilterIteratorTest.php

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

1212
namespace Symfony\Component\Finder\Tests\Iterator;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Finder\Iterator\MultiplePcreFilterIterator;
1516

16-
class MultiplePcreFilterIteratorTest extends \PHPUnit_Framework_TestCase
17+
class MultiplePcreFilterIteratorTest extends TestCase
1718
{
1819
/**
1920
* @dataProvider getIsRegexFixtures

0 commit comments

Comments
 (0)