a few more minor tidy ups

diff --git a/CRM/Core/BAO/File.php b/CRM/Core/BAO/File.php
index f78231f25877b7762456bab7b951208eb10df81a..591be45904d0d77b44ae085ee6d050b27f958625 100644 (file)
--- a/CRM/Core/BAO/File.php
+++ b/CRM/Core/BAO/File.php
@@ -669,7 +669,6 @@ AND       CEF.entity_id    = %2";
     foreach ($currentAttachmentInfo as $fileKey => $fileValue) {
       $fileID = $fileValue['fileID'];
       $fileType = $fileValue['mime_type'];
-      $eid = $entityID;
       if ($fileID) {
         if ($fileType == 'image/jpeg' ||
           $fileType == 'image/pjpeg' ||

diff --git a/CRM/Core/DAO.php b/CRM/Core/DAO.php
index 24643ee900595a83b4f5ec6a073b8ffdfb025b59..6edc424c07333935b657ac7e49a4f66f33d8001e 100644 (file)
--- a/CRM/Core/DAO.php
+++ b/CRM/Core/DAO.php
@@ -1124,8 +1124,10 @@ FROM   civicrm_domain
    * @param bool $i18nRewrite
    * @param bool $trapException
    *
-   * @return CRM_Core_DAO
+   * @return CRM_Core_DAO|object
    *   object that holds the results of the query
+   *   NB - if this is defined as just returning a DAO phpstorm keeps pointing
+   *   out all the properties that are not part of the DAO
    */
   public static function &executeQuery(
     $query,

diff --git a/CRM/SMS/Controller/Send.php b/CRM/SMS/Controller/Send.php
index 2febbdfc993b31b4660a6fffb1a0235d9520dc00..48037399b7b6975d08e230e2b4f8188b3e62090a 100644 (file)
--- a/CRM/SMS/Controller/Send.php
+++ b/CRM/SMS/Controller/Send.php
@@ -1,5 +1,5 @@
 <?php
-/**
+/*
  +--------------------------------------------------------------------+
  | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
@@ -37,7 +37,7 @@ class CRM_SMS_Controller_Send extends CRM_Core_Controller {
   /**
    * Class constructor
    *
-   * @param null $title
+   * @param string $title
    * @param bool|int $action
    * @param bool $modal
    */
@@ -68,8 +68,7 @@ class CRM_SMS_Controller_Send extends CRM_Core_Controller {
       CRM_Core_BAO_File::uploadNames()
     );
 
-    $config = CRM_Core_Config::singleton();
-    $this->addActions($config->uploadDir,
+    $this->addActions(CRM_Core_Config::singleton()->uploadDir,
       $uploadNames
     );
   }