Merge branch '2.7' into 2.8

* 2.7:
  fixed CS
This commit is contained in:
Fabien Potencier 2017-03-02 13:33:27 -08:00
commit a19e3fe970
13 changed files with 35 additions and 13 deletions

View File

@ -11,7 +11,9 @@
namespace Symfony\Bundle\FrameworkBundle\Tests;
class CustomPathBundle extends \Symfony\Component\HttpKernel\Bundle\Bundle
use Symfony\Component\HttpKernel\Bundle\Bundle;
class CustomPathBundle extends Bundle
{
public function getPath()
{

View File

@ -11,6 +11,8 @@
namespace Symfony\Bundle\FrameworkBundle\Tests;
class TestBundle extends \Symfony\Component\HttpKernel\Bundle\Bundle
use Symfony\Component\HttpKernel\Bundle\Bundle;
class TestBundle extends Bundle
{
}

View File

@ -11,9 +11,11 @@
namespace Symfony\Component\Form\Extension\Validator\Util;
use Symfony\Component\Form\Util\ServerParams as BaseServerParams;
/**
* @author Bernhard Schussek <bschussek@gmail.com>
*/
class ServerParams extends \Symfony\Component\Form\Util\ServerParams
class ServerParams extends BaseServerParams
{
}

View File

@ -14,8 +14,9 @@ namespace Symfony\Component\Form\Tests;
use Symfony\Component\Form\FormError;
use Symfony\Component\Form\FormView;
use Symfony\Component\Form\Extension\Csrf\CsrfExtension;
use Symfony\Component\Form\Test\FormIntegrationTestCase;
abstract class AbstractLayoutTest extends \Symfony\Component\Form\Test\FormIntegrationTestCase
abstract class AbstractLayoutTest extends FormIntegrationTestCase
{
protected $csrfTokenManager;
protected $testableFeatures = array();

View File

@ -11,10 +11,12 @@
namespace Symfony\Component\Form\Tests;
use Symfony\Component\Form\Test\FormPerformanceTestCase;
/**
* @author Bernhard Schussek <bschussek@gmail.com>
*/
class CompoundFormPerformanceTest extends \Symfony\Component\Form\Test\FormPerformanceTestCase
class CompoundFormPerformanceTest extends FormPerformanceTestCase
{
/**
* Create a compound form multiple times, as happens in a collection form.

View File

@ -11,10 +11,12 @@
namespace Symfony\Component\Form\Tests\Extension\Core\Type;
use Symfony\Component\Form\Test\TypeTestCase;
/**
* @author Bernhard Schussek <bschussek@gmail.com>
*/
abstract class BaseTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
abstract class BaseTypeTest extends TypeTestCase
{
public function testPassDisabledAsOption()
{

View File

@ -12,8 +12,9 @@
namespace Symfony\Component\Form\Tests\Extension\Core\Type;
use Symfony\Component\Form\CallbackTransformer;
use Symfony\Component\Form\Test\TypeTestCase;
class CheckboxTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
class CheckboxTypeTest extends TypeTestCase
{
/**
* @group legacy

View File

@ -11,9 +11,10 @@
namespace Symfony\Component\Form\Tests\Extension\Core\Type;
use Symfony\Component\Form\Test\TypeTestCase;
use Symfony\Component\Form\Tests\Fixtures\Author;
class CollectionTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
class CollectionTypeTest extends TypeTestCase
{
/**
* @group legacy

View File

@ -11,7 +11,9 @@
namespace Symfony\Component\Form\Tests\Extension\Core\Type;
class FileTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
use Symfony\Component\Form\Test\TypeTestCase;
class FileTypeTest extends TypeTestCase
{
/**
* @group legacy

View File

@ -11,7 +11,9 @@
namespace Symfony\Component\Form\Tests\Extension\Core\Type;
class PasswordTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
use Symfony\Component\Form\Test\TypeTestCase;
class PasswordTypeTest extends TypeTestCase
{
/**
* @group legacy

View File

@ -11,7 +11,9 @@
namespace Symfony\Component\Form\Tests\Extension\Core\Type;
class RepeatedTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
use Symfony\Component\Form\Test\TypeTestCase;
class RepeatedTypeTest extends TypeTestCase
{
protected $form;

View File

@ -12,8 +12,9 @@
namespace Symfony\Component\Form\Tests\Extension\Core\Type;
use Symfony\Component\Form\ChoiceList\View\ChoiceView;
use Symfony\Component\Form\Test\TypeTestCase;
class TimezoneTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
class TimezoneTypeTest extends TypeTestCase
{
/**
* @group legacy

View File

@ -48,7 +48,9 @@ namespace Symfony\Component\Security\Core\Tests\Util
namespace Acme\DemoBundle\Proxy\__CG__\Symfony\Component\Security\Core\Tests\Util
{
class TestObject extends \Symfony\Component\Security\Core\Tests\Util\TestObject
use Symfony\Component\Security\Core\Tests\Util\TestObject as BaseTestObject;
class TestObject extends BaseTestObject
{
}
}