Fix new static analysis issues due to PhpStan2

Author: jon48

app/Module/Certificates/Model/Certificate.php

@@ -73,12 +73,10 @@ protected function extractDataFromPath(string $path): void
             $this->type = $match['type'];
             $this->description = $match['descr'];
 
-            $day = $match['day'] ?? '';
-            $month_date = DateTime::createFromFormat('m', $match['month'] ?? '');
+            $month_date = DateTime::createFromFormat('m', $match['month']);
             $month = $month_date !== false ? strtoupper($month_date->format('M')) : '';
-            $year = $match['year'] ?? '';
 
-            $this->date = new Date(sprintf('%s %s %s', $day, $month, $year));
+            $this->date = new Date(sprintf('%s %s %s', $match['day'], $month, $match['year']));
         } else {
             $this->description = $this->filename;
         }

app/Module/GeoDispersion/PlaceMappers/CoordinatesPlaceMapper.php

@@ -38,7 +38,6 @@ class CoordinatesPlaceMapper implements PlaceMapperInterface
 {
     use PlaceMapperTrait;
 
-    private ?string $cache_key = null;
     private ?GeometryEngine $geometry_engine = null;
 
     /**
@@ -82,7 +81,7 @@ public function map(Place $place, string $feature_property): ?string
             $features_index['map_SW'],
             $features_index['nb_columns']
         );
-        if ($grid_box === null || !$this->setGeometryEngine() || $this->geometry_engine == null) {
+        if ($grid_box === null || !$this->setGeometryEngine() || $this->geometry_engine === null) {
             return null;
         }
         $features = $features_index['grid'][$grid_box[0]][$grid_box[1]];
@@ -128,7 +127,7 @@ protected function getGridCell(Point $point, Point $grid_NE, Point $grid_SW, int
     /**
      * Get an indexed array of the features of the map.
      *
-     * {@internal The map is divided in a grid, eacg cell containing the features which bounding box overlaps that cell.
+     * {@internal The map is divided in a grid, each cell containing the features which bounding box overlaps that cell.
      * The grid is computed once for each map, and cached.}
      *
      * @phpcs:ignore Generic.Files.LineLength.TooLong
@@ -211,13 +210,10 @@ protected function setGeometryEngine(): bool
      */
     protected function cacheKey(): ?string
     {
-        if ($this->cache_key === null) {
-            $map_def = $this->data('map');
-            if ($map_def === null || !($map_def instanceof MapDefinitionInterface)) {
-                return null;
-            }
-            return spl_object_id($this) . '-map-' . $map_def->id();
+        $map_def = $this->data('map');
+        if ($map_def === null || !($map_def instanceof MapDefinitionInterface)) {
+            return null;
         }
-        return $this->cache_key;
+        return spl_object_id($this) . '-map-' . $map_def->id();
     }
 }

app/Module/GeoDispersion/Services/GeoAnalysisDataService.php

@@ -76,7 +76,7 @@ public function placeHierarchyExample(Tree $tree): array
             ->get()->pluck('g_gedcom')
             ->flatMap(static function (string $gedcom): array {
                 preg_match_all('/\n2 PLAC (.+)/', $gedcom, $matches);
-                return $matches[1] ?? [];
+                return $matches[1];
             })
             ->sort(I18N::comparator())->reverse()
             ->mapWithKeys(static function (string $place): array {

app/Module/GeoDispersion/Services/PlacesReferenceTableService.php

@@ -76,9 +76,6 @@ public function targetId(string $source, string $source_format, string $target_f
         }
 
         $mapping = (array) $rows->first();
-        if (count($columns_select) === 0) {
-            return $target_format;
-        }
 
         return str_replace(
             array_map(fn($tag) => '{' . $tag . '}', $columns_select[1]),

app/Module/PatronymicLineage/Model/LineageBuilder.php

@@ -207,7 +207,7 @@ private function buildLineage(LineageNode $node): LineageNode
                         /** @psalm-suppress RedundantCondition */
                         if (
                             $spouse === null ||
-                            ($spouse_surname !== '' && I18N::comparator()($child_surname, $spouse_surname) != 0)
+                            ($spouse_surname !== '' && I18N::comparator()($child_surname, $spouse_surname) !== 0)
                         ) {
                             if (I18N::comparator()($child_surname, $indi_surname) === 0) {
                                 $nb_natural++;
@@ -224,7 +224,7 @@ private function buildLineage(LineageNode $node): LineageNode
                             mb_strlen($child_surname) === 0 ||
                             mb_strlen($indi_surname) === 0 || mb_strlen($spouse_surname) === 0 ||
                             I18N::comparator()($child_surname, $indi_surname) === 0 ||
-                            I18N::comparator()($child_surname, $spouse_surname) != 0
+                            I18N::comparator()($child_surname, $spouse_surname) !== 0
                         ) {
                             $node_child = new LineageNode($child, $node->rootNode());
                             $node_child = $this->buildLineage($node_child);

phpstan.neon.dist

@@ -2,10 +2,14 @@ includes:
    - phpstan-baseline.neon
 
 parameters:
-   level: max
+   level: 9
    paths:
       - app
       - tests
    checkExplicitMixed: false
    ignoreErrors:
       - '#^Call to an undefined static method Illuminate\\Database\\Capsule\\Manager::.*\(\)\.$#'
+      -
+         identifier: varTag.type
+   strictRules:
+       strictArrayFilter: false