Upgrade PHPStan to 2.0 (#1256)

Author: stloyd

phpstan.neon

@@ -2,6 +2,7 @@ parameters:
     level: 8
     treatPhpDocTypesAsCertain: false
     ignoreErrors:
+        - identifier: argument.type
         - identifier: missingType.iterableValue
         - identifier: missingType.generics
     paths:

src/adapter/etl-adapter-csv/src/Flow/ETL/Adapter/CSV/CSVExtractor.php

@@ -59,7 +59,7 @@ public function extract(FlowContext $context) : \Generator
                     continue;
                 }
 
-                /** @var array<mixed> $rowData */
+                /** @var non-empty-list<null|string> $rowData */
                 $rowData = \str_getcsv($csvLine, $separator, $enclosure, $escape);
 
                 if (!\count($headers)) {

src/adapter/etl-adapter-doctrine/src/Flow/ETL/Adapter/Doctrine/DbalLimitOffsetExtractor.php

@@ -55,6 +55,7 @@ public function extract(FlowContext $context) : \Generator
         } else {
             $countQuery = (clone $this->queryBuilder)->select('COUNT(*)');
 
+            // @phpstan-ignore-next-line
             if (\method_exists($countQuery, 'resetOrderBy')) {
                 $countQuery->resetOrderBy();
             } else {

src/adapter/etl-adapter-doctrine/src/Flow/ETL/Adapter/Doctrine/Parameter.php

@@ -37,12 +37,15 @@ public function queryParamName() : string
         return $this->queryParamName;
     }
 
-    public function toQueryParam(Rows $rows) : mixed
+    /**
+     * @return array<array-key, null|bool|float|int|string>
+     */
+    public function toQueryParam(Rows $rows) : array
     {
         return $rows->reduceToArray($this->ref);
     }
 
-    public function type() : int|ArrayParameterType|null
+    public function type() : int|ArrayParameterType
     {
         return $this->type;
     }

src/adapter/etl-adapter-elasticsearch/src/Flow/ETL/Adapter/Elasticsearch/ElasticsearchPHP/ElasticsearchExtractor.php

@@ -9,9 +9,9 @@
 final class ElasticsearchExtractor implements Extractor
 {
     /**
-     * @phpstan-ignore-next-line
-     *
      * @psalm-suppress UndefinedClass
+     *
+     * @phpstan-ignore-next-line
      */
     private \Elasticsearch\Client|\Elastic\Elasticsearch\Client|null $client;
 

src/adapter/etl-adapter-logger/src/Flow/ETL/Adapter/Logger/PsrLoggerLoader.php

@@ -15,9 +15,6 @@ public function __construct(private LoggerInterface $logger, private string $mes
 
     public function load(Rows $rows, FlowContext $context) : void
     {
-        /**
-         * @psalm-var callable(Row) : void $loader
-         */
         $loader = function (Row $row) : void {
             $this->logger->log($this->logLevel, $this->message, $row->toArray());
         };

src/core/etl/src/Flow/ETL/Config/Cache/CacheConfigBuilder.php

@@ -22,13 +22,8 @@ final class CacheConfigBuilder
 
     public function build(FilesystemTable $fstab, Serializer $serializer) : CacheConfig
     {
-        $cachePath = \is_string(\getenv(CacheConfig::CACHE_DIR_ENV)) && \getenv(CacheConfig::CACHE_DIR_ENV) !== ''
-            ? \getenv(CacheConfig::CACHE_DIR_ENV)
-            : \sys_get_temp_dir() . '/flow_php/cache';
-
-        if (!\is_string($cachePath)) {
-            throw new RuntimeException('Cache directory must be a string, got ' . \gettype($cachePath));
-        }
+        $cachePath = \getenv(CacheConfig::CACHE_DIR_ENV) ?: '';
+        $cachePath = $cachePath !== '' ? $cachePath : \sys_get_temp_dir() . '/flow_php/cache';
 
         if (!\file_exists($cachePath)) {
             if (!mkdir($cachePath, 0777, true) && !is_dir($cachePath)) {

src/core/etl/src/Flow/ETL/DataFrame.php

@@ -110,15 +110,14 @@ public static function fromArray(array $definition) : self
     }
 
     /**
-     * @throws \JsonException
      * @throws InvalidArgumentException
      */
     public static function fromJson(string $json) : self
     {
         try {
             return self::fromArray(\json_decode($json, true, 512, JSON_THROW_ON_ERROR));
         } catch (\JsonException $exception) {
-            throw new InvalidFileFormatException('json', 'unknown');
+            throw new InvalidFileFormatException('json', 'unknown', $exception);
         }
     }
 

src/core/etl/src/Flow/ETL/Extractor/LimitableExtractor.php

@@ -4,12 +4,14 @@
 
 namespace Flow\ETL\Extractor;
 
+use Flow\ETL\Extractor;
+
 /**
  * Limitable extractor is one that can be limited to extract only given number of rows.
  * Whenever limit is set in a pipeline before any transformations, LogicalPlan processor will try
  * to grab that limit and inject it directly to the extractor to avoid unnecessary processing.
  */
-interface LimitableExtractor
+interface LimitableExtractor extends Extractor
 {
     public function changeLimit(int $limit) : void;
 

src/core/etl/src/Flow/ETL/Function/Split.php

@@ -15,7 +15,7 @@ public function __construct(
     ) {
     }
 
-    public function eval(Row $row) : array|string|null
+    public function eval(Row $row) : ?array
     {
         $value = (new Parameter($this->value))->asString($row);
         $separator = (new Parameter($this->separator))->asString($row);