fix #14749 - Uncaught TypeError in routines

Signed-off-by: William Desportes <williamdes@wdes.fr>

5 files changed, 9 insertions, 8 deletions

diff --git a/libraries/classes/DatabaseInterface.php b/libraries/classes/DatabaseInterface.php
index 8dd64c9ba0..c1fc1d58df 100644
--- a/libraries/classes/DatabaseInterface.php
+++ b/libraries/classes/DatabaseInterface.php
@@ -1965,14 +1965,14 @@ class DatabaseInterface
      * @param string  $name  the procedure|function|event|view name
      * @param integer $link  link type
      *
-     * @return string the definition
+     * @return string|null the definition
      */
     public function getDefinition(
         string $db,
         string $which,
         string $name,
         $link = DatabaseInterface::CONNECT_USER
-    ): string {
+    ): ?string {
         $returned_field = [
             'PROCEDURE' => 'Create Procedure',
             'FUNCTION'  => 'Create Function',
@@ -1982,7 +1982,8 @@ class DatabaseInterface
         $query = 'SHOW CREATE ' . $which . ' '
             . Util::backquote($db) . '.'
             . Util::backquote($name);
-        return $this->fetchValue($query, 0, $returned_field[$which], $link);
+        $result = $this->fetchValue($query, 0, $returned_field[$which], $link);
+        return is_string($result) ? $result : null;
     }
 
     /**
diff --git a/libraries/classes/Operations.php b/libraries/classes/Operations.php
index 5fc5b1265a..6229a50815 100644
--- a/libraries/classes/Operations.php
+++ b/libraries/classes/Operations.php
@@ -359,7 +359,7 @@ class Operations
                     'PROCEDURE',
                     $procedure_name
                 );
-                if ($tmp_query !== false) {
+                if ($tmp_query !== null) {
                     // collect for later display
                     $GLOBALS['sql_query'] .= "\n" . $tmp_query;
                     $this->dbi->selectDb($_REQUEST['newname']);
@@ -377,7 +377,7 @@ class Operations
                     'FUNCTION',
                     $function_name
                 );
-                if ($tmp_query !== false) {
+                if ($tmp_query !== null) {
                     // collect for later display
                     $GLOBALS['sql_query'] .= "\n" . $tmp_query;
                     $this->dbi->selectDb($_REQUEST['newname']);
diff --git a/libraries/classes/Rte/Export.php b/libraries/classes/Rte/Export.php
index 040de58a35..63df464dba 100644
--- a/libraries/classes/Rte/Export.php
+++ b/libraries/classes/Rte/Export.php
@@ -130,7 +130,7 @@ class Export
                         $_GET['item_type'],
                         $_GET['item_name']
                     );
-                if (! $rtn_definition) {
+                if ($rtn_definition === null) {
                     $export_data = false;
                 } else {
                     $export_data = "DELIMITER $$\n"
diff --git a/libraries/classes/Rte/Routines.php b/libraries/classes/Rte/Routines.php
index eeccefce7f..6006906eb9 100644
--- a/libraries/classes/Rte/Routines.php
+++ b/libraries/classes/Rte/Routines.php
@@ -671,7 +671,7 @@ class Routines
                 $routine['SPECIFIC_NAME']
             );
 
-        if ($definition == null) {
+        if ($definition === null) {
             return false;
         }
 
diff --git a/libraries/classes/Rte/RteList.php b/libraries/classes/Rte/RteList.php
index 8b0ae966da..b3e924cb71 100644
--- a/libraries/classes/Rte/RteList.php
+++ b/libraries/classes/Rte/RteList.php
@@ -296,7 +296,7 @@ class RteList
             $routine['type'],
             $routine['name']
         );
-        if ($definition !== false) {
+        if ($definition !== null) {
             $parser = new Parser($definition);
 
             /**