From bb94bdeb2e92da1cc372a3a3a9278c922bfdc847 Mon Sep 17 00:00:00 2001
From: Hugues Peccatte <hugues.peccatte@gmail.com>
Date: Fri, 1 Nov 2019 22:55:56 +0100
Subject: [PATCH] Use is_* functions instead of gettype

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
---
 libraries/classes/Display/Results.php | 6 +++---
 libraries/classes/Error.php           | 2 +-
 libraries/classes/Sql.php             | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libraries/classes/Display/Results.php b/libraries/classes/Display/Results.php
index ddda6a3320..8342a98362 100644
--- a/libraries/classes/Display/Results.php
+++ b/libraries/classes/Display/Results.php
@@ -3796,7 +3796,7 @@ class Results
         $is_analyse = $this->__get('is_analyse');
         $field_flags = $GLOBALS['dbi']->fieldFlags($dt_result, $col_index);
 
-        $bIsText = gettype($transformation_plugin) === 'object'
+        $bIsText = is_object($transformation_plugin)
             && strpos($transformation_plugin->getMIMEType(), 'Text')
             === false;
 
@@ -3828,7 +3828,7 @@ class Results
         // Cut all fields to $GLOBALS['cfg']['LimitChars']
         // (unless it's a link-type transformation or binary)
         $displayedColumn = $column;
-        if (! (gettype($transformation_plugin) === "object"
+        if (! (is_object($transformation_plugin)
             && strpos($transformation_plugin->getName(), 'Link') !== false)
             && false === stripos($field_flags, self::BINARY_FIELD)
         ) {
@@ -5076,7 +5076,7 @@ class Results
         $result .= ']';
 
         // if we want to use a text transformation on a BLOB column
-        if (gettype($transformation_plugin) === "object") {
+        if (is_object($transformation_plugin)) {
             $posMimeOctetstream = strpos(
                 $transformation_plugin->getMIMESubtype(),
                 'Octetstream'
diff --git a/libraries/classes/Error.php b/libraries/classes/Error.php
index 2f4db57748..e407fcc506 100644
--- a/libraries/classes/Error.php
+++ b/libraries/classes/Error.php
@@ -425,7 +425,7 @@ class Error extends Message
         if (in_array($function, $include_functions)) {
             $retval .= self::relPath($arg);
         } elseif (in_array($function, $connect_functions)
-            && gettype($arg) === 'string'
+            && is_string($arg)
         ) {
             $retval .= gettype($arg) . ' ********';
         } elseif (is_scalar($arg)) {
diff --git a/libraries/classes/Sql.php b/libraries/classes/Sql.php
index 2ae2abf194..1d92e19945 100644
--- a/libraries/classes/Sql.php
+++ b/libraries/classes/Sql.php
@@ -643,7 +643,7 @@ class Sql
             $property_value,
             $_POST['table_create_time']
         );
-        if (gettype($retval) != 'boolean') {
+        if (! is_bool($retval)) {
             $response = Response::getInstance();
             $response->setRequestStatus(false);
             $response->addJSON('message', $retval->getString());