ondrej-bouda / ivory

src/Ivory/Connection/ConnConfig.php

Doc Comments +3 added lines

@@ -301,6 +301,9 @@
                 {
                     private $refresher;
 
+                    /**
+                     * @param \Closure $refresher
+                     */
                     public function __construct($refresher)
                     {
                         $this->refresher = $refresher;

Spacing +1 added lines, -1 removed lines

@@ -293,7 +293,7 @@
     {
         if ($this->effectiveSearchPathCache === null) {
             $this->initEffectiveSearchPathCache();
-            $refresher = function () {
+            $refresher = function() {
                 $this->initEffectiveSearchPathCache();
             };
             $this->addObserver(

Braces +6 added lines, -12 removed lines

@@ -118,8 +118,7 @@ 
             }
             if ($res !== false) {
                 return pg_fetch_result($res, 0, 0);
-            }
-            else {
+            } else {
                 return null;
             }
         }
@@ -156,8 +155,7 @@ 
         // try exact match first, for performance reasons; hopefully, indexing the type map will not be needed
         if (array_key_exists($propertyName, ConfigParam::TYPEMAP)) {
             $type = ConfigParam::TYPEMAP[$propertyName];
-        }
-        else {
+        } else {
             // okay, try to search for case-insensitive matches
             if ($this->typeCache === null) {
                 $this->typeCache = array_change_key_case(ConfigParam::TYPEMAP, CASE_LOWER);
@@ -180,8 +178,7 @@ 
                     $this->typeCache[$propertyName] = $type;
                     $this->typeCache[strtolower($propertyName)] = $type;
                     return ConfigParamType::createValue($type, $row['setting'], $row['unit']);
-                }
-                catch (UnsupportedException $e) {
+                } catch (UnsupportedException $e) {
                     throw new UnsupportedException("Unsupported type of configuration parameter '$propertyName'");
                 }
             }
@@ -199,8 +196,7 @@ 
         if ($res !== false) {
             $val = pg_fetch_result($res, 0, 0);
             return ConfigParamType::createValue($type, $val);
-        }
-        else {
+        } else {
             return null;
         }
     }
@@ -342,8 +338,7 @@ 
         $v = $r->value();
         if (preg_match('~1(\D*)2~', $v, $m)) {
             return $m[1];
-        }
-        else {
+        } else {
             return null;
         }
     }
@@ -357,8 +352,7 @@ 
             foreach ($parameterName as $pn) {
                 $this->addObserverImpl($observer, $pn);
             }
-        }
-        else {
+        } else {
             $this->addObserverImpl($observer, $parameterName);
         }
     }

src/Ivory/Connection/ConnConfigTransactionWatcher.php

Doc Comments +9 added lines

@@ -40,6 +40,9 @@ 
     }
 
 
+    /**
+     * @param string $propertyName
+     */
     public function handleSetForTransaction($propertyName)
     {
         if ($this->inTrans) {
@@ -47,6 +50,9 @@ 
         }
     }
 
+    /**
+     * @param string $propertyName
+     */
     public function handleSetForSession($propertyName)
     {
         if ($this->inTrans) {
@@ -157,6 +163,9 @@ 
         }
     }
 
+    /**
+     * @param string $name
+     */
     private function findSavepoint($name)
     {
         for ($idx = $this->tailIdx - 1; $idx >= 0; $idx--) {

Braces +2 added lines, -4 removed lines

@@ -97,8 +97,7 @@ 
 
         if (isset($rolledBack[self::RESET_ALL])) {
             $this->connConfig->notifyPropertiesReset();
-        }
-        else {
+        } else {
             foreach ($rolledBack as $propName) {
                 $this->connConfig->notifyPropertyChange($propName);
             }
@@ -149,8 +148,7 @@ 
 
         if (isset($rolledBack[self::RESET_ALL])) {
             $this->connConfig->notifyPropertiesReset();
-        }
-        else {
+        } else {
             foreach ($rolledBack as $propName) {
                 $this->connConfig->notifyPropertyChange($propName);
             }

src/Ivory/Exception/StatementExceptionFactory.php

Doc Comments +3 added lines

@@ -108,6 +108,9 @@
         return new $exClass($resultHandler, $query);
     }
 
+    /**
+     * @param resource $resultHandler
+     */
     private function inferExceptionClass($resultHandler, StatementExceptionFactory $fallbackFactory = null)
     {
         if ($this->bySqlStateCodeAndMessage || $this->bySqlStateCode || $this->bySqlStateClass) {

Braces +1 added lines, -2 removed lines

@@ -145,8 +145,7 @@
 
         if ($fallbackFactory !== null) {
             return $fallbackFactory->inferExceptionClass($resultHandler);
-        }
-        else {
+        } else {
             return StatementException::class;
         }
     }

src/Ivory/Ivory.php

Doc Comments +1 added lines, -1 removed lines

@@ -166,7 +166,7 @@
 	}
 
 	/**
-	 * @param IConnection|string $conn (name of) connection to use as the default connection
+	 * @param IConnection $conn (name of) connection to use as the default connection
 	 * @throws \RuntimeException if the requested connection is not defined
 	 */
 	public static function useConnectionAsDefault($conn)

Indentation +135 added lines, -135 removed lines

@@ -12,16 +12,16 @@ 
 {
     /** @var ICoreFactory */
     private static $coreFactory = null;
-	/** @var TypeRegister */
-	private static $typeRegister = null;
-	/** @var SqlPatternParser */
-	private static $sqlPatternParser = null;
-	/** @var StatementExceptionFactory */
-	private static $stmtExFactory = null;
-	/** @var IConnection[] map: name => connection */
-	private static $connections = [];
-	/** @var IConnection */
-	private static $defaultConn = null;
+    /** @var TypeRegister */
+    private static $typeRegister = null;
+    /** @var SqlPatternParser */
+    private static $sqlPatternParser = null;
+    /** @var StatementExceptionFactory */
+    private static $stmtExFactory = null;
+    /** @var IConnection[] map: name => connection */
+    private static $connections = [];
+    /** @var IConnection */
+    private static $defaultConn = null;
 
 
     private function __construct()
@@ -50,16 +50,16 @@ 
         self::$coreFactory = $coreFactory;
     }
 
-	/**
-	 * @return TypeRegister the global type register, used for getting types not defined locally for a connection
-	 */
-	public static function getTypeRegister() : TypeRegister
-	{
-		if (self::$typeRegister === null) {
+    /**
+     * @return TypeRegister the global type register, used for getting types not defined locally for a connection
+     */
+    public static function getTypeRegister() : TypeRegister
+    {
+        if (self::$typeRegister === null) {
             self::$typeRegister = self::getCoreFactory()->createTypeRegister();
-		}
-		return self::$typeRegister;
-	}
+        }
+        return self::$typeRegister;
+    }
 
     public static function getSqlPatternParser() : SqlPatternParser
     {
@@ -69,120 +69,120 @@ 
         return self::$sqlPatternParser;
     }
 
-	/**
-	 * @return StatementExceptionFactory the global statement exception factory, used for emitting the
-	 *                                     {@link \Ivory\Exception\StatementException}s upon statement errors;
-	 *                                   like the type register, an overriding factory is also defined locally on each
-	 *                                     connection - this factory only applies if the local one does not
-	 */
-	public static function getStatementExceptionFactory() : StatementExceptionFactory
-	{
-		if (self::$stmtExFactory === null) {
-			self::$stmtExFactory = self::getCoreFactory()->createStatementExceptionFactory();
-		}
-		return self::$stmtExFactory;
-	}
-
-	/**
-	 * Sets up a new database connection.
-	 *
-	 * If this is the first connection to set up, it is automatically set as the default connection.
-	 *
-	 * The connection with the database is not immediately established - just a {@link Connection} object is initialized
-	 * and returned, it connects to the database on demand.
-	 *
-	 * @param mixed $params the parameters for creating the connection;
-	 *                      anything accepted by {@link ConnectionParameters::create()} - one of the following options:
-	 *                        <ul>
-	 *                          <li>a {@link ConnectionParameters} object
-	 *                          <li>a URI, e.g., <tt>"postgresql://usr@localhost:5433/db?connect_timeout=10"</tt>
-	 *                          <li>a PostgreSQL connection string, e.g.,
-	 *                              <tt>"host=localhost port=5432 dbname=mydb connect_timeout=10"</tt>
-	 *                          <li>a map of connection parameter keywords to values, e.g., <tt>['host' => '/tmp']</tt>
-	 *                        </ul>
-	 * @param string|null $connName name for the connection;
-	 *                              if not given, the database name is considered if it is given within <tt>$params</tt>
-	 *                                or the fallback name <tt>'conn'</tt> is used;
-	 *                              if not given and if the auto-generated name is already taken, it is appended with a
-	 *                                numeric suffix, e.g., <tt>'conn1'</tt>, <tt>'conn2'</tt>, etc.
-	 * @return IConnection
-	 * @throws ConnectionException if connection name is explicitly specified but a connection with the same name
-	 *                               already exists
-	 */
-	public static function setupConnection($params, $connName = null) : IConnection
-	{
-		if (!$params instanceof ConnectionParameters) {
-			$params = ConnectionParameters::create($params);
-		}
-
-		if ($connName === null) {
-			$connName = (isset($params['dbname']) ? $params['dbname'] : 'conn');
-			$safetyBreak = 10000;
-			for ($i = 1; $i < $safetyBreak; $i++) {
-				if (!isset(self::$connections[$connName . $i])) {
-					$connName .= $i;
-					break;
-				}
-			}
-			if ($i >= $safetyBreak) {
-				throw new \RuntimeException('Error auto-generating name for the new connection: all suffixes taken');
-			}
-		}
-
-		$conn = self::getCoreFactory()->createConnection($connName, $params);
-
-		if (!self::$connections) {
-			self::useConnectionAsDefault($conn);
-		}
-
-		self::$connections[$connName] = $conn;
-
-		return $conn;
-	}
-
-	/**
-	 * @param string|null $connName name of the connection to get; <tt>null</tt> to get the default connection
-	 * @return IConnection
-	 * @throws \RuntimeException if the default connection is requested but no connection has been setup yet, or if the
-	 *                             requested connection is not defined
-	 */
-	public static function getConnection($connName = null) : IConnection
-	{
-		if ($connName === null) {
-			if (self::$defaultConn) {
-				return self::$defaultConn;
-			}
-			else {
-				throw new \RuntimeException('No connection has been setup');
-			}
-		}
-
-		if (isset(self::$connections[$connName])) {
-			return self::$connections[$connName];
-		}
-		else {
-			throw new \RuntimeException('Undefined connection');
-		}
-	}
-
-	/**
-	 * @param IConnection|string $conn (name of) connection to use as the default connection
-	 * @throws \RuntimeException if the requested connection is not defined
-	 */
-	public static function useConnectionAsDefault($conn)
-	{
-		if (is_string($conn)) {
-			if (isset(self::$connections[$conn])) {
-				$conn = self::$connections[$conn];
-			}
-			else {
-				throw new \RuntimeException('Undefined connection');
-			}
-		}
-		elseif (!$conn instanceof IConnection) {
-			throw new \InvalidArgumentException('conn');
-		}
-
-		self::$defaultConn = $conn;
-	}
+    /**
+     * @return StatementExceptionFactory the global statement exception factory, used for emitting the
+     *                                     {@link \Ivory\Exception\StatementException}s upon statement errors;
+     *                                   like the type register, an overriding factory is also defined locally on each
+     *                                     connection - this factory only applies if the local one does not
+     */
+    public static function getStatementExceptionFactory() : StatementExceptionFactory
+    {
+        if (self::$stmtExFactory === null) {
+            self::$stmtExFactory = self::getCoreFactory()->createStatementExceptionFactory();
+        }
+        return self::$stmtExFactory;
+    }
+
+    /**
+     * Sets up a new database connection.
+     *
+     * If this is the first connection to set up, it is automatically set as the default connection.
+     *
+     * The connection with the database is not immediately established - just a {@link Connection} object is initialized
+     * and returned, it connects to the database on demand.
+     *
+     * @param mixed $params the parameters for creating the connection;
+     *                      anything accepted by {@link ConnectionParameters::create()} - one of the following options:
+     *                        <ul>
+     *                          <li>a {@link ConnectionParameters} object
+     *                          <li>a URI, e.g., <tt>"postgresql://usr@localhost:5433/db?connect_timeout=10"</tt>
+     *                          <li>a PostgreSQL connection string, e.g.,
+     *                              <tt>"host=localhost port=5432 dbname=mydb connect_timeout=10"</tt>
+     *                          <li>a map of connection parameter keywords to values, e.g., <tt>['host' => '/tmp']</tt>
+     *                        </ul>
+     * @param string|null $connName name for the connection;
+     *                              if not given, the database name is considered if it is given within <tt>$params</tt>
+     *                                or the fallback name <tt>'conn'</tt> is used;
+     *                              if not given and if the auto-generated name is already taken, it is appended with a
+     *                                numeric suffix, e.g., <tt>'conn1'</tt>, <tt>'conn2'</tt>, etc.
+     * @return IConnection
+     * @throws ConnectionException if connection name is explicitly specified but a connection with the same name
+     *                               already exists
+     */
+    public static function setupConnection($params, $connName = null) : IConnection
+    {
+        if (!$params instanceof ConnectionParameters) {
+            $params = ConnectionParameters::create($params);
+        }
+
+        if ($connName === null) {
+            $connName = (isset($params['dbname']) ? $params['dbname'] : 'conn');
+            $safetyBreak = 10000;
+            for ($i = 1; $i < $safetyBreak; $i++) {
+                if (!isset(self::$connections[$connName . $i])) {
+                    $connName .= $i;
+                    break;
+                }
+            }
+            if ($i >= $safetyBreak) {
+                throw new \RuntimeException('Error auto-generating name for the new connection: all suffixes taken');
+            }
+        }
+
+        $conn = self::getCoreFactory()->createConnection($connName, $params);
+
+        if (!self::$connections) {
+            self::useConnectionAsDefault($conn);
+        }
+
+        self::$connections[$connName] = $conn;
+
+        return $conn;
+    }
+
+    /**
+     * @param string|null $connName name of the connection to get; <tt>null</tt> to get the default connection
+     * @return IConnection
+     * @throws \RuntimeException if the default connection is requested but no connection has been setup yet, or if the
+     *                             requested connection is not defined
+     */
+    public static function getConnection($connName = null) : IConnection
+    {
+        if ($connName === null) {
+            if (self::$defaultConn) {
+                return self::$defaultConn;
+            }
+            else {
+                throw new \RuntimeException('No connection has been setup');
+            }
+        }
+
+        if (isset(self::$connections[$connName])) {
+            return self::$connections[$connName];
+        }
+        else {
+            throw new \RuntimeException('Undefined connection');
+        }
+    }
+
+    /**
+     * @param IConnection|string $conn (name of) connection to use as the default connection
+     * @throws \RuntimeException if the requested connection is not defined
+     */
+    public static function useConnectionAsDefault($conn)
+    {
+        if (is_string($conn)) {
+            if (isset(self::$connections[$conn])) {
+                $conn = self::$connections[$conn];
+            }
+            else {
+                throw new \RuntimeException('Undefined connection');
+            }
+        }
+        elseif (!$conn instanceof IConnection) {
+            throw new \InvalidArgumentException('conn');
+        }
+
+        self::$defaultConn = $conn;
+    }
 }

Braces +4 added lines, -8 removed lines

@@ -151,16 +151,14 @@ 
 		if ($connName === null) {
 			if (self::$defaultConn) {
 				return self::$defaultConn;
-			}
-			else {
+			} else {
 				throw new \RuntimeException('No connection has been setup');
 			}
 		}
 
 		if (isset(self::$connections[$connName])) {
 			return self::$connections[$connName];
-		}
-		else {
+		} else {
 			throw new \RuntimeException('Undefined connection');
 		}
 	}
@@ -174,12 +172,10 @@ 
 		if (is_string($conn)) {
 			if (isset(self::$connections[$conn])) {
 				$conn = self::$connections[$conn];
-			}
-			else {
+			} else {
 				throw new \RuntimeException('Undefined connection');
 			}
-		}
-		elseif (!$conn instanceof IConnection) {
+		} elseif (!$conn instanceof IConnection) {
 			throw new \InvalidArgumentException('conn');
 		}
 

src/Ivory/Relation/QueryRelation.php

Doc Comments +3 added lines

@@ -14,6 +14,9 @@
     /** @var IQueryResult */
     private $result = null;
 
+    /**
+     * @param string $query
+     */
     public function __construct(IStatementExecution $conn, $query, ...$args)
     {
         parent::__construct();

src/Ivory/Relation/RelationMacros.php

Doc Comments +6 added lines

@@ -15,6 +15,9 @@ 
  */
 trait RelationMacros
 {
+    /**
+     * @param string[] $columns
+     */
     abstract public function project($columns);
 
     /**
@@ -74,6 +77,9 @@ 
         return $this->tuple($tupleOffset)->value($colOffsetOrNameOrEvaluator);
     }
 
+    /**
+     * @param IColumn[] $columns
+     */
     final protected function _colImpl($offsetOrNameOrEvaluator, $columns, $colNameMap, IRelation $relation)
     {
         if (is_scalar($offsetOrNameOrEvaluator)) {

Spacing +2 added lines, -2 removed lines

@@ -107,7 +107,7 @@ 
     public function assoc($col1, $col2, ...$moreCols)
     {
         return $this->assocImpl(
-            function () {
+            function() {
                 // FIXME: depending on the data type of the keys, either use an array-based implementation, or an object hashing implementation
                 return new ArrayValueMap();
             },
@@ -118,7 +118,7 @@ 
     public function map($mappingCol, ...$moreMappingCols)
     {
         return $this->assocImpl(
-            function () {
+            function() {
                 // FIXME: depending on the data type of the keys, either use an array-based implementation, or an object hashing implementation
                 return new ArrayTupleMap();
             },

Braces +5 added lines, -10 removed lines

@@ -80,26 +80,21 @@
             if (filter_var($offsetOrNameOrEvaluator, FILTER_VALIDATE_INT) !== false) {
                 if (isset($columns[$offsetOrNameOrEvaluator])) {
                     return $columns[$offsetOrNameOrEvaluator];
-                }
-                else {
+                } else {
                     throw new UndefinedColumnException("No column at offset $offsetOrNameOrEvaluator");
                 }
-            }
-            else {
+            } else {
                 if (isset($colNameMap[$offsetOrNameOrEvaluator])) {
                     return $columns[$colNameMap[$offsetOrNameOrEvaluator]];
-                }
-                else {
+                } else {
                     throw new UndefinedColumnException("No column named $offsetOrNameOrEvaluator");
                 }
             }
-        }
-        elseif ($offsetOrNameOrEvaluator instanceof ITupleEvaluator ||
+        } elseif ($offsetOrNameOrEvaluator instanceof ITupleEvaluator ||
             $offsetOrNameOrEvaluator instanceof \Closure)
         {
             return new Column($relation, $offsetOrNameOrEvaluator, null, null);
-        }
-        else {
+        } else {
             throw new \InvalidArgumentException('$offsetOrNameOrEvaluator');
         }
     }

src/Ivory/Type/ArrayType.php

Doc Comments +13 added lines

@@ -29,6 +29,9 @@ 
     private $delim;
     private $elemNeedsQuotesRegex;
 
+    /**
+     * @param string $delimiter
+     */
     public function __construct(INamedType $elemType, $delimiter)
     {
         $this->elemType = $elemType;
@@ -284,6 +287,11 @@ 
         return $out;
     }
 
+    /**
+     * @param string $str
+     * @param string $errMsg
+     * @param integer $offset
+     */
     private static function throwArrayParseException($str, $errMsg = null, $offset = null)
     {
         $msg = "Value '$str' is not valid for an array";
@@ -293,6 +301,11 @@ 
         throw new ParseException($msg, $offset);
     }
 
+    /**
+     * @param string $str
+     * @param integer $offset
+     * @param ParseException $cause
+     */
     private function throwParseException($str, $errMsg = null, $offset = null, $cause = null)
     {
         $elemTypeName = $this->elemType->getSchemaName() . '.' . $this->elemType->getName();

Spacing +1 added lines, -1 removed lines

@@ -128,7 +128,7 @@
                     case '{':
                         $dim++;
                         $keys[$dim] = $lowerBounds[$dim];
-                        $refs[$dim] = &$refs[$dim - 1][$keys[$dim-1]];
+                        $refs[$dim] = &$refs[$dim - 1][$keys[$dim - 1]];
                         $refs[$dim] = [];
                         break;
                     case '}':

Braces +19 added lines, -38 removed lines

@@ -72,8 +72,7 @@ 
             for ($strOffset = $decorSepPos + 1; isset($str[$strOffset]) && ctype_space($str[$strOffset]); $strOffset++);
             $lowerBounds = $m[1];
             unset($m);
-        }
-        else {
+        } else {
             if (trim($str) == '{}') {
                 return [];
             }
@@ -82,11 +81,9 @@ 
             for ($i = $strOffset; $i < $len; $i++) {
                 if (ctype_space($str[$i])) {
                     continue;
-                }
-                elseif ($str[$i] == '{') {
+                } elseif ($str[$i] == '{') {
                     $dims++;
-                }
-                else {
+                } else {
                     break;
                 }
             }
@@ -146,14 +143,12 @@ 
                 $k = $keys[$dim];
                 if (strcasecmp($elem, 'NULL') == 0) {
                     $refs[$dim][$k] = null;
-                }
-                else {
+                } else {
                     $cont = ($elem[0] == '"' ? substr($elem, 1, -1) : $elem);
                     $unEsc = preg_replace('~\\\\(.)~', '$1', $cont);
                     $refs[$dim][$k] = $this->elemType->parseValue($unEsc);
                 }
-            }
-            catch (ParseException $e) {
+            } catch (ParseException $e) {
                 $this->throwParseException($str, 'Error parsing the element value', $strOffset, $e);
             }
             $strOffset += strlen($elem);
@@ -200,8 +195,7 @@ 
             $maxDim = $curDim;
             $b = ($arr ? [$keys[0], $keys[count($keys) - 1]] : [1, 0]);
             $bounds[$curDim] = $b;
-        }
-        else {
+        } else {
             $b = $bounds[$curDim];
             if ($keys[0] < $b[0] || $keys[count($keys) - 1] > $b[1]) {
                 $msg = "Some array subscripts do not match the bounds of the array: " . print_r($val, true);
@@ -218,15 +212,13 @@ 
         foreach ($arr as $v) {
             if ($first) {
                 $first = false;
-            }
-            else {
+            } else {
                 $out .= $this->delim;
             }
 
             if (is_array($v)) {
                 $out .= $this->serializeValueImpl($v, $curDim + 1, $maxDim, $bounds);
-            }
-            else {
+            } else {
                 if ($curDim != $maxDim) {
                     $msg = "Some array items do not match the dimensions of the array: " . print_r($val, true);
                     throw new \InvalidArgumentException($msg);
@@ -234,8 +226,7 @@ 
 
                 if ($v === null) {
                     $valOut = 'NULL';
-                }
-                else {
+                } else {
                     $valOut = $this->elemType->serializeValue($v);
                     /* Trim the single quotes and other decoration - the value will be used inside a string literal.
                        As an optimization, doubled single quotes (meaning the literal single quote) will be preserved
@@ -330,25 +321,20 @@ 
                 if ($bv !== null) {
                     return -1;
                 }
-            }
-            elseif ($bv === null) {
+            } elseif ($bv === null) {
                 return 1;
-            }
-            elseif (is_array($av)) {
+            } elseif (is_array($av)) {
                 if (is_array($bv)) {
                     $comp = $this->compareValuesImpl($av, $bv);
                     if ($comp) {
                         return $comp;
                     }
-                }
-                else {
+                } else {
                     return 1;
                 }
-            }
-            elseif (is_array($bv)) {
+            } elseif (is_array($bv)) {
                 return -1;
-            }
-            else {
+            } else {
                 /** @var ITotallyOrderedType $et */
                 $et = $this->elemType;
                 $comp = $et->compareValues($av, $bv);
@@ -371,22 +357,17 @@ 
             $bk = key($bFst);
             if ($ak === null && $bk === null) {
                 return 0;
-            }
-            elseif ($ak === null) {
+            } elseif ($ak === null) {
                 return -1;
-            }
-            elseif ($bk === null) {
+            } elseif ($bk === null) {
                 return 1;
-            }
-            elseif (!is_numeric($ak) || !is_numeric($bk)) {
+            } elseif (!is_numeric($ak) || !is_numeric($bk)) {
                 return 0;
-            }
-            else {
+            } else {
                 $d = $ak - $bk;
                 if ($d) {
                     return $d;
-                }
-                else {
+                } else {
                     $aFst = current($aFst);
                     $bFst = current($bFst);
                 }

src/Ivory/Type/IntrospectingTypeDictionaryCompiler.php

Doc Comments +7 added lines

@@ -8,6 +8,9 @@ 
     private $connection;
     private $connHandler;
 
+    /**
+     * @param resource|null $connHandler
+     */
     public function __construct(IConnection $connection, $connHandler)
     {
         $this->connection = $connection;
@@ -190,6 +193,10 @@ 
         }
     }
 
+    /**
+     * @param string $query
+     * @param string $errorDesc
+     */
     private function query($query, $errorDesc)
     {
         $result = pg_query($this->connHandler, $query);

Braces +2 added lines, -4 removed lines

@@ -137,8 +137,7 @@ 
                                     "range. That might lead to unexpected results, though.";
                                 trigger_error($msg, E_USER_WARNING);
                             }
-                        }
-                        else {
+                        } else {
                             $canonFunc = null;
                         }
                         $type = $this->createRangeType($schemaName, $typeName, $subtype, $canonFunc);
@@ -218,8 +217,7 @@ 
         $type = $typeProvider->provideType($schemaName, $typeName);
         if ($type !== null) {
             return $type;
-        }
-        else {
+        } else {
             return new UndefinedType($schemaName, $typeName, $this->connection->getName(), $this->connection);
         }
     }

src/Ivory/Type/RangeType.php

Doc Comments +12 added lines

@@ -17,6 +17,10 @@ 
     private $subtype;
     private $canonicalFunc;
 
+    /**
+     * @param string $schemaName
+     * @param string $name
+     */
     public function __construct($schemaName, $name, ITotallyOrderedType $subtype, IRangeCanonicalFunc $canonicalFunc = null)
     {
         $this->setName($schemaName, $name);
@@ -69,6 +73,9 @@ 
         return Range::createFromBounds($this->subtype, $this->canonicalFunc, $lower, $upper, $lowerInc, $upperInc);
     }
 
+    /**
+     * @param string $str
+     */
     private function parseBoundStr($str)
     {
         if (strlen($str) == 0) {
@@ -152,6 +159,11 @@ 
         }
     }
 
+    /**
+     * @param integer $sgn
+     * @param boolean|null $aIsInc
+     * @param boolean|null $bIsInc
+     */
     private function compareBounds($sgn, $aVal, $aIsInc, $bVal, $bIsInc)
     {
         if ($aVal === null && $bVal === null) {

Braces +10 added lines, -20 removed lines

@@ -91,8 +91,7 @@ 
         if (!$val instanceof Range) {
             if (is_array($val) && isset($val[0], $val[1]) && count($val) == 2) {
                 $val = Range::createFromBounds($this->subtype, $this->canonicalFunc, $val[0], $val[1], true, true);
-            }
-            else {
+            } else {
                 $message = "Value '$val' is not valid for type {$this->getSchemaName()}.{$this->getName()}";
                 throw new \InvalidArgumentException($message);
             }
@@ -134,19 +133,15 @@ 
         // empty ranges are sorted before all else in PostgreSQL
         if ($a->isEmpty() && $b->isEmpty()) {
             return 0;
-        }
-        elseif ($a->isEmpty()) {
+        } elseif ($a->isEmpty()) {
             return -1;
-        }
-        elseif ($b->isEmpty()) {
+        } elseif ($b->isEmpty()) {
             return 1;
-        }
-        else {
+        } else {
             $cmp = $this->compareBounds(-1, $a->getLower(), $a->isLowerInc(), $b->getLower(), $b->isLowerInc());
             if ($cmp != 0) {
                 return $cmp;
-            }
-            else {
+            } else {
                 return $this->compareBounds(1, $a->getUpper(), $a->isUpperInc(), $b->getUpper(), $b->isUpperInc());
             }
         }
@@ -156,11 +151,9 @@ 
     {
         if ($aVal === null && $bVal === null) {
             return 0;
-        }
-        elseif ($aVal === null) {
+        } elseif ($aVal === null) {
             return 1 * $sgn;
-        }
-        elseif ($bVal === null) {
+        } elseif ($bVal === null) {
             return -1 * $sgn;
         }
 
@@ -172,14 +165,11 @@ 
         // PHP 7: <=> could lead to a more compact form
         if ($aIsInc && $bIsInc) {
             return 0;
-        }
-        elseif ($aIsInc) {
+        } elseif ($aIsInc) {
             return 1 * $sgn;
-        }
-        elseif ($bIsInc) {
+        } elseif ($bIsInc) {
             return -1 * $sgn;
-        }
-        else {
+        } else {
             return 0;
         }
     }