Skip to content

Commit 432c4de

Browse files
jderussejderusse
committed
Remove use of ForwardCompatTrait
1 parent 6189410 commit 432c4de

File tree

675 files changed

+522
-2514
lines changed

Some content is hidden

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

675 files changed

+522
-2514
lines changed

‎.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ env:
1717
global:
1818
- MIN_PHP=5.5.9
1919
- SYMFONY_PROCESS_PHP_TEST_BINARY=~/.phpenv/versions/5.6/bin/php
20+
- PHPUNIT_INJECT_FORWARD_COMPAT=1
21+
- PHPUNIT_REMOVE_RETURN_TYPEHINT=1
2022

2123
matrix:
2224
include:

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,14 @@
1313

1414
use PHPUnit\Framework\TestCase;
1515
use Symfony\Bridge\Doctrine\ContainerAwareEventManager;
16-
use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
1716
use Symfony\Component\DependencyInjection\Container;
1817

1918
class ContainerAwareEventManagerTest extends TestCase
2019
{
21-
use ForwardCompatTestTrait;
22-
2320
private $container;
2421
private $evm;
2522

26-
private function doSetUp()
23+
protected function setUp()
2724
{
2825
$this->container = new Container();
2926
$this->evm = new ContainerAwareEventManager($this->container);

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,12 @@
1313

1414
use PHPUnit\Framework\TestCase;
1515
use Symfony\Bridge\Doctrine\DependencyInjection\CompilerPass\RegisterEventListenersAndSubscribersPass;
16-
use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
1716
use Symfony\Component\DependencyInjection\ContainerBuilder;
1817
use Symfony\Component\DependencyInjection\Definition;
1918
use Symfony\Component\DependencyInjection\Reference;
2019

2120
class RegisterEventListenersAndSubscribersPassTest extends TestCase
2221
{
23-
use ForwardCompatTestTrait;
24-
2522
public function testExceptionOnAbstractTaggedSubscriber()
2623
{
2724
$this->expectException('InvalidArgumentException');

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,11 @@
44

55
use PHPUnit\Framework\TestCase;
66
use Symfony\Bridge\Doctrine\DependencyInjection\CompilerPass\RegisterMappingsPass;
7-
use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
87
use Symfony\Component\DependencyInjection\ContainerBuilder;
98
use Symfony\Component\DependencyInjection\Definition;
109

1110
class RegisterMappingsPassTest extends TestCase
1211
{
13-
use ForwardCompatTestTrait;
14-
1512
public function testNoDriverParmeterException()
1613
{
1714
$this->expectException('InvalidArgumentException');

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Bridge\Doctrine\Tests\DependencyInjection;
1313

1414
use PHPUnit\Framework\TestCase;
15-
use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
1615
use Symfony\Component\DependencyInjection\ContainerBuilder;
1716
use Symfony\Component\DependencyInjection\Definition;
1817
use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
@@ -22,14 +21,12 @@
2221
*/
2322
class DoctrineExtensionTest extends TestCase
2423
{
25-
use ForwardCompatTestTrait;
26-
2724
/**
2825
* @var \Symfony\Bridge\Doctrine\DependencyInjection\AbstractDoctrineExtension
2926
*/
3027
private $extension;
3128

32-
private function doSetUp()
29+
protected function setUp()
3330
{
3431
parent::setUp();
3532

‎src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/DoctrineChoiceLoaderTest.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
use Symfony\Bridge\Doctrine\Form\ChoiceList\DoctrineChoiceLoader;
1919
use Symfony\Bridge\Doctrine\Form\ChoiceList\EntityLoaderInterface;
2020
use Symfony\Bridge\Doctrine\Form\ChoiceList\IdReader;
21-
use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
2221
use Symfony\Component\Form\ChoiceList\ArrayChoiceList;
2322
use Symfony\Component\Form\ChoiceList\Factory\ChoiceListFactoryInterface;
2423

@@ -27,8 +26,6 @@
2726
*/
2827
class DoctrineChoiceLoaderTest extends TestCase
2928
{
30-
use ForwardCompatTestTrait;
31-
3229
/**
3330
* @var ChoiceListFactoryInterface|\PHPUnit_Framework_MockObject_MockObject
3431
*/
@@ -74,7 +71,7 @@ class DoctrineChoiceLoaderTest extends TestCase
7471
*/
7572
private $obj3;
7673

77-
private function doSetUp()
74+
protected function setUp()
7875
{
7976
$this->factory = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\Factory\ChoiceListFactoryInterface')->getMock();
8077
$this->om = $this->getMockBuilder('Doctrine\Common\Persistence\ObjectManager')->getMock();

‎src/Symfony/Bridge/Doctrine/Tests/Form/DataTransformer/CollectionToArrayTransformerTest.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,18 @@
1414
use Doctrine\Common\Collections\ArrayCollection;
1515
use PHPUnit\Framework\TestCase;
1616
use Symfony\Bridge\Doctrine\Form\DataTransformer\CollectionToArrayTransformer;
17-
use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
1817

1918
/**
2019
* @author Bernhard Schussek <bschussek@gmail.com>
2120
*/
2221
class CollectionToArrayTransformerTest extends TestCase
2322
{
24-
use ForwardCompatTestTrait;
25-
2623
/**
2724
* @var CollectionToArrayTransformer
2825
*/
2926
private $transformer;
3027

31-
private function doSetUp()
28+
protected function setUp()
3229
{
3330
$this->transformer = new CollectionToArrayTransformer();
3431
}

‎src/Symfony/Bridge/Doctrine/Tests/Form/EventListener/MergeDoctrineCollectionListenerTest.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,21 @@
1414
use Doctrine\Common\Collections\ArrayCollection;
1515
use PHPUnit\Framework\TestCase;
1616
use Symfony\Bridge\Doctrine\Form\EventListener\MergeDoctrineCollectionListener;
17-
use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
1817
use Symfony\Component\EventDispatcher\EventDispatcher;
1918
use Symfony\Component\Form\FormBuilder;
2019
use Symfony\Component\Form\FormEvent;
2120
use Symfony\Component\Form\FormEvents;
2221

2322
class MergeDoctrineCollectionListenerTest extends TestCase
2423
{
25-
use ForwardCompatTestTrait;
26-
2724
/** @var \Doctrine\Common\Collections\ArrayCollection */
2825
private $collection;
2926
/** @var \Symfony\Component\EventDispatcher\EventDispatcher */
3027
private $dispatcher;
3128
private $factory;
3229
private $form;
3330

34-
private function doSetUp()
31+
protected function setUp()
3532
{
3633
$this->collection = new ArrayCollection(['test']);
3734
$this->dispatcher = new EventDispatcher();
@@ -40,7 +37,7 @@ private function doSetUp()
4037
->getForm();
4138
}
4239

43-
private function doTearDown()
40+
protected function tearDown()
4441
{
4542
$this->collection = null;
4643
$this->dispatcher = null;

‎src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypePerformanceTest.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
use Symfony\Bridge\Doctrine\Form\DoctrineOrmExtension;
1616
use Symfony\Bridge\Doctrine\Test\DoctrineTestHelper;
1717
use Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdEntity;
18-
use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
1918
use Symfony\Component\Form\Extension\Core\CoreExtension;
2019
use Symfony\Component\Form\Test\FormPerformanceTestCase;
2120

@@ -24,8 +23,6 @@
2423
*/
2524
class EntityTypePerformanceTest extends FormPerformanceTestCase
2625
{
27-
use ForwardCompatTestTrait;
28-
2926
const ENTITY_CLASS = 'Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdEntity';
3027

3128
/**
@@ -53,7 +50,7 @@ protected function getExtensions()
5350
];
5451
}
5552

56-
private function doSetUp()
53+
protected function setUp()
5754
{
5855
$this->em = DoctrineTestHelper::createTestEntityManager();
5956

‎src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
use Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdNoToStringEntity;
2929
use Symfony\Bridge\Doctrine\Tests\Fixtures\SingleStringCastableIdEntity;
3030
use Symfony\Bridge\Doctrine\Tests\Fixtures\SingleStringIdEntity;
31-
use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
3231
use Symfony\Component\Form\ChoiceList\View\ChoiceGroupView;
3332
use Symfony\Component\Form\ChoiceList\View\ChoiceView;
3433
use Symfony\Component\Form\Forms;
@@ -37,8 +36,6 @@
3736

3837
class EntityTypeTest extends BaseTypeTest
3938
{
40-
use ForwardCompatTestTrait;
41-
4239
const TESTED_TYPE = 'Symfony\Bridge\Doctrine\Form\Type\EntityType';
4340

4441
const ITEM_GROUP_CLASS = 'Symfony\Bridge\Doctrine\Tests\Fixtures\GroupableEntity';
@@ -62,7 +59,7 @@ class EntityTypeTest extends BaseTypeTest
6259

6360
protected static $supportedFeatureSetVersion = 304;
6461

65-
private function doSetUp()
62+
protected function setUp()
6663
{
6764
$this->em = DoctrineTestHelper::createTestEntityManager();
6865
$this->emRegistry = $this->createRegistryMock('default', $this->em);
@@ -92,7 +89,7 @@ private function doSetUp()
9289
}
9390
}
9491

95-
private function doTearDown()
92+
protected function tearDown()
9693
{
9794
parent::tearDown();
9895

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy