From ee299f1405bf74cddbd13e410045525b9685c29e Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Mon, 9 Jan 2017 16:44:59 -0800
Subject: [PATCH] Civi/Token - Fix various PHPStorm warnings

---
 Civi/Token/TokenCompatSubscriber.php | 1 +
 Civi/Token/TokenRow.php              | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/Civi/Token/TokenCompatSubscriber.php b/Civi/Token/TokenCompatSubscriber.php
index 3eaf57d3b7..e6c2f72e65 100644
--- a/Civi/Token/TokenCompatSubscriber.php
+++ b/Civi/Token/TokenCompatSubscriber.php
@@ -49,6 +49,7 @@ class TokenCompatSubscriber implements EventSubscriberInterface {
     $messageTokens = $e->getTokenProcessor()->getMessageTokens();
 
     foreach ($e->getRows() as $row) {
+      /** @var int $contactId */
       $contactId = $row->context['contactId'];
       if (empty($row->context['contact'])) {
         $params = array(
diff --git a/Civi/Token/TokenRow.php b/Civi/Token/TokenRow.php
index a18a81c435..3c77f31d12 100644
--- a/Civi/Token/TokenRow.php
+++ b/Civi/Token/TokenRow.php
@@ -134,6 +134,8 @@ class TokenRow {
    * @param string $baoName
    * @param array $baoField
    * @param mixed $fieldValue
+   * @return TokenRow
+   * @throws \CRM_Core_Exception
    */
   public function dbToken($tokenEntity, $tokenField, $baoName, $baoField, $fieldValue) {
     if ($fieldValue === NULL || $fieldValue === '') {
-- 
2.25.1