From 2aee2c17b3cf58db295f73b5c356be7011a54092 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Sun, 7 Nov 2021 14:33:50 +0000
Subject: [PATCH] Issue #3212891 by vaish, brentgees@gmail.com, srilakshmier,
 mikelutz, quietone, alexpott: Incorrect type declaration in docblock for
 class property

---
 core/modules/migrate/src/Plugin/Migration.php          | 2 +-
 core/modules/migrate/src/Plugin/migrate/id_map/Sql.php | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/modules/migrate/src/Plugin/Migration.php b/core/modules/migrate/src/Plugin/Migration.php
index 66ab6642cec6..021edfd6ba72 100644
--- a/core/modules/migrate/src/Plugin/Migration.php
+++ b/core/modules/migrate/src/Plugin/Migration.php
@@ -96,7 +96,7 @@ class Migration extends PluginBase implements MigrationInterface, RequirementsIn
    *
    * Used to initialize $idMapPlugin.
    *
-   * @var string
+   * @var array
    */
   protected $idMap = [];
 
diff --git a/core/modules/migrate/src/Plugin/migrate/id_map/Sql.php b/core/modules/migrate/src/Plugin/migrate/id_map/Sql.php
index 6ecc8ed4ea65..d0f31ffa0b4e 100644
--- a/core/modules/migrate/src/Plugin/migrate/id_map/Sql.php
+++ b/core/modules/migrate/src/Plugin/migrate/id_map/Sql.php
@@ -111,9 +111,9 @@ class Sql extends PluginBase implements MigrateIdMapInterface, ContainerFactoryP
   /**
    * The result.
    *
-   * @var null
+   * @var \Drupal\Core\Database\StatementInterface
    */
-  protected $result = NULL;
+  protected $result;
 
   /**
    * The source identifiers.
@@ -132,7 +132,7 @@ class Sql extends PluginBase implements MigrateIdMapInterface, ContainerFactoryP
   /**
    * The current row.
    *
-   * @var null
+   * @var array|false|null
    */
   protected $currentRow = NULL;
 
-- 
GitLab