ondrej-bouda / ivory

src/Ivory/Type/Std/LineSegmentType.php

Braces +4 added lines, -8 removed lines

@@ -32,12 +32,10 @@ 
                 $start = $this->pointType->parseValue($m[4]);
                 $end = $this->pointType->parseValue($m[5]);
                 return LineSegment::fromEndpoints($start, $end);
-            }
-            catch (\InvalidArgumentException $e) {
+            } catch (\InvalidArgumentException $e) {
                 $this->throwInvalidValue($str, $e);
             }
-        }
-        else {
+        } else {
             $this->throwInvalidValue($str);
         }
     }
@@ -46,14 +44,12 @@ 
     {
         if ($val === null) {
             return 'NULL';
-        }
-        elseif ($val instanceof LineSegment) {
+        } elseif ($val instanceof LineSegment) {
             return sprintf('lseg(%s,%s)',
                 $this->pointType->serializeValue($val->getStart()),
                 $this->pointType->serializeValue($val->getEnd())
             );
-        }
-        else {
+        } else {
             $this->throwInvalidValue($val);
         }
     }

src/Ivory/Type/Std/BoxType.php

Braces +4 added lines, -8 removed lines

@@ -32,12 +32,10 @@ 
                 $corner = $this->pointType->parseValue($m[2]);
                 $oppositeCorner = $this->pointType->parseValue($m[3]);
                 return Box::fromOppositeCorners($corner, $oppositeCorner);
-            }
-            catch (\InvalidArgumentException $e) {
+            } catch (\InvalidArgumentException $e) {
                 $this->throwInvalidValue($str, $e);
             }
-        }
-        else {
+        } else {
             $this->throwInvalidValue($str);
         }
     }
@@ -46,14 +44,12 @@ 
     {
         if ($val === null) {
             return 'NULL';
-        }
-        elseif ($val instanceof Box) {
+        } elseif ($val instanceof Box) {
             return sprintf('box(%s,%s)',
                 $this->pointType->serializeValue($val->getUpperRight()),
                 $this->pointType->serializeValue($val->getLowerLeft())
             );
-        }
-        else {
+        } else {
             $this->throwInvalidValue($val);
         }
     }

src/Ivory/Type/Std/TxIdSnapshotType.php

Braces +1 added lines, -2 removed lines

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

src/Ivory/Type/Std/MacAddrType.php

Braces +1 added lines, -2 removed lines

@@ -22,8 +22,7 @@
 
         try {
             return MacAddr::fromString($str);
-        }
-        catch (\InvalidArgumentException $e) {
+        } catch (\InvalidArgumentException $e) {
             $this->throwInvalidValue($str, $e);
         }
     }

src/Ivory/Type/Std/HstoreType.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
                 throw new \InvalidArgumentException('Invalid syntax of hstore value');
             }
 
-            $k = ($m[2][0] ? : $this->unescapeAtom($m[1][0]));
+            $k = ($m[2][0] ?: $this->unescapeAtom($m[1][0]));
             $v = (!empty($m[4][0]) ? null : (!empty($m[5][0]) ? $m[5][0] : $this->unescapeAtom($m[3][0])));
             $result[$k] = $v;
 

Braces +23 added lines, -46 removed lines

@@ -80,8 +80,7 @@ 
         foreach ($val as $k => $v) {
             if (!$isFirst) {
                 $res .= ',';
-            }
-            else {
+            } else {
                 $isFirst = false;
             }
             $res .= $this->quoteAtom($k) . '=>' . $this->quoteAtom($v);
@@ -93,8 +92,7 @@ 
     {
         if ($atom === null) {
             return 'NULL';
-        }
-        else {
+        } else {
             return '"' . strtr($atom, ['"' => '\\"', '\\' => '\\\\']) . '"';
         }
     }
@@ -132,15 +130,12 @@ 
                     if ($ch == '"') {
                         $key = '';
                         $state = 1;
-                    }
-                    elseif (ctype_space($ch)) {
+                    } elseif (ctype_space($ch)) {
                         continue 2;
-                    }
-                    elseif (strpos($ctlChars, $ch) === false) {
+                    } elseif (strpos($ctlChars, $ch) === false) {
                         $key = $ch;
                         $state = 3;
-                    }
-                    else {
+                    } else {
                         break 2;
                     }
                     break;
@@ -148,11 +143,9 @@ 
                 case 1:
                     if ($ch == '\\') {
                         $state = 2;
-                    }
-                    elseif ($ch == '"') {
+                    } elseif ($ch == '"') {
                         $state = 4;
-                    }
-                    else {
+                    } else {
                         $key .= $ch;
                     }
                     break;
@@ -165,14 +158,11 @@ 
                 case 3:
                     if ($ch == '=') {
                         $state = 5;
-                    }
-                    elseif (ctype_space($ch)) {
+                    } elseif (ctype_space($ch)) {
                         $state = 4;
-                    }
-                    elseif (strpos($ctlChars, $ch) === false) {
+                    } elseif (strpos($ctlChars, $ch) === false) {
                         $key .= $ch;
-                    }
-                    else {
+                    } else {
                         break 2;
                     }
                     break;
@@ -180,11 +170,9 @@ 
                 case 4:
                     if ($ch == '=') {
                         $state = 5;
-                    }
-                    elseif (ctype_space($ch)) {
+                    } elseif (ctype_space($ch)) {
                         continue 2;
-                    }
-                    else {
+                    } else {
                         break 2;
                     }
                     break;
@@ -192,8 +180,7 @@ 
                 case 5:
                     if ($ch == '>') {
                         $state = 6;
-                    }
-                    else {
+                    } else {
                         break 2;
                     }
                     break;
@@ -201,16 +188,13 @@ 
                 case 6:
                     if (ctype_space($ch)) {
                         continue 2;
-                    }
-                    elseif ($ch == '"') {
+                    } elseif ($ch == '"') {
                         $val = '';
                         $state = 7;
-                    }
-                    elseif (strpos($ctlChars, $ch) === false) {
+                    } elseif (strpos($ctlChars, $ch) === false) {
                         $val = $ch;
                         $state = 9;
-                    }
-                    else {
+                    } else {
                         break 2;
                     }
                     break;
@@ -218,11 +202,9 @@ 
                 case 7:
                     if ($ch == '"') {
                         $state = 10;
-                    }
-                    elseif ($ch == '\\') {
+                    } elseif ($ch == '\\') {
                         $state = 8;
-                    }
-                    else {
+                    } else {
                         $val .= $ch;
                     }
                     break;
@@ -236,14 +218,11 @@ 
                     if ($ch == ',') {
                         $result[$key] = (strcasecmp($val, 'NULL') == 0 ? null : $val);
                         $state = 0;
-                    }
-                    elseif (ctype_space($ch)) {
+                    } elseif (ctype_space($ch)) {
                         $state = 10;
-                    }
-                    elseif (strpos($ctlChars, $ch) === false) {
+                    } elseif (strpos($ctlChars, $ch) === false) {
                         $val .= $ch;
-                    }
-                    else {
+                    } else {
                         $state = -1;
                         break 2;
                     }
@@ -253,11 +232,9 @@ 
                     if ($ch == ',') {
                         $result[$key] = $val;
                         $state = 0;
-                    }
-                    elseif (ctype_space($ch)) {
+                    } elseif (ctype_space($ch)) {
                         continue 2;
-                    }
-                    else {
+                    } else {
                         $state = -1;
                         break 2;
                     }

src/Ivory/Type/Std/CircleType.php

Braces +4 added lines, -8 removed lines

@@ -31,12 +31,10 @@ 
             try {
                 $center = $this->pointType->parseValue($m[4]);
                 return Circle::fromCoords($center, $m[5]);
-            }
-            catch (\InvalidArgumentException $e) {
+            } catch (\InvalidArgumentException $e) {
                 $this->throwInvalidValue($str, $e);
             }
-        }
-        else {
+        } else {
             $this->throwInvalidValue($str);
         }
     }
@@ -45,14 +43,12 @@ 
     {
         if ($val === null) {
             return 'NULL';
-        }
-        elseif ($val instanceof Circle) {
+        } elseif ($val instanceof Circle) {
             return sprintf('circle(%s,%s)',
                 $this->pointType->serializeValue($val->getCenter()),
                 $val->getRadius()
             );
-        }
-        else {
+        } else {
             $this->throwInvalidValue($val);
         }
     }

src/Ivory/Type/Std/TsQueryType.php

Braces +1 added lines, -2 removed lines

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

src/Ivory/Type/Std/FloatType.php

Indentation +65 added lines, -65 removed lines

@@ -12,74 +12,74 @@
  */
 class FloatType extends \Ivory\Type\BaseType implements ITotallyOrderedType
 {
-	public function parseValue($str)
-	{
-		if ($str === null) {
-			return null;
-		}
-		elseif (is_numeric($str)) {
-			return (float)$str;
-		}
-		elseif (strcasecmp($str, 'NaN') == 0) {
-			return NAN;
-		}
-		elseif (strcasecmp($str, 'Infinity') == 0) {
-			return INF;
-		}
-		elseif (strcasecmp($str, '-Infinity') == 0) {
-			return -INF;
-		}
-		else {
-			$this->throwInvalidValue($str);
-		}
-	}
+    public function parseValue($str)
+    {
+        if ($str === null) {
+            return null;
+        }
+        elseif (is_numeric($str)) {
+            return (float)$str;
+        }
+        elseif (strcasecmp($str, 'NaN') == 0) {
+            return NAN;
+        }
+        elseif (strcasecmp($str, 'Infinity') == 0) {
+            return INF;
+        }
+        elseif (strcasecmp($str, '-Infinity') == 0) {
+            return -INF;
+        }
+        else {
+            $this->throwInvalidValue($str);
+        }
+    }
 
-	public function serializeValue($val)
-	{
-		if ($val === null) {
-			return 'NULL';
-		}
-		elseif (is_finite($val)) {
-			return (string)$val;
-		}
-		elseif (is_nan($val)) {
-			return "'NaN'";
-		}
-		elseif ($val < 0) {
-			return "'-Infinity'";
-		}
-		else {
-			return "'Infinity'";
-		}
-	}
+    public function serializeValue($val)
+    {
+        if ($val === null) {
+            return 'NULL';
+        }
+        elseif (is_finite($val)) {
+            return (string)$val;
+        }
+        elseif (is_nan($val)) {
+            return "'NaN'";
+        }
+        elseif ($val < 0) {
+            return "'-Infinity'";
+        }
+        else {
+            return "'Infinity'";
+        }
+    }
 
-	public function compareValues($a, $b)
-	{
-		return self::compareFloats($a, $b);
-	}
+    public function compareValues($a, $b)
+    {
+        return self::compareFloats($a, $b);
+    }
 
-	public static function compareFloats($a, $b)
-	{
-		if ($a === null || $b === null) {
-			return null;
-		}
+    public static function compareFloats($a, $b)
+    {
+        if ($a === null || $b === null) {
+            return null;
+        }
 
-		if ($a === NAN) {
-			return ($b === NAN ? 0 : 1);
-		}
-		elseif ($b === NAN) {
-			return -1;
-		}
+        if ($a === NAN) {
+            return ($b === NAN ? 0 : 1);
+        }
+        elseif ($b === NAN) {
+            return -1;
+        }
 
-		// TODO PHP 7: use the spaceship operator
-		if ((float)$a < (float)$b) {
-			return -1;
-		}
-		elseif ((float)$a == (float)$b) {
-			return 0;
-		}
-		else {
-			return 1;
-		}
-	}
+        // TODO PHP 7: use the spaceship operator
+        if ((float)$a < (float)$b) {
+            return -1;
+        }
+        elseif ((float)$a == (float)$b) {
+            return 0;
+        }
+        else {
+            return 1;
+        }
+    }
 }

Braces +12 added lines, -24 removed lines

@@ -16,20 +16,15 @@ 
 	{
 		if ($str === null) {
 			return null;
-		}
-		elseif (is_numeric($str)) {
+		} elseif (is_numeric($str)) {
 			return (float)$str;
-		}
-		elseif (strcasecmp($str, 'NaN') == 0) {
+		} elseif (strcasecmp($str, 'NaN') == 0) {
 			return NAN;
-		}
-		elseif (strcasecmp($str, 'Infinity') == 0) {
+		} elseif (strcasecmp($str, 'Infinity') == 0) {
 			return INF;
-		}
-		elseif (strcasecmp($str, '-Infinity') == 0) {
+		} elseif (strcasecmp($str, '-Infinity') == 0) {
 			return -INF;
-		}
-		else {
+		} else {
 			$this->throwInvalidValue($str);
 		}
 	}
@@ -38,17 +33,13 @@ 
 	{
 		if ($val === null) {
 			return 'NULL';
-		}
-		elseif (is_finite($val)) {
+		} elseif (is_finite($val)) {
 			return (string)$val;
-		}
-		elseif (is_nan($val)) {
+		} elseif (is_nan($val)) {
 			return "'NaN'";
-		}
-		elseif ($val < 0) {
+		} elseif ($val < 0) {
 			return "'-Infinity'";
-		}
-		else {
+		} else {
 			return "'Infinity'";
 		}
 	}
@@ -66,19 +57,16 @@ 
 
 		if ($a === NAN) {
 			return ($b === NAN ? 0 : 1);
-		}
-		elseif ($b === NAN) {
+		} elseif ($b === NAN) {
 			return -1;
 		}
 
 		// TODO PHP 7: use the spaceship operator
 		if ((float)$a < (float)$b) {
 			return -1;
-		}
-		elseif ((float)$a == (float)$b) {
+		} elseif ((float)$a == (float)$b) {
 			return 0;
-		}
-		else {
+		} else {
 			return 1;
 		}
 	}

src/Ivory/Type/Std/PointType.php

Braces +6 added lines, -12 removed lines

@@ -19,13 +19,11 @@ 
     {
         if ($str === null) {
             return null;
-        }
-        elseif (preg_match('~^ \s* (\()? \s* ([0-9.e+-]+) \s* , \s* ([0-9.e+-]+) \s* (?(1)\)) \s* $~ix', $str, $m) &&
+        } elseif (preg_match('~^ \s* (\()? \s* ([0-9.e+-]+) \s* , \s* ([0-9.e+-]+) \s* (?(1)\)) \s* $~ix', $str, $m) &&
                 is_numeric($m[2]) && is_numeric($m[3]))
         {
             return Point::fromCoords($m[2], $m[3]);
-        }
-        else {
+        } else {
             $this->throwInvalidValue($str);
         }
     }
@@ -38,8 +36,7 @@ 
 
         if (is_array($val)) {
             $val = Point::fromCoords($val);
-        }
-        elseif (!$val instanceof Point) {
+        } elseif (!$val instanceof Point) {
             $this->throwInvalidValue($val);
         }
 
@@ -54,15 +51,13 @@ 
 
         if (is_array($a)) {
             $a = Point::fromCoords($a);
-        }
-        elseif (!$a instanceof Point) {
+        } elseif (!$a instanceof Point) {
             throw new IncomparableException('$a is not a ' . Point::class);
         }
 
         if (is_array($b)) {
             $b = Point::fromCoords($b);
-        }
-        elseif (!$b instanceof Point) {
+        } elseif (!$b instanceof Point) {
             throw new IncomparableException('$b is not a ' . Point::class);
         }
 
@@ -72,8 +67,7 @@ 
         $xComp = FloatType::compareFloats($ac[0], $bc[0]);
         if ($xComp !== 0) {
             return $xComp;
-        }
-        else {
+        } else {
             return FloatType::compareFloats($ac[1], $bc[1]);
         }
     }