From 54186c9d262910075fe6cbd3cc01e45f774f6759 Mon Sep 17 00:00:00 2001 From: Aaron Piotrowski Date: Thu, 13 Feb 2020 17:13:28 -0600 Subject: [PATCH] Remove unneeded str_replace() ConnectionConfig object made this unnecessary. --- src/PgSqlConnection.php | 16 ++++++---------- src/PqConnection.php | 16 ++++++---------- 2 files changed, 12 insertions(+), 20 deletions(-) diff --git a/src/PgSqlConnection.php b/src/PgSqlConnection.php index 56c2612..405e398 100644 --- a/src/PgSqlConnection.php +++ b/src/PgSqlConnection.php @@ -27,9 +27,7 @@ final class PgSqlConnection extends Connection implements Link throw new \Error('ext-pgsql is not compatible with pecl-ev; use pecl-pq or a different loop extension'); } // @codeCoverageIgnoreEnd - $connectionString = \str_replace(";", " ", $connectionConfig->getConnectionString()); - - if (!$connection = @\pg_connect($connectionString, \PGSQL_CONNECT_ASYNC | \PGSQL_CONNECT_FORCE_NEW)) { + if (!$connection = @\pg_connect($connectionConfig->getConnectionString(), \PGSQL_CONNECT_ASYNC | \PGSQL_CONNECT_FORCE_NEW)) { return new Failure(new ConnectionException("Failed to create connection resource")); } @@ -43,13 +41,11 @@ final class PgSqlConnection extends Connection implements Link $deferred = new Deferred; - $callback = function ($watcher, $resource) use ($connection, $deferred) { + $callback = function ($watcher, $resource) use ($connection, $deferred): void { switch (\pg_connect_poll($connection)) { - case \PGSQL_POLLING_READING: - return; // Connection not ready, poll again. - - case \PGSQL_POLLING_WRITING: - return; // Still writing... + case \PGSQL_POLLING_READING: // Connection not ready, poll again. + case \PGSQL_POLLING_WRITING: // Still writing... + return; case \PGSQL_POLLING_FAILED: $deferred->fail(new ConnectionException(\pg_last_error($connection))); @@ -66,7 +62,7 @@ final class PgSqlConnection extends Connection implements Link $promise = $deferred->promise(); - $token = $token ?? new NullCancellationToken(); + $token = $token ?? new NullCancellationToken; $id = $token->subscribe([$deferred, "fail"]); $promise->onResolve(function ($exception) use ($connection, $poll, $await, $id, $token): void { diff --git a/src/PqConnection.php b/src/PqConnection.php index c2d7925..74d7304 100644 --- a/src/PqConnection.php +++ b/src/PqConnection.php @@ -24,10 +24,8 @@ final class PqConnection extends Connection implements Link */ public static function connect(ConnectionConfig $connectionConfig, ?CancellationToken $token = null): Promise { - $connectionString = \str_replace(";", " ", $connectionConfig->getConnectionString()); - try { - $connection = new pq\Connection($connectionString, pq\Connection::ASYNC); + $connection = new pq\Connection($connectionConfig->getConnectionString(), pq\Connection::ASYNC); } catch (pq\Exception $exception) { return new Failure(new ConnectionException("Could not connect to PostgreSQL server", 0, $exception)); } @@ -37,13 +35,11 @@ final class PqConnection extends Connection implements Link $deferred = new Deferred; - $callback = function () use ($connection, $deferred) { + $callback = function () use ($connection, $deferred): void { switch ($connection->poll()) { - case pq\Connection::POLLING_READING: - return; // Connection not ready, poll again. - - case pq\Connection::POLLING_WRITING: - return; // Still writing... + case pq\Connection::POLLING_READING: // Connection not ready, poll again. + case pq\Connection::POLLING_WRITING: // Still writing... + return; case pq\Connection::POLLING_FAILED: $deferred->fail(new ConnectionException($connection->errorMessage)); @@ -60,7 +56,7 @@ final class PqConnection extends Connection implements Link $promise = $deferred->promise(); - $token = $token ?? new NullCancellationToken(); + $token = $token ?? new NullCancellationToken; $id = $token->subscribe([$deferred, "fail"]); $promise->onResolve(function () use ($poll, $await, $id, $token): void {