Merge "Fix IDEA warnings in Xhprof class"

diff --git a/includes/libs/Xhprof.php b/includes/libs/Xhprof.php
index 8175427..a1ddfd0 100644 (file)
--- a/includes/libs/Xhprof.php
+++ b/includes/libs/Xhprof.php
@@ -77,6 +77,8 @@ class Xhprof {
                                'tideways_disable',
                                'tideways_xhprof_disable'
                        ] );
+               } else {
+                       return null;
                }
        }
 
@@ -84,6 +86,7 @@ class Xhprof {
         * Call the first available function from $functions.
         * @param array $functions
         * @param array $args
+        * @return mixed
         * @throws Exception
         */
        protected static function callAny( array $functions, array $args = [] ) {