aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--phpBB/includes/db/mssql.php2
-rw-r--r--phpBB/includes/db/mssql_odbc.php2
-rw-r--r--phpBB/includes/db/mssqlnative.php6
-rw-r--r--phpBB/includes/db/mysql.php4
-rw-r--r--phpBB/includes/db/sqlite.php2
-rw-r--r--tests/dbal/connect_test.php3
6 files changed, 10 insertions, 9 deletions
diff --git a/phpBB/includes/db/mssql.php b/phpBB/includes/db/mssql.php
index 3792e82aa0..2dd95c2508 100644
--- a/phpBB/includes/db/mssql.php
+++ b/phpBB/includes/db/mssql.php
@@ -367,7 +367,7 @@ class dbal_mssql extends dbal
{
$error = array(
'message' => @mssql_get_last_message(),
- 'code' => ''
+ 'code' => '',
);
// Get error code number
diff --git a/phpBB/includes/db/mssql_odbc.php b/phpBB/includes/db/mssql_odbc.php
index e1234389df..47792d74ab 100644
--- a/phpBB/includes/db/mssql_odbc.php
+++ b/phpBB/includes/db/mssql_odbc.php
@@ -364,7 +364,7 @@ class dbal_mssql_odbc extends dbal
{
return array(
'message' => @odbc_errormsg(),
- 'code' => @odbc_error()
+ 'code' => @odbc_error(),
);
}
else
diff --git a/phpBB/includes/db/mssqlnative.php b/phpBB/includes/db/mssqlnative.php
index e5de30faf6..41ac0a1784 100644
--- a/phpBB/includes/db/mssqlnative.php
+++ b/phpBB/includes/db/mssqlnative.php
@@ -526,10 +526,10 @@ class dbal_mssqlnative extends dbal
{
foreach ($errors as $error)
{
- $error_message .= "SQLSTATE: ".$error[ 'SQLSTATE']."\n";
- $error_message .= "code: ".$error[ 'code']."\n";
+ $error_message .= "SQLSTATE: " . $error[ 'SQLSTATE'] . "\n";
+ $error_message .= "code: " . $error[ 'code'] . "\n";
$code = $error['code'];
- $error_message .= "message: ".$error[ 'message']."\n";
+ $error_message .= "message: " . $error[ 'message'] . "\n";
}
$this->last_error_result = $error_message;
$error = $this->last_error_result;
diff --git a/phpBB/includes/db/mysql.php b/phpBB/includes/db/mysql.php
index 7314e92087..0125be0917 100644
--- a/phpBB/includes/db/mysql.php
+++ b/phpBB/includes/db/mysql.php
@@ -443,7 +443,7 @@ class dbal_mysql extends dbal
{
return array(
'message' => @mysql_error(),
- 'code' => @mysql_errno()
+ 'code' => @mysql_errno(),
);
}
else
@@ -457,7 +457,7 @@ class dbal_mysql extends dbal
return array(
'message' => @mysql_error($this->db_connect_id),
- 'code' => @mysql_errno($this->db_connect_id)
+ 'code' => @mysql_errno($this->db_connect_id),
);
}
diff --git a/phpBB/includes/db/sqlite.php b/phpBB/includes/db/sqlite.php
index 3c9b2cce34..199b4eed23 100644
--- a/phpBB/includes/db/sqlite.php
+++ b/phpBB/includes/db/sqlite.php
@@ -304,7 +304,7 @@ class dbal_sqlite extends dbal
{
return array(
'message' => @sqlite_error_string(@sqlite_last_error($this->db_connect_id)),
- 'code' => @sqlite_last_error($this->db_connect_id)
+ 'code' => @sqlite_last_error($this->db_connect_id),
);
}
else
diff --git a/tests/dbal/connect_test.php b/tests/dbal/connect_test.php
index cefd76aa16..505ce28fa1 100644
--- a/tests/dbal/connect_test.php
+++ b/tests/dbal/connect_test.php
@@ -33,7 +33,8 @@ class phpbb_dbal_connect_test extends phpbb_database_test_case
{
$db->sql_connect($config['dbhost'], 'phpbbogus', 'phpbbogus', 'phpbbogus', $config['dbport']);
$this->assertFalse(true);
- } catch (Exception $e)
+ }
+ catch (Exception $e)
{
// should have a legitimate message
$this->assertNotEmpty($e->getMessage());