Skip to content

Commit 2a597d6

Browse files
Merge branch '3.2'
* 3.2: Fix typo in process error message Update to PHPUnit namespaces Minor typo fix messsagesData -> messagesData remove translation data collector when not usable
2 parents e314b6c + aeae853 commit 2a597d6

File tree

51 files changed

+106
-50
lines changed

Some content is hidden

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

51 files changed

+106
-50
lines changed

Test/FormIntegrationTestCase.php

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

1212
namespace Symfony\Component\Form\Test;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Form\Forms;
1516
use Symfony\Component\Form\FormFactoryInterface;
1617

1718
/**
1819
* @author Bernhard Schussek <bschussek@gmail.com>
1920
*/
20-
abstract class FormIntegrationTestCase extends \PHPUnit_Framework_TestCase
21+
abstract class FormIntegrationTestCase extends TestCase
2122
{
2223
/**
2324
* @var FormFactoryInterface

Tests/AbstractExtensionTest.php

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

1212
namespace Symfony\Component\Form\Tests;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Form\AbstractExtension;
1516
use Symfony\Component\Form\Tests\Fixtures\FooType;
1617

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

Tests/AbstractFormTest.php

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

1212
namespace Symfony\Component\Form\Tests;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Form\FormBuilder;
1516
use Symfony\Component\EventDispatcher\EventDispatcher;
1617
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
1718

18-
abstract class AbstractFormTest extends \PHPUnit_Framework_TestCase
19+
abstract class AbstractFormTest extends TestCase
1920
{
2021
/**
2122
* @var EventDispatcherInterface

Tests/AbstractRequestHandlerTest.php

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

1212
namespace Symfony\Component\Form\Tests;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Form\FormError;
1516
use Symfony\Component\Form\FormFactory;
1617
use Symfony\Component\Form\Forms;
@@ -19,7 +20,7 @@
1920
/**
2021
* @author Bernhard Schussek <bschussek@gmail.com>
2122
*/
22-
abstract class AbstractRequestHandlerTest extends \PHPUnit_Framework_TestCase
23+
abstract class AbstractRequestHandlerTest extends TestCase
2324
{
2425
/**
2526
* @var RequestHandlerInterface

Tests/ButtonBuilderTest.php

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

1212
namespace Symfony\Component\Form\Tests;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Form\ButtonBuilder;
1516

1617
/**
1718
* @author Alexander Cheprasov <cheprasov.84@ya.ru>
1819
*/
19-
class ButtonBuilderTest extends \PHPUnit_Framework_TestCase
20+
class ButtonBuilderTest extends TestCase
2021
{
2122
public function getValidNames()
2223
{

Tests/ButtonTest.php

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

1212
namespace Symfony\Component\Form\Tests;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Form\ButtonBuilder;
1516
use Symfony\Component\Form\FormBuilder;
1617

1718
/**
1819
* @author Bernhard Schussek <bschussek@gmail.com>
1920
*/
20-
class ButtonTest extends \PHPUnit_Framework_TestCase
21+
class ButtonTest extends TestCase
2122
{
2223
private $dispatcher;
2324

Tests/CallbackTransformerTest.php

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

1212
namespace Symfony\Component\Form\Tests;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Form\CallbackTransformer;
1516

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

Tests/ChoiceList/AbstractChoiceListTest.php

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

1212
namespace Symfony\Component\Form\Tests\ChoiceList;
1313

14+
use PHPUnit\Framework\TestCase;
15+
1416
/**
1517
* @author Bernhard Schussek <bschussek@gmail.com>
1618
*/
17-
abstract class AbstractChoiceListTest extends \PHPUnit_Framework_TestCase
19+
abstract class AbstractChoiceListTest extends TestCase
1820
{
1921
/**
2022
* @var \Symfony\Component\Form\ChoiceList\ChoiceListInterface

Tests/ChoiceList/Factory/CachingFactoryDecoratorTest.php

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

1212
namespace Symfony\Component\Form\Tests\ChoiceList\Factory;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Form\ChoiceList\Factory\CachingFactoryDecorator;
1516

1617
/**
1718
* @author Bernhard Schussek <bschussek@gmail.com>
1819
*/
19-
class CachingFactoryDecoratorTest extends \PHPUnit_Framework_TestCase
20+
class CachingFactoryDecoratorTest extends TestCase
2021
{
2122
/**
2223
* @var \PHPUnit_Framework_MockObject_MockObject

Tests/ChoiceList/Factory/DefaultChoiceListFactoryTest.php

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

1212
namespace Symfony\Component\Form\Tests\ChoiceList\Factory;
1313

14+
use PHPUnit\Framework\TestCase;
1415
use Symfony\Component\Form\ChoiceList\ArrayChoiceList;
1516
use Symfony\Component\Form\ChoiceList\ChoiceListInterface;
1617
use Symfony\Component\Form\ChoiceList\Factory\DefaultChoiceListFactory;
@@ -19,7 +20,7 @@
1920
use Symfony\Component\Form\ChoiceList\View\ChoiceListView;
2021
use Symfony\Component\Form\ChoiceList\View\ChoiceView;
2122

22-
class DefaultChoiceListFactoryTest extends \PHPUnit_Framework_TestCase
23+
class DefaultChoiceListFactoryTest extends TestCase
2324
{
2425
private $obj1;
2526

0 commit comments

Comments
 (0)