Merge branch '4.3' into 4.4

* 4.3:
  Disable phpunit typehint patch on 4.3 branch
  Fix deprecation on 4.3

Author: nicolas-grekas

Tests/Store/CombinedStoreTest.php

@@ -60,7 +60,7 @@ public function getStore()
     /** @var CombinedStore */
     private $store;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->strategy = $this->getMockBuilder(StrategyInterface::class)->getMock();
         $this->store1 = $this->createMock(BlockingStoreInterface::class);

Tests/Store/MemcachedStoreTest.php

@@ -23,7 +23,7 @@ class MemcachedStoreTest extends AbstractStoreTest
 {
     use ExpiringStoreTestTrait;
 
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $memcached = new \Memcached();
         $memcached->addServer(getenv('MEMCACHED_HOST'), 11211);

Tests/Store/PredisStoreTest.php

@@ -16,7 +16,7 @@
  */
 class PredisStoreTest extends AbstractRedisStoreTest
 {
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         $redis = new \Predis\Client('tcp://'.getenv('REDIS_HOST').':6379');
         try {

Tests/Store/RedisArrayStoreTest.php

@@ -18,7 +18,7 @@
  */
 class RedisArrayStoreTest extends AbstractRedisStoreTest
 {
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         if (!class_exists('RedisArray')) {
             self::markTestSkipped('The RedisArray class is required.');

Tests/Store/RedisClusterStoreTest.php

@@ -18,7 +18,7 @@
  */
 class RedisClusterStoreTest extends AbstractRedisStoreTest
 {
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         if (!class_exists('RedisCluster')) {
             self::markTestSkipped('The RedisCluster class is required.');

Tests/Store/RedisStoreTest.php

@@ -20,7 +20,7 @@
  */
 class RedisStoreTest extends AbstractRedisStoreTest
 {
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         if (!@((new \Redis())->connect(getenv('REDIS_HOST')))) {
             $e = error_get_last();

Tests/Strategy/ConsensusStrategyTest.php

@@ -22,7 +22,7 @@ class ConsensusStrategyTest extends TestCase
     /** @var ConsensusStrategy */
     private $strategy;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->strategy = new ConsensusStrategy();
     }

Tests/Strategy/UnanimousStrategyTest.php

@@ -22,7 +22,7 @@ class UnanimousStrategyTest extends TestCase
     /** @var UnanimousStrategy */
     private $strategy;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->strategy = new UnanimousStrategy();
     }