Skip to content

Commit

Permalink
Explicit type conversion where return type is not guaranteed
Browse files Browse the repository at this point in the history
  • Loading branch information
BenMorel committed Nov 15, 2018
1 parent 1a0ff77 commit 1cf6e2f
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion lib/Doctrine/DBAL/Driver/IBMDB2/DB2Connection.php
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public function quote($input, $type = ParameterType::STRING) : string
$input = db2_escape_string($input);

if ($type === ParameterType::INTEGER) {
return $input;
return (string) $input;
}

return "'" . $input . "'";
Expand Down
2 changes: 1 addition & 1 deletion lib/Doctrine/DBAL/Driver/Mysqli/MysqliConnection.php
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ public function exec(string $statement) : int
*/
public function lastInsertId(string $name = null) : string
{
return $this->conn->insert_id;
return (string) $this->conn->insert_id;
}

/**
Expand Down
2 changes: 1 addition & 1 deletion lib/Doctrine/DBAL/Driver/OCI8/OCI8Connection.php
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ public function lastInsertId(string $name = null) : string
throw new OCI8Exception('lastInsertId failed: Query was executed but no result was returned.');
}

return $result;
return (string) $result;
}

/**
Expand Down
2 changes: 1 addition & 1 deletion lib/Doctrine/DBAL/Driver/PDOSqlsrv/Connection.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public function lastInsertId(string $name = null) : string
$stmt = $this->prepare('SELECT CONVERT(VARCHAR(MAX), current_value) FROM sys.sequences WHERE name = ?');
$stmt->execute([$name]);

return $stmt->fetchColumn();
return (string) $stmt->fetchColumn();
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,10 @@ public function getServerVersion()
public function lastInsertId(string $name = null) : string
{
if ($name === null) {
return sasql_insert_id($this->connection);
return (string) sasql_insert_id($this->connection);
}

return $this->query('SELECT ' . $name . '.CURRVAL')->fetchColumn();
return (string) $this->query('SELECT ' . $name . '.CURRVAL')->fetchColumn();
}

/**
Expand Down
2 changes: 1 addition & 1 deletion lib/Doctrine/DBAL/Driver/SQLSrv/SQLSrvConnection.php
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ public function lastInsertId(string $name = null) : string
$stmt = $this->query('SELECT @@IDENTITY');
}

return $stmt->fetchColumn();
return (string) $stmt->fetchColumn();
}

/**
Expand Down
4 changes: 2 additions & 2 deletions tests/Doctrine/Tests/Mocks/ConnectionMock.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,15 @@ public function insert($tableName, array $data, array $types = [])

public function lastInsertId(string $seqName = null) : string
{
return $this->lastInsertId;
return (string) $this->lastInsertId;
}

public function quote($input, $type = ParameterType::STRING) : string
{
if (is_string($input)) {
return "'" . $input . "'";
}
return $input;
return (string) $input;
}

public function setLastInsertId($id)
Expand Down

0 comments on commit 1cf6e2f

Please sign in to comment.