ondrej-bouda / ivory

src/Ivory/Type/Std/IntervalType.php

Braces +1 added lines, -2 removed lines

@@ -36,8 +36,7 @@
         if (!$val instanceof TimeInterval) {
             if (is_array($val)) {
                 $val = TimeInterval::fromParts($val);
-            }
-            else {
+            } else {
                 $val = TimeInterval::fromString($val);
             }
         }

src/Ivory/Type/Std/PgLsnType.php

Braces +1 added lines, -2 removed lines

@@ -21,8 +21,7 @@
     {
         if ($str === null) {
             return null;
-        }
-        else {
+        } else {
             return PgLogSequenceNumber::fromString($str);
         }
     }

src/Ivory/Type/Std/BigIntType.php

Indentation +48 added lines, -48 removed lines

@@ -13,56 +13,56 @@
  */
 class BigIntType extends IntegerType implements IDiscreteType
 {
-	const _PHP_INT_MIN = (PHP_MAJOR_VERSION >= 7 ? PHP_INT_MIN : -PHP_INT_MAX); // PHP 7: refactor out
+    const _PHP_INT_MIN = (PHP_MAJOR_VERSION >= 7 ? PHP_INT_MIN : -PHP_INT_MAX); // PHP 7: refactor out
 
-	public function parseValue($str)
-	{
-		if ($str > PHP_INT_MAX || $str < self::_PHP_INT_MIN) { // correctness: int does not overflow, but rather gets converted to a float
-			return $str;
-		}
-		else {
-			return parent::parseValue($str);
-		}
-	}
+    public function parseValue($str)
+    {
+        if ($str > PHP_INT_MAX || $str < self::_PHP_INT_MIN) { // correctness: int does not overflow, but rather gets converted to a float
+            return $str;
+        }
+        else {
+            return parent::parseValue($str);
+        }
+    }
 
-	public function serializeValue($val)
-	{
-		if ($val > PHP_INT_MAX || $val < self::_PHP_INT_MIN) {
-			if (preg_match('~^\s*-?[0-9]+\s*$~', $val)) {
-				return (string)$val;
-			}
-			else {
-				$this->throwInvalidValue($val);
-			}
-		}
-		else {
-			return parent::serializeValue($val);
-		}
-	}
+    public function serializeValue($val)
+    {
+        if ($val > PHP_INT_MAX || $val < self::_PHP_INT_MIN) {
+            if (preg_match('~^\s*-?[0-9]+\s*$~', $val)) {
+                return (string)$val;
+            }
+            else {
+                $this->throwInvalidValue($val);
+            }
+        }
+        else {
+            return parent::serializeValue($val);
+        }
+    }
 
-	public function compareValues($a, $b)
-	{
-		if ($a === null || $b === null) {
-			return null;
-		}
-		if ($a > PHP_INT_MAX || $b > PHP_INT_MAX || $a < self::_PHP_INT_MIN || $b < self::_PHP_INT_MIN) {
-			return bccomp($a, $b, 0);
-		}
-		else {
-			return (int)$a - (int)$b;
-		}
-	}
+    public function compareValues($a, $b)
+    {
+        if ($a === null || $b === null) {
+            return null;
+        }
+        if ($a > PHP_INT_MAX || $b > PHP_INT_MAX || $a < self::_PHP_INT_MIN || $b < self::_PHP_INT_MIN) {
+            return bccomp($a, $b, 0);
+        }
+        else {
+            return (int)$a - (int)$b;
+        }
+    }
 
-	public function step($delta, $value)
-	{
-		if ($value === null) {
-			return null;
-		}
-		if ($value > PHP_INT_MAX || $value < self::_PHP_INT_MIN) {
-			return bcadd($value, $delta, 0);
-		}
-		else {
-			return (int)$value + $delta;
-		}
-	}
+    public function step($delta, $value)
+    {
+        if ($value === null) {
+            return null;
+        }
+        if ($value > PHP_INT_MAX || $value < self::_PHP_INT_MIN) {
+            return bcadd($value, $delta, 0);
+        }
+        else {
+            return (int)$value + $delta;
+        }
+    }
 }

Braces +5 added lines, -10 removed lines

@@ -19,8 +19,7 @@ 
 	{
 		if ($str > PHP_INT_MAX || $str < self::_PHP_INT_MIN) { // correctness: int does not overflow, but rather gets converted to a float
 			return $str;
-		}
-		else {
+		} else {
 			return parent::parseValue($str);
 		}
 	}
@@ -30,12 +29,10 @@ 
 		if ($val > PHP_INT_MAX || $val < self::_PHP_INT_MIN) {
 			if (preg_match('~^\s*-?[0-9]+\s*$~', $val)) {
 				return (string)$val;
-			}
-			else {
+			} else {
 				$this->throwInvalidValue($val);
 			}
-		}
-		else {
+		} else {
 			return parent::serializeValue($val);
 		}
 	}
@@ -47,8 +44,7 @@ 
 		}
 		if ($a > PHP_INT_MAX || $b > PHP_INT_MAX || $a < self::_PHP_INT_MIN || $b < self::_PHP_INT_MIN) {
 			return bccomp($a, $b, 0);
-		}
-		else {
+		} else {
 			return (int)$a - (int)$b;
 		}
 	}
@@ -60,8 +56,7 @@ 
 		}
 		if ($value > PHP_INT_MAX || $value < self::_PHP_INT_MIN) {
 			return bcadd($value, $delta, 0);
-		}
-		else {
+		} else {
 			return (int)$value + $delta;
 		}
 	}

src/Ivory/Type/Std/LineType.php

Braces +4 added lines, -8 removed lines

@@ -43,8 +43,7 @@ 
         if (preg_match($re, $str, $m)) {
             try {
                 return Line::fromEquationCoeffs($m[1], $m[2], $m[3]);
-            }
-            catch (\InvalidArgumentException $e) {
+            } catch (\InvalidArgumentException $e) {
                 $this->throwInvalidValue($str, $e);
             }
         }
@@ -54,8 +53,7 @@ 
             /** @var LineSegment $lineSeg */
             $lineSeg = $this->lineSegType->parseValue($str);
             return Line::fromPoints($lineSeg->getStart(), $lineSeg->getEnd());
-        }
-        catch (\InvalidArgumentException $e) {
+        } catch (\InvalidArgumentException $e) {
             $this->throwInvalidValue($str, $e);
         }
     }
@@ -64,15 +62,13 @@ 
     {
         if ($val === null) {
             return 'NULL';
-        }
-        elseif ($val instanceof Line) {
+        } elseif ($val instanceof Line) {
             list($p1, $p2) = $val->getPoints();
             return sprintf('line(%s,%s)',
                 $this->pointType->serializeValue($p1),
                 $this->pointType->serializeValue($p2)
             );
-        }
-        else {
+        } else {
             $this->throwInvalidValue($val);
         }
     }

src/Ivory/Type/Std/DecimalType.php

Indentation +33 added lines, -33 removed lines

@@ -13,26 +13,26 @@ 
  */
 class DecimalType extends \Ivory\Type\BaseType implements ITotallyOrderedType
 {
-	public function parseValue($str)
-	{
-		if ($str === null) {
-			return null;
-		}
-
-		if (strcasecmp($str, 'NaN') == 0) {
-			return Decimal::NaN();
-		}
-
-		return Decimal::fromNumber($str);
-	}
-
-	public function serializeValue($val)
-	{
-		if ($val === null) {
-			return 'NULL';
-		}
-
-		if (!$val instanceof Decimal) {
+    public function parseValue($str)
+    {
+        if ($str === null) {
+            return null;
+        }
+
+        if (strcasecmp($str, 'NaN') == 0) {
+            return Decimal::NaN();
+        }
+
+        return Decimal::fromNumber($str);
+    }
+
+    public function serializeValue($val)
+    {
+        if ($val === null) {
+            return 'NULL';
+        }
+
+        if (!$val instanceof Decimal) {
             $val = Decimal::fromNumber($val);
         }
 
@@ -41,17 +41,17 @@ 
         }
         else {
             return $val->toString();
-		}
-	}
-
-	public function compareValues($a, $b)
-	{
-		if ($a === null || $b === null) {
-			return null;
-		}
-		if (!$a instanceof Decimal) {
-			$a = Decimal::fromNumber($a);
-		}
-		return $a->compareTo($b);
-	}
+        }
+    }
+
+    public function compareValues($a, $b)
+    {
+        if ($a === null || $b === null) {
+            return null;
+        }
+        if (!$a instanceof Decimal) {
+            $a = Decimal::fromNumber($a);
+        }
+        return $a->compareTo($b);
+    }
 }

Braces +1 added lines, -2 removed lines

@@ -38,8 +38,7 @@
 
         if ($val->isNaN()) {
             return "'NaN'";
-        }
-        else {
+        } else {
             return $val->toString();
 		}
 	}

src/Ivory/Type/Std/PolymorphicPseudoType.php

Braces +2 added lines, -4 removed lines

@@ -15,8 +15,7 @@ 
     {
         if ($str === null) {
             return null;
-        }
-        else {
+        } else {
             throw new InternalException('A non-null value to be parsed for a polymorphic pseudo-type');
         }
     }
@@ -25,8 +24,7 @@ 
     {
         if ($val === null) {
             return 'NULL';
-        }
-        else {
+        } else {
             $this->throwInvalidValue($val);
         }
     }

src/Ivory/Type/Std/IntegerType.php

Indentation +29 added lines, -29 removed lines

@@ -12,36 +12,36 @@
  */
 class IntegerType extends \Ivory\Type\BaseType implements IDiscreteType
 {
-	public function parseValue($str)
-	{
-		if ($str === null) {
-			return null;
-		}
-		else {
-			return (int)$str;
-		}
-	}
+    public function parseValue($str)
+    {
+        if ($str === null) {
+            return null;
+        }
+        else {
+            return (int)$str;
+        }
+    }
 
-	public function serializeValue($val)
-	{
-		if ($val === null) {
-			return 'NULL';
-		}
-		else {
-			return (int)$val;
-		}
-	}
+    public function serializeValue($val)
+    {
+        if ($val === null) {
+            return 'NULL';
+        }
+        else {
+            return (int)$val;
+        }
+    }
 
-	public function compareValues($a, $b)
-	{
-		if ($a === null || $b === null) {
-			return null;
-		}
-		return (int)$a - (int)$b;
-	}
+    public function compareValues($a, $b)
+    {
+        if ($a === null || $b === null) {
+            return null;
+        }
+        return (int)$a - (int)$b;
+    }
 
-	public function step($delta, $value)
-	{
-		return ($value === null ? null : $value + $delta);
-	}
+    public function step($delta, $value)
+    {
+        return ($value === null ? null : $value + $delta);
+    }
 }

Braces +2 added lines, -4 removed lines

@@ -16,8 +16,7 @@ 
 	{
 		if ($str === null) {
 			return null;
-		}
-		else {
+		} else {
 			return (int)$str;
 		}
 	}
@@ -26,8 +25,7 @@ 
 	{
 		if ($val === null) {
 			return 'NULL';
-		}
-		else {
+		} else {
 			return (int)$val;
 		}
 	}

src/Ivory/Type/Std/JsonExactType.php

Braces +1 added lines, -2 removed lines

@@ -21,8 +21,7 @@
 
         try {
             return Json::fromEncoded($str);
-        }
-        catch (\InvalidArgumentException $e) {
+        } catch (\InvalidArgumentException $e) {
             $this->throwInvalidValue($str, $e);
         }
     }

src/Ivory/Type/Std/BitStringType.php

Indentation +25 added lines, -25 removed lines

@@ -12,30 +12,30 @@
  */
 abstract class BitStringType extends \Ivory\Type\BaseType implements ITotallyOrderedType
 {
-	public function serializeValue($val)
-	{
-		if ($val === null) {
-			return 'NULL';
-		}
-		elseif ($val instanceof BitString) {
-			return "B'" . $val->toString() . "'";
-		}
-		else {
-			$this->throwInvalidValue($val);
-		}
-	}
+    public function serializeValue($val)
+    {
+        if ($val === null) {
+            return 'NULL';
+        }
+        elseif ($val instanceof BitString) {
+            return "B'" . $val->toString() . "'";
+        }
+        else {
+            $this->throwInvalidValue($val);
+        }
+    }
 
-	public function compareValues($a, $b)
-	{
-		if ($a === null || $b === null) {
-			return null;
-		}
-		if (!$a instanceof BitString) {
-			throw new IncomparableException('$a is not a ' . BitString::class);
-		}
-		if (!$b instanceof BitString) {
-			throw new IncomparableException('$b is not a ' . BitString::class);
-		}
-		return strcmp($a->toString(), $b->toString());
-	}
+    public function compareValues($a, $b)
+    {
+        if ($a === null || $b === null) {
+            return null;
+        }
+        if (!$a instanceof BitString) {
+            throw new IncomparableException('$a is not a ' . BitString::class);
+        }
+        if (!$b instanceof BitString) {
+            throw new IncomparableException('$b is not a ' . BitString::class);
+        }
+        return strcmp($a->toString(), $b->toString());
+    }
 }

Braces +2 added lines, -4 removed lines

@@ -16,11 +16,9 @@
 	{
 		if ($val === null) {
 			return 'NULL';
-		}
-		elseif ($val instanceof BitString) {
+		} elseif ($val instanceof BitString) {
 			return "B'" . $val->toString() . "'";
-		}
-		else {
+		} else {
 			$this->throwInvalidValue($val);
 		}
 	}