Add types

brick · Feb 20, 2025 · 034135f · 034135f
1 parent d324678
commit 034135f
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 37 deletions.
diff --git a/src/Internal/GenericExporter.php b/src/Internal/GenericExporter.php
@@ -21,7 +21,7 @@ final class GenericExporter
     /**
      * @var ObjectExporter[]
      */
-    private $objectExporters = [];
+    private array $objectExporters = [];
 
     /**
      * The visited objects, to detect circular references.
@@ -34,52 +34,38 @@ final class GenericExporter
 
     /**
      * @psalm-readonly
-     *
-     * @var bool
      */
-    public $addTypeHints;
+    public bool $addTypeHints;
 
     /**
      * @psalm-readonly
-     *
-     * @var bool
      */
-    public $skipDynamicProperties;
+    public bool $skipDynamicProperties;
 
     /**
      * @psalm-readonly
-     *
-     * @var bool
      */
-    public $inlineArray;
+    public bool $inlineArray;
 
     /**
      * @psalm-readonly
-     *
-     * @var bool
      */
-    public $inlineScalarList;
+    public bool $inlineScalarList;
 
     /**
      * @psalm-readonly
-     *
-     * @var bool
      */
-    public $closureSnapshotUses;
+    public bool $closureSnapshotUses;
 
     /**
      * @psalm-readonly
-     *
-     * @var bool
      */
-    public $trailingCommaInArray;
+    public bool $trailingCommaInArray;
 
     /**
      * @psalm-readonly
-     *
-     * @var int
      */
-    public $indentLevel;
+    public int $indentLevel;
 
     public function __construct(int $options, int $indentLevel = 0)
     {
@@ -126,7 +112,7 @@ public function __construct(int $options, int $indentLevel = 0)
      *
      * @throws ExportException
      */
-    public function export($var, array $path, array $parentIds) : array
+    public function export(mixed $var, array $path, array $parentIds) : array
     {
         switch ($type = gettype($var)) {
             case 'boolean':

diff --git a/src/Internal/ObjectExporter.php b/src/Internal/ObjectExporter.php
@@ -13,10 +13,7 @@
  */
 abstract class ObjectExporter
 {
-    /**
-     * @var GenericExporter
-     */
-    protected $exporter;
+    protected GenericExporter $exporter;
 
     /**
      * @param GenericExporter $exporter

diff --git a/src/Internal/ObjectExporter/ClosureExporter.php b/src/Internal/ObjectExporter/ClosureExporter.php
@@ -59,10 +59,7 @@ public function export(object $object, \ReflectionObject $reflectionObject, arra
         return [$code];
     }
 
-    /**
-     * @return Parser
-     */
-    private function getParser()
+    private function getParser(): Parser
     {
         if ($this->parser === null) {
             $this->parser = (new ParserFactory)->createForHostVersion();

diff --git a/src/VarExporter.php b/src/VarExporter.php
@@ -84,7 +84,7 @@ final class VarExporter
      *
      * @throws ExportException
      */
-    public static function export($var, int $options = 0, int $indentLevel = 0) : string
+    public static function export(mixed $var, int $options = 0, int $indentLevel = 0) : string
     {
         $exporter = new GenericExporter($options, $indentLevel);
         $lines = $exporter->export($var, [], []);

diff --git a/tests/AbstractTestCase.php b/tests/AbstractTestCase.php
@@ -19,7 +19,7 @@ abstract class AbstractTestCase extends TestCase
      *
      * @return void
      */
-    public function assertExportEquals(string $expected, $var, int $options = 0) : void
+    public function assertExportEquals(string $expected, mixed $var, int $options = 0) : void
     {
         // test the string output of export()
 
@@ -61,7 +61,7 @@ public function assertExportEquals(string $expected, $var, int $options = 0) : v
      *
      * @return void
      */
-    public function assertExportThrows(string $expectedMessage, $var, int $options = 0) : void
+    public function assertExportThrows(string $expectedMessage, mixed $var, int $options = 0) : void
     {
         $expectedMessageRegExp = '/' . implode('.*', array_map(fn(string $str) => preg_quote($str, '/'), explode('*', $expectedMessage))) . '/';
 

diff --git a/tests/VarExporterTest.php b/tests/VarExporterTest.php
@@ -356,10 +356,8 @@ public function testExportObjectWithCircularReference(): void
 
     /**
      * @dataProvider providerExportIndented
-     *
-     * @param mixed $var
      */
-    public function testExportIndented($var, string $expected, int $options): void
+    public function testExportIndented(mixed $var, string $expected, int $options): void
     {
         $template = <<<'TPL'
 public function foo()