Skip to content

Commit 028eaa4

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: fixed CS
2 parents 8a7d59f + 16a9bc5 commit 028eaa4

File tree

10 files changed

+26
-10
lines changed

10 files changed

+26
-10
lines changed

Extension/Validator/Util/ServerParams.php

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

1212
namespace Symfony\Component\Form\Extension\Validator\Util;
1313

14+
use Symfony\Component\Form\Util\ServerParams as BaseServerParams;
15+
1416
/**
1517
* @author Bernhard Schussek <[email protected]>
1618
*/
17-
class ServerParams extends \Symfony\Component\Form\Util\ServerParams
19+
class ServerParams extends BaseServerParams
1820
{
1921
}

Tests/AbstractLayoutTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@
1414
use Symfony\Component\Form\FormError;
1515
use Symfony\Component\Form\FormView;
1616
use Symfony\Component\Form\Extension\Csrf\CsrfExtension;
17+
use Symfony\Component\Form\Test\FormIntegrationTestCase;
1718

18-
abstract class AbstractLayoutTest extends \Symfony\Component\Form\Test\FormIntegrationTestCase
19+
abstract class AbstractLayoutTest extends FormIntegrationTestCase
1920
{
2021
protected $csrfTokenManager;
2122
protected $testableFeatures = array();

Tests/CompoundFormPerformanceTest.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;
1313

14+
use Symfony\Component\Form\Test\FormPerformanceTestCase;
15+
1416
/**
1517
* @author Bernhard Schussek <[email protected]>
1618
*/
17-
class CompoundFormPerformanceTest extends \Symfony\Component\Form\Test\FormPerformanceTestCase
19+
class CompoundFormPerformanceTest extends FormPerformanceTestCase
1820
{
1921
/**
2022
* Create a compound form multiple times, as happens in a collection form.

Tests/Extension/Core/Type/BaseTypeTest.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\Extension\Core\Type;
1313

14+
use Symfony\Component\Form\Test\TypeTestCase;
15+
1416
/**
1517
* @author Bernhard Schussek <[email protected]>
1618
*/
17-
abstract class BaseTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
19+
abstract class BaseTypeTest extends TypeTestCase
1820
{
1921
public function testPassDisabledAsOption()
2022
{

Tests/Extension/Core/Type/CheckboxTypeTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@
1212
namespace Symfony\Component\Form\Tests\Extension\Core\Type;
1313

1414
use Symfony\Component\Form\CallbackTransformer;
15+
use Symfony\Component\Form\Test\TypeTestCase;
1516

16-
class CheckboxTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
17+
class CheckboxTypeTest extends TypeTestCase
1718
{
1819
/**
1920
* @group legacy

Tests/Extension/Core/Type/CollectionTypeTest.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\Extension\Core\Type;
1313

14+
use Symfony\Component\Form\Test\TypeTestCase;
1415
use Symfony\Component\Form\Tests\Fixtures\Author;
1516

16-
class CollectionTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
17+
class CollectionTypeTest extends TypeTestCase
1718
{
1819
/**
1920
* @group legacy

Tests/Extension/Core/Type/FileTypeTest.php

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

1212
namespace Symfony\Component\Form\Tests\Extension\Core\Type;
1313

14-
class FileTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
14+
use Symfony\Component\Form\Test\TypeTestCase;
15+
16+
class FileTypeTest extends TypeTestCase
1517
{
1618
/**
1719
* @group legacy

Tests/Extension/Core/Type/PasswordTypeTest.php

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

1212
namespace Symfony\Component\Form\Tests\Extension\Core\Type;
1313

14-
class PasswordTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
14+
use Symfony\Component\Form\Test\TypeTestCase;
15+
16+
class PasswordTypeTest extends TypeTestCase
1517
{
1618
/**
1719
* @group legacy

Tests/Extension/Core/Type/RepeatedTypeTest.php

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

1212
namespace Symfony\Component\Form\Tests\Extension\Core\Type;
1313

14-
class RepeatedTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
14+
use Symfony\Component\Form\Test\TypeTestCase;
15+
16+
class RepeatedTypeTest extends TypeTestCase
1517
{
1618
protected $form;
1719

Tests/Extension/Core/Type/TimezoneTypeTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@
1212
namespace Symfony\Component\Form\Tests\Extension\Core\Type;
1313

1414
use Symfony\Component\Form\ChoiceList\View\ChoiceView;
15+
use Symfony\Component\Form\Test\TypeTestCase;
1516

16-
class TimezoneTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
17+
class TimezoneTypeTest extends TypeTestCase
1718
{
1819
/**
1920
* @group legacy

0 commit comments

Comments
 (0)