ondrej-bouda / ivory

src/Ivory/Relation/ProjectedRelation.php

Braces +8 added lines, -16 removed lines

@@ -32,14 +32,12 @@ 
                 }
                 $columns[] = new Column($this, count($this->projectionList), $colName, $srcCols[$value]->getType());
                 $this->projectionList[] = (int)$value;
-            }
-            elseif (is_string($value)) { // column name
+            } elseif (is_string($value)) { // column name
                 if ($value[0] == '/') { // PCRE macro
                     $pcre = $value;
                     $matchAll = true;
                     $repl = ($nameSpecified ? $key : null);
-                }
-                else {
+                } else {
                     $pcre = self::simpleMacroPatternToPcre($value, $starCnt);
                     $matchAll = ($starCnt > 0);
                     $repl = ($nameSpecified ? self::simpleMacroReplacementToPcre($key) : null);
@@ -55,8 +53,7 @@ 
                     if (!$matchAll) {
                         $matched = array_slice($matched, 0, 1, true);
                     }
-                }
-                else {
+                } else {
                     $matched = [];
                     foreach ($srcCols as $i => $c) {
                         if ($c->getName() !== null) {
@@ -77,12 +74,10 @@ 
                     $columns[] = new Column($this, count($this->projectionList), $cn, $srcCols[$i]->getType());
                     $this->projectionList[] = $i;
                 }
-            }
-            elseif ($value instanceof ITupleEvaluator || $value instanceof \Closure) {
+            } elseif ($value instanceof ITupleEvaluator || $value instanceof \Closure) {
                 $columns[] = new Column($this, $value, $colName, null);
                 $this->projectionList[] = $value;
-            }
-            else {
+            } else {
                 throw new \InvalidArgumentException("Invalid specification of the projection item '$key'");
             }
         }
@@ -98,14 +93,11 @@ 
         foreach ($this->projectionList as $i => $spec) {
             if (is_int($spec)) {
                 $data[$i] = $srcTuple[$spec];
-            }
-            elseif ($spec instanceof ITupleEvaluator) {
+            } elseif ($spec instanceof ITupleEvaluator) {
                 $data[$i] = $spec->evaluate($srcTuple);
-            }
-            elseif ($spec instanceof \Closure) {
+            } elseif ($spec instanceof \Closure) {
                 $data[$i] = call_user_func($spec, $srcTuple);
-            }
-            else {
+            } else {
                 throw new InternalException("The type of projection list item $i is not supported");
             }
         }

src/Ivory/Connection/ICachingConnConfig.php

Indentation +29 added lines, -29 removed lines

@@ -29,35 +29,35 @@
  */
 interface ICachingConnConfig extends IConnConfig
 {
-	/**
-	 * Invalidates the cache of configuration values. Next time a configuration option is read, its fresh value is
-	 * queried from the database.
-	 *
-	 * @param string|string[] one or more names of parameters the cached values of which to invalidate;
-	 *                        <tt>null</tt> invalidates everything
-	 */
-	function invalidateCache($paramName = null);;
+    /**
+     * Invalidates the cache of configuration values. Next time a configuration option is read, its fresh value is
+     * queried from the database.
+     *
+     * @param string|string[] one or more names of parameters the cached values of which to invalidate;
+     *                        <tt>null</tt> invalidates everything
+     */
+    function invalidateCache($paramName = null);;
 
-	/**
-	 * Disables caching of values of a given configuration parameter, or of any configuration parameter.
-	 *
-	 * This is useful for parameters changed indirectly, e.g., using a custom SQL query or within a stored function.
-	 *
-	 * Use {@link enableCaching()} to enable the caching again.
-	 *
-	 * @param string|string[] $paramName one or more names of parameters to disabled caching values of;
-	 *                                   <tt>null</tt> disables the caching altogether
-	 */
-	function disableCaching($paramName = null);
+    /**
+     * Disables caching of values of a given configuration parameter, or of any configuration parameter.
+     *
+     * This is useful for parameters changed indirectly, e.g., using a custom SQL query or within a stored function.
+     *
+     * Use {@link enableCaching()} to enable the caching again.
+     *
+     * @param string|string[] $paramName one or more names of parameters to disabled caching values of;
+     *                                   <tt>null</tt> disables the caching altogether
+     */
+    function disableCaching($paramName = null);
 
-	/**
-	 * Enables caching of configuration parameter values again, after it has been disabled by {@link disableCaching()}.
-	 *
-	 * Note that, if caching was disabled altogether using {@link disableCaching()}, this method will only turn caching
-	 * on for the requested parameters. Others will remain non-cached. To turn caching generally on, use `null` as the
-	 * argument (which is the default).
-	 *
-	 * @param string|string[] $paramName
-	 */
-	function enableCaching($paramName = null);
+    /**
+     * Enables caching of configuration parameter values again, after it has been disabled by {@link disableCaching()}.
+     *
+     * Note that, if caching was disabled altogether using {@link disableCaching()}, this method will only turn caching
+     * on for the requested parameters. Others will remain non-cached. To turn caching generally on, use `null` as the
+     * argument (which is the default).
+     *
+     * @param string|string[] $paramName
+     */
+    function enableCaching($paramName = null);
 }

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
 	 * @param string|string[] one or more names of parameters the cached values of which to invalidate;
 	 *                        <tt>null</tt> invalidates everything
 	 */
-	function invalidateCache($paramName = null);;
+	function invalidateCache($paramName = null); ;
 
 	/**
 	 * Disables caching of values of a given configuration parameter, or of any configuration parameter.

src/Ivory/Connection/Connection.php

Indentation +266 added lines, -266 removed lines

@@ -8,270 +8,270 @@
 // TODO: consider introducing factory methods for abbreviating relation creating; e.g., new QueryRelation($conn, $query)
 class Connection implements IConnection
 {
-	use NotSerializable; // TODO: implement connection serialization instead of giving up
-
-	private $name;
-	private $connCtl;
-	private $typeCtl;
-	private $stmtExec;
-	private $copyCtl;
-	private $txCtl;
-	private $ipcCtl;
-
-	private $config;
-
-
-	/**
-	 * @param string $name name for the connection
-	 * @param ConnectionParameters|array|string $params either a connection parameters object, or an associative array
-	 *                                                    of parameters for {@link ConnectionParameters::__construct()},
-	 *                                                    or a URL for {@link ConnectionParameters::fromUrl()},
-	 *                                                    or a PostgreSQL connection string (see {@link pg_connect()})
-	 */
-	public function __construct($name, $params)
-	{
-		$this->name = $name;
-		$this->connCtl = new ConnectionControl($params); // TODO: extract all usages of ConnectionControl::requireConnection() - consider introducing an interface specifying the method, named like PGSQLDriver or ConnectionManager or ConnectionPool
-		$this->typeCtl = new TypeControl($this, $this->connCtl);
-		$this->stmtExec = new StatementExecution($this->connCtl, $this->typeCtl);
-		$this->copyCtl = new CopyControl();
-		$this->txCtl = new TransactionControl($this->connCtl, $this->stmtExec);
-		$this->ipcCtl = new IPCControl($this->connCtl);
-		$this->config = new ConnConfig($this->connCtl, $this->stmtExec, $this->txCtl);
-	}
-
-	final public function getName()
-	{
-		return $this->name;
-	}
-
-	final public function getConfig()
-	{
-		return $this->config;
-	}
-
-
-	//region Connection Control
-
-	public function getParameters()
-	{
-		return $this->connCtl->getParameters();
-	}
-
-	public function isConnected()
-	{
-		return $this->connCtl->isConnected();
-	}
-
-	public function isConnectedWait()
-	{
-		return $this->connCtl->isConnectedWait();
-	}
-
-	public function connect()
-	{
-		return $this->connCtl->connect();
-	}
-
-	public function connectWait()
-	{
-		return $this->connCtl->connectWait();
-	}
-
-	public function disconnect()
-	{
-		return $this->connCtl->disconnect();
-	}
-
-	//endregion
-
-	//region Type Control
-
-	public function getTypeRegister()
-	{
-		return $this->typeCtl->getTypeRegister();
-	}
-
-	public function getTypeDictionary()
-	{
-		return $this->typeCtl->getTypeDictionary();
-	}
-
-	public function flushTypeDictionary()
-	{
-		$this->typeCtl->flushTypeDictionary();
-	}
-
-	//endregion
-
-	//region Statement Execution
-
-	public function getStatementExceptionFactory()
-	{
-		return $this->stmtExec->getStatementExceptionFactory();
-	}
-
-	public function rawQuery($sqlStatement)
-	{
-		return $this->stmtExec->rawQuery($sqlStatement);
-	}
-
-	public function rawMultiQuery($sqlStatements)
-	{
-		return $this->stmtExec->rawMultiQuery($sqlStatements);
-	}
-
-	public function runScript($sqlScript)
-	{
-		return $this->stmtExec->runScript($sqlScript);
-	}
-
-	//endregion
-
-	//region Copy Control
-
-	public function copyFromFile($file, $table, $columns = null, $options = [])
-	{
-		return $this->copyCtl->copyFromFile($file, $table, $columns, $options);
-	}
-
-	public function copyFromProgram($program, $table, $columns = null, $options = [])
-	{
-		return $this->copyCtl->copyFromProgram($program, $table, $columns, $options);
-	}
-
-	public function copyFromInput($table, $columns = null, $options = [])
-	{
-		return $this->copyCtl->copyFromInput($table, $columns, $options);
-	}
-
-	public function copyToFile($file, $tableOrQuery, $columns = null, $options = [])
-	{
-		return $this->copyCtl->copyToFile($file, $tableOrQuery, $columns, $options);
-	}
-
-	public function copyToProgram($program, $tableOrQuery, $columns = null, $options = [])
-	{
-		return $this->copyCtl->copyToProgram($program, $tableOrQuery, $columns, $options);
-	}
-
-	public function copyToArray($table, $options = [])
-	{
-		return $this->copyCtl->copyToArray($table, $options);
-	}
-
-	//endregion
-
-	//region Transaction Control
-
-	public function inTransaction()
-	{
-		return $this->txCtl->inTransaction();
-	}
-
-	public function startTransaction($transactionOptions = 0)
-	{
-		return $this->txCtl->startTransaction($transactionOptions);
-	}
-
-	public function setupTransaction($transactionOptions)
-	{
-		$this->txCtl->setupTransaction($transactionOptions);
-	}
-
-	public function setupSubsequentTransactions($transactionOptions)
-	{
-		$this->txCtl->setupSubsequentTransactions($transactionOptions);
-	}
-
-	public function commit()
-	{
-		return $this->txCtl->commit();
-	}
-
-	public function rollback()
-	{
-		return $this->txCtl->rollback();
-	}
-
-	public function savepoint($name)
-	{
-		$this->txCtl->savepoint($name);
-	}
-
-	public function rollbackToSavepoint($name)
-	{
-		$this->txCtl->rollbackToSavepoint($name);
-	}
-
-	public function releaseSavepoint($name)
-	{
-		$this->txCtl->releaseSavepoint($name);
-	}
-
-	public function setTransactionSnapshot($snapshotId)
-	{
-		return $this->txCtl->setTransactionSnapshot($snapshotId);
-	}
-
-	public function exportTransactionSnapshot()
-	{
-		return $this->txCtl->exportTransactionSnapshot();
-	}
-
-	public function prepareTransaction($name)
-	{
-		return $this->txCtl->prepareTransaction($name);
-	}
-
-	public function commitPreparedTransaction($name)
-	{
-		$this->txCtl->commitPreparedTransaction($name);
-	}
-
-	public function rollbackPreparedTransaction($name)
-	{
-		$this->txCtl->rollbackPreparedTransaction($name);
-	}
-
-	public function listPreparedTransactions()
-	{
-		return $this->txCtl->listPreparedTransactions();
-	}
-
-	//endregion
-
-	//region IPC Control
-
-	public function getBackendPID()
-	{
-		return $this->ipcCtl->getBackendPID();
-	}
-
-	public function notify($channel, $payload = null)
-	{
-		$this->ipcCtl->notify($channel, $payload);
-	}
-
-	public function listen($channel)
-	{
-		$this->ipcCtl->listen($channel);
-	}
-
-	public function unlisten($channel)
-	{
-		$this->ipcCtl->unlisten($channel);
-	}
-
-	public function unlistenAll()
-	{
-		$this->ipcCtl->unlistenAll();
-	}
-
-	public function pollNotification()
-	{
-		return $this->ipcCtl->pollNotification();
-	}
-
-	//endregion
+    use NotSerializable; // TODO: implement connection serialization instead of giving up
+
+    private $name;
+    private $connCtl;
+    private $typeCtl;
+    private $stmtExec;
+    private $copyCtl;
+    private $txCtl;
+    private $ipcCtl;
+
+    private $config;
+
+
+    /**
+     * @param string $name name for the connection
+     * @param ConnectionParameters|array|string $params either a connection parameters object, or an associative array
+     *                                                    of parameters for {@link ConnectionParameters::__construct()},
+     *                                                    or a URL for {@link ConnectionParameters::fromUrl()},
+     *                                                    or a PostgreSQL connection string (see {@link pg_connect()})
+     */
+    public function __construct($name, $params)
+    {
+        $this->name = $name;
+        $this->connCtl = new ConnectionControl($params); // TODO: extract all usages of ConnectionControl::requireConnection() - consider introducing an interface specifying the method, named like PGSQLDriver or ConnectionManager or ConnectionPool
+        $this->typeCtl = new TypeControl($this, $this->connCtl);
+        $this->stmtExec = new StatementExecution($this->connCtl, $this->typeCtl);
+        $this->copyCtl = new CopyControl();
+        $this->txCtl = new TransactionControl($this->connCtl, $this->stmtExec);
+        $this->ipcCtl = new IPCControl($this->connCtl);
+        $this->config = new ConnConfig($this->connCtl, $this->stmtExec, $this->txCtl);
+    }
+
+    final public function getName()
+    {
+        return $this->name;
+    }
+
+    final public function getConfig()
+    {
+        return $this->config;
+    }
+
+
+    //region Connection Control
+
+    public function getParameters()
+    {
+        return $this->connCtl->getParameters();
+    }
+
+    public function isConnected()
+    {
+        return $this->connCtl->isConnected();
+    }
+
+    public function isConnectedWait()
+    {
+        return $this->connCtl->isConnectedWait();
+    }
+
+    public function connect()
+    {
+        return $this->connCtl->connect();
+    }
+
+    public function connectWait()
+    {
+        return $this->connCtl->connectWait();
+    }
+
+    public function disconnect()
+    {
+        return $this->connCtl->disconnect();
+    }
+
+    //endregion
+
+    //region Type Control
+
+    public function getTypeRegister()
+    {
+        return $this->typeCtl->getTypeRegister();
+    }
+
+    public function getTypeDictionary()
+    {
+        return $this->typeCtl->getTypeDictionary();
+    }
+
+    public function flushTypeDictionary()
+    {
+        $this->typeCtl->flushTypeDictionary();
+    }
+
+    //endregion
+
+    //region Statement Execution
+
+    public function getStatementExceptionFactory()
+    {
+        return $this->stmtExec->getStatementExceptionFactory();
+    }
+
+    public function rawQuery($sqlStatement)
+    {
+        return $this->stmtExec->rawQuery($sqlStatement);
+    }
+
+    public function rawMultiQuery($sqlStatements)
+    {
+        return $this->stmtExec->rawMultiQuery($sqlStatements);
+    }
+
+    public function runScript($sqlScript)
+    {
+        return $this->stmtExec->runScript($sqlScript);
+    }
+
+    //endregion
+
+    //region Copy Control
+
+    public function copyFromFile($file, $table, $columns = null, $options = [])
+    {
+        return $this->copyCtl->copyFromFile($file, $table, $columns, $options);
+    }
+
+    public function copyFromProgram($program, $table, $columns = null, $options = [])
+    {
+        return $this->copyCtl->copyFromProgram($program, $table, $columns, $options);
+    }
+
+    public function copyFromInput($table, $columns = null, $options = [])
+    {
+        return $this->copyCtl->copyFromInput($table, $columns, $options);
+    }
+
+    public function copyToFile($file, $tableOrQuery, $columns = null, $options = [])
+    {
+        return $this->copyCtl->copyToFile($file, $tableOrQuery, $columns, $options);
+    }
+
+    public function copyToProgram($program, $tableOrQuery, $columns = null, $options = [])
+    {
+        return $this->copyCtl->copyToProgram($program, $tableOrQuery, $columns, $options);
+    }
+
+    public function copyToArray($table, $options = [])
+    {
+        return $this->copyCtl->copyToArray($table, $options);
+    }
+
+    //endregion
+
+    //region Transaction Control
+
+    public function inTransaction()
+    {
+        return $this->txCtl->inTransaction();
+    }
+
+    public function startTransaction($transactionOptions = 0)
+    {
+        return $this->txCtl->startTransaction($transactionOptions);
+    }
+
+    public function setupTransaction($transactionOptions)
+    {
+        $this->txCtl->setupTransaction($transactionOptions);
+    }
+
+    public function setupSubsequentTransactions($transactionOptions)
+    {
+        $this->txCtl->setupSubsequentTransactions($transactionOptions);
+    }
+
+    public function commit()
+    {
+        return $this->txCtl->commit();
+    }
+
+    public function rollback()
+    {
+        return $this->txCtl->rollback();
+    }
+
+    public function savepoint($name)
+    {
+        $this->txCtl->savepoint($name);
+    }
+
+    public function rollbackToSavepoint($name)
+    {
+        $this->txCtl->rollbackToSavepoint($name);
+    }
+
+    public function releaseSavepoint($name)
+    {
+        $this->txCtl->releaseSavepoint($name);
+    }
+
+    public function setTransactionSnapshot($snapshotId)
+    {
+        return $this->txCtl->setTransactionSnapshot($snapshotId);
+    }
+
+    public function exportTransactionSnapshot()
+    {
+        return $this->txCtl->exportTransactionSnapshot();
+    }
+
+    public function prepareTransaction($name)
+    {
+        return $this->txCtl->prepareTransaction($name);
+    }
+
+    public function commitPreparedTransaction($name)
+    {
+        $this->txCtl->commitPreparedTransaction($name);
+    }
+
+    public function rollbackPreparedTransaction($name)
+    {
+        $this->txCtl->rollbackPreparedTransaction($name);
+    }
+
+    public function listPreparedTransactions()
+    {
+        return $this->txCtl->listPreparedTransactions();
+    }
+
+    //endregion
+
+    //region IPC Control
+
+    public function getBackendPID()
+    {
+        return $this->ipcCtl->getBackendPID();
+    }
+
+    public function notify($channel, $payload = null)
+    {
+        $this->ipcCtl->notify($channel, $payload);
+    }
+
+    public function listen($channel)
+    {
+        $this->ipcCtl->listen($channel);
+    }
+
+    public function unlisten($channel)
+    {
+        $this->ipcCtl->unlisten($channel);
+    }
+
+    public function unlistenAll()
+    {
+        $this->ipcCtl->unlistenAll();
+    }
+
+    public function pollNotification()
+    {
+        return $this->ipcCtl->pollNotification();
+    }
+
+    //endregion
 }

src/Ivory/Connection/ConnectionParameters.php

Indentation +224 added lines, -224 removed lines

@@ -11,228 +11,228 @@
  */
 class ConnectionParameters implements \ArrayAccess, \IteratorAggregate
 {
-	private $params = [];
-
-
-	public static function create($params)
-	{
-		if (is_array($params)) {
-			return new ConnectionParameters($params);
-		}
-		elseif (is_string($params)) {
-			if (preg_match("~^[^=']+://~", $params)) {
-				return self::fromUri($params);
-			}
-			else {
-				return self::fromConnectionString($params);
-			}
-		}
-		elseif ($params instanceof ConnectionParameters) {
-			return clone $params;
-		}
-		else {
-			throw new \InvalidArgumentException('params');
-		}
-	}
-
-
-	/**
-	 * Creates a connection parameters object from a RFC 3986 URI, e.g., `"postgresql://usr@localhost:5433/db"`.
-	 *
-	 * The accepted URI is the same as for the libpq connect function, described in the
-	 * {@link http://www.postgresql.org/docs/9.4/static/libpq-connect.html PostgreSQL documentation}.
-	 *
-	 * The following holds for the accepted URIs:
-	 * - the URI scheme designator must either be `"postgresql"` or `"postgres"`,
-	 * - any part of the URI is optional,
-	 * - username and password are used as credentials when connecting,
-	 * - server and port specify the server and port to connect to,
-	 * - the path specifies the name of the database to connect to,
-	 * - URI parameters are also supported, e.g., `"postgresql:///mydb?host=localhost&port=5433"`.
-	 *
-	 * @param string $uri
-	 * @return ConnectionParameters
-	 */
-	public static function fromUri($uri)
-	{
-		$c = parse_url($uri);
-		if ($c === false) {
-			// NOTE: parse_url() denies the input if the host part is omitted, even though RFC 3986 says it is optional
-			$auxUri = preg_replace('~//~', '//host', $uri, 1, $found); // NOTE: only preg_replace has a limit :-(
-			if (!$found || ($c = parse_url($auxUri)) === false) {
-				throw new \InvalidArgumentException('uri is malformed');
-			}
-			unset($c['host']);
-		}
-		if (!isset($c['scheme'])) {
-			throw new \InvalidArgumentException('uri scheme not specified');
-		}
-		if ($c['scheme'] != 'postgresql' && $c['scheme'] != 'postgres') {
-			throw new UnsupportedException('Only "postgresql" or "postgres" scheme is supported');
-		}
-
-		$params = array_filter(
-			[
-				'host' => (isset($c['host']) ? $c['host'] : null),
-				'port' => (isset($c['port']) ? $c['port'] : null),
-				'dbname' => (isset($c['path']) && strlen($c['path']) > 1 ? substr($c['path'], 1) : null),
-				'user' => (isset($c['user']) ? $c['user'] : null),
-				'password' => (isset($c['pass']) ? $c['pass'] : null),
-			],
-			'strlen'
-		);
-		if (isset($c['query'])) {
-			parse_str($c['query'], $pars);
-			$params = array_merge($params, $pars);
-		}
-
-		foreach ($params as &$par) {
-			$par = rawurldecode($par); // NOTE: neither parse_url() nor parse_str() do that automatically
-		}
-
-		return new ConnectionParameters($params);
-	}
-
-	/**
-	 * Creates a connection parameters object from a PostgreSQL connection string (see {@link pg_connect()}).
-	 *
-	 * A connection string is a set of `keyword = value` pairs, separated by space. Spaces around the equal sign are
-	 * optional. To contain special characters, the value may be enclosed in single quotes, using backslash as the
-	 * escape character.
-	 *
-	 * For details about the connection parameter keywords and values, see {@link __construct()}.
-	 *
-	 * @param string $connStr a PostgreSQL connection string
-	 * @return ConnectionParameters
-	 */
-	public static function fromConnectionString($connStr)
-	{
-		$params = [];
-		$offset = 0;
-		while (preg_match("~\\s*([^=\\s]+)\\s*=\\s*([^'\\s]+|'(?:[^'\\\\]|\\\\['\\\\])*')~", $connStr, $m, 0, $offset)) {
-			$k = $m[1];
-			$v = $m[2];
-			if ($v[0] == "'") {
-				$v = strtr(substr($v, 1, -1), ["\\'" => "'", '\\\\' => '\\']);
-			}
-			$params[$k] = $v;
-			$offset += strlen($m[0]);
-		}
-		if (strlen(trim(substr($connStr, $offset))) > 0) {
-			throw new \InvalidArgumentException('connStr');
-		}
-
-		return new ConnectionParameters($params);
-	}
-
-	/**
-	 * Initializes the connection parameters from an associative array of keywords to values.
-	 *
-	 * The most important are the following parameters:
-	 * - `host (string)`: the database server to connect to,
-	 * - `port (int)`: the port to connect to,
-	 * - `user (string)`: username to authenticate as,
-	 * - `password (string)`: password for the given username,
-	 * - `dbname (string)`: name of the database to connect to,
-	 * - `connect_timeout (int)`: connection timeout (0 means to wait indefinitely),
-	 * - `options (string)`: the runtime options to send to the server.
-	 *
-	 * For details, see the
-	 * {@link http://www.postgresql.org/docs/current/static/libpq-connect.html#LIBPQ-PARAMKEYWORDS PostgreSQL documentation}.
-	 * Any parameter may be omitted - the default is used then.
-	 *
-	 * @param array $params map: connection parameter keyword => value
-	 */
-	public function __construct($params)
-	{
-		$this->params = $params;
-	}
-
-	/**
-	 * @return string connection string suitable for the pg_connect() function
-	 */
-	public function buildConnectionString()
-	{
-		$kvPairs = [];
-		foreach ($this->params as $k => $v) {
-			if (strlen($v) == 0 || preg_match("~[\\s']~", $v)) {
-				$vstr = "'" . strtr($v, ["'" => "\\'", '\\' => '\\\\']) . "'";
-			}
-			else {
-				$vstr = $v;
-			}
-
-			$kvPairs[] = $k . '=' . $vstr;
-		}
-
-		return implode(' ', $kvPairs);
-	}
-
-
-	/**
-	 * @return string|null
-	 */
-	public function getHost()
-	{
-		return (isset($this->params['host']) ? $this->params['host'] : null);
-	}
-
-	/**
-	 * @return int|null
-	 */
-	public function getPort()
-	{
-		return (isset($this->params['port']) ? (int)$this->params['port'] : null);
-	}
-
-	/**
-	 * @return string|null
-	 */
-	public function getDbName()
-	{
-		return (isset($this->params['dbname']) ? $this->params['dbname'] : null);
-	}
-
-	/**
-	 * @return string|null
-	 */
-	public function getUsername()
-	{
-		return (isset($this->params['user']) ? $this->params['user'] : null);
-	}
-
-	/**
-	 * @return string|null
-	 */
-	public function getPassword()
-	{
-		return (isset($this->params['password']) ? $this->params['password'] : null);
-	}
-
-
-	public function getIterator()
-	{
-		return new \ArrayIterator($this->params);
-	}
-
-
-	public function offsetExists($offset)
-	{
-		return array_key_exists($offset, $this->params);
-	}
-
-	public function offsetGet($offset)
-	{
-		return $this->params[$offset];
-	}
-
-	public function offsetSet($offset, $value)
-	{
-		$this->params[$offset] = ($value === null ? null : (string)$value);
-	}
-
-	public function offsetUnset($offset)
-	{
-		unset($this->params[$offset]);
-	}
+    private $params = [];
+
+
+    public static function create($params)
+    {
+        if (is_array($params)) {
+            return new ConnectionParameters($params);
+        }
+        elseif (is_string($params)) {
+            if (preg_match("~^[^=']+://~", $params)) {
+                return self::fromUri($params);
+            }
+            else {
+                return self::fromConnectionString($params);
+            }
+        }
+        elseif ($params instanceof ConnectionParameters) {
+            return clone $params;
+        }
+        else {
+            throw new \InvalidArgumentException('params');
+        }
+    }
+
+
+    /**
+     * Creates a connection parameters object from a RFC 3986 URI, e.g., `"postgresql://usr@localhost:5433/db"`.
+     *
+     * The accepted URI is the same as for the libpq connect function, described in the
+     * {@link http://www.postgresql.org/docs/9.4/static/libpq-connect.html PostgreSQL documentation}.
+     *
+     * The following holds for the accepted URIs:
+     * - the URI scheme designator must either be `"postgresql"` or `"postgres"`,
+     * - any part of the URI is optional,
+     * - username and password are used as credentials when connecting,
+     * - server and port specify the server and port to connect to,
+     * - the path specifies the name of the database to connect to,
+     * - URI parameters are also supported, e.g., `"postgresql:///mydb?host=localhost&port=5433"`.
+     *
+     * @param string $uri
+     * @return ConnectionParameters
+     */
+    public static function fromUri($uri)
+    {
+        $c = parse_url($uri);
+        if ($c === false) {
+            // NOTE: parse_url() denies the input if the host part is omitted, even though RFC 3986 says it is optional
+            $auxUri = preg_replace('~//~', '//host', $uri, 1, $found); // NOTE: only preg_replace has a limit :-(
+            if (!$found || ($c = parse_url($auxUri)) === false) {
+                throw new \InvalidArgumentException('uri is malformed');
+            }
+            unset($c['host']);
+        }
+        if (!isset($c['scheme'])) {
+            throw new \InvalidArgumentException('uri scheme not specified');
+        }
+        if ($c['scheme'] != 'postgresql' && $c['scheme'] != 'postgres') {
+            throw new UnsupportedException('Only "postgresql" or "postgres" scheme is supported');
+        }
+
+        $params = array_filter(
+            [
+                'host' => (isset($c['host']) ? $c['host'] : null),
+                'port' => (isset($c['port']) ? $c['port'] : null),
+                'dbname' => (isset($c['path']) && strlen($c['path']) > 1 ? substr($c['path'], 1) : null),
+                'user' => (isset($c['user']) ? $c['user'] : null),
+                'password' => (isset($c['pass']) ? $c['pass'] : null),
+            ],
+            'strlen'
+        );
+        if (isset($c['query'])) {
+            parse_str($c['query'], $pars);
+            $params = array_merge($params, $pars);
+        }
+
+        foreach ($params as &$par) {
+            $par = rawurldecode($par); // NOTE: neither parse_url() nor parse_str() do that automatically
+        }
+
+        return new ConnectionParameters($params);
+    }
+
+    /**
+     * Creates a connection parameters object from a PostgreSQL connection string (see {@link pg_connect()}).
+     *
+     * A connection string is a set of `keyword = value` pairs, separated by space. Spaces around the equal sign are
+     * optional. To contain special characters, the value may be enclosed in single quotes, using backslash as the
+     * escape character.
+     *
+     * For details about the connection parameter keywords and values, see {@link __construct()}.
+     *
+     * @param string $connStr a PostgreSQL connection string
+     * @return ConnectionParameters
+     */
+    public static function fromConnectionString($connStr)
+    {
+        $params = [];
+        $offset = 0;
+        while (preg_match("~\\s*([^=\\s]+)\\s*=\\s*([^'\\s]+|'(?:[^'\\\\]|\\\\['\\\\])*')~", $connStr, $m, 0, $offset)) {
+            $k = $m[1];
+            $v = $m[2];
+            if ($v[0] == "'") {
+                $v = strtr(substr($v, 1, -1), ["\\'" => "'", '\\\\' => '\\']);
+            }
+            $params[$k] = $v;
+            $offset += strlen($m[0]);
+        }
+        if (strlen(trim(substr($connStr, $offset))) > 0) {
+            throw new \InvalidArgumentException('connStr');
+        }
+
+        return new ConnectionParameters($params);
+    }
+
+    /**
+     * Initializes the connection parameters from an associative array of keywords to values.
+     *
+     * The most important are the following parameters:
+     * - `host (string)`: the database server to connect to,
+     * - `port (int)`: the port to connect to,
+     * - `user (string)`: username to authenticate as,
+     * - `password (string)`: password for the given username,
+     * - `dbname (string)`: name of the database to connect to,
+     * - `connect_timeout (int)`: connection timeout (0 means to wait indefinitely),
+     * - `options (string)`: the runtime options to send to the server.
+     *
+     * For details, see the
+     * {@link http://www.postgresql.org/docs/current/static/libpq-connect.html#LIBPQ-PARAMKEYWORDS PostgreSQL documentation}.
+     * Any parameter may be omitted - the default is used then.
+     *
+     * @param array $params map: connection parameter keyword => value
+     */
+    public function __construct($params)
+    {
+        $this->params = $params;
+    }
+
+    /**
+     * @return string connection string suitable for the pg_connect() function
+     */
+    public function buildConnectionString()
+    {
+        $kvPairs = [];
+        foreach ($this->params as $k => $v) {
+            if (strlen($v) == 0 || preg_match("~[\\s']~", $v)) {
+                $vstr = "'" . strtr($v, ["'" => "\\'", '\\' => '\\\\']) . "'";
+            }
+            else {
+                $vstr = $v;
+            }
+
+            $kvPairs[] = $k . '=' . $vstr;
+        }
+
+        return implode(' ', $kvPairs);
+    }
+
+
+    /**
+     * @return string|null
+     */
+    public function getHost()
+    {
+        return (isset($this->params['host']) ? $this->params['host'] : null);
+    }
+
+    /**
+     * @return int|null
+     */
+    public function getPort()
+    {
+        return (isset($this->params['port']) ? (int)$this->params['port'] : null);
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getDbName()
+    {
+        return (isset($this->params['dbname']) ? $this->params['dbname'] : null);
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getUsername()
+    {
+        return (isset($this->params['user']) ? $this->params['user'] : null);
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getPassword()
+    {
+        return (isset($this->params['password']) ? $this->params['password'] : null);
+    }
+
+
+    public function getIterator()
+    {
+        return new \ArrayIterator($this->params);
+    }
+
+
+    public function offsetExists($offset)
+    {
+        return array_key_exists($offset, $this->params);
+    }
+
+    public function offsetGet($offset)
+    {
+        return $this->params[$offset];
+    }
+
+    public function offsetSet($offset, $value)
+    {
+        $this->params[$offset] = ($value === null ? null : (string)$value);
+    }
+
+    public function offsetUnset($offset)
+    {
+        unset($this->params[$offset]);
+    }
 }

Braces +5 added lines, -10 removed lines

@@ -18,19 +18,15 @@ 
 	{
 		if (is_array($params)) {
 			return new ConnectionParameters($params);
-		}
-		elseif (is_string($params)) {
+		} elseif (is_string($params)) {
 			if (preg_match("~^[^=']+://~", $params)) {
 				return self::fromUri($params);
-			}
-			else {
+			} else {
 				return self::fromConnectionString($params);
 			}
-		}
-		elseif ($params instanceof ConnectionParameters) {
+		} elseif ($params instanceof ConnectionParameters) {
 			return clone $params;
-		}
-		else {
+		} else {
 			throw new \InvalidArgumentException('params');
 		}
 	}
@@ -157,8 +153,7 @@ 
 		foreach ($this->params as $k => $v) {
 			if (strlen($v) == 0 || preg_match("~[\\s']~", $v)) {
 				$vstr = "'" . strtr($v, ["'" => "\\'", '\\' => '\\\\']) . "'";
-			}
-			else {
+			} else {
 				$vstr = $v;
 			}
 

src/Ivory/Connection/ConfigParamType.php

Braces +1 added lines, -2 removed lines

@@ -102,8 +102,7 @@
             case self::INTEGER_WITH_UNIT:
                 if ($unit !== null) {
                     return Quantity::fromValue($valueString, $unit);
-                }
-                else {
+                } else {
                     return Quantity::fromString($valueString);
                 }
         }

src/Ivory/Connection/TxConfig.php

Braces +2 added lines, -4 removed lines

@@ -63,11 +63,9 @@
                 throw new \InvalidArgumentException(__CLASS__ . " options specify both $errorDesc");
             }
             return true;
-        }
-        elseif ($options & $falseBit) {
+        } elseif ($options & $falseBit) {
             return false;
-        }
-        else {
+        } else {
             return null;
         }
     }

src/Ivory/Connection/StatementExecution.php

Braces +1 added lines, -2 removed lines

@@ -138,8 +138,7 @@
         if ($resNotice !== $connNotice) {
             $this->connCtl->setLastNotice($resNotice);
             return $resNotice;
-        }
-        else {
+        } else {
             return null;
         }
     }

src/Ivory/Connection/CachingConnConfig.php

Braces +5 added lines, -10 removed lines

@@ -20,8 +20,7 @@ 
     {
         if ($paramName === null) {
             $this->cachedValues = [];
-        }
-        else {
+        } else {
             foreach ((array)$paramName as $pn) {
                 unset($this->cachedValues[$pn]);
             }
@@ -33,13 +32,11 @@ 
         if ($paramName === null) {
             $this->cacheEnabled = false;
             $this->cacheExceptions = [];
-        }
-        elseif ($this->cacheEnabled) {
+        } elseif ($this->cacheEnabled) {
             foreach ((array)$paramName as $pn) {
                 $this->cacheExceptions[$pn] = true;
             }
-        }
-        else {
+        } else {
             foreach ((array)$paramName as $pn) {
                 unset($this->cacheExceptions[$pn]);
             }
@@ -53,13 +50,11 @@ 
         if ($paramName === null) {
             $this->cacheEnabled = true;
             $this->cacheExceptions = [];
-        }
-        elseif (!$this->cacheEnabled) {
+        } elseif (!$this->cacheEnabled) {
             foreach ((array)$paramName as $pn) {
                 $this->cacheExceptions[$pn] = true;
             }
-        }
-        else {
+        } else {
             foreach ((array)$paramName as $pn) {
                 unset($this->cacheExceptions[$pn]);
             }

src/Ivory/Connection/TypeControl.php

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
 
     private function setupTypeDictionaryUndefinedHandler()
     {
-        $handler = function ($oid, $schemaName, $typeName, $value) {
+        $handler = function($oid, $schemaName, $typeName, $value) {
             $compiler = new IntrospectingTypeDictionaryCompiler($this->connection, $this->connCtl->requireConnection());
             $dict = $compiler->compileTypeDictionary($this);
             $this->initTypeDictionary($dict);

Braces +3 added lines, -6 removed lines

@@ -70,14 +70,11 @@
 
             if ($oid !== null) {
                 $type = $dict->requireTypeByOid($oid);
-            }
-            elseif ($typeName !== null) {
+            } elseif ($typeName !== null) {
                 $type = $dict->requireTypeByName($typeName, $schemaName);
-            }
-            elseif ($value !== null) {
+            } elseif ($value !== null) {
                 $type = $dict->requireTypeByValue($value);
-            }
-            else {
+            } else {
                 return null;
             }