Merge branch '4.3' into 4.4

nicolas-grekas · nicolas-grekas · commit 35f472b7b3e9 · 2019-08-08T14:07:40.000+02:00
* 4.3:
  Disable phpunit typehint patch on 4.3 branch
  Fix deprecation on 4.3
diff --git a/Tests/OptionsResolverTest.php b/Tests/OptionsResolverTest.php
@@ -24,7 +24,7 @@ class OptionsResolverTest extends TestCase
      */
     private $resolver;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->resolver = new OptionsResolver();
     }

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class OptionsResolverTest extends TestCase`
`24`	`24`	`*/`
`25`	`25`	`private $resolver;`
`26`	`26`
`27`		`- protected function setUp()`
	`27`	`+ protected function setUp(): void`
`28`	`28`	`{`
`29`	`29`	`$this->resolver = new OptionsResolver();`
`30`	`30`	`}`