Skip to content

Commit cb7b25a

Browse files
Merge branch '4.4'
* 4.4: Fix compatibility with PHPUnit 8 Disable phpunit typehint patch on 4.3 branch Fix deprecation on 4.3
2 parents 9d12d72 + 8754dad commit cb7b25a

17 files changed

+23
-23
lines changed

Tests/Collator/Verification/CollatorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323
class CollatorTest extends AbstractCollatorTest
2424
{
25-
protected function setUp()
25+
protected function setUp(): void
2626
{
2727
IntlTestHelper::requireFullIntl($this, false);
2828

Tests/Data/Bundle/Reader/BundleEntryReaderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class BundleEntryReaderTest extends TestCase
6262
'Foo' => 'Bar',
6363
];
6464

65-
protected function setUp()
65+
protected function setUp(): void
6666
{
6767
$this->readerImpl = $this->getMockBuilder('Symfony\Component\Intl\Data\Bundle\Reader\BundleEntryReaderInterface')->getMock();
6868
$this->reader = new BundleEntryReader($this->readerImpl);

Tests/Data/Bundle/Reader/IntlBundleReaderTest.php

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

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

Tests/Data/Bundle/Reader/JsonBundleReaderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class JsonBundleReaderTest extends TestCase
2424
*/
2525
private $reader;
2626

27-
protected function setUp()
27+
protected function setUp(): void
2828
{
2929
$this->reader = new JsonBundleReader();
3030
}

Tests/Data/Bundle/Reader/PhpBundleReaderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class PhpBundleReaderTest extends TestCase
2424
*/
2525
private $reader;
2626

27-
protected function setUp()
27+
protected function setUp(): void
2828
{
2929
$this->reader = new PhpBundleReader();
3030
}

Tests/Data/Bundle/Writer/JsonBundleWriterTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class JsonBundleWriterTest extends TestCase
3232
*/
3333
private $filesystem;
3434

35-
protected function setUp()
35+
protected function setUp(): void
3636
{
3737
$this->writer = new JsonBundleWriter();
3838
$this->directory = sys_get_temp_dir().'/JsonBundleWriterTest/'.mt_rand(1000, 9999);
@@ -41,7 +41,7 @@ protected function setUp()
4141
$this->filesystem->mkdir($this->directory);
4242
}
4343

44-
protected function tearDown()
44+
protected function tearDown(): void
4545
{
4646
$this->filesystem->remove($this->directory);
4747
}

Tests/Data/Bundle/Writer/PhpBundleWriterTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class PhpBundleWriterTest extends TestCase
3232
*/
3333
private $filesystem;
3434

35-
protected function setUp()
35+
protected function setUp(): void
3636
{
3737
$this->writer = new PhpBundleWriter();
3838
$this->directory = sys_get_temp_dir().'/PhpBundleWriterTest/'.mt_rand(1000, 9999);
@@ -41,7 +41,7 @@ protected function setUp()
4141
$this->filesystem->mkdir($this->directory);
4242
}
4343

44-
protected function tearDown()
44+
protected function tearDown(): void
4545
{
4646
$this->filesystem->remove($this->directory);
4747
}

Tests/Data/Bundle/Writer/TextBundleWriterTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class TextBundleWriterTest extends TestCase
3434
*/
3535
private $filesystem;
3636

37-
protected function setUp()
37+
protected function setUp(): void
3838
{
3939
$this->writer = new TextBundleWriter();
4040
$this->directory = sys_get_temp_dir().'/TextBundleWriterTest/'.mt_rand(1000, 9999);
@@ -43,7 +43,7 @@ protected function setUp()
4343
$this->filesystem->mkdir($this->directory);
4444
}
4545

46-
protected function tearDown()
46+
protected function tearDown(): void
4747
{
4848
$this->filesystem->remove($this->directory);
4949
}

Tests/Data/Util/LocaleScannerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class LocaleScannerTest extends TestCase
3232
*/
3333
private $scanner;
3434

35-
protected function setUp()
35+
protected function setUp(): void
3636
{
3737
$this->directory = sys_get_temp_dir().'/LocaleScannerTest/'.mt_rand(1000, 9999);
3838
$this->filesystem = new Filesystem();
@@ -62,7 +62,7 @@ protected function setUp()
6262
file_put_contents($this->directory.'/fr_child.txt', 'en_GB{%%Parent{"fr"}}');
6363
}
6464

65-
protected function tearDown()
65+
protected function tearDown(): void
6666
{
6767
$this->filesystem->remove($this->directory);
6868
}

Tests/Data/Util/RingBufferTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class RingBufferTest extends TestCase
2424
*/
2525
private $buffer;
2626

27-
protected function setUp()
27+
protected function setUp(): void
2828
{
2929
$this->buffer = new RingBuffer(2);
3030
}

0 commit comments

Comments
 (0)