Skip to content

Commit 32389f8

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '4.3' into 4.4
* 4.3: Disable phpunit typehint patch on 4.3 branch Fix deprecation on 4.3
2 parents 11fab74 + f773217 commit 32389f8

File tree

360 files changed

+773
-672
lines changed

Some content is hidden

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

360 files changed

+773
-672
lines changed

‎.travis.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ env:
1919
global:
2020
- MIN_PHP=7.1.3
2121
- SYMFONY_PROCESS_PHP_TEST_BINARY=~/.phpenv/shims/php
22-
- SYMFONY_PHPUNIT_REMOVE_RETURN_TYPEHINT=1
2322
- MESSENGER_AMQP_DSN=amqp://localhost/%2f/messages
2423
- MESSENGER_REDIS_DSN=redis://127.0.0.1:7001/messages
2524

@@ -30,6 +29,9 @@ matrix:
3029
env: deps=high
3130
- php: 7.3
3231
env: deps=low
32+
- php: 7.4snapshot
33+
allow_failures:
34+
- php: 7.4snapshot
3335
fast_finish: true
3436

3537
cache:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class ContainerAwareEventManagerTest extends TestCase
2020
private $container;
2121
private $evm;
2222

23-
protected function setUp()
23+
protected function setUp(): void
2424
{
2525
$this->container = new Container();
2626
$this->evm = new ContainerAwareEventManager($this->container);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class DoctrineExtensionTest extends TestCase
2626
*/
2727
private $extension;
2828

29-
protected function setUp()
29+
protected function setUp(): void
3030
{
3131
parent::setUp();
3232

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class DoctrineChoiceLoaderTest extends TestCase
7373
*/
7474
private $obj3;
7575

76-
protected function setUp()
76+
protected function setUp(): void
7777
{
7878
$this->factory = $this->getMockBuilder('Symfony\Component\Form\ChoiceList\Factory\ChoiceListFactoryInterface')->getMock();
7979
$this->om = $this->getMockBuilder('Doctrine\Common\Persistence\ObjectManager')->getMock();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class CollectionToArrayTransformerTest extends TestCase
2525
*/
2626
private $transformer;
2727

28-
protected function setUp()
28+
protected function setUp(): void
2929
{
3030
$this->transformer = new CollectionToArrayTransformer();
3131
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class MergeDoctrineCollectionListenerTest extends TestCase
2828
private $factory;
2929
private $form;
3030

31-
protected function setUp()
31+
protected function setUp(): void
3232
{
3333
$this->collection = new ArrayCollection(['test']);
3434
$this->dispatcher = new EventDispatcher();
@@ -37,7 +37,7 @@ protected function setUp()
3737
->getForm();
3838
}
3939

40-
protected function tearDown()
40+
protected function tearDown(): void
4141
{
4242
$this->collection = null;
4343
$this->dispatcher = null;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ protected function getExtensions()
5050
];
5151
}
5252

53-
protected function setUp()
53+
protected function setUp(): void
5454
{
5555
$this->em = DoctrineTestHelper::createTestEntityManager();
5656

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class EntityTypeTest extends BaseTypeTest
6060

6161
protected static $supportedFeatureSetVersion = 304;
6262

63-
protected function setUp()
63+
protected function setUp(): void
6464
{
6565
$this->em = DoctrineTestHelper::createTestEntityManager();
6666
$this->emRegistry = $this->createRegistryMock('default', $this->em);
@@ -90,7 +90,7 @@ protected function setUp()
9090
}
9191
}
9292

93-
protected function tearDown()
93+
protected function tearDown(): void
9494
{
9595
parent::tearDown();
9696

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
class ManagerRegistryTest extends TestCase
1919
{
20-
public static function setUpBeforeClass()
20+
public static function setUpBeforeClass(): void
2121
{
2222
if (!class_exists('PHPUnit_Framework_TestCase')) {
2323
self::markTestSkipped('proxy-manager-bridge is not yet compatible with namespaced phpunit versions.');

‎src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class UniqueEntityValidatorTest extends ConstraintValidatorTestCase
5858

5959
protected $repositoryFactory;
6060

61-
protected function setUp()
61+
protected function setUp(): void
6262
{
6363
$this->repositoryFactory = new TestRepositoryFactory();
6464

0 commit comments

Comments
 (0)