ondrej-bouda / ivory

src/Ivory/Value/TimeInterval.php

Braces +8 added lines, -16 removed lines

@@ -198,20 +198,16 @@ 
             $timeDelimPos = strpos($str, 'T');
             if (!$timeDelimPos) {
                 $parts = self::parseIsoDateStr(substr($str, 1));
-            }
-            elseif ($timeDelimPos == 1) {
+            } elseif ($timeDelimPos == 1) {
                 $parts = self::parseTimeStr($str, 2);
-            }
-            else {
+            } else {
                 $parts = self::parseIsoDateStr(substr($str, 1, $timeDelimPos - 1)) +
                     self::parseTimeStr($str, $timeDelimPos + 1);
             }
-        }
-        elseif ($str[0] == '@') {
+        } elseif ($str[0] == '@') {
             // verbose PostgreSQL format
             $parts = self::parsePostgresqlStr($str, 1);
-        }
-        elseif (preg_match('~^(?:(-)?(\d+)-(\d+))?\s*(-?\d+)??\s*(-?\d+(?::\d+(?::\d+(?:\.\d+)?)?)?)?$~', $str, $m)) {
+        } elseif (preg_match('~^(?:(-)?(\d+)-(\d+))?\s*(-?\d+)??\s*(-?\d+(?::\d+(?::\d+(?:\.\d+)?)?)?)?$~', $str, $m)) {
             // sql format
             $parts = (isset($m[5]) ? self::parseTimeStr($m[5], 0, false) : []);
             if (!empty($m[2]) || !empty($m[3])) {
@@ -222,8 +218,7 @@ 
             if (!empty($m[4])) {
                 $parts[self::DAY] = (int)$m[4];
             }
-        }
-        else {
+        } else {
             // PostgreSQL format
             $parts = self::parsePostgresqlStr($str);
         }
@@ -239,8 +234,7 @@ 
                 self::MONTH => (int)$m[2],
                 self::DAY => (int)$m[3],
             ];
-        }
-        else {
+        } else {
             $parts = [];
             preg_match_all('~(-?\d+(?:\.\d+)?)([YMDW])~', $str, $matches, PREG_SET_ORDER);
             static $units = ['Y' => self::YEAR, 'M' => self::MONTH, 'D' => self::DAY, 'W' => self::WEEK];
@@ -266,14 +260,12 @@ 
                     self::MINUTE => $sgn * $m[2],
                     self::SECOND => $sgn * (isset($m[3]) ? (float)$m[3] : 0),
                 ];
-            }
-            else {
+            } else {
                 return [
                     self::SECOND => (float)$m[1],
                 ];
             }
-        }
-        else {
+        } else {
             $parts = [];
             preg_match_all('~(-?\d+(?:\.\d+)?)([HMS])~', $str, $matches, PREG_SET_ORDER, $offset);
             static $units = ['H' => self::HOUR, 'M' => self::MINUTE, 'S' => self::SECOND];

src/Ivory/Value/Date.php

Braces +3 added lines, -6 removed lines

@@ -136,8 +136,7 @@ 
 
         if ($month >= 1 && $month <= 12 && $day >= 1 && $day <= 31) { // works even for months without 31 days
             return self::fromISOString(sprintf('%s%04d-%02d-%02d', ($z < 0 ? '-' : ''), abs($z), $month, $day));
-        }
-        else {
+        } else {
             return self::fromISOString(sprintf('%s%04d-01-01', ($z < 0 ? '-' : ''), abs($z)))
                 ->addParts(0, $month - 1, $day - 1);
         }
@@ -178,8 +177,7 @@ 
         $date = self::fromISOString(sprintf('%s%04d-%02d-%02d', ($z < 0 ? '-' : ''), abs($z), $month, $day));
         if ($date->format('j') == $day) {
             return $date;
-        }
-        else {
+        } else {
             throw new \OutOfRangeException('$day out of range');
         }
     }
@@ -224,8 +222,7 @@ 
     {
         if ($this->inf) {
             return null;
-        }
-        else {
+        } else {
             $z = (int)$this->dt->format('Y');
             return [($z > 0 ? $z : $z - 1), (int)$this->dt->format('n'), (int)$this->dt->format('j')];
         }

src/Ivory/Value/LineSegment.php

Braces +2 added lines, -4 removed lines

@@ -25,15 +25,13 @@
     {
         if (is_array($start)) {
             $start = Point::fromCoords($start);
-        }
-        elseif (!$start instanceof Point) {
+        } elseif (!$start instanceof Point) {
             throw new \InvalidArgumentException('start');
         }
 
         if (is_array($end)) {
             $end = Point::fromCoords($end);
-        }
-        elseif (!$end instanceof Point) {
+        } elseif (!$end instanceof Point) {
             throw new \InvalidArgumentException('end');
         }
 

src/Ivory/Value/XmlContent.php

Braces +8 added lines, -16 removed lines

@@ -23,26 +23,22 @@ 
         if (is_string($value)) {
             $xmlStr = $value;
             $isDoc = self::isXmlDocument($value);
-        }
-        elseif ($value instanceof XmlContent) {
+        } elseif ($value instanceof XmlContent) {
             return $value;
-        }
-        elseif ($value instanceof \DOMDocument) {
+        } elseif ($value instanceof \DOMDocument) {
             $xmlStr = $value->saveXML();
             if ($xmlStr === false) {
                 throw new \InvalidArgumentException('value');
             }
             $isDoc = true;
-        }
-        elseif ($value instanceof \DOMNode) {
+        } elseif ($value instanceof \DOMNode) {
             $d = $value->ownerDocument->saveXML($value);
             if ($d === false) {
                 throw new \InvalidArgumentException('value');
             }
             $xmlStr = self::getXMLDeclaration($value->ownerDocument) . $d;
             $isDoc = true;
-        }
-        elseif ($value instanceof \DOMNodeList) {
+        } elseif ($value instanceof \DOMNodeList) {
             $xmlStr = ($value->length > 0 ? self::getXMLDeclaration($value->item(0)->ownerDocument) : '');
             foreach ($value as $i => $node) {
                 $n = $node->ownerDocument->saveXML($node);
@@ -52,26 +48,22 @@ 
                 $xmlStr .= $n;
             }
             $isDoc = ($value->length == 1);
-        }
-        elseif ($value instanceof \SimpleXMLElement) {
+        } elseif ($value instanceof \SimpleXMLElement) {
             $xmlStr = $value->saveXML();
             if ($xmlStr === false) {
                 throw new \InvalidArgumentException('value');
             }
             $isDoc = true;
-        }
-        elseif (is_object($value)) {
+        } elseif (is_object($value)) {
             $xmlStr = (string)$value;
             $isDoc = self::isXmlDocument($value);
-        }
-        else {
+        } else {
             throw new \InvalidArgumentException('value');
         }
 
         if ($isDoc) {
             return new XmlDocument($xmlStr);
-        }
-        else {
+        } else {
             return new XmlContent($xmlStr);
         }
     }

src/Ivory/Value/Path.php

Braces +2 added lines, -4 removed lines

@@ -49,11 +49,9 @@
         foreach ($points as $i => $point) {
             if ($point instanceof Point) {
                 $normalized[] = $point;
-            }
-            elseif (is_array($point)) {
+            } elseif (is_array($point)) {
                 $normalized[] = Point::fromCoords($point[0], $point[1]);
-            }
-            else {
+            } else {
                 throw new \InvalidArgumentException("points[$i]");
             }
         }

src/Ivory/Value/Timestamp.php

Braces +3 added lines, -6 removed lines

@@ -31,8 +31,7 @@ 
     {
         if (PHP_VERSION_ID >= 70100) {
             return new Timestamp(0, new \DateTimeImmutable('now', self::getUTCTimeZone()));
-        }
-        else {
+        } else {
             // up to PHP 7.0, new \DateTimeImmutable('now') had only precision up to seconds
             list($micro, $sec) = explode(' ', microtime());
             $microFrac = substr($micro, 1); // cut off the whole part (always a zero)
@@ -111,8 +110,7 @@ 
                 '%s%04d-%02d-%02d %02d:%02d:%s',
                 ($z < 0 ? '-' : ''), abs($z), $month, $day, $hour, $minute, self::floatToTwoPlaces($second)
             ));
-        }
-        else {
+        } else {
             return self::fromISOString(sprintf('%s%04d-01-01 00:00:00', ($z < 0 ? '-' : ''), abs($z)))
                 ->addParts(0, $month - 1, $day - 1, $hour, $minute, $second);
         }
@@ -176,8 +174,7 @@ 
     {
         if ($this->inf) {
             return null;
-        }
-        else {
+        } else {
             $y = (int)$this->dt->format('Y');
             $u = $this->dt->format('u');
             return [

src/Ivory/Value/VarBitString.php

Braces +3 added lines, -6 removed lines

@@ -35,15 +35,12 @@
 
 		if ($maxLength === null) {
 			return new VarBitString($bits, null);
-		}
-		elseif ($maxLength <= 0) {
+		} elseif ($maxLength <= 0) {
 			throw new \InvalidArgumentException('maxLength is non-positive');
-		}
-		elseif ($maxLength < strlen($bits)) {
+		} elseif ($maxLength < strlen($bits)) {
 			trigger_error("Bit string truncated to the length of $maxLength", E_USER_WARNING);
 			return new VarBitString(substr($bits, 0, $maxLength), $maxLength);
-		}
-		else {
+		} else {
 			return new VarBitString($bits, $maxLength);
 		}
 	}

src/Ivory/Value/Json.php

Braces +1 added lines, -2 removed lines

@@ -93,8 +93,7 @@
     {
         if (PHP_VERSION_ID >= 50500) {
             return json_last_error_msg();
-        }
-        else {
+        } else {
             static $messages = [
                 JSON_ERROR_DEPTH => 'Maximum stack depth exceeded',
                 JSON_ERROR_STATE_MISMATCH => 'Underflow or the modes mismatch',

src/Ivory/Value/Quantity.php

Braces +3 added lines, -6 removed lines

@@ -88,8 +88,7 @@ 
         if (isset($m[3]) && $m[3] !== '') {
             $val .= '.' . preg_replace('~\D+~', '', $m[3]);
             $val = (float)$val;
-        }
-        else {
+        } else {
             $val = (int)$val;
         }
 
@@ -151,8 +150,7 @@ 
         if ($this->unit == $quantity->unit) {
             $thisNormValue = $this->value;
             $quanNormValue = $quantity->value;
-        }
-        else {
+        } else {
             if (!isset(self::$conversion[$this->unit], self::$conversion[$quantity->unit])) {
                 return false;
             }
@@ -183,8 +181,7 @@ 
         if (!$this->unit || !$destUnit) {
             if ($this->value == 0) {
                 return new Quantity($this->value, $destUnit);
-            }
-            else {
+            } else {
                 throw new UndefinedOperationException('Conversion from/to dimensionless quantity is undefined.');
             }
         }