ondrej-bouda / ivory

src/Ivory/Value/FixedBitString.php

Indentation +94 added lines, -94 removed lines

@@ -19,106 +19,106 @@
  */
 class FixedBitString extends BitString
 {
-	/**
-	 * @param string $bits the bit string, i.e., a string of 1's and 0's
-	 * @param int|null $length length of the bit string in bits;
-	 *                         <tt>null</tt> for taking the length of <tt>$bits</tt>;
-	 *                         if less or greater than <tt>strlen($bits)</tt>, the bits get zero-padded or truncated on
-	 *                           the right to be exactly <tt>$length</tt> bits (and a warning is issued is case of
-	 *                           truncation)
-	 * @return FixedBitString
-	 * @throws \InvalidArgumentException if <tt>$length</tt> is a non-positive number (PostgreSQL forbids it)
-	 */
-	public static function fromString($bits, $length = null)
-	{
-		$bits = (string)$bits;
-		$bitsLen = strlen($bits);
+    /**
+     * @param string $bits the bit string, i.e., a string of 1's and 0's
+     * @param int|null $length length of the bit string in bits;
+     *                         <tt>null</tt> for taking the length of <tt>$bits</tt>;
+     *                         if less or greater than <tt>strlen($bits)</tt>, the bits get zero-padded or truncated on
+     *                           the right to be exactly <tt>$length</tt> bits (and a warning is issued is case of
+     *                           truncation)
+     * @return FixedBitString
+     * @throws \InvalidArgumentException if <tt>$length</tt> is a non-positive number (PostgreSQL forbids it)
+     */
+    public static function fromString($bits, $length = null)
+    {
+        $bits = (string)$bits;
+        $bitsLen = strlen($bits);
 
-		if ($length === null) {
-			return new FixedBitString($bits, $bitsLen);
-		}
-		elseif ($length <= 0) {
-			throw new \InvalidArgumentException('length is non-positive');
-		}
-		elseif ($length == $bitsLen) {
-			return new FixedBitString($bits, $bitsLen);
-		}
-		elseif ($length > $bitsLen) {
-			return new FixedBitString(str_pad($bits, $length, '0'), $length);
-		}
-		else { // $length < $bitsLen
-			trigger_error("Bit string truncated to the length of $length", E_USER_WARNING);
-			return new FixedBitString(substr($bits, 0, $length), $length);
-		}
-	}
+        if ($length === null) {
+            return new FixedBitString($bits, $bitsLen);
+        }
+        elseif ($length <= 0) {
+            throw new \InvalidArgumentException('length is non-positive');
+        }
+        elseif ($length == $bitsLen) {
+            return new FixedBitString($bits, $bitsLen);
+        }
+        elseif ($length > $bitsLen) {
+            return new FixedBitString(str_pad($bits, $length, '0'), $length);
+        }
+        else { // $length < $bitsLen
+            trigger_error("Bit string truncated to the length of $length", E_USER_WARNING);
+            return new FixedBitString(substr($bits, 0, $length), $length);
+        }
+    }
 
-	/**
-	 * Creates a bit string as the two's complement of a given integer represented on a given number of bits.
-	 *
-	 * The least significant bit is the rightmost one in the resulting bit string.
-	 *
-	 * Overflows are not detected - if `$length` is not sufficient for representing the whole `$int`, only the `$length`
-	 * least significant bits of the representation are used quietly, without any notice.
-	 *
-	 * @param int $int integer to represent
-	 * @param int $length number of bits
-	 * @return FixedBitString
-	 * @throws \InvalidArgumentException if <tt>$length</tt> is a non-positive number
-	 */
-	public static function fromInt($int, $length)
-	{
-		if ($length <= 0) {
-			throw new \InvalidArgumentException('length <= 0');
-		}
+    /**
+     * Creates a bit string as the two's complement of a given integer represented on a given number of bits.
+     *
+     * The least significant bit is the rightmost one in the resulting bit string.
+     *
+     * Overflows are not detected - if `$length` is not sufficient for representing the whole `$int`, only the `$length`
+     * least significant bits of the representation are used quietly, without any notice.
+     *
+     * @param int $int integer to represent
+     * @param int $length number of bits
+     * @return FixedBitString
+     * @throws \InvalidArgumentException if <tt>$length</tt> is a non-positive number
+     */
+    public static function fromInt($int, $length)
+    {
+        if ($length <= 0) {
+            throw new \InvalidArgumentException('length <= 0');
+        }
 
-		$bin = decbin($int);
+        $bin = decbin($int);
 
-		$padBit = ($int >= 0 ? '0' : '1');
-		$padded = str_pad($bin, $length, $padBit, STR_PAD_LEFT);
+        $padBit = ($int >= 0 ? '0' : '1');
+        $padded = str_pad($bin, $length, $padBit, STR_PAD_LEFT);
 
-		$truncated = substr($padded, -$length);
-		return self::fromString($truncated);
-	}
+        $truncated = substr($padded, -$length);
+        return self::fromString($truncated);
+    }
 
-	/**
-	 * Returns a non-negative integer encoded by the bits in the bit string.
-	 *
-	 * The standard binary encoding is used. The rightmost bit in the string is the least significant in the integer.
-	 *
-	 * Only that many rightmost bits are taken which allow the encoded integer be represented correctly by the PHP `int`
-	 * type. That is 31 bits or 63 bits depending on whether this is a 32-bit or 64-bit compilation of PHP.
-	 *
-	 * For getting an arbitrary-length integer instead of the truncated `int`, use {@link toNumber()}.
-	 *
-	 * Note that, unlike {@link fromInt()}, this method does NOT work with the two's complement, but rather with the
-	 * standard binary encoding, and thus never returns any negative number. This is to resemble the PostgreSQL
-	 * behaviour.
-	 *
-	 * @return int
-	 */
-	public function toInt()
-	{
-		return bindec(substr($this->bits, -(PHP_INT_SIZE * 8 - 1)));
-	}
+    /**
+     * Returns a non-negative integer encoded by the bits in the bit string.
+     *
+     * The standard binary encoding is used. The rightmost bit in the string is the least significant in the integer.
+     *
+     * Only that many rightmost bits are taken which allow the encoded integer be represented correctly by the PHP `int`
+     * type. That is 31 bits or 63 bits depending on whether this is a 32-bit or 64-bit compilation of PHP.
+     *
+     * For getting an arbitrary-length integer instead of the truncated `int`, use {@link toNumber()}.
+     *
+     * Note that, unlike {@link fromInt()}, this method does NOT work with the two's complement, but rather with the
+     * standard binary encoding, and thus never returns any negative number. This is to resemble the PostgreSQL
+     * behaviour.
+     *
+     * @return int
+     */
+    public function toInt()
+    {
+        return bindec(substr($this->bits, -(PHP_INT_SIZE * 8 - 1)));
+    }
 
-	public static function fromNumber($number)
-	{
-		// TODO: make up an object of the class for representing arbitrary-length integers, and fix the interface (method name) and phpdoc
-		throw new NotImplementedException();
-	}
+    public static function fromNumber($number)
+    {
+        // TODO: make up an object of the class for representing arbitrary-length integers, and fix the interface (method name) and phpdoc
+        throw new NotImplementedException();
+    }
 
-	/**
-	 * Returns a non-negative arbitrary-length integer encoded by the bits in the bit string.
-	 *
-	 * The standard binary encoding is used. The rightmost bit in the string is the least significant in the integer.
-	 *
-	 * Contrary to {@link toInt()}, this method uses all the bits to constitute the result.
-	 *
-	 * @return object
-	 */
-	public function toNumber()
-	{
-		// TODO: make up an object of the class for representing arbitrary-length integers, and fix the interface (method name) and phpdoc
-		throw new NotImplementedException();
-	}
+    /**
+     * Returns a non-negative arbitrary-length integer encoded by the bits in the bit string.
+     *
+     * The standard binary encoding is used. The rightmost bit in the string is the least significant in the integer.
+     *
+     * Contrary to {@link toInt()}, this method uses all the bits to constitute the result.
+     *
+     * @return object
+     */
+    public function toNumber()
+    {
+        // TODO: make up an object of the class for representing arbitrary-length integers, and fix the interface (method name) and phpdoc
+        throw new NotImplementedException();
+    }
 }

Braces +4 added lines, -8 removed lines

@@ -36,17 +36,13 @@
 
 		if ($length === null) {
 			return new FixedBitString($bits, $bitsLen);
-		}
-		elseif ($length <= 0) {
+		} elseif ($length <= 0) {
 			throw new \InvalidArgumentException('length is non-positive');
-		}
-		elseif ($length == $bitsLen) {
+		} elseif ($length == $bitsLen) {
 			return new FixedBitString($bits, $bitsLen);
-		}
-		elseif ($length > $bitsLen) {
+		} elseif ($length > $bitsLen) {
 			return new FixedBitString(str_pad($bits, $length, '0'), $length);
-		}
-		else { // $length < $bitsLen
+		} else { // $length < $bitsLen
 			trigger_error("Bit string truncated to the length of $length", E_USER_WARNING);
 			return new FixedBitString(substr($bits, 0, $length), $length);
 		}

src/Ivory/Relation/CherryPickedRelation.php

Braces +1 added lines, -2 removed lines

@@ -55,8 +55,7 @@
         if (isset($this->offsetMap[$effectiveOffset])) {
             $sourceOffset = $this->offsetMap[$effectiveOffset];
             return parent::tuple($sourceOffset);
-        }
-        else {
+        } else {
             throw new \OutOfBoundsException("Tuple offset $offset out of the relation bounds");
         }
     }

src/Ivory/Relation/ProjectedRelationBase.php

Braces +2 added lines, -4 removed lines

@@ -40,8 +40,7 @@ 
             if ($escaped) {
                 $lastLiteral .= $c;
                 $escaped = false;
-            }
-            else {
+            } else {
                 switch ($c) {
                     case '\\':
                         $escaped = true;
@@ -78,8 +77,7 @@ 
                 }
                 $repl .= $c;
                 $escaped = false;
-            }
-            else {
+            } else {
                 switch ($c) {
                     case '\\':
                         $escaped = true;

src/Ivory/Relation/Column.php

Spacing +4 added lines, -4 removed lines

@@ -61,12 +61,12 @@ 
     public function uniq($hasher = null, $comparator = null)
     {
         if ($hasher === null) {
-            $hasher = new CallbackValueHasher(function ($value) {
+            $hasher = new CallbackValueHasher(function($value) {
                 return (is_int($value) || is_string($value) ? $value : serialize($value));
             });
         }
         elseif ($hasher === 1) {
-            $hasher = new CallbackValueHasher(function ($value) {
+            $hasher = new CallbackValueHasher(function($value) {
                 return 1;
             });
         }
@@ -75,7 +75,7 @@ 
         }
 
         if ($comparator === null) {
-            $comparator = new CallbackValueComparator(function ($a, $b) {
+            $comparator = new CallbackValueComparator(function($a, $b) {
                 if (is_object($a) && is_object($b) && $a instanceof IComparable) {
                     return $a->equals($b);
                 }
@@ -89,7 +89,7 @@ 
         }
 
         $hashTable = [];
-        return new FilteredColumn($this, function ($value) use ($hasher, $comparator, &$hashTable) {
+        return new FilteredColumn($this, function($value) use ($hasher, $comparator, &$hashTable) {
             $h = $hasher->hash($value);
             if (!isset($hashTable[$h])) {
                 $hashTable[$h] = [$value];

Braces +5 added lines, -10 removed lines

@@ -64,13 +64,11 @@ 
             $hasher = new CallbackValueHasher(function ($value) {
                 return (is_int($value) || is_string($value) ? $value : serialize($value));
             });
-        }
-        elseif ($hasher === 1) {
+        } elseif ($hasher === 1) {
             $hasher = new CallbackValueHasher(function ($value) {
                 return 1;
             });
-        }
-        elseif (!$hasher instanceof IValueHasher) {
+        } elseif (!$hasher instanceof IValueHasher) {
             $hasher = new CallbackValueHasher($hasher);
         }
 
@@ -78,13 +76,11 @@ 
             $comparator = new CallbackValueComparator(function ($a, $b) {
                 if (is_object($a) && is_object($b) && $a instanceof IComparable) {
                     return $a->equals($b);
-                }
-                else {
+                } else {
                     return ($a == $b);
                 }
             });
-        }
-        elseif (!$comparator instanceof IValueComparator) {
+        } elseif (!$comparator instanceof IValueComparator) {
             $comparator = new CallbackValueComparator($comparator);
         }
 
@@ -94,8 +90,7 @@ 
             if (!isset($hashTable[$h])) {
                 $hashTable[$h] = [$value];
                 return true;
-            }
-            else {
+            } else {
                 foreach ($hashTable[$h] as $v) {
                     if ($comparator->equal($value, $v)) {
                         return false;

src/Ivory/Relation/Tuple.php

Braces +10 added lines, -20 removed lines

@@ -82,27 +82,21 @@ 
             if (filter_var($colOffsetOrNameOrEvaluator, FILTER_VALIDATE_INT) !== false) {
                 if (isset($this->data[$colOffsetOrNameOrEvaluator])) {
                     return $this->data[$colOffsetOrNameOrEvaluator];
-                }
-                else {
+                } else {
                     throw new UndefinedColumnException("No column at offset $colOffsetOrNameOrEvaluator");
                 }
-            }
-            else {
+            } else {
                 if (isset($this->colNameMap[$colOffsetOrNameOrEvaluator])) {
                     return $this->data[$this->colNameMap[$colOffsetOrNameOrEvaluator]];
-                }
-                else {
+                } else {
                     throw new UndefinedColumnException("No column named $colOffsetOrNameOrEvaluator");
                 }
             }
-        }
-        elseif ($colOffsetOrNameOrEvaluator instanceof ITupleEvaluator) {
+        } elseif ($colOffsetOrNameOrEvaluator instanceof ITupleEvaluator) {
             return $colOffsetOrNameOrEvaluator->evaluate($this);
-        }
-        elseif ($colOffsetOrNameOrEvaluator instanceof \Closure) {
+        } elseif ($colOffsetOrNameOrEvaluator instanceof \Closure) {
             return call_user_func($colOffsetOrNameOrEvaluator, $this);
-        }
-        else {
+        } else {
             throw new \InvalidArgumentException('$colOffsetOrNameOrEvaluator');
         }
     }
@@ -120,8 +114,7 @@ 
     {
         if (isset($this->colNameMap[$name])) {
             return $this->data[$this->colNameMap[$name]];
-        }
-        else {
+        } else {
             return null;
         }
     }
@@ -139,8 +132,7 @@ 
     {
         if (filter_var($offset, FILTER_VALIDATE_INT) !== false) {
             return array_key_exists($offset, $this->data);
-        }
-        else {
+        } else {
             return isset($this->colNameMap[$offset]);
         }
     }
@@ -149,15 +141,13 @@ 
     {
         if (filter_var($offset, FILTER_VALIDATE_INT) !== false) {
             $key = $offset;
-        }
-        else {
+        } else {
             $key = $this->colNameMap[$offset];
         }
 
         if (array_key_exists($key, $this->data)) {
             return $this->data[$key];
-        }
-        else {
+        } else {
             trigger_error("Undefined offset `$offset` for the tuple");
             return null;
         }

src/Ivory/Relation/FilteredColumn.php

Braces +3 added lines, -6 removed lines

@@ -88,16 +88,13 @@
         if ($valueOffset >= 0) {
             if ($valueOffset < $cnt) {
                 return $this->data[$valueOffset];
-            }
-            else {
+            } else {
                 throw new \OutOfBoundsException("The column does not have offset $valueOffset");
             }
-        }
-        else {
+        } else {
             if (-$valueOffset <= $cnt) {
                 return $this->data[$valueOffset + $cnt];
-            }
-            else {
+            } else {
                 throw new \OutOfBoundsException("The column does not have offset $valueOffset");
             }
         }

src/Ivory/Relation/FilteredRelation.php

Braces +3 added lines, -6 removed lines

@@ -20,11 +20,9 @@ 
 
         if ($decider instanceof \Closure) {
             $this->decider = new CallbackTupleFilter($decider);
-        }
-        elseif ($decider instanceof ITupleFilter) {
+        } elseif ($decider instanceof ITupleFilter) {
             $this->decider = $decider;
-        }
-        else {
+        } else {
             throw new \InvalidArgumentException('$decider');
         }
     }
@@ -60,8 +58,7 @@ 
         $effectiveOffset = ($offset >= 0 ? $offset : $this->count() + $offset);
         if (isset($this->acceptMap[$effectiveOffset])) {
             return parent::tuple($this->acceptMap[$effectiveOffset]);
-        }
-        else {
+        } else {
             throw new \OutOfBoundsException("Tuple offset $offset out of the relation bounds");
         }
     }

src/Ivory/Relation/Alg/ITupleEvaluator.php

Indentation +7 added lines, -7 removed lines

@@ -5,11 +5,11 @@
 
 interface ITupleEvaluator
 {
-	/**
-	 * Computes a value for a given tuple.
-	 *
-	 * @param ITuple $tuple
-	 * @return mixed
-	 */
-	function evaluate(ITuple $tuple);
+    /**
+     * Computes a value for a given tuple.
+     *
+     * @param ITuple $tuple
+     * @return mixed
+     */
+    function evaluate(ITuple $tuple);
 }

src/Ivory/Relation/RenamedRelation.php

Braces +3 added lines, -6 removed lines

@@ -20,11 +20,9 @@ 
             if ($orig[0] == '/') {
                 $pcres[] = $orig;
                 $repls[] = $new;
-            }
-            elseif (is_int($orig) || filter_var((string)$orig, FILTER_VALIDATE_INT)) {
+            } elseif (is_int($orig) || filter_var((string)$orig, FILTER_VALIDATE_INT)) {
                 $byOffset[$orig] = $new;
-            }
-            else {
+            } else {
                 $pcres[] = self::simpleMacroPatternToPcre($orig);
                 $repls[] = self::simpleMacroReplacementToPcre($new);
             }
@@ -35,8 +33,7 @@ 
             $origName = $col->getName();
             if (isset($byOffset[$colOffset])) {
                 $newName = $byOffset[$colOffset];
-            }
-            else {
+            } else {
                 $newName = $origName;
                 foreach ($pcres as $i => $pcre) {
                     $newName = preg_replace($pcre, $repls[$i], (string)$origName, -1, $replaced);