From 8d0a3eb6387da1f2113b1a630f01e4d2a7bb1c53 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 24 Jan 2020 16:17:14 -0800
Subject: [PATCH] (NFC) Civi/Core - Update for
 Drupal.Commenting.VariableComment.IncorrectVarType

---
 Civi/Core/DAO/Event/PostDelete.php          |  4 ++--
 Civi/Core/DAO/Event/PostUpdate.php          |  2 +-
 Civi/Core/DAO/Event/PreDelete.php           |  2 +-
 Civi/Core/Event/PostEvent.php               |  4 +++-
 Civi/Core/Event/PreEvent.php                |  4 +++-
 Civi/Core/Event/UnhandledExceptionEvent.php |  4 +++-
 Civi/Core/Transaction/Frame.php             | 12 +++++++++---
 Civi/Core/Transaction/Manager.php           |  4 +++-
 8 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/Civi/Core/DAO/Event/PostDelete.php b/Civi/Core/DAO/Event/PostDelete.php
index f631513947..ade776ebc9 100644
--- a/Civi/Core/DAO/Event/PostDelete.php
+++ b/Civi/Core/DAO/Event/PostDelete.php
@@ -18,12 +18,12 @@ namespace Civi\Core\DAO\Event;
 class PostDelete extends \Symfony\Component\EventDispatcher\Event {
 
   /**
-   * @var DAO Object
+   * @var \CRM_Core_DAO
    */
   public $object;
 
   /**
-   * @var DAO delete result
+   * @var mixed
    */
   public $result;
 
diff --git a/Civi/Core/DAO/Event/PostUpdate.php b/Civi/Core/DAO/Event/PostUpdate.php
index e436127083..8f07957e38 100644
--- a/Civi/Core/DAO/Event/PostUpdate.php
+++ b/Civi/Core/DAO/Event/PostUpdate.php
@@ -18,7 +18,7 @@ namespace Civi\Core\DAO\Event;
 class PostUpdate extends \Symfony\Component\EventDispatcher\Event {
 
   /**
-   * @var DAO Object
+   * @var \CRM_Core_DAO
    */
   public $object;
 
diff --git a/Civi/Core/DAO/Event/PreDelete.php b/Civi/Core/DAO/Event/PreDelete.php
index b1e3bb75b0..ca28673208 100644
--- a/Civi/Core/DAO/Event/PreDelete.php
+++ b/Civi/Core/DAO/Event/PreDelete.php
@@ -18,7 +18,7 @@ namespace Civi\Core\DAO\Event;
 class PreDelete extends \Symfony\Component\EventDispatcher\Event {
 
   /**
-   * @var DAO Object
+   * @var \CRM_Core_DAO
    */
   public $object;
 
diff --git a/Civi/Core/Event/PostEvent.php b/Civi/Core/Event/PostEvent.php
index 3c028b4cc0..1123752758 100644
--- a/Civi/Core/Event/PostEvent.php
+++ b/Civi/Core/Event/PostEvent.php
@@ -29,7 +29,9 @@ class PostEvent extends GenericHookEvent {
   }
 
   /**
-   * @var string 'create'|'edit'|'delete' etc
+   * One of: 'create'|'edit'|'delete'
+   *
+   * @var string
    */
   public $action;
 
diff --git a/Civi/Core/Event/PreEvent.php b/Civi/Core/Event/PreEvent.php
index 4dc5f1c7cf..3382e9dbe7 100644
--- a/Civi/Core/Event/PreEvent.php
+++ b/Civi/Core/Event/PreEvent.php
@@ -29,7 +29,9 @@ class PreEvent extends GenericHookEvent {
   }
 
   /**
-   * @var string 'create'|'edit'|'delete' etc
+   * One of: 'create'|'edit'|'delete'
+   *
+   * @var string
    */
   public $action;
 
diff --git a/Civi/Core/Event/UnhandledExceptionEvent.php b/Civi/Core/Event/UnhandledExceptionEvent.php
index 32d83151c0..5e5993f74f 100644
--- a/Civi/Core/Event/UnhandledExceptionEvent.php
+++ b/Civi/Core/Event/UnhandledExceptionEvent.php
@@ -23,7 +23,9 @@ class UnhandledExceptionEvent extends GenericHookEvent {
   public $exception;
 
   /**
-   * @var mixed reserved for future use
+   * Reserved for future use.
+   *
+   * @var mixed
    */
   public $request;
 
diff --git a/Civi/Core/Transaction/Frame.php b/Civi/Core/Transaction/Frame.php
index acb0c3fb89..7dbe7e4a50 100644
--- a/Civi/Core/Transaction/Frame.php
+++ b/Civi/Core/Transaction/Frame.php
@@ -29,17 +29,23 @@ class Frame {
   private $dao;
 
   /**
-   * @var string|null e.g. "BEGIN" or "SAVEPOINT foo"
+   * The statement used to start this transaction - e.g. "BEGIN" or "SAVEPOINT foo"
+   *
+   * @var string|null
    */
   private $beginStmt;
 
   /**
-   * @var string|null e.g. "COMMIT"
+   * The statement used to commit this transaction - e.g. "COMMIT"
+   *
+   * @var string|null
    */
   private $commitStmt;
 
   /**
-   * @var string|null e.g. "ROLLBACK" or "ROLLBACK TO SAVEPOINT foo"
+   * The statement used to rollback this transaction - e.g. "ROLLBACK" or "ROLLBACK TO SAVEPOINT foo"
+   *
+   * @var string|null
    */
   private $rollbackStmt;
 
diff --git a/Civi/Core/Transaction/Manager.php b/Civi/Core/Transaction/Manager.php
index eb830c8850..bfa8130d39 100644
--- a/Civi/Core/Transaction/Manager.php
+++ b/Civi/Core/Transaction/Manager.php
@@ -26,7 +26,9 @@ class Manager {
   private $dao;
 
   /**
-   * @var array<Frame> stack of SQL transactions/savepoints
+   * Stack of SQL transactions/savepoints.
+   *
+   * @var \Civi\Core\Transaction\Frame[]
    */
   private $frames = [];
 
-- 
2.25.1