Merge pull request #22 from always-open/chore/fixing-psalm

Fixing psalm errors

Author: qschmick

psalm.xml.dist

@@ -13,4 +13,11 @@
             <directory name="vendor"/>
         </ignoreFiles>
     </projectFiles>
+    <issueHandlers>
+        <InvalidScalarArgument>
+            <errorLevel type="suppress">
+                <file name="src/ReportBase.php" />
+            </errorLevel>
+        </InvalidScalarArgument>
+    </issueHandlers>
 </psalm>

src/BaseFeatures/Data/Column.php

@@ -3,6 +3,7 @@
 namespace AlwaysOpen\ReportEngine\BaseFeatures\Data;
 
 use AlwaysOpen\ReportEngine\BaseFeatures\Data\Types\Bases\BaseType;
+use AlwaysOpen\ReportEngine\BaseFeatures\Data\Types\DateTime;
 use AlwaysOpen\ReportEngine\BaseFeatures\Data\Types\Enum;
 use AlwaysOpen\ReportEngine\BaseFeatures\Data\Types\Text;
 use AlwaysOpen\ReportEngine\BaseFeatures\Filters\BaseFilter;
@@ -115,10 +116,7 @@ public function formattedValue($result)
         return $value;
     }
 
-    /**
-     * @return BaseType
-     */
-    public function type(): BaseType
+    public function type(): BaseType|DateTime
     {
         if (! empty($this->config['type'])) {
             if ($this->config['type'] instanceof BaseType) {
@@ -566,7 +564,7 @@ public function renderFilter()
             ->renderFilter($this->label(), $this->name(), $this->filterInstances(), $this->type(), $this->getFilterValue());
     }
 
-    public function formatter() : string
+    public function formatter() : string|null
     {
         return $this->type()->formatter();
     }

src/BaseFeatures/Data/Types/Bases/BaseType.php

@@ -202,7 +202,7 @@ public function setFormatter(?string $formatter) : self
         return $this;
     }
 
-    public function formatter() : string
+    public function formatter() : string|null
     {
         return $this->formatter ?? 'plaintext';
     }

src/BaseFeatures/Data/Types/DateTime.php

@@ -69,7 +69,7 @@ public function setOutputTimezone(string|null $timezone) : self
         return $this;
     }
 
-    public function formatter(): string
+    public function formatter(): string|null
     {
         return $this->formatter;
     }

src/BaseFeatures/Data/Types/Html.php

@@ -34,10 +34,7 @@ public static function availableFilters(): array
         ];
     }
 
-    /**
-     * @return string
-     */
-    public function formatter() : string
+    public function formatter() : string|null
     {
         return 'html';
     }

src/BaseFeatures/Data/Types/NumericHtml.php

@@ -21,10 +21,7 @@ public function typeFormat($value, ?object $result = null)
         return (string) $value;
     }
 
-    /**
-     * @return string
-     */
-    public function formatter() : string
+    public function formatter() : string|null
     {
         return 'html';
     }

src/ReportBase.php

@@ -318,7 +318,7 @@ public function toArray(): array
         $this->build();
 
         return [
-            'columns' => collect($this->columns)->map(function (Column $column) {
+            'columns' => $this->columns->map(function (Column $column) {
                 return $column->toArray();
             }),
             'data' => $this->rowsArray,