Version 4.7.0

admin/convertutf8/system/Convert/Convert.php

@@ -549,7 +549,7 @@ class Convert
 				}
 				
 				/* If we have moved the only row from $batch to $nextbatch, then process that now */
-				if ( \count( $nextBatch ) and ! \count( $batch ) )
+				if ( \is_array( $batch ) and \count( $nextBatch ) and ! \count( $batch ) )
 				{
 					$batch     = $nextBatch;
 					$nextBatch = array();

admin/convertutf8/system/Db/Db.php

@@ -183,7 +183,7 @@ class Db extends \mysqli
 	 * @see		<a href="http://uk1.php.net/manual/en/mysqli.query.php">mysqli::query</a>
 	 * @throws	\IPS\Db\Exception
 	 */
-	public function query( $query )
+	public function query( string $query, int $result_mode = MYSQLI_STORE_RESULT )
 	{
 		/* Should we return the query instead of executing it? */
 		if( $this->returnQuery === TRUE )