ondrej-bouda / ivory

src/Ivory/Connection/TypeControl.php

Braces +1 added lines, -2 removed lines

@@ -70,8 +70,7 @@
                 $dict->disableTypeUsageWatching();
             }
             return $dict;
-        }
-        else {
+        } else {
             return null;
         }
     }

src/Ivory/Relation/IRelation.php

Doc Comments +2 added lines, -9 removed lines

@@ -162,13 +162,6 @@ 
     /**
      * Projects a single column from this relation.
      *
-     * @param int|string|ITupleEvaluator|\Closure $offsetOrNameOrEvaluator
-     *                                  Zero-based offset or (non-numeric) name of column to project from this relation,
-     *                                    or an evaluator which computes each value from the tuple.
-     *                                  As an evaluator, either {@link ITupleEvaluator} (the
-     *                                    {@link ITupleEvaluator::evaluate()} method of which is called) or
-     *                                    <tt>Closure</tt> may be used; the <tt>Closure</tt> is given one {@link ITuple}
-     *                                    argument and is expected to return the value to use for the resulting column.
      * @return IColumn
      * @throws UndefinedColumnException if no column matches the specification
      * @throws AmbiguousException if referring to the column by its name, which is used by multiple columns
@@ -318,12 +311,12 @@ 
     function tuple(int $offset = 0): ITuple;
 
     /**
-     * @param int|string|ITupleEvaluator|\Closure $colOffsetOrNameOrEvaluator
+     * @param integer $colOffsetOrNameOrEvaluator
      *                                  Specification of column from which to get the value. See {@link col()} for more
      *                                    details on the column specification.
      * @param int $tupleOffset zero-based offset of the tuple to get;
      *                         if negative, the <tt>-$tupleOffset</tt>'th tuple from the end is returned
-     * @return mixed
+     * @return string
      * @throws \OutOfBoundsException when this relation has fewer than <tt>$tupleOffset+1</tt> tuples, or fewer than
      *                                 <tt>-$tupleOffset</tt> tuples if <tt>$tupleOffset</tt> is negative
      * @throws UndefinedColumnException if no column matches the specification

src/Ivory/Relation/ProjectedRelationBase.php

Spacing +2 added lines, -3 removed lines

@@ -18,8 +18,7 @@ 
             $colName = $col->getName();
             if (strlen($colName) > 0) {
                 $this->projectedColNameMap[$colName] = (isset($this->projectedColNameMap[$colName]) ?
-                    Tuple::AMBIGUOUS_COL :
-                    $colOffset
+                    Tuple::AMBIGUOUS_COL : $colOffset
                 );
             }
         }
@@ -33,7 +32,7 @@ 
      * @param int $starCnt number of star wildcards is stored here
      * @return string PCRE equivalent to <tt>$macroPattern</tt>
      */
-    protected static function simpleMacroPatternToPcre(string $macroPattern, int &$starCnt = null): string
+    protected static function simpleMacroPatternToPcre(string $macroPattern, int & $starCnt = null): string
     {
         $starCnt = 0;
         $pcre = '/^';