Disable phpunit typehint patch on 4.3 branch

jderusse · jderusse · commit 8524e966d840 · 2019-08-08T11:29:19.000+02:00
diff --git a/Tests/CacheWarmer/AnnotationsCacheWarmerTest.php b/Tests/CacheWarmer/AnnotationsCacheWarmerTest.php
@@ -17,15 +17,15 @@ class AnnotationsCacheWarmerTest extends TestCase
 {
     private $cacheDir;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->cacheDir = sys_get_temp_dir().'/'.uniqid();
         $fs = new Filesystem();
         $fs->mkdir($this->cacheDir);
         parent::setUp();
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $fs = new Filesystem();
         $fs->remove($this->cacheDir);
diff --git a/Tests/CacheWarmer/TemplatePathsCacheWarmerTest.php b/Tests/CacheWarmer/TemplatePathsCacheWarmerTest.php
@@ -38,7 +38,7 @@ class TemplatePathsCacheWarmerTest extends TestCase
 
     private $tmpDir;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->templateFinder = $this
             ->getMockBuilder(TemplateFinderInterface::class)
@@ -59,7 +59,7 @@ protected function setUp()
         $this->filesystem->mkdir($this->tmpDir);
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $this->filesystem->remove($this->tmpDir);
     }
diff --git a/Tests/Command/CacheClearCommand/CacheClearCommandTest.php b/Tests/Command/CacheClearCommand/CacheClearCommandTest.php
@@ -28,14 +28,14 @@ class CacheClearCommandTest extends TestCase
     /** @var Filesystem */
     private $fs;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->fs = new Filesystem();
         $this->kernel = new TestAppKernel('test', true);
         $this->fs->mkdir($this->kernel->getProjectDir());
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $this->fs->remove($this->kernel->getProjectDir());
     }
diff --git a/Tests/Command/TranslationDebugCommandTest.php b/Tests/Command/TranslationDebugCommandTest.php
@@ -127,15 +127,15 @@ public function testDebugInvalidDirectory()
         $tester->execute(['locale' => 'en', 'bundle' => 'dir']);
     }
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->fs = new Filesystem();
         $this->translationDir = sys_get_temp_dir().'/'.uniqid('sf_translation', true);
         $this->fs->mkdir($this->translationDir.'/translations');
         $this->fs->mkdir($this->translationDir.'/templates');
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $this->fs->remove($this->translationDir);
     }
diff --git a/Tests/Command/TranslationUpdateCommandTest.php b/Tests/Command/TranslationUpdateCommandTest.php
@@ -105,15 +105,15 @@ public function testWriteMessagesForSpecificDomain()
         $this->assertRegExp('/Translation files were successfully updated./', $tester->getDisplay());
     }
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->fs = new Filesystem();
         $this->translationDir = sys_get_temp_dir().'/'.uniqid('sf_translation', true);
         $this->fs->mkdir($this->translationDir.'/translations');
         $this->fs->mkdir($this->translationDir.'/templates');
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $this->fs->remove($this->translationDir);
     }
diff --git a/Tests/Command/YamlLintCommandTest.php b/Tests/Command/YamlLintCommandTest.php
@@ -181,13 +181,13 @@ private function getKernelAwareApplicationMock()
         return $application;
     }
 
-    protected function setUp()
+    protected function setUp(): void
     {
         @mkdir(sys_get_temp_dir().'/yml-lint-test');
         $this->files = [];
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         foreach ($this->files as $file) {
             if (file_exists($file)) {
diff --git a/Tests/Console/Descriptor/TextDescriptorTest.php b/Tests/Console/Descriptor/TextDescriptorTest.php
@@ -15,12 +15,12 @@
 
 class TextDescriptorTest extends AbstractDescriptorTest
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         putenv('COLUMNS=121');
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         putenv('COLUMNS');
     }
diff --git a/Tests/Controller/ControllerNameParserTest.php b/Tests/Controller/ControllerNameParserTest.php
@@ -23,15 +23,15 @@ class ControllerNameParserTest extends TestCase
 {
     protected $loader;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->loader = new ClassLoader();
         $this->loader->add('TestBundle', __DIR__.'/../Fixtures');
         $this->loader->add('TestApplication', __DIR__.'/../Fixtures');
         $this->loader->register();
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $this->loader->unregister();
         $this->loader = null;
diff --git a/Tests/DependencyInjection/Compiler/CachePoolPassTest.php b/Tests/DependencyInjection/Compiler/CachePoolPassTest.php
@@ -26,7 +26,7 @@ class CachePoolPassTest extends TestCase
 {
     private $cachePoolPass;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->cachePoolPass = new CachePoolPass();
     }
diff --git a/Tests/DependencyInjection/Compiler/DataCollectorTranslatorPassTest.php b/Tests/DependencyInjection/Compiler/DataCollectorTranslatorPassTest.php
@@ -22,7 +22,7 @@ class DataCollectorTranslatorPassTest extends TestCase
     private $container;
     private $dataCollectorTranslatorPass;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->container = new ContainerBuilder();
         $this->dataCollectorTranslatorPass = new DataCollectorTranslatorPass();
diff --git a/Tests/DependencyInjection/Compiler/WorkflowGuardListenerPassTest.php b/Tests/DependencyInjection/Compiler/WorkflowGuardListenerPassTest.php
@@ -25,7 +25,7 @@ class WorkflowGuardListenerPassTest extends TestCase
     private $container;
     private $compilerPass;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->container = new ContainerBuilder();
         $this->compilerPass = new WorkflowGuardListenerPass();
diff --git a/Tests/Functional/AbstractWebTestCase.php b/Tests/Functional/AbstractWebTestCase.php
@@ -22,12 +22,12 @@ public static function assertRedirect($response, $location)
         self::assertEquals('http://localhost'.$location, $response->headers->get('Location'));
     }
 
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         static::deleteTmpDir();
     }
 
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
         static::deleteTmpDir();
     }
diff --git a/Tests/Functional/CachePoolClearCommandTest.php b/Tests/Functional/CachePoolClearCommandTest.php
@@ -20,7 +20,7 @@
  */
 class CachePoolClearCommandTest extends AbstractWebTestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         static::bootKernel(['test_case' => 'CachePoolClear', 'root_config' => 'config.yml']);
     }
diff --git a/Tests/Functional/ConfigDebugCommandTest.php b/Tests/Functional/ConfigDebugCommandTest.php
@@ -23,7 +23,7 @@ class ConfigDebugCommandTest extends AbstractWebTestCase
 {
     private $application;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $kernel = static::createKernel(['test_case' => 'ConfigDump', 'root_config' => 'config.yml']);
         $this->application = new Application($kernel);
diff --git a/Tests/Functional/ConfigDumpReferenceCommandTest.php b/Tests/Functional/ConfigDumpReferenceCommandTest.php
@@ -23,7 +23,7 @@ class ConfigDumpReferenceCommandTest extends AbstractWebTestCase
 {
     private $application;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $kernel = static::createKernel(['test_case' => 'ConfigDump', 'root_config' => 'config.yml']);
         $this->application = new Application($kernel);
diff --git a/Tests/Templating/GlobalVariablesTest.php b/Tests/Templating/GlobalVariablesTest.php
@@ -23,7 +23,7 @@ class GlobalVariablesTest extends TestCase
     private $container;
     private $globals;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->container = new Container();
         $this->globals = new GlobalVariables($this->container);
diff --git a/Tests/Templating/Helper/AssetsHelperTest.php b/Tests/Templating/Helper/AssetsHelperTest.php
@@ -24,7 +24,7 @@ class AssetsHelperTest extends TestCase
 {
     private $helper;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $fooPackage = new Package(new StaticVersionStrategy('42', '%s?v=%s'));
         $barPackage = new Package(new StaticVersionStrategy('22', '%s?%s'));
diff --git a/Tests/Templating/Helper/FormHelperDivLayoutTest.php b/Tests/Templating/Helper/FormHelperDivLayoutTest.php
@@ -55,7 +55,7 @@ protected function getExtensions()
         ]);
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $this->engine = null;
 
diff --git a/Tests/Templating/Helper/FormHelperTableLayoutTest.php b/Tests/Templating/Helper/FormHelperTableLayoutTest.php
@@ -100,7 +100,7 @@ protected function getExtensions()
         ]);
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $this->engine = null;
 
diff --git a/Tests/Templating/Helper/RequestHelperTest.php b/Tests/Templating/Helper/RequestHelperTest.php
@@ -23,7 +23,7 @@ class RequestHelperTest extends TestCase
 {
     protected $requestStack;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->requestStack = new RequestStack();
         $request = new Request();
diff --git a/Tests/Templating/Helper/SessionHelperTest.php b/Tests/Templating/Helper/SessionHelperTest.php
@@ -25,7 +25,7 @@ class SessionHelperTest extends TestCase
 {
     protected $requestStack;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $request = new Request();
 
@@ -39,7 +39,7 @@ protected function setUp()
         $this->requestStack->push($request);
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $this->requestStack = null;
     }
diff --git a/Tests/Templating/TemplateFilenameParserTest.php b/Tests/Templating/TemplateFilenameParserTest.php
@@ -22,12 +22,12 @@ class TemplateFilenameParserTest extends TestCase
 {
     protected $parser;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->parser = new TemplateFilenameParser();
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $this->parser = null;
     }
diff --git a/Tests/Templating/TemplateNameParserTest.php b/Tests/Templating/TemplateNameParserTest.php
@@ -23,7 +23,7 @@ class TemplateNameParserTest extends TestCase
 {
     protected $parser;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\KernelInterface')->getMock();
         $kernel
@@ -40,7 +40,7 @@ protected function setUp()
         $this->parser = new TemplateNameParser($kernel);
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $this->parser = null;
     }
diff --git a/Tests/Translation/TranslatorTest.php b/Tests/Translation/TranslatorTest.php
@@ -24,13 +24,13 @@ class TranslatorTest extends TestCase
 {
     protected $tmpDir;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->tmpDir = sys_get_temp_dir().'/sf_translation';
         $this->deleteTmpDir();
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $this->deleteTmpDir();
     }

Original file line number	Diff line number	Diff line change
`@@ -17,15 +17,15 @@ class AnnotationsCacheWarmerTest extends TestCase`
`17`	`17`	`{`
`18`	`18`	`private $cacheDir;`
`19`	`19`
`20`		`- protected function setUp()`
	`20`	`+ protected function setUp(): void`
`21`	`21`	`{`
`22`	`22`	`$this->cacheDir = sys_get_temp_dir().'/'.uniqid();`
`23`	`23`	`$fs = new Filesystem();`
`24`	`24`	`$fs->mkdir($this->cacheDir);`
`25`	`25`	`parent::setUp();`
`26`	`26`	`}`
`27`	`27`
`28`		`- protected function tearDown()`
	`28`	`+ protected function tearDown(): void`
`29`	`29`	`{`
`30`	`30`	`$fs = new Filesystem();`
`31`	`31`	`$fs->remove($this->cacheDir);`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ class TemplatePathsCacheWarmerTest extends TestCase`
`38`	`38`
`39`	`39`	`private $tmpDir;`
`40`	`40`
`41`		`- protected function setUp()`
	`41`	`+ protected function setUp(): void`
`42`	`42`	`{`
`43`	`43`	`$this->templateFinder = $this`
`44`	`44`	`->getMockBuilder(TemplateFinderInterface::class)`
`@@ -59,7 +59,7 @@ protected function setUp()`
`59`	`59`	`$this->filesystem->mkdir($this->tmpDir);`
`60`	`60`	`}`
`61`	`61`
`62`		`- protected function tearDown()`
	`62`	`+ protected function tearDown(): void`
`63`	`63`	`{`
`64`	`64`	`$this->filesystem->remove($this->tmpDir);`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,14 +28,14 @@ class CacheClearCommandTest extends TestCase`
`28`	`28`	`/** @var Filesystem */`
`29`	`29`	`private $fs;`
`30`	`30`
`31`		`- protected function setUp()`
	`31`	`+ protected function setUp(): void`
`32`	`32`	`{`
`33`	`33`	`$this->fs = new Filesystem();`
`34`	`34`	`$this->kernel = new TestAppKernel('test', true);`
`35`	`35`	`$this->fs->mkdir($this->kernel->getProjectDir());`
`36`	`36`	`}`
`37`	`37`
`38`		`- protected function tearDown()`
	`38`	`+ protected function tearDown(): void`
`39`	`39`	`{`
`40`	`40`	`$this->fs->remove($this->kernel->getProjectDir());`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -127,15 +127,15 @@ public function testDebugInvalidDirectory()`
`127`	`127`	`$tester->execute(['locale' => 'en', 'bundle' => 'dir']);`
`128`	`128`	`}`
`129`	`129`
`130`		`- protected function setUp()`
	`130`	`+ protected function setUp(): void`
`131`	`131`	`{`
`132`	`132`	`$this->fs = new Filesystem();`
`133`	`133`	`$this->translationDir = sys_get_temp_dir().'/'.uniqid('sf_translation', true);`
`134`	`134`	`$this->fs->mkdir($this->translationDir.'/translations');`
`135`	`135`	`$this->fs->mkdir($this->translationDir.'/templates');`
`136`	`136`	`}`
`137`	`137`
`138`		`- protected function tearDown()`
	`138`	`+ protected function tearDown(): void`
`139`	`139`	`{`
`140`	`140`	`$this->fs->remove($this->translationDir);`
`141`	`141`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,15 +105,15 @@ public function testWriteMessagesForSpecificDomain()`
`105`	`105`	`$this->assertRegExp('/Translation files were successfully updated./', $tester->getDisplay());`
`106`	`106`	`}`
`107`	`107`
`108`		`- protected function setUp()`
	`108`	`+ protected function setUp(): void`
`109`	`109`	`{`
`110`	`110`	`$this->fs = new Filesystem();`
`111`	`111`	`$this->translationDir = sys_get_temp_dir().'/'.uniqid('sf_translation', true);`
`112`	`112`	`$this->fs->mkdir($this->translationDir.'/translations');`
`113`	`113`	`$this->fs->mkdir($this->translationDir.'/templates');`
`114`	`114`	`}`
`115`	`115`
`116`		`- protected function tearDown()`
	`116`	`+ protected function tearDown(): void`
`117`	`117`	`{`
`118`	`118`	`$this->fs->remove($this->translationDir);`
`119`	`119`	`}`
Original file line number	Diff line number	Diff line change
`@@ -181,13 +181,13 @@ private function getKernelAwareApplicationMock()`
`181`	`181`	`return $application;`
`182`	`182`	`}`
`183`	`183`
`184`		`- protected function setUp()`
	`184`	`+ protected function setUp(): void`
`185`	`185`	`{`
`186`	`186`	`@mkdir(sys_get_temp_dir().'/yml-lint-test');`
`187`	`187`	`$this->files = [];`
`188`	`188`	`}`
`189`	`189`
`190`		`- protected function tearDown()`
	`190`	`+ protected function tearDown(): void`
`191`	`191`	`{`
`192`	`192`	`foreach ($this->files as $file) {`
`193`	`193`	`if (file_exists($file)) {`
Original file line number	Diff line number	Diff line change
`@@ -15,12 +15,12 @@`
`15`	`15`
`16`	`16`	`class TextDescriptorTest extends AbstractDescriptorTest`
`17`	`17`	`{`
`18`		`- protected function setUp()`
	`18`	`+ protected function setUp(): void`
`19`	`19`	`{`
`20`	`20`	`putenv('COLUMNS=121');`
`21`	`21`	`}`
`22`	`22`
`23`		`- protected function tearDown()`
	`23`	`+ protected function tearDown(): void`
`24`	`24`	`{`
`25`	`25`	`putenv('COLUMNS');`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,15 +23,15 @@ class ControllerNameParserTest extends TestCase`
`23`	`23`	`{`
`24`	`24`	`protected $loader;`
`25`	`25`
`26`		`- protected function setUp()`
	`26`	`+ protected function setUp(): void`
`27`	`27`	`{`
`28`	`28`	`$this->loader = new ClassLoader();`
`29`	`29`	`$this->loader->add('TestBundle', __DIR__.'/../Fixtures');`
`30`	`30`	`$this->loader->add('TestApplication', __DIR__.'/../Fixtures');`
`31`	`31`	`$this->loader->register();`
`32`	`32`	`}`
`33`	`33`
`34`		`- protected function tearDown()`
	`34`	`+ protected function tearDown(): void`
`35`	`35`	`{`
`36`	`36`	`$this->loader->unregister();`
`37`	`37`	`$this->loader = null;`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class CachePoolPassTest extends TestCase`
`26`	`26`	`{`
`27`	`27`	`private $cachePoolPass;`
`28`	`28`
`29`		`- protected function setUp()`
	`29`	`+ protected function setUp(): void`
`30`	`30`	`{`
`31`	`31`	`$this->cachePoolPass = new CachePoolPass();`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class DataCollectorTranslatorPassTest extends TestCase`
`22`	`22`	`private $container;`
`23`	`23`	`private $dataCollectorTranslatorPass;`
`24`	`24`
`25`		`- protected function setUp()`
	`25`	`+ protected function setUp(): void`
`26`	`26`	`{`
`27`	`27`	`$this->container = new ContainerBuilder();`
`28`	`28`	`$this->dataCollectorTranslatorPass = new DataCollectorTranslatorPass();`