Civi/Core - Fix various PHPStorm warnings

diff --git a/Civi/Core/Resolver.php b/Civi/Core/Resolver.php
index 70654bac29a43cbf64d6a114cdadf4150a074eb5..0d71d185e7fd70e0bd9df207fe430e30ef3b83b7 100644 (file)
--- a/Civi/Core/Resolver.php
+++ b/Civi/Core/Resolver.php
@@ -53,7 +53,7 @@ class Resolver {
    * @param string|array $id
    *   A callback expression; any of the following.
    *
-   * @return array
+   * @return array|callable
    *   A PHP callback. Do not serialize (b/c it may include an object).
    * @throws \RuntimeException
    */
@@ -277,6 +277,7 @@ class ResolverGlobalCallback {
     }
     elseif ($this->mode === 'setter') {
       \CRM_Utils_Array::pathSet($GLOBALS, explode('/', $this->path), $arg1);
+      return NULL;
     }
     else {
       throw new \RuntimeException("Resolver failed: global:// must specify getter or setter mode.");

diff --git a/Civi/Core/SettingsMetadata.php b/Civi/Core/SettingsMetadata.php
index bf84572654c17a40bcc8cb80fd3d3c79c35e38bc..c7ee46523366dc195cbf3a6236b98769b16f9923 100644 (file)
--- a/Civi/Core/SettingsMetadata.php
+++ b/Civi/Core/SettingsMetadata.php
@@ -112,7 +112,7 @@ class SettingsMetadata {
       $realFolder = realpath($metaDataFolder);
       if (is_dir($realFolder) && !isset($loadedFolders[$realFolder])) {
         $loadedFolders[$realFolder] = TRUE;
-        $settingsMetadata = $settingsMetadata + self::loadSettingsMetaData($metaDataFolder);
+        $settingsMetadata = $settingsMetadata + self::loadSettingsMetadata($metaDataFolder);
       }
     }
     return $settingsMetadata;

diff --git a/Civi/Core/Transaction/Manager.php b/Civi/Core/Transaction/Manager.php
index 9b1d029989da27712588465ba7f681551b397895..2f40345796478fe4c58f9fdddbe4666d1c85d0cb 100644 (file)
--- a/Civi/Core/Transaction/Manager.php
+++ b/Civi/Core/Transaction/Manager.php
@@ -63,7 +63,7 @@ class Manager {
   }
 
   /**
-   * @param CRM_Core_DAO $dao
+   * @param \CRM_Core_DAO $dao
    *   Handle for the DB connection that will execute transaction statements.
    *   (all we really care about is the query() function)
    */