Merge remote-tracking branch 'upstream/develop' into 4.3

Author: kenjis

phpstan-baseline.neon.dist

@@ -70,16 +70,6 @@ parameters:
 			count: 1
 			path: system/Database/BaseBuilder.php
 
-		-
-			message: "#^Call to an undefined method CodeIgniter\\\\Database\\\\BaseConnection\\:\\:_disableForeignKeyChecks\\(\\)\\.$#"
-			count: 1
-			path: system/Database/BaseConnection.php
-
-		-
-			message: "#^Call to an undefined method CodeIgniter\\\\Database\\\\BaseConnection\\:\\:_enableForeignKeyChecks\\(\\)\\.$#"
-			count: 1
-			path: system/Database/BaseConnection.php
-
 		-
 			message: "#^Call to an undefined method CodeIgniter\\\\Database\\\\QueryInterface\\:\\:getOriginalQuery\\(\\)\\.$#"
 			count: 1

system/Database/BaseConnection.php

@@ -423,13 +423,6 @@ public function initialize()
         $this->connectDuration = microtime(true) - $this->connectTime;
     }
 
-    /**
-     * Connect to the database.
-     *
-     * @return mixed
-     */
-    abstract public function connect(bool $persistent = false);
-
     /**
      * Close the database connection.
      */
@@ -458,14 +451,6 @@ public function persistentConnect()
         return $this->connect(true);
     }
 
-    /**
-     * Keep or establish the connection if no queries have been sent for
-     * a length of time exceeding the server's idle timeout.
-     *
-     * @return mixed
-     */
-    abstract public function reconnect();
-
     /**
      * Returns the actual connection object. If both a 'read' and 'write'
      * connection has been specified, you can pass either term in to
@@ -480,13 +465,6 @@ public function getConnection(?string $alias = null)
         return $this->connID;
     }
 
-    /**
-     * Select a specific database table to use.
-     *
-     * @return mixed
-     */
-    abstract public function setDatabase(string $databaseName);
-
     /**
      * Returns the name of the current database being used.
      */
@@ -523,11 +501,6 @@ public function getPlatform(): string
         return $this->DBDriver;
     }
 
-    /**
-     * Returns a string containing the version of the database being used.
-     */
-    abstract public function getVersion(): string;
-
     /**
      * Sets the Table Aliases to use. These are typically
      * collected during use of the Builder, and set here
@@ -1588,21 +1561,35 @@ protected function foreignKeyDataToObjects(array $data)
 
     /**
      * Disables foreign key checks temporarily.
+     *
+     * @return bool
      */
     public function disableForeignKeyChecks()
     {
         $sql = $this->_disableForeignKeyChecks();
 
+        if ($sql === '') {
+            // The feature is not supported.
+            return false;
+        }
+
         return $this->query($sql);
     }
 
     /**
      * Enables foreign key checks temporarily.
+     *
+     * @return bool
      */
     public function enableForeignKeyChecks()
     {
         $sql = $this->_enableForeignKeyChecks();
 
+        if ($sql === '') {
+            // The feature is not supported.
+            return false;
+        }
+
         return $this->query($sql);
     }
 
@@ -1697,6 +1684,38 @@ abstract protected function _indexData(string $table): array;
      */
     abstract protected function _foreignKeyData(string $table): array;
 
+    /**
+     * Platform-specific SQL statement to disable foreign key checks.
+     *
+     * If this feature is not supported, return empty string.
+     *
+     * @TODO This method should be moved to an interface that represents foreign key support.
+     *
+     * @return string
+     *
+     * @see disableForeignKeyChecks()
+     */
+    protected function _disableForeignKeyChecks()
+    {
+        return '';
+    }
+
+    /**
+     * Platform-specific SQL statement to enable foreign key checks.
+     *
+     * If this feature is not supported, return empty string.
+     *
+     * @TODO This method should be moved to an interface that represents foreign key support.
+     *
+     * @return string
+     *
+     * @see enableForeignKeyChecks()
+     */
+    protected function _enableForeignKeyChecks()
+    {
+        return '';
+    }
+
     /**
      * Accessor for properties if they exist.
      *