Use typed properties in tests as much as possible

nicolas-grekas · nicolas-grekas · commit fc12f00ac2b4 · 2023-07-25T10:53:33.000+02:00
diff --git a/Tests/Loader/ChainLoaderTest.php b/Tests/Loader/ChainLoaderTest.php
@@ -18,8 +18,8 @@
 
 class ChainLoaderTest extends TestCase
 {
-    protected $loader1;
-    protected $loader2;
+    protected FilesystemLoader $loader1;
+    protected FilesystemLoader $loader2;
 
     protected function setUp(): void
     {
diff --git a/Tests/Loader/FilesystemLoaderTest.php b/Tests/Loader/FilesystemLoaderTest.php
@@ -19,7 +19,7 @@
 
 class FilesystemLoaderTest extends TestCase
 {
-    protected static $fixturesPath;
+    protected static string $fixturesPath;
 
     public static function setUpBeforeClass(): void
     {
diff --git a/Tests/PhpEngineTest.php b/Tests/PhpEngineTest.php
@@ -24,18 +24,13 @@
 
 class PhpEngineTest extends TestCase
 {
-    protected $loader;
+    protected ProjectTemplateLoader $loader;
 
     protected function setUp(): void
     {
         $this->loader = new ProjectTemplateLoader();
     }
 
-    protected function tearDown(): void
-    {
-        $this->loader = null;
-    }
-
     public function testConstructor()
     {
         $engine = new ProjectTemplateEngine(new TemplateNameParser(), $this->loader);
@@ -204,7 +199,7 @@ public function getLoader(): LoaderInterface
 
 class ProjectTemplateLoader extends Loader
 {
-    public $templates = [];
+    public array $templates = [];
 
     public function setTemplate($name, $content)
     {
diff --git a/Tests/TemplateNameParserTest.php b/Tests/TemplateNameParserTest.php
@@ -17,18 +17,13 @@
 
 class TemplateNameParserTest extends TestCase
 {
-    protected $parser;
+    protected TemplateNameParser $parser;
 
     protected function setUp(): void
     {
         $this->parser = new TemplateNameParser();
     }
 
-    protected function tearDown(): void
-    {
-        $this->parser = null;
-    }
-
     /**
      * @dataProvider getLogicalNameToTemplateProvider
      */

Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,8 @@`
`18`	`18`
`19`	`19`	`class ChainLoaderTest extends TestCase`
`20`	`20`	`{`
`21`		`- protected $loader1;`
`22`		`- protected $loader2;`
	`21`	`+ protected FilesystemLoader $loader1;`
	`22`	`+ protected FilesystemLoader $loader2;`
`23`	`23`
`24`	`24`	`protected function setUp(): void`
`25`	`25`	`{`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`
`20`	`20`	`class FilesystemLoaderTest extends TestCase`
`21`	`21`	`{`
`22`		`- protected static $fixturesPath;`
	`22`	`+ protected static string $fixturesPath;`
`23`	`23`
`24`	`24`	`public static function setUpBeforeClass(): void`
`25`	`25`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,18 +24,13 @@`
`24`	`24`
`25`	`25`	`class PhpEngineTest extends TestCase`
`26`	`26`	`{`
`27`		`- protected $loader;`
	`27`	`+ protected ProjectTemplateLoader $loader;`
`28`	`28`
`29`	`29`	`protected function setUp(): void`
`30`	`30`	`{`
`31`	`31`	`$this->loader = new ProjectTemplateLoader();`
`32`	`32`	`}`
`33`	`33`
`34`		`- protected function tearDown(): void`
`35`		`- {`
`36`		`- $this->loader = null;`
`37`		`- }`
`38`		`-`
`39`	`34`	`public function testConstructor()`
`40`	`35`	`{`
`41`	`36`	`$engine = new ProjectTemplateEngine(new TemplateNameParser(), $this->loader);`
`@@ -204,7 +199,7 @@ public function getLoader(): LoaderInterface`
`204`	`199`
`205`	`200`	`class ProjectTemplateLoader extends Loader`
`206`	`201`	`{`
`207`		`- public $templates = [];`
	`202`	`+ public array $templates = [];`
`208`	`203`
`209`	`204`	`public function setTemplate($name, $content)`
`210`	`205`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,18 +17,13 @@`
`17`	`17`
`18`	`18`	`class TemplateNameParserTest extends TestCase`
`19`	`19`	`{`
`20`		`- protected $parser;`
	`20`	`+ protected TemplateNameParser $parser;`
`21`	`21`
`22`	`22`	`protected function setUp(): void`
`23`	`23`	`{`
`24`	`24`	`$this->parser = new TemplateNameParser();`
`25`	`25`	`}`
`26`	`26`
`27`		`- protected function tearDown(): void`
`28`		`- {`
`29`		`- $this->parser = null;`
`30`		`- }`
`31`		`-`
`32`	`27`	`/**`
`33`	`28`	`* @dataProvider getLogicalNameToTemplateProvider`
`34`	`29`	`*/`