ondrej-bouda / ivory

src/Ivory/Type/Std/MoneyType.php

Doc Comments +4 added lines

@@ -29,6 +29,10 @@
 {
     private $decSepRetriever;
 
+    /**
+     * @param string $schemaName
+     * @param string $name
+     */
     public function __construct($schemaName, $name, IConnection $connection)
     {
         parent::__construct($schemaName, $name, $connection);

Braces +5 added lines, -10 removed lines

@@ -45,8 +45,7 @@ 
         $decSep = $this->decSepRetriever->getValue();
         try {
             return Money::fromString($str, $decSep);
-        }
-        catch (\InvalidArgumentException $e) {
+        } catch (\InvalidArgumentException $e) {
             $this->throwInvalidValue($str, $e);
         }
     }
@@ -59,17 +58,13 @@ 
 
         if ($val instanceof Money) {
             $str = $val->getAmount()->toString();
-        }
-        elseif ($val instanceof Decimal) {
+        } elseif ($val instanceof Decimal) {
             $str = $val->toString();
-        }
-        elseif (is_int($val) || is_float($val) || filter_var($val, FILTER_VALIDATE_FLOAT)) {
+        } elseif (is_int($val) || is_float($val) || filter_var($val, FILTER_VALIDATE_FLOAT)) {
             $str = (string)$val;
-        }
-        elseif (is_string($val)) {
+        } elseif (is_string($val)) {
             $str = Money::fromString($val, '.')->getAmount()->toString();
-        }
-        else {
+        } else {
             $this->throwInvalidValue($val);
         }
 

src/Ivory/Type/Std/PathType.php

Unused Use Statements -3 removed lines

@@ -1,10 +1,7 @@
 <?php
 namespace Ivory\Type\Std;
 
-use Ivory\Value\Line;
-use Ivory\Value\LineSegment;
 use Ivory\Value\Path;
-use Ivory\Value\Polygon;
 
 /**
  * Path on a plane.

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
             $fragments = explode(',', $pointListStr);
             try {
                 for ($i = 0; $i < count($fragments); $i += 2) {
-                    $points[] = $this->pointType->parseValue($fragments[$i] . ',' . $fragments[$i+1]);
+                    $points[] = $this->pointType->parseValue($fragments[$i] . ',' . $fragments[$i + 1]);
                 }
                 return Path::fromPoints($points, ($isOpen ? Path::OPEN : Path::CLOSED));
             }

Braces +3 added lines, -6 removed lines

@@ -44,12 +44,10 @@ 
                     $points[] = $this->pointType->parseValue($fragments[$i] . ',' . $fragments[$i+1]);
                 }
                 return Path::fromPoints($points, ($isOpen ? Path::OPEN : Path::CLOSED));
-            }
-            catch (\InvalidArgumentException $e) {
+            } catch (\InvalidArgumentException $e) {
                 $this->throwInvalidValue($str, $e);
             }
-        }
-        else {
+        } else {
             $this->throwInvalidValue($str);
         }
     }
@@ -63,8 +61,7 @@ 
         if (!$val instanceof Path) {
             try {
                 $val = Path::fromPoints($val);
-            }
-            catch (\InvalidArgumentException $e) {
+            } catch (\InvalidArgumentException $e) {
                 $this->throwInvalidValue($val, $e);
             }
         }

src/Ivory/Type/Std/PolygonType.php

Unused Use Statements -2 removed lines

@@ -1,8 +1,6 @@
 <?php
 namespace Ivory\Type\Std;
 
-use Ivory\Value\Line;
-use Ivory\Value\LineSegment;
 use Ivory\Value\Polygon;
 
 /**

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
             $fragments = explode(',', $pointListStr);
             try {
                 for ($i = 0; $i < count($fragments); $i += 2) {
-                    $points[] = $this->pointType->parseValue($fragments[$i] . ',' . $fragments[$i+1]);
+                    $points[] = $this->pointType->parseValue($fragments[$i] . ',' . $fragments[$i + 1]);
                 }
                 return Polygon::fromPoints($points);
             }

Braces +3 added lines, -6 removed lines

@@ -42,12 +42,10 @@ 
                     $points[] = $this->pointType->parseValue($fragments[$i] . ',' . $fragments[$i+1]);
                 }
                 return Polygon::fromPoints($points);
-            }
-            catch (\InvalidArgumentException $e) {
+            } catch (\InvalidArgumentException $e) {
                 $this->throwInvalidValue($str, $e);
             }
-        }
-        else {
+        } else {
             $this->throwInvalidValue($str);
         }
     }
@@ -61,8 +59,7 @@ 
         if (!$val instanceof Polygon) {
             try {
                 $val = Polygon::fromPoints($val);
-            }
-            catch (\InvalidArgumentException $e) {
+            } catch (\InvalidArgumentException $e) {
                 $this->throwInvalidValue($val, $e);
             }
         }

src/Ivory/Type/Std/TimestampType.php

Doc Comments +4 added lines

@@ -45,6 +45,10 @@
 
     private $dateStyleRetriever;
 
+    /**
+     * @param string $schemaName
+     * @param string $name
+     */
     public function __construct($schemaName, $name, IConnection $connection)
     {
         parent::__construct($schemaName, $name, $connection);

Braces +7 added lines, -14 removed lines

@@ -58,11 +58,9 @@ 
     {
         if ($str === null) {
             return null;
-        }
-        elseif ($str == 'infinity') {
+        } elseif ($str == 'infinity') {
             return Timestamp::infinity();
-        }
-        elseif ($str == '-infinity') {
+        } elseif ($str == '-infinity') {
             return Timestamp::minusInfinity();
         }
 
@@ -86,8 +84,7 @@ 
                 preg_match('~^(\d+)/(\d+)/(\d+) (\d+):(\d+):(\d+(?:\.\d+)?).*?(BC)?$~', $str, $matches);
                 if ($dateStyle->getOrder() == DateStyle::ORDER_DMY) {
                     list(, $d, $m, $y, $h, $i, $s) = $matches;
-                }
-                else {
+                } else {
                     list(, $m, $d, $y, $h, $i, $s) = $matches;
                 }
                 break;
@@ -95,8 +92,7 @@ 
                 preg_match('~^\w{3} (\d+|\w{3}) (\d+|\w{3}) (\d+):(\d+):(\d+(?:\.\d+)?) (\d+).*?(BC)?$~', $str, $matches);
                 if ($dateStyle->getOrder() == DateStyle::ORDER_DMY) {
                     list(, $d, $ms, $h, $i, $s, $y) = $matches;
-                }
-                else {
+                } else {
                     list(, $ms, $d, $h, $i, $s, $y) = $matches;
                 }
                 static $monthNames = [
@@ -131,14 +127,11 @@ 
                 ($val->format('u') ? $val->format('.u') : ''),
                 ($val->getYear() < 0 ? ' BC' : '')
             );
-        }
-        elseif ($val === Timestamp::infinity()) {
+        } elseif ($val === Timestamp::infinity()) {
             return "'infinity'";
-        }
-        elseif ($val === Timestamp::minusInfinity()) {
+        } elseif ($val === Timestamp::minusInfinity()) {
             return "'-infinity'";
-        }
-        else {
+        } else {
             throw new \LogicException('A non-finite timestamp not recognized');
         }
     }

src/Ivory/Type/Std/TimestampTzType.php

Doc Comments +8 added lines

@@ -28,6 +28,10 @@ 
     private $dateStyleRetriever;
     private $localMeanTimeZoneRetriever;
 
+    /**
+     * @param string $schemaName
+     * @param string $name
+     */
     public function __construct($schemaName, $name, IConnection $connection)
     {
         parent::__construct($schemaName, $name, $connection);
@@ -38,6 +42,10 @@ 
         $this->localMeanTimeZoneRetriever = new ConnConfigValueRetriever(
             $connection->getConfig(),
             ConfigParam::TIME_ZONE,
+
+            /**
+             * @param string $timeZone
+             */
             function ($timeZone) use ($connection) {
                 try {
                     $tz = new \DateTimeZone($timeZone);

Spacing +3 added lines, -3 removed lines

@@ -38,13 +38,13 @@ 
         $this->localMeanTimeZoneRetriever = new ConnConfigValueRetriever(
             $connection->getConfig(),
             ConfigParam::TIME_ZONE,
-            function ($timeZone) use ($connection) {
+            function($timeZone) use ($connection) {
                 try {
                     $tz = new \DateTimeZone($timeZone);
                     $longitude = $tz->getLocation()['longitude'];
                     $offset = $longitude * 24 / 360;
                     $abs = abs($offset);
-                    $tzSpec = sprintf('%s%d:%02d', ($offset >= 0 ? '+' : '-'), (int)$abs, (int)(($abs - (int)$abs)*60));
+                    $tzSpec = sprintf('%s%d:%02d', ($offset >= 0 ? '+' : '-'), (int)$abs, (int)(($abs - (int)$abs) * 60));
                     // unfortunately, \DateTimeZone cannot be created with offsets precise to seconds
                     return new \DateTimeZone($tzSpec);
                 }
@@ -99,7 +99,7 @@ 
             case DateStyle::FORMAT_POSTGRES:
                 preg_match('~^\w{3} (\d+|\w{3}) (\d+|\w{3}) (\d+):(\d+):(\d+(?:\.\d+)?) (\d+) ([^ ]+)( BC)?$~', $str, $matches);
                 if ($dateStyle->getOrder() == DateStyle::ORDER_DMY) {
-                    list(, $d, $ms, $h, $i, $s, $y ,$z) = $matches;
+                    list(, $d, $ms, $h, $i, $s, $y, $z) = $matches;
                 }
                 else {
                     list(, $ms, $d, $h, $i, $s, $y, $z) = $matches;

Braces +8 added lines, -16 removed lines

@@ -47,8 +47,7 @@ 
                     $tzSpec = sprintf('%s%d:%02d', ($offset >= 0 ? '+' : '-'), (int)$abs, (int)(($abs - (int)$abs)*60));
                     // unfortunately, \DateTimeZone cannot be created with offsets precise to seconds
                     return new \DateTimeZone($tzSpec);
-                }
-                catch (\Exception $e) {
+                } catch (\Exception $e) {
                     $msg = "Time zone '$timeZone', as configured for the PostgreSQL connection {$connection->getName()}, "
                         . "is unknown to PHP. Falling back to UTC (only relevant for timestamptz values representing "
                         . "very old date/times).";
@@ -63,11 +62,9 @@ 
     {
         if ($str === null) {
             return null;
-        }
-        elseif ($str == 'infinity') {
+        } elseif ($str == 'infinity') {
             return TimestampTz::infinity();
-        }
-        elseif ($str == '-infinity') {
+        } elseif ($str == '-infinity') {
             return TimestampTz::minusInfinity();
         }
 
@@ -91,8 +88,7 @@ 
                 preg_match('~^(\d+)/(\d+)/(\d+) (\d+):(\d+):(\d+(?:\.\d+)?) ([^ ]+)( BC)?$~', $str, $matches);
                 if ($dateStyle->getOrder() == DateStyle::ORDER_DMY) {
                     list(, $d, $m, $y, $h, $i, $s, $z) = $matches;
-                }
-                else {
+                } else {
                     list(, $m, $d, $y, $h, $i, $s, $z) = $matches;
                 }
                 break;
@@ -100,8 +96,7 @@ 
                 preg_match('~^\w{3} (\d+|\w{3}) (\d+|\w{3}) (\d+):(\d+):(\d+(?:\.\d+)?) (\d+) ([^ ]+)( BC)?$~', $str, $matches);
                 if ($dateStyle->getOrder() == DateStyle::ORDER_DMY) {
                     list(, $d, $ms, $h, $i, $s, $y ,$z) = $matches;
-                }
-                else {
+                } else {
                     list(, $ms, $d, $h, $i, $s, $y, $z) = $matches;
                 }
                 static $monthNames = [
@@ -140,14 +135,11 @@ 
                 $val->getOffsetISOString(),
                 ($val->getYear() < 0 ? ' BC' : '')
             );
-        }
-        elseif ($val === TimestampTz::infinity()) {
+        } elseif ($val === TimestampTz::infinity()) {
             return "'infinity'";
-        }
-        elseif ($val === TimestampTz::minusInfinity()) {
+        } elseif ($val === TimestampTz::minusInfinity()) {
             return "'-infinity'";
-        }
-        else {
+        } else {
             throw new \LogicException('A non-finite timezone-aware timestamp not recognized');
         }
     }

src/Ivory/Utils/StringUtils.php

Doc Comments +2 added lines, -2 removed lines

@@ -10,9 +10,9 @@
 	 * plain array of matches, but an extended array: each item is a pair of the matching portion of the needle and the
 	 * byte offset to the subject, like {@link preg_match_all()} does with the `PREG_OFFSET_CAPTURE` flag.
 	 *
-	 * @param string|string[] $pattern
+	 * @param string $pattern
 	 * @param callable $callback
-	 * @param string|string[] $subject
+	 * @param string $subject
 	 * @param int $limit
 	 * @param int|null $count
 	 * @return string|string[] depending on whether <tt>$subject</tt> is <tt>string</tt> or <tt>array</tt>,

Indentation +48 added lines, -48 removed lines

@@ -5,59 +5,59 @@
 
 class StringUtils
 {
-	/**
-	 * Like {@link preg_replace_callback()}, it performs a string search and replace. The callback does not receive
-	 * plain array of matches, but an extended array: each item is a pair of the matching portion of the needle and the
-	 * byte offset to the subject, like {@link preg_match_all()} does with the `PREG_OFFSET_CAPTURE` flag.
-	 *
-	 * @param string|string[] $pattern
-	 * @param callable $callback
-	 * @param string|string[] $subject
-	 * @param int $limit
-	 * @param int|null $count
-	 * @return string|string[] depending on whether <tt>$subject</tt> is <tt>string</tt> or <tt>array</tt>,
-	 *                           a <tt>string</tt> or <tt>array</tt> is returned
-	 */
-	public static function pregReplaceCallbackWithOffset(
-		$pattern, callable $callback, $subject, int $limit = -1, int &$count = null)
-	{
-		if (is_array($subject)) {
-			$result = [];
-			foreach ($subject as $item) {
-				$result[] = self::pregReplaceCallbackWithOffsetImpl($pattern, $callback, $item, $limit, $count);
-			}
-			return $result;
-		}
-		else {
-			return self::pregReplaceCallbackWithOffsetImpl($pattern, $callback, $subject, $limit, $count);
-		}
-	}
+    /**
+     * Like {@link preg_replace_callback()}, it performs a string search and replace. The callback does not receive
+     * plain array of matches, but an extended array: each item is a pair of the matching portion of the needle and the
+     * byte offset to the subject, like {@link preg_match_all()} does with the `PREG_OFFSET_CAPTURE` flag.
+     *
+     * @param string|string[] $pattern
+     * @param callable $callback
+     * @param string|string[] $subject
+     * @param int $limit
+     * @param int|null $count
+     * @return string|string[] depending on whether <tt>$subject</tt> is <tt>string</tt> or <tt>array</tt>,
+     *                           a <tt>string</tt> or <tt>array</tt> is returned
+     */
+    public static function pregReplaceCallbackWithOffset(
+        $pattern, callable $callback, $subject, int $limit = -1, int &$count = null)
+    {
+        if (is_array($subject)) {
+            $result = [];
+            foreach ($subject as $item) {
+                $result[] = self::pregReplaceCallbackWithOffsetImpl($pattern, $callback, $item, $limit, $count);
+            }
+            return $result;
+        }
+        else {
+            return self::pregReplaceCallbackWithOffsetImpl($pattern, $callback, $subject, $limit, $count);
+        }
+    }
 
-	private static function pregReplaceCallbackWithOffsetImpl(
-		$pattern, callable $callback, string $subject, int $limit = -1, int &$count = null) : string
-	{
-		if (is_array($pattern)) {
-			throw new NotImplementedException(); // TODO
-		}
+    private static function pregReplaceCallbackWithOffsetImpl(
+        $pattern, callable $callback, string $subject, int $limit = -1, int &$count = null) : string
+    {
+        if (is_array($pattern)) {
+            throw new NotImplementedException(); // TODO
+        }
 
-		$count = 0;
+        $count = 0;
 
-		$curOffset = 0;
-		$result = '';
-		preg_match_all($pattern, $subject, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE);
-		foreach ($matches as $i => $match) {
-			if ($limit >= 0 && $i >= $limit) {
-				break;
-			}
+        $curOffset = 0;
+        $result = '';
+        preg_match_all($pattern, $subject, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE);
+        foreach ($matches as $i => $match) {
+            if ($limit >= 0 && $i >= $limit) {
+                break;
+            }
 
-			$result .= substr($subject, $curOffset, $match[0][1] - $curOffset) . $callback($match);
-			$curOffset = $match[0][1] + strlen($match[0][0]);
-			$count++;
-		}
-		$result .= substr($subject, $curOffset);
+            $result .= substr($subject, $curOffset, $match[0][1] - $curOffset) . $callback($match);
+            $curOffset = $match[0][1] + strlen($match[0][0]);
+            $count++;
+        }
+        $result .= substr($subject, $curOffset);
 
-		return $result;
-	}
+        return $result;
+    }
 
     /**
      * @param int $num

Spacing +2 added lines, -2 removed lines

@@ -19,7 +19,7 @@ 
 	 *                           a <tt>string</tt> or <tt>array</tt> is returned
 	 */
 	public static function pregReplaceCallbackWithOffset(
-		$pattern, callable $callback, $subject, int $limit = -1, int &$count = null)
+		$pattern, callable $callback, $subject, int $limit = -1, int & $count = null)
 	{
 		if (is_array($subject)) {
 			$result = [];
@@ -34,7 +34,7 @@ 
 	}
 
 	private static function pregReplaceCallbackWithOffsetImpl(
-		$pattern, callable $callback, string $subject, int $limit = -1, int &$count = null) : string
+		$pattern, callable $callback, string $subject, int $limit = -1, int & $count = null) : string
 	{
 		if (is_array($pattern)) {
 			throw new NotImplementedException(); // TODO

Braces +1 added lines, -2 removed lines

@@ -27,8 +27,7 @@
 				$result[] = self::pregReplaceCallbackWithOffsetImpl($pattern, $callback, $item, $limit, $count);
 			}
 			return $result;
-		}
-		else {
+		} else {
 			return self::pregReplaceCallbackWithOffsetImpl($pattern, $callback, $subject, $limit, $count);
 		}
 	}

src/Ivory/Value/Composite.php

Doc Comments +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
 
 	/**
 	 * @param mixed $other
-	 * @return bool whether this and the other composite value are of the identical type and contain the same data
+	 * @return null|boolean whether this and the other composite value are of the identical type and contain the same data
 	 */
 	public function equals($other)
 	{

Indentation +174 added lines, -174 removed lines

@@ -28,178 +28,178 @@
  */
 class Composite implements IComparable, \ArrayAccess, \IteratorAggregate
 {
-	/** @var CompositeType type of the composite */
-	private $type;
-	/** @var array list of attribute values */
-	private $values;
-
-	/**
-	 * Creates a new composite value out of a list of attributes values.
-	 *
-	 * @param CompositeType $type the type of the value
-	 * @param array $values list of values of corresponding attributes
-	 * @return Composite
-	 */
-	public static function fromList(CompositeType $type, $values)
-	{
-		return new Composite($type, $values);
-	}
-
-	/**
-	 * Creates a new composite value out of a map of attribute names to the corresponding values.
-	 *
-	 * Attributes not mentioned in the given map are set to `null`.
-	 *
-	 * @param NamedCompositeType $type the type of the value; must be a named composite type
-	 * @param array $map map: attribute name => value; unspecified attributes get a <tt>null</tt> value
-	 * @return Composite
-	 */
-	public static function fromMap(NamedCompositeType $type, $map)
-	{
-		$values = array_fill(0, count($type->getAttributes()), null);
-		foreach ($map as $k => $v) {
-			$pos = $type->getAttPos($k);
-			if ($pos !== null) {
-				$values[$pos] = $v;
-			}
-			else {
-				$typeName = "{$type->getSchemaName()}.{$type->getName()}";
-				$msg = "Error creating a composite value of type $typeName: key '$k' is undefined";
-				throw new \InvalidArgumentException($msg);
-			}
-		}
-		return new Composite($type, $values);
-	}
-
-	private function __construct(CompositeType $type, $values)
-	{
-		$this->type = $type;
-		$this->values = $values;
-	}
-
-	final public function getType()
-	{
-		return $this->type;
-	}
-
-	/**
-	 * @param mixed $other
-	 * @return bool whether this and the other composite value are of the identical type and contain the same data
-	 */
-	public function equals($other)
-	{
-		if ($other === null) {
-			return null;
-		}
-		if (get_class($this) != get_class($other)) {
-			return false;
-		}
-		if ($this->type !== $other->type) {
-			return false;
-		}
-
-		return ValueUtils::equals($this->values, $other->values);
-	}
-
-	/**
-	 * @return array list of the elementary values
-	 */
-	public function toList()
-	{
-		return $this->values;
-	}
-
-	/**
-	 * @return array ordered map: attribute name => attribute value
-	 * @throws UnsupportedException if called on a value of an ad hoc composite type, i.e., such that defines no
-	 *                              attributes
-	 */
-	public function toMap()
-	{
-		$attNames = array_keys($this->type->getAttributes());
-		if (!$attNames) {
-			$msg = 'Ad hoc composite type value cannot be converted to map - no attributes are defined';
-			throw new UnsupportedException($msg);
-		}
-		$result = [];
-		foreach ($this->values as $i => $v) {
-			if (isset($attNames[$i])) {
-				$k = $attNames[$i];
-				$result[$k] = $v;
-			}
-		}
-		return $result;
-	}
-
-	//region dynamic properties
-
-	/**
-	 * @param string $name attribute name
-	 * @return mixed value of the given attribute, or <tt>null</tt> if no such attribute is defined on this value
-	 */
-	public function __get($name)
-	{
-		$pos = $this->type->getAttPos($name);
-		if ($pos !== null) {
-			return $this->values[$pos];
-		}
-		else {
-			return null;
-		}
-	}
-
-	/**
-	 * @param string $name attribute name
-	 * @return bool whether the attribute is defined on this value
-	 */
-	public function __isset($name)
-	{
-		return ($this->type->getAttPos($name) !== null);
-	}
-
-	//endregion
-
-	//region \IArrayAccess
-
-	public function offsetExists($offset)
-	{
-		if (filter_var($offset, FILTER_VALIDATE_INT) !== false) {
-			return ($offset < count($this->values));
-		}
-		else {
-			return ($this->type->getAttPos($offset) !== null);
-		}
-	}
-
-	public function offsetGet($offset)
-	{
-		if (filter_var($offset, FILTER_VALIDATE_INT) !== false) {
-			return $this->values[$offset];
-		}
-		else {
-			return $this->values[$this->type->getAttPos($offset)];
-		}
-	}
-
-	public function offsetSet($offset, $value)
-	{
-		throw new ImmutableException();
-	}
-
-	public function offsetUnset($offset)
-	{
-		throw new ImmutableException();
-	}
-
-	//endregion
-
-	//region \IteratorAggregate
-
-	public function getIterator()
-	{
-		$arr = ($this->type->getAttributes() ? $this->toMap() : $this->values);
-		return new \ArrayIterator($arr);
-	}
-
-	//endregion
+    /** @var CompositeType type of the composite */
+    private $type;
+    /** @var array list of attribute values */
+    private $values;
+
+    /**
+     * Creates a new composite value out of a list of attributes values.
+     *
+     * @param CompositeType $type the type of the value
+     * @param array $values list of values of corresponding attributes
+     * @return Composite
+     */
+    public static function fromList(CompositeType $type, $values)
+    {
+        return new Composite($type, $values);
+    }
+
+    /**
+     * Creates a new composite value out of a map of attribute names to the corresponding values.
+     *
+     * Attributes not mentioned in the given map are set to `null`.
+     *
+     * @param NamedCompositeType $type the type of the value; must be a named composite type
+     * @param array $map map: attribute name => value; unspecified attributes get a <tt>null</tt> value
+     * @return Composite
+     */
+    public static function fromMap(NamedCompositeType $type, $map)
+    {
+        $values = array_fill(0, count($type->getAttributes()), null);
+        foreach ($map as $k => $v) {
+            $pos = $type->getAttPos($k);
+            if ($pos !== null) {
+                $values[$pos] = $v;
+            }
+            else {
+                $typeName = "{$type->getSchemaName()}.{$type->getName()}";
+                $msg = "Error creating a composite value of type $typeName: key '$k' is undefined";
+                throw new \InvalidArgumentException($msg);
+            }
+        }
+        return new Composite($type, $values);
+    }
+
+    private function __construct(CompositeType $type, $values)
+    {
+        $this->type = $type;
+        $this->values = $values;
+    }
+
+    final public function getType()
+    {
+        return $this->type;
+    }
+
+    /**
+     * @param mixed $other
+     * @return bool whether this and the other composite value are of the identical type and contain the same data
+     */
+    public function equals($other)
+    {
+        if ($other === null) {
+            return null;
+        }
+        if (get_class($this) != get_class($other)) {
+            return false;
+        }
+        if ($this->type !== $other->type) {
+            return false;
+        }
+
+        return ValueUtils::equals($this->values, $other->values);
+    }
+
+    /**
+     * @return array list of the elementary values
+     */
+    public function toList()
+    {
+        return $this->values;
+    }
+
+    /**
+     * @return array ordered map: attribute name => attribute value
+     * @throws UnsupportedException if called on a value of an ad hoc composite type, i.e., such that defines no
+     *                              attributes
+     */
+    public function toMap()
+    {
+        $attNames = array_keys($this->type->getAttributes());
+        if (!$attNames) {
+            $msg = 'Ad hoc composite type value cannot be converted to map - no attributes are defined';
+            throw new UnsupportedException($msg);
+        }
+        $result = [];
+        foreach ($this->values as $i => $v) {
+            if (isset($attNames[$i])) {
+                $k = $attNames[$i];
+                $result[$k] = $v;
+            }
+        }
+        return $result;
+    }
+
+    //region dynamic properties
+
+    /**
+     * @param string $name attribute name
+     * @return mixed value of the given attribute, or <tt>null</tt> if no such attribute is defined on this value
+     */
+    public function __get($name)
+    {
+        $pos = $this->type->getAttPos($name);
+        if ($pos !== null) {
+            return $this->values[$pos];
+        }
+        else {
+            return null;
+        }
+    }
+
+    /**
+     * @param string $name attribute name
+     * @return bool whether the attribute is defined on this value
+     */
+    public function __isset($name)
+    {
+        return ($this->type->getAttPos($name) !== null);
+    }
+
+    //endregion
+
+    //region \IArrayAccess
+
+    public function offsetExists($offset)
+    {
+        if (filter_var($offset, FILTER_VALIDATE_INT) !== false) {
+            return ($offset < count($this->values));
+        }
+        else {
+            return ($this->type->getAttPos($offset) !== null);
+        }
+    }
+
+    public function offsetGet($offset)
+    {
+        if (filter_var($offset, FILTER_VALIDATE_INT) !== false) {
+            return $this->values[$offset];
+        }
+        else {
+            return $this->values[$this->type->getAttPos($offset)];
+        }
+    }
+
+    public function offsetSet($offset, $value)
+    {
+        throw new ImmutableException();
+    }
+
+    public function offsetUnset($offset)
+    {
+        throw new ImmutableException();
+    }
+
+    //endregion
+
+    //region \IteratorAggregate
+
+    public function getIterator()
+    {
+        $arr = ($this->type->getAttributes() ? $this->toMap() : $this->values);
+        return new \ArrayIterator($arr);
+    }
+
+    //endregion
 }

Braces +4 added lines, -8 removed lines

@@ -61,8 +61,7 @@ 
 			$pos = $type->getAttPos($k);
 			if ($pos !== null) {
 				$values[$pos] = $v;
-			}
-			else {
+			} else {
 				$typeName = "{$type->getSchemaName()}.{$type->getName()}";
 				$msg = "Error creating a composite value of type $typeName: key '$k' is undefined";
 				throw new \InvalidArgumentException($msg);
@@ -142,8 +141,7 @@ 
 		$pos = $this->type->getAttPos($name);
 		if ($pos !== null) {
 			return $this->values[$pos];
-		}
-		else {
+		} else {
 			return null;
 		}
 	}
@@ -165,8 +163,7 @@ 
 	{
 		if (filter_var($offset, FILTER_VALIDATE_INT) !== false) {
 			return ($offset < count($this->values));
-		}
-		else {
+		} else {
 			return ($this->type->getAttPos($offset) !== null);
 		}
 	}
@@ -175,8 +172,7 @@ 
 	{
 		if (filter_var($offset, FILTER_VALIDATE_INT) !== false) {
 			return $this->values[$offset];
-		}
-		else {
+		} else {
 			return $this->values[$this->type->getAttPos($offset)];
 		}
 	}

src/Ivory/Value/DateBase.php

Doc Comments +9 added lines, -1 removed lines

@@ -56,6 +56,7 @@ 
 
     /**
      * @internal Only for the purpose of Ivory itself.
+     * @param integer $inf
      */
     final protected function __construct($inf, \DateTimeImmutable $dt = null)
     {
@@ -178,7 +179,7 @@ 
 
     /**
      * @param \DateTimeZone $timezone timezone to create the {@link \DateTime} object with
-     * @return \DateTime|null the date/time represented as a {@link \DateTimeImmutable} object;
+     * @return null|\DateTimeImmutable the date/time represented as a {@link \DateTimeImmutable} object;
      *                        <tt>null</tt> iff the date/time is not finite
      */
     public function toDateTimeImmutable(\DateTimeZone $timezone = null)
@@ -233,6 +234,13 @@ 
     }
 
 
+    /**
+     * @param integer $years
+     * @param integer $months
+     * @param integer $days
+     * @param integer $hours
+     * @param integer $minutes
+     */
     final protected function addPartsImpl($years, $months, $days, $hours, $minutes, $seconds)
     {
         if ($this->inf) {

Braces +5 added lines, -10 removed lines

@@ -87,8 +87,7 @@ 
         $z = $this->getZeroBasedYear();
         if ($z > 0 || $z === null) {
             return $z;
-        }
-        else {
+        } else {
             return $z - 1;
         }
     }
@@ -132,8 +131,7 @@ 
     {
         if ($this->inf) {
             return null;
-        }
-        else {
+        } else {
             return $this->dt->format($dateFmt);
         }
     }
@@ -185,12 +183,10 @@ 
     {
         if ($this->inf) {
             return null;
-        }
-        else {
+        } else {
             if ($timezone === $this->dt->getTimezone()) {
                 return $this->dt;
-            }
-            else {
+            } else {
                 return new \DateTimeImmutable($this->toISOString(), $timezone);
             }
         }
@@ -253,8 +249,7 @@ 
             if ($resFracSec < 0) {
                 $resFracSec++;
                 $wholeSec--;
-            }
-            elseif ($resFracSec >= 1) {
+            } elseif ($resFracSec >= 1) {
                 $resFracSec--;
                 $wholeSec++;
             }

src/Ivory/Value/Decimal.php

Doc Comments +8 added lines, -8 removed lines

@@ -266,8 +266,8 @@ 
 	 * which might or might not be desired. Such a difference only arises in the trailing fractional zero digits,
 	 * though.
 	 *
-	 * @param string|int|float|Decimal|object $number number to compare this number with
-	 * @return bool whether this number numerically equals to <tt>$number</tt>
+	 * @param Decimal|null $number number to compare this number with
+	 * @return null|boolean whether this number numerically equals to <tt>$number</tt>
 	 */
 	public function equals($number)
 	{
@@ -287,7 +287,7 @@ 
 	}
 
 	/**
-	 * @param string|int|float|Decimal|object $number
+	 * @param Decimal $number
 	 * @return bool <tt>true</tt> iff this number is numerically greater than <tt>$number</tt>
 	 */
 	public function greaterThan($number)
@@ -327,7 +327,7 @@ 
 	}
 
 	/**
-	 * @return bool whether this is zero
+	 * @return null|boolean whether this is zero
 	 */
 	public function isZero()
 	{
@@ -375,7 +375,7 @@ 
 	}
 
 	/**
-	 * @param string|int|float|Decimal|object $augend
+	 * @param integer $augend
 	 * @return Decimal a new decimal number, representing the result of sum of this and the given number
 	 */
 	public function add($augend)
@@ -392,7 +392,7 @@ 
 	}
 
 	/**
-	 * @param string|int|float|Decimal|object $subtrahend
+	 * @param Decimal $subtrahend
 	 * @return Decimal a new decimal number, representing the result of subtraction of this and the given number
 	 */
 	public function subtract($subtrahend)
@@ -409,7 +409,7 @@ 
 	}
 
 	/**
-	 * @param string|int|float|Decimal|object $multiplicand
+	 * @param Decimal $multiplicand
 	 * @return Decimal a new decimal number, representing the result of multiplication of this and the given number
 	 */
 	public function multiply($multiplicand)
@@ -426,7 +426,7 @@ 
 	}
 
 	/**
-	 * @param string|int|float|Decimal|object $divisor
+	 * @param Decimal $divisor
 	 * @return Decimal a new decimal number, representing the result of division of this number with the given number
 	 * @throws \RuntimeException if <tt>$divisor</tt> is zero
 	 */

Indentation +681 added lines, -681 removed lines

@@ -32,686 +32,686 @@
  */
 class Decimal implements IComparable
 {
-	/** Maximal number of decimal digits considered by PostgreSQL. */
-	const SCALE_LIMIT = 16383;
-	/**
-	 * Minimal number of significant digits for inexact calculations, like division or square root. It reflects the
-	 * behaviour of PostgreSQL.
-	 */
-	const MIN_SIG_DIGITS = 16;
-
-	/** @var string|null string of decimal digits, including the sign and decimal point; null for the not-a-number */
-	private $val;
-	/** @var int number of decimal digits in the fractional part, to the right of the decimal point (if any) */
-	private $scale;
-
-	/**
-	 * @param string|int|float|Decimal|object $decimalNumber the value of the decimal number;
-	 *                                                       leading zeros are ignored (even after the minus sign), as
-	 *                                                         well as leading and trailing whitespace;
-	 *                                                       if an object is passed, it gets cast to string (which works
-	 *                                                         for {@link \GMP} objects, besides others)
-	 * @param int|null $scale the requested scale (i.e., the number of decimal digits in the fractional part) of the
-	 *                          number;
-	 *                        must be non-negative, or null;
-	 *                        if smaller than the scale of the given number, the number gets mathematically rounded to
-	 *                          the requested scale;
-	 *                        if greater than the scale of the given number, the number gets padded to have such many
-	 *                          decimal places;
-	 *                        if not given, it is computed from the given number automatically
-	 * @return Decimal
-	 */
-	public static function fromNumber($decimalNumber, $scale = null)
-	{
-		if ($decimalNumber === null) {
-			throw new \InvalidArgumentException('decimalNumber');
-		}
-		if ($scale < 0) {
-			throw new \InvalidArgumentException('scale');
-		}
-		if ($decimalNumber instanceof Decimal) {
-			if ($scale === null || $scale == $decimalNumber->scale) {
-				return $decimalNumber;
-			}
-			else {
-				return $decimalNumber->round($scale);
-			}
-		}
-
-		if (is_int($decimalNumber)) {
-			$val = (string)$decimalNumber;
-		}
-		elseif (is_float($decimalNumber)) {
-			$val = (string)$decimalNumber;
-			$ePos = stripos($val, 'e');
-			if ($ePos > 0) {
-				$exp = (int)substr($val, $ePos + 1);
-				$decs = substr($val, 0, $ePos);
-				list($wp, $dp) = explode('.', $decs, 2);
-
-				if ($exp >= 0) {
-					$dpLen = strlen($dp);
-					if ($exp >= $dpLen) {
-						$val = $wp . $dp . str_repeat('0', $exp - $dpLen);
-					}
-					else {
-						$val = $wp . substr($dp, 0, $exp) . '.' . substr($dp, $exp);
-					}
-				}
-				else {
-					$mn = ($wp[0] == '-' ? 1 : 0);
-					$ord = strlen($wp) - $mn;
-					if (-$exp >= $ord) {
-						$prefix = ($mn ? '-' : '') . '0.' . str_repeat('0', -$exp - $ord);
-						if (($mn ? ($wp != '-0') : ($wp != '0'))) {
-							$prefix .= substr($wp, $mn);
-						}
-						$val = $prefix . $dp;
-					}
-					else {
-						$val = substr($wp, 0, $mn + $ord + $exp) . '.' . substr($wp, $mn + $ord + $exp) . $dp;
-					}
-				}
-			}
-		}
-		else {
-			if (!preg_match('~^\s*(-?)(?|(\.[0-9]+)|0*([0-9]+(?:\.[0-9]*)?))\s*$~', (string)$decimalNumber, $m)) {
-				throw new \InvalidArgumentException('decimalNumber');
-			}
-			$val = $m[1] . $m[2]; // cuts off unnecessary leading zeros
-		}
-
-		return new Decimal($val, $scale);
-	}
-
-	/**
-	 * Gets the not-a-number special value. Returns the same object every time.
-	 *
-	 * It only equals to the not-a-number, and is greater than any number value. The result of any operation is, again,
-	 * the not-a-number.
-	 *
-	 * @return Decimal the not-a-number value
-	 */
-	public static function NaN()
-	{
-		static $dec = null;
-		if ($dec === null) {
-			$dec = new Decimal(null);
-		}
-		return $dec;
-	}
-
-	/**
-	 * Gets the decimal object representing the number zero. Returns the same object every time.
-	 *
-	 * @return Decimal
-	 */
-	public static function zero()
-	{
-		static $dec = null;
-		if ($dec === null) {
-			$dec = new Decimal(0);
-		}
-		return $dec;
-	}
-
-	/**
-	 * NOTE: The constructor is kept private so that extra sanity checks are performed on user input, while trusting the
-	 *       results of the operations without these extra checks.
-	 *
-	 * @param string|null $val
-	 * @param int|null $scale
-	 */
-	private function __construct($val, $scale = null)
-	{
-		if ($val === null) {
-			$this->val = null;
-			$this->scale = null;
-			return;
-		}
-
-		$this->val = (string)$val;
-
-		$decPoint = strpos($this->val, '.');
-		if ($scale < 0) {
-			$this->scale = 0;
-			$minus = ($this->val[0] == '-' ? 1 : 0);
-			if ($decPoint !== false) {
-				$digits = substr($this->val, $minus, $decPoint - $minus);
-			}
-			else {
-				$digits = ($minus ? substr($this->val, $minus) : $this->val);
-			}
-			$len = strlen($digits);
-			$sigPos = $len + $scale;
-			if ($sigPos < 0) {
-				$this->val = '0';
-				return;
-			}
-			$inc = ($digits[$sigPos] >= 5);
-			if (!$inc && $sigPos == 0) {
-				$this->val = '0';
-				return;
-			}
-			for ($i = $sigPos; $i < $len; $i++) {
-				$digits[$i] = '0';
-			}
-			if ($inc) {
-				$augend = '1' . str_repeat('0', -$scale);
-				$digits = bcadd($digits, $augend, 0);
-			}
-			$this->val = ($minus ? '-' : '') . $digits;
-		}
-		elseif ($decPoint === false) {
-			if ($scale > 0) {
-				$this->val .= '.' . str_repeat('0', $scale);
-				$this->scale = $scale;
-			}
-			else {
-				$this->scale = 0;
-			}
-		}
-		else {
-			$len = strlen($this->val);
-			$this->scale = $len - $decPoint - 1;
-			$scale = min(self::SCALE_LIMIT, ($scale === null ? $this->scale : max(0, $scale)));
-			if ($this->scale < $scale) {
-				$this->val .= str_repeat('0', $scale - $this->scale);
-				$this->scale = $scale;
-			}
-			elseif ($this->scale > $scale) {
-				$newLen = $len - ($this->scale - $scale);
-				$inc = ($this->val[$newLen] >= 5);
-				if ($scale == 0) {
-					$newLen--;
-				}
-				$this->val = substr($this->val, 0, $newLen);
-				if ($inc) {
-					$mn = ($this->val[0] == '-' ? '-' : '');
-					$augend = $mn . ($scale == 0 ? '1' : '.' . str_repeat('0', $scale - 1) . '1');
-					$this->val = bcadd($this->val, $augend, $scale);
-				}
-				$this->scale = $scale;
-			}
-
-			if ($this->val[0] == '.') {
-				$this->val = '0' . $this->val;
-			}
-			elseif ($this->val[0] == '-' && $this->val[1] == '.') {
-				$this->val[0] = '0';
-				$this->val = '-' . $this->val;
-			}
-		}
-
-		// eliminate negative zero - PostgreSQL does not differentiate between zeros
-		if ($this->val[0] == '-' && strspn($this->val, '-0.') == strlen($this->val)) {
-			$this->val = substr($this->val, 1);
-		}
-	}
-
-
-	/**
-	 * @return int|null number of decimal digits in the fractional part, to the right of the decimal point (if any), or
-	 *                  <tt>null</tt> for the not-a-number
-	 */
-	public function getScale()
-	{
-		return $this->scale;
-	}
-
-	/**
-	 * Compare this number numerically with another number.
-	 *
-	 * Note that using the `==` operator checks that the two {@link Decimal} objects are of the same value and scale,
-	 * which might or might not be desired. Such a difference only arises in the trailing fractional zero digits,
-	 * though.
-	 *
-	 * @param string|int|float|Decimal|object $number number to compare this number with
-	 * @return bool whether this number numerically equals to <tt>$number</tt>
-	 */
-	public function equals($number)
-	{
-		if ($number === null) {
-			return null;
-		}
-		return ($this->compareTo($number) == 0);
-	}
-
-	/**
-	 * @param string|int|float|Decimal|object $number
-	 * @return bool <tt>true</tt> iff this number is numerically less than <tt>$number</tt>
-	 */
-	public function lessThan($number)
-	{
-		return ($this->compareTo($number) < 0);
-	}
-
-	/**
-	 * @param string|int|float|Decimal|object $number
-	 * @return bool <tt>true</tt> iff this number is numerically greater than <tt>$number</tt>
-	 */
-	public function greaterThan($number)
-	{
-		return ($this->compareTo($number) > 0);
-	}
-
-	/**
-	 * @param string|int|float|Decimal|object $number number to compare this number with
-	 * @return int -1, 0, or 1 if this number is numerically less than, equal to, or greater than <tt>$number</tt>
-	 */
-	public function compareTo($number)
-	{
-		$arg = self::fromNumber($number);
-		if ($this->isNaN()) {
-			if ($arg->isNaN()) {
-				return 0;
-			}
-			else {
-				return 1;
-			}
-		}
-		elseif ($arg->isNaN()) {
-			return -1;
-		}
-		else {
-			return bccomp($this->val, $arg->val, max($this->scale, $arg->scale));
-		}
-	}
-
-	/**
-	 * @return bool whether this is a not-a-number
-	 */
-	public function isNaN()
-	{
-		return ($this->val === null);
-	}
-
-	/**
-	 * @return bool whether this is zero
-	 */
-	public function isZero()
-	{
-		return ($this->equals(self::zero()));
-	}
-
-	/**
-	 * @return bool whether this is a positive number
-	 */
-	public function isPositive()
-	{
-		return (!$this->isNaN() && $this->compareTo(self::zero()) > 0);
-	}
-
-	/**
-	 * @return bool whether this is a negative number
-	 */
-	public function isNegative()
-	{
-		return (!$this->isNaN() && $this->val[0] == '-');
-	}
-
-	/**
-	 * @return bool whether this is an integer, i.e., a number without decimal part (or the decimal part equal to zero)
-	 */
-	public function isInteger()
-	{
-		if ($this->isNaN()) {
-			return false;
-		}
-		if (strpos($this->val, '.') === false) {
-			return true;
-		}
-		for ($i = strlen($this->val) - 1; ; $i--) {
-			switch ($this->val[$i]) {
-				case '.':
-					return true;
-				case '0':
-					break;
-				default:
-					return false;
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * @param string|int|float|Decimal|object $augend
-	 * @return Decimal a new decimal number, representing the result of sum of this and the given number
-	 */
-	public function add($augend)
-	{
-		if ($this->isNaN()) {
-			return $this;
-		}
-		$arg = self::fromNumber($augend);
-		if ($arg->isNaN()) {
-			return $arg;
-		}
-		$scale = max($this->scale, $arg->scale);
-		return new Decimal(bcadd($this->val, $arg->val, $scale + 1), $scale);
-	}
-
-	/**
-	 * @param string|int|float|Decimal|object $subtrahend
-	 * @return Decimal a new decimal number, representing the result of subtraction of this and the given number
-	 */
-	public function subtract($subtrahend)
-	{
-		if ($this->isNaN()) {
-			return $this;
-		}
-		$arg = self::fromNumber($subtrahend);
-		if ($arg->isNaN()) {
-			return $arg;
-		}
-		$scale = max($this->scale, $arg->scale);
-		return new Decimal(bcsub($this->val, $arg->val, $scale + 1), $scale);
-	}
-
-	/**
-	 * @param string|int|float|Decimal|object $multiplicand
-	 * @return Decimal a new decimal number, representing the result of multiplication of this and the given number
-	 */
-	public function multiply($multiplicand)
-	{
-		if ($this->isNaN()) {
-			return $this;
-		}
-		$arg = self::fromNumber($multiplicand);
-		if ($arg->isNaN()) {
-			return $arg;
-		}
-		$scale = min($this->scale + $arg->scale, self::SCALE_LIMIT);
-		return new Decimal(bcmul($this->val, $arg->val, $scale + 1), $scale);
-	}
-
-	/**
-	 * @param string|int|float|Decimal|object $divisor
-	 * @return Decimal a new decimal number, representing the result of division of this number with the given number
-	 * @throws \RuntimeException if <tt>$divisor</tt> is zero
-	 */
-	public function divide($divisor)
-	{
-		if ($this->isNaN()) {
-			return $this;
-		}
-		$arg = self::fromNumber($divisor);
-		if ($arg->isNaN()) {
-			return $arg;
-		}
-		$scale = max($this->scale, $arg->scale, self::MIN_SIG_DIGITS);
-		return new Decimal(bcdiv($this->val, $arg->val, $scale + 1), $scale);
-	}
-
-	/**
-	 * @param string|int|float|Decimal|object $modulus
-	 * @return Decimal remainder of this number divided by <tt>$modulus</tt>
-	 * @throws \RuntimeException if <tt>$modulus</tt> is zero
-	 */
-	public function mod($modulus)
-	{
-		if ($this->isNaN()) {
-			return $this;
-		}
-		$arg = self::fromNumber($modulus);
-		if ($arg->isNaN()) {
-			return $arg;
-		}
-		if ($arg->isZero()) {
-			throw new \RuntimeException('Division by zero');
-		}
-
-		// NOTE: bcmod() only calculates integer modulus
-		$a = $this->abs();
-		$b = $arg->abs();
-		$m = $a->subtract($b->multiply($a->divide($b)->floor()));
-		if ($this->isNegative()) {
-			return $m->negate();
-		}
-		else {
-			return $m;
-		}
-	}
-
-	/**
-	 * @todo more precise calculation of fractional powers - now only double precision is used
-	 * @param string|int|float|Decimal|object $power
-	 * @return Decimal this number powered to <tt>$number</tt>
-	 * @throws \RuntimeException if this number is negative while <tt>$power</tt> is non-integer (that would lead to a
-	 *                             complex result)
-	 */
-	public function pow($power)
-	{
-		if ($this->isNaN()) {
-			return $this;
-		}
-		$arg = self::fromNumber($power);
-		if ($arg->isNaN()) {
-			return $arg;
-		}
-
-		$scale = max($this->scale, $arg->scale, self::MIN_SIG_DIGITS);
-
-		// NOTE: bcpow() only takes integer powers
-		if ($arg->isInteger()) {
-			return new Decimal(bcpow($this->val, $arg->val, $scale + 1), $scale);
-		}
-		else {
-			if ($this->isNegative()) {
-				throw new \RuntimeException('Negative number raised to a non-integer power yields a complex result');
-			}
-			return self::fromNumber(pow($this->toFloat(), $arg->toFloat()));
-		}
-	}
-
-	/**
-	 * @return Decimal the absolute value of this number
-	 */
-	public function abs()
-	{
-		if ($this->isNegative()) {
-			return $this->negate();
-		}
-		else {
-			return $this;
-		}
-	}
-
-	/**
-	 * @return Decimal a new decimal number, representing the negative value of this number
-	 */
-	public function negate()
-	{
-		if ($this->isNaN() || $this->isZero()) {
-			return $this;
-		}
-		elseif ($this->val[0] == '-') {
-			return new Decimal(substr($this->val, 1));
-		}
-		else {
-			return new Decimal('-' . $this->val);
-		}
-	}
-
-	/**
-	 * Computes the exact factorial of this number.
-	 * Only defined on numbers of scale zero, i.e., those without decimal part, and on the not-a-number.
-	 *
-	 * In conformance with PostgreSQL, the factorial of non-positive numbers is defined to be 1.
-	 *
-	 * @return Decimal the factorial of this number
-	 * @throws UndefinedOperationException if this number is neither a zero-scale number nor the not-a-number
-	 */
-	public function factorial()
-	{
-		if ($this->isNaN()) {
-			return $this;
-		}
-		if ($this->scale > 0) {
-			throw new UndefinedOperationException('Number with a decimal part');
-		}
-		if ($this->lessThan(2)) {
-			return new Decimal(1);
-		}
-
-		if (System::hasGMP()) {
-			return new Decimal(gmp_strval(gmp_fact($this->toGMP())));
-		}
-
-		// OPT: there are more efficient algorithms calculating the factorial; see, e.g., http://www.luschny.de/math/factorial/index.html
-		$result = new Decimal(2);
-		for ($i = new Decimal(3); $i->compareTo($this) <= 0; $i = $i->add(1)) {
-			$result = $result->multiply($i);
-		}
-		return $result;
-	}
-
-	/**
-	 * @param int $scale number of decimal places to round this number to; may be negative to round to higher orders
-	 * @return Decimal a new decimal number, representing this number rounded to <tt>$scale</tt> decimal places
-	 */
-	public function round($scale = 0)
-	{
-		return new Decimal($this->val, $scale);
-	}
-
-	/**
-	 * @return Decimal largest integer not greater than this number
-	 */
-	public function floor()
-	{
-		$decPoint = strpos($this->val, '.');
-		if ($decPoint === false) {
-			return $this;
-		}
-		if ($this->val[0] != '-') {
-			return new Decimal(substr($this->val, 0, $decPoint));
-		}
-		elseif ($this->isInteger()) {
-			return new Decimal($this->val, 0);
-		}
-		else {
-			// negative number with non-zero fractional part
-			return new Decimal(bcsub(substr($this->val, 0, $decPoint), 1, 0));
-		}
-	}
-
-	/**
-	 * @return Decimal smallest integer not less than this number
-	 */
-	public function ceil()
-	{
-		$decPoint = strpos($this->val, '.');
-		if ($decPoint === false) {
-			return $this;
-		}
-		if ($this->val[0] == '-') {
-			return new Decimal(substr($this->val, 0, $decPoint));
-		}
-		elseif ($this->isInteger()) {
-			return new Decimal($this->val, 0);
-		}
-		else {
-			// non-negative number with non-zero fractional part
-			return new Decimal(bcadd(substr($this->val, 0, $decPoint), 1, 0));
-		}
-	}
-
-	/**
-	 * @param string|int|float|Decimal|object $number
-	 * @return Decimal the greater of this number and <tt>$number</tt>, preferably this number if numerically equal
-	 */
-	public function max($number)
-	{
-		$arg = self::fromNumber($number);
-		if ($this->lessThan($arg)) {
-			return $arg;
-		}
-		else {
-			return $this;
-		}
-	}
-
-	/**
-	 * @param string|int|float|Decimal|object $number
-	 * @return Decimal the smaller of this number and <tt>$number</tt>, preferably this number if numerically equal
-	 */
-	public function min($number)
-	{
-		$arg = self::fromNumber($number);
-		if ($this->greaterThan($arg)) {
-			return $arg;
-		}
-		else {
-			return $this;
-		}
-	}
-
-	/**
-	 * @return Decimal a new decimal number, representing the square root of this number
-	 * @throws UndefinedOperationException if this is a negative number
-	 */
-	public function sqrt()
-	{
-		if ($this->isNaN()) {
-			return $this;
-		}
-		if ($this->isNegative()) {
-			throw new UndefinedOperationException('square root of negative number');
-		}
-		$scale = max($this->scale, self::MIN_SIG_DIGITS);
-		return new Decimal(bcsqrt($this->val, $scale + 1));
-	}
-
-
-	/**
-	 * @return int|null the value of this number cast explicitly to <tt>int</tt>;
-	 *                  for big numbers, this yields the maximal available integer value (i.e., <tt>PHP_INT_MAX</tt> or
-	 *                    <tt>PHP_INT_MIN</tt>);
+    /** Maximal number of decimal digits considered by PostgreSQL. */
+    const SCALE_LIMIT = 16383;
+    /**
+     * Minimal number of significant digits for inexact calculations, like division or square root. It reflects the
+     * behaviour of PostgreSQL.
+     */
+    const MIN_SIG_DIGITS = 16;
+
+    /** @var string|null string of decimal digits, including the sign and decimal point; null for the not-a-number */
+    private $val;
+    /** @var int number of decimal digits in the fractional part, to the right of the decimal point (if any) */
+    private $scale;
+
+    /**
+     * @param string|int|float|Decimal|object $decimalNumber the value of the decimal number;
+     *                                                       leading zeros are ignored (even after the minus sign), as
+     *                                                         well as leading and trailing whitespace;
+     *                                                       if an object is passed, it gets cast to string (which works
+     *                                                         for {@link \GMP} objects, besides others)
+     * @param int|null $scale the requested scale (i.e., the number of decimal digits in the fractional part) of the
+     *                          number;
+     *                        must be non-negative, or null;
+     *                        if smaller than the scale of the given number, the number gets mathematically rounded to
+     *                          the requested scale;
+     *                        if greater than the scale of the given number, the number gets padded to have such many
+     *                          decimal places;
+     *                        if not given, it is computed from the given number automatically
+     * @return Decimal
+     */
+    public static function fromNumber($decimalNumber, $scale = null)
+    {
+        if ($decimalNumber === null) {
+            throw new \InvalidArgumentException('decimalNumber');
+        }
+        if ($scale < 0) {
+            throw new \InvalidArgumentException('scale');
+        }
+        if ($decimalNumber instanceof Decimal) {
+            if ($scale === null || $scale == $decimalNumber->scale) {
+                return $decimalNumber;
+            }
+            else {
+                return $decimalNumber->round($scale);
+            }
+        }
+
+        if (is_int($decimalNumber)) {
+            $val = (string)$decimalNumber;
+        }
+        elseif (is_float($decimalNumber)) {
+            $val = (string)$decimalNumber;
+            $ePos = stripos($val, 'e');
+            if ($ePos > 0) {
+                $exp = (int)substr($val, $ePos + 1);
+                $decs = substr($val, 0, $ePos);
+                list($wp, $dp) = explode('.', $decs, 2);
+
+                if ($exp >= 0) {
+                    $dpLen = strlen($dp);
+                    if ($exp >= $dpLen) {
+                        $val = $wp . $dp . str_repeat('0', $exp - $dpLen);
+                    }
+                    else {
+                        $val = $wp . substr($dp, 0, $exp) . '.' . substr($dp, $exp);
+                    }
+                }
+                else {
+                    $mn = ($wp[0] == '-' ? 1 : 0);
+                    $ord = strlen($wp) - $mn;
+                    if (-$exp >= $ord) {
+                        $prefix = ($mn ? '-' : '') . '0.' . str_repeat('0', -$exp - $ord);
+                        if (($mn ? ($wp != '-0') : ($wp != '0'))) {
+                            $prefix .= substr($wp, $mn);
+                        }
+                        $val = $prefix . $dp;
+                    }
+                    else {
+                        $val = substr($wp, 0, $mn + $ord + $exp) . '.' . substr($wp, $mn + $ord + $exp) . $dp;
+                    }
+                }
+            }
+        }
+        else {
+            if (!preg_match('~^\s*(-?)(?|(\.[0-9]+)|0*([0-9]+(?:\.[0-9]*)?))\s*$~', (string)$decimalNumber, $m)) {
+                throw new \InvalidArgumentException('decimalNumber');
+            }
+            $val = $m[1] . $m[2]; // cuts off unnecessary leading zeros
+        }
+
+        return new Decimal($val, $scale);
+    }
+
+    /**
+     * Gets the not-a-number special value. Returns the same object every time.
+     *
+     * It only equals to the not-a-number, and is greater than any number value. The result of any operation is, again,
+     * the not-a-number.
+     *
+     * @return Decimal the not-a-number value
+     */
+    public static function NaN()
+    {
+        static $dec = null;
+        if ($dec === null) {
+            $dec = new Decimal(null);
+        }
+        return $dec;
+    }
+
+    /**
+     * Gets the decimal object representing the number zero. Returns the same object every time.
+     *
+     * @return Decimal
+     */
+    public static function zero()
+    {
+        static $dec = null;
+        if ($dec === null) {
+            $dec = new Decimal(0);
+        }
+        return $dec;
+    }
+
+    /**
+     * NOTE: The constructor is kept private so that extra sanity checks are performed on user input, while trusting the
+     *       results of the operations without these extra checks.
+     *
+     * @param string|null $val
+     * @param int|null $scale
+     */
+    private function __construct($val, $scale = null)
+    {
+        if ($val === null) {
+            $this->val = null;
+            $this->scale = null;
+            return;
+        }
+
+        $this->val = (string)$val;
+
+        $decPoint = strpos($this->val, '.');
+        if ($scale < 0) {
+            $this->scale = 0;
+            $minus = ($this->val[0] == '-' ? 1 : 0);
+            if ($decPoint !== false) {
+                $digits = substr($this->val, $minus, $decPoint - $minus);
+            }
+            else {
+                $digits = ($minus ? substr($this->val, $minus) : $this->val);
+            }
+            $len = strlen($digits);
+            $sigPos = $len + $scale;
+            if ($sigPos < 0) {
+                $this->val = '0';
+                return;
+            }
+            $inc = ($digits[$sigPos] >= 5);
+            if (!$inc && $sigPos == 0) {
+                $this->val = '0';
+                return;
+            }
+            for ($i = $sigPos; $i < $len; $i++) {
+                $digits[$i] = '0';
+            }
+            if ($inc) {
+                $augend = '1' . str_repeat('0', -$scale);
+                $digits = bcadd($digits, $augend, 0);
+            }
+            $this->val = ($minus ? '-' : '') . $digits;
+        }
+        elseif ($decPoint === false) {
+            if ($scale > 0) {
+                $this->val .= '.' . str_repeat('0', $scale);
+                $this->scale = $scale;
+            }
+            else {
+                $this->scale = 0;
+            }
+        }
+        else {
+            $len = strlen($this->val);
+            $this->scale = $len - $decPoint - 1;
+            $scale = min(self::SCALE_LIMIT, ($scale === null ? $this->scale : max(0, $scale)));
+            if ($this->scale < $scale) {
+                $this->val .= str_repeat('0', $scale - $this->scale);
+                $this->scale = $scale;
+            }
+            elseif ($this->scale > $scale) {
+                $newLen = $len - ($this->scale - $scale);
+                $inc = ($this->val[$newLen] >= 5);
+                if ($scale == 0) {
+                    $newLen--;
+                }
+                $this->val = substr($this->val, 0, $newLen);
+                if ($inc) {
+                    $mn = ($this->val[0] == '-' ? '-' : '');
+                    $augend = $mn . ($scale == 0 ? '1' : '.' . str_repeat('0', $scale - 1) . '1');
+                    $this->val = bcadd($this->val, $augend, $scale);
+                }
+                $this->scale = $scale;
+            }
+
+            if ($this->val[0] == '.') {
+                $this->val = '0' . $this->val;
+            }
+            elseif ($this->val[0] == '-' && $this->val[1] == '.') {
+                $this->val[0] = '0';
+                $this->val = '-' . $this->val;
+            }
+        }
+
+        // eliminate negative zero - PostgreSQL does not differentiate between zeros
+        if ($this->val[0] == '-' && strspn($this->val, '-0.') == strlen($this->val)) {
+            $this->val = substr($this->val, 1);
+        }
+    }
+
+
+    /**
+     * @return int|null number of decimal digits in the fractional part, to the right of the decimal point (if any), or
+     *                  <tt>null</tt> for the not-a-number
+     */
+    public function getScale()
+    {
+        return $this->scale;
+    }
+
+    /**
+     * Compare this number numerically with another number.
+     *
+     * Note that using the `==` operator checks that the two {@link Decimal} objects are of the same value and scale,
+     * which might or might not be desired. Such a difference only arises in the trailing fractional zero digits,
+     * though.
+     *
+     * @param string|int|float|Decimal|object $number number to compare this number with
+     * @return bool whether this number numerically equals to <tt>$number</tt>
+     */
+    public function equals($number)
+    {
+        if ($number === null) {
+            return null;
+        }
+        return ($this->compareTo($number) == 0);
+    }
+
+    /**
+     * @param string|int|float|Decimal|object $number
+     * @return bool <tt>true</tt> iff this number is numerically less than <tt>$number</tt>
+     */
+    public function lessThan($number)
+    {
+        return ($this->compareTo($number) < 0);
+    }
+
+    /**
+     * @param string|int|float|Decimal|object $number
+     * @return bool <tt>true</tt> iff this number is numerically greater than <tt>$number</tt>
+     */
+    public function greaterThan($number)
+    {
+        return ($this->compareTo($number) > 0);
+    }
+
+    /**
+     * @param string|int|float|Decimal|object $number number to compare this number with
+     * @return int -1, 0, or 1 if this number is numerically less than, equal to, or greater than <tt>$number</tt>
+     */
+    public function compareTo($number)
+    {
+        $arg = self::fromNumber($number);
+        if ($this->isNaN()) {
+            if ($arg->isNaN()) {
+                return 0;
+            }
+            else {
+                return 1;
+            }
+        }
+        elseif ($arg->isNaN()) {
+            return -1;
+        }
+        else {
+            return bccomp($this->val, $arg->val, max($this->scale, $arg->scale));
+        }
+    }
+
+    /**
+     * @return bool whether this is a not-a-number
+     */
+    public function isNaN()
+    {
+        return ($this->val === null);
+    }
+
+    /**
+     * @return bool whether this is zero
+     */
+    public function isZero()
+    {
+        return ($this->equals(self::zero()));
+    }
+
+    /**
+     * @return bool whether this is a positive number
+     */
+    public function isPositive()
+    {
+        return (!$this->isNaN() && $this->compareTo(self::zero()) > 0);
+    }
+
+    /**
+     * @return bool whether this is a negative number
+     */
+    public function isNegative()
+    {
+        return (!$this->isNaN() && $this->val[0] == '-');
+    }
+
+    /**
+     * @return bool whether this is an integer, i.e., a number without decimal part (or the decimal part equal to zero)
+     */
+    public function isInteger()
+    {
+        if ($this->isNaN()) {
+            return false;
+        }
+        if (strpos($this->val, '.') === false) {
+            return true;
+        }
+        for ($i = strlen($this->val) - 1; ; $i--) {
+            switch ($this->val[$i]) {
+                case '.':
+                    return true;
+                case '0':
+                    break;
+                default:
+                    return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * @param string|int|float|Decimal|object $augend
+     * @return Decimal a new decimal number, representing the result of sum of this and the given number
+     */
+    public function add($augend)
+    {
+        if ($this->isNaN()) {
+            return $this;
+        }
+        $arg = self::fromNumber($augend);
+        if ($arg->isNaN()) {
+            return $arg;
+        }
+        $scale = max($this->scale, $arg->scale);
+        return new Decimal(bcadd($this->val, $arg->val, $scale + 1), $scale);
+    }
+
+    /**
+     * @param string|int|float|Decimal|object $subtrahend
+     * @return Decimal a new decimal number, representing the result of subtraction of this and the given number
+     */
+    public function subtract($subtrahend)
+    {
+        if ($this->isNaN()) {
+            return $this;
+        }
+        $arg = self::fromNumber($subtrahend);
+        if ($arg->isNaN()) {
+            return $arg;
+        }
+        $scale = max($this->scale, $arg->scale);
+        return new Decimal(bcsub($this->val, $arg->val, $scale + 1), $scale);
+    }
+
+    /**
+     * @param string|int|float|Decimal|object $multiplicand
+     * @return Decimal a new decimal number, representing the result of multiplication of this and the given number
+     */
+    public function multiply($multiplicand)
+    {
+        if ($this->isNaN()) {
+            return $this;
+        }
+        $arg = self::fromNumber($multiplicand);
+        if ($arg->isNaN()) {
+            return $arg;
+        }
+        $scale = min($this->scale + $arg->scale, self::SCALE_LIMIT);
+        return new Decimal(bcmul($this->val, $arg->val, $scale + 1), $scale);
+    }
+
+    /**
+     * @param string|int|float|Decimal|object $divisor
+     * @return Decimal a new decimal number, representing the result of division of this number with the given number
+     * @throws \RuntimeException if <tt>$divisor</tt> is zero
+     */
+    public function divide($divisor)
+    {
+        if ($this->isNaN()) {
+            return $this;
+        }
+        $arg = self::fromNumber($divisor);
+        if ($arg->isNaN()) {
+            return $arg;
+        }
+        $scale = max($this->scale, $arg->scale, self::MIN_SIG_DIGITS);
+        return new Decimal(bcdiv($this->val, $arg->val, $scale + 1), $scale);
+    }
+
+    /**
+     * @param string|int|float|Decimal|object $modulus
+     * @return Decimal remainder of this number divided by <tt>$modulus</tt>
+     * @throws \RuntimeException if <tt>$modulus</tt> is zero
+     */
+    public function mod($modulus)
+    {
+        if ($this->isNaN()) {
+            return $this;
+        }
+        $arg = self::fromNumber($modulus);
+        if ($arg->isNaN()) {
+            return $arg;
+        }
+        if ($arg->isZero()) {
+            throw new \RuntimeException('Division by zero');
+        }
+
+        // NOTE: bcmod() only calculates integer modulus
+        $a = $this->abs();
+        $b = $arg->abs();
+        $m = $a->subtract($b->multiply($a->divide($b)->floor()));
+        if ($this->isNegative()) {
+            return $m->negate();
+        }
+        else {
+            return $m;
+        }
+    }
+
+    /**
+     * @todo more precise calculation of fractional powers - now only double precision is used
+     * @param string|int|float|Decimal|object $power
+     * @return Decimal this number powered to <tt>$number</tt>
+     * @throws \RuntimeException if this number is negative while <tt>$power</tt> is non-integer (that would lead to a
+     *                             complex result)
+     */
+    public function pow($power)
+    {
+        if ($this->isNaN()) {
+            return $this;
+        }
+        $arg = self::fromNumber($power);
+        if ($arg->isNaN()) {
+            return $arg;
+        }
+
+        $scale = max($this->scale, $arg->scale, self::MIN_SIG_DIGITS);
+
+        // NOTE: bcpow() only takes integer powers
+        if ($arg->isInteger()) {
+            return new Decimal(bcpow($this->val, $arg->val, $scale + 1), $scale);
+        }
+        else {
+            if ($this->isNegative()) {
+                throw new \RuntimeException('Negative number raised to a non-integer power yields a complex result');
+            }
+            return self::fromNumber(pow($this->toFloat(), $arg->toFloat()));
+        }
+    }
+
+    /**
+     * @return Decimal the absolute value of this number
+     */
+    public function abs()
+    {
+        if ($this->isNegative()) {
+            return $this->negate();
+        }
+        else {
+            return $this;
+        }
+    }
+
+    /**
+     * @return Decimal a new decimal number, representing the negative value of this number
+     */
+    public function negate()
+    {
+        if ($this->isNaN() || $this->isZero()) {
+            return $this;
+        }
+        elseif ($this->val[0] == '-') {
+            return new Decimal(substr($this->val, 1));
+        }
+        else {
+            return new Decimal('-' . $this->val);
+        }
+    }
+
+    /**
+     * Computes the exact factorial of this number.
+     * Only defined on numbers of scale zero, i.e., those without decimal part, and on the not-a-number.
+     *
+     * In conformance with PostgreSQL, the factorial of non-positive numbers is defined to be 1.
+     *
+     * @return Decimal the factorial of this number
+     * @throws UndefinedOperationException if this number is neither a zero-scale number nor the not-a-number
+     */
+    public function factorial()
+    {
+        if ($this->isNaN()) {
+            return $this;
+        }
+        if ($this->scale > 0) {
+            throw new UndefinedOperationException('Number with a decimal part');
+        }
+        if ($this->lessThan(2)) {
+            return new Decimal(1);
+        }
+
+        if (System::hasGMP()) {
+            return new Decimal(gmp_strval(gmp_fact($this->toGMP())));
+        }
+
+        // OPT: there are more efficient algorithms calculating the factorial; see, e.g., http://www.luschny.de/math/factorial/index.html
+        $result = new Decimal(2);
+        for ($i = new Decimal(3); $i->compareTo($this) <= 0; $i = $i->add(1)) {
+            $result = $result->multiply($i);
+        }
+        return $result;
+    }
+
+    /**
+     * @param int $scale number of decimal places to round this number to; may be negative to round to higher orders
+     * @return Decimal a new decimal number, representing this number rounded to <tt>$scale</tt> decimal places
+     */
+    public function round($scale = 0)
+    {
+        return new Decimal($this->val, $scale);
+    }
+
+    /**
+     * @return Decimal largest integer not greater than this number
+     */
+    public function floor()
+    {
+        $decPoint = strpos($this->val, '.');
+        if ($decPoint === false) {
+            return $this;
+        }
+        if ($this->val[0] != '-') {
+            return new Decimal(substr($this->val, 0, $decPoint));
+        }
+        elseif ($this->isInteger()) {
+            return new Decimal($this->val, 0);
+        }
+        else {
+            // negative number with non-zero fractional part
+            return new Decimal(bcsub(substr($this->val, 0, $decPoint), 1, 0));
+        }
+    }
+
+    /**
+     * @return Decimal smallest integer not less than this number
+     */
+    public function ceil()
+    {
+        $decPoint = strpos($this->val, '.');
+        if ($decPoint === false) {
+            return $this;
+        }
+        if ($this->val[0] == '-') {
+            return new Decimal(substr($this->val, 0, $decPoint));
+        }
+        elseif ($this->isInteger()) {
+            return new Decimal($this->val, 0);
+        }
+        else {
+            // non-negative number with non-zero fractional part
+            return new Decimal(bcadd(substr($this->val, 0, $decPoint), 1, 0));
+        }
+    }
+
+    /**
+     * @param string|int|float|Decimal|object $number
+     * @return Decimal the greater of this number and <tt>$number</tt>, preferably this number if numerically equal
+     */
+    public function max($number)
+    {
+        $arg = self::fromNumber($number);
+        if ($this->lessThan($arg)) {
+            return $arg;
+        }
+        else {
+            return $this;
+        }
+    }
+
+    /**
+     * @param string|int|float|Decimal|object $number
+     * @return Decimal the smaller of this number and <tt>$number</tt>, preferably this number if numerically equal
+     */
+    public function min($number)
+    {
+        $arg = self::fromNumber($number);
+        if ($this->greaterThan($arg)) {
+            return $arg;
+        }
+        else {
+            return $this;
+        }
+    }
+
+    /**
+     * @return Decimal a new decimal number, representing the square root of this number
+     * @throws UndefinedOperationException if this is a negative number
+     */
+    public function sqrt()
+    {
+        if ($this->isNaN()) {
+            return $this;
+        }
+        if ($this->isNegative()) {
+            throw new UndefinedOperationException('square root of negative number');
+        }
+        $scale = max($this->scale, self::MIN_SIG_DIGITS);
+        return new Decimal(bcsqrt($this->val, $scale + 1));
+    }
+
+
+    /**
+     * @return int|null the value of this number cast explicitly to <tt>int</tt>;
+     *                  for big numbers, this yields the maximal available integer value (i.e., <tt>PHP_INT_MAX</tt> or
+     *                    <tt>PHP_INT_MIN</tt>);
      *                  <tt>null</tt> is returned if this is the not-a-number
-	 */
-	public function toInt()
-	{
-		return ($this->val === null ? null : (int)$this->val);
-	}
-
-	/**
-	 * @return float the value of this number cast explicitly to <tt>float</tt>, or the float <tt>NAN</tt> value if this
-	 *                 is the not-a-number
-	 */
-	public function toFloat()
-	{
-		return ($this->val === null ? NAN : (float)$this->val);
-	}
-
-	/**
-	 * @return string the value of this number, or the special string <tt>'NaN'</tt> for the not-a-number value
-	 */
-	public function toString()
-	{
-		return ($this->val === null ? 'NaN' : $this->val);
-	}
-
-	/**
-	 * Converts the value to a {@link \GMP} object.
-	 *
-	 * Requires the `gmp` PHP extension.
-	 *
-	 * @return \GMP a {@link \GMP} object representing the same integer as this number
-	 * @throws UndefinedOperationException if this number is not an integer, i.e., has some non-zero fractional digits
-	 */
-	public function toGMP()
-	{
-		if (!$this->isInteger()) {
-			throw new UndefinedOperationException('toGMP() is only defined for integers');
-		}
-		$decPoint = strpos($this->val, '.');
-		$str = ($decPoint === false ? $this->val : substr($this->val, 0, $decPoint - 1));
-		return gmp_init($str);
-	}
-
-	public function __toString()
-	{
-		return $this->toString();
-	}
+     */
+    public function toInt()
+    {
+        return ($this->val === null ? null : (int)$this->val);
+    }
+
+    /**
+     * @return float the value of this number cast explicitly to <tt>float</tt>, or the float <tt>NAN</tt> value if this
+     *                 is the not-a-number
+     */
+    public function toFloat()
+    {
+        return ($this->val === null ? NAN : (float)$this->val);
+    }
+
+    /**
+     * @return string the value of this number, or the special string <tt>'NaN'</tt> for the not-a-number value
+     */
+    public function toString()
+    {
+        return ($this->val === null ? 'NaN' : $this->val);
+    }
+
+    /**
+     * Converts the value to a {@link \GMP} object.
+     *
+     * Requires the `gmp` PHP extension.
+     *
+     * @return \GMP a {@link \GMP} object representing the same integer as this number
+     * @throws UndefinedOperationException if this number is not an integer, i.e., has some non-zero fractional digits
+     */
+    public function toGMP()
+    {
+        if (!$this->isInteger()) {
+            throw new UndefinedOperationException('toGMP() is only defined for integers');
+        }
+        $decPoint = strpos($this->val, '.');
+        $str = ($decPoint === false ? $this->val : substr($this->val, 0, $decPoint - 1));
+        return gmp_init($str);
+    }
+
+    public function __toString()
+    {
+        return $this->toString();
+    }
 }

Braces +26 added lines, -52 removed lines

@@ -72,16 +72,14 @@ 
 		if ($decimalNumber instanceof Decimal) {
 			if ($scale === null || $scale == $decimalNumber->scale) {
 				return $decimalNumber;
-			}
-			else {
+			} else {
 				return $decimalNumber->round($scale);
 			}
 		}
 
 		if (is_int($decimalNumber)) {
 			$val = (string)$decimalNumber;
-		}
-		elseif (is_float($decimalNumber)) {
+		} elseif (is_float($decimalNumber)) {
 			$val = (string)$decimalNumber;
 			$ePos = stripos($val, 'e');
 			if ($ePos > 0) {
@@ -93,12 +91,10 @@ 
 					$dpLen = strlen($dp);
 					if ($exp >= $dpLen) {
 						$val = $wp . $dp . str_repeat('0', $exp - $dpLen);
-					}
-					else {
+					} else {
 						$val = $wp . substr($dp, 0, $exp) . '.' . substr($dp, $exp);
 					}
-				}
-				else {
+				} else {
 					$mn = ($wp[0] == '-' ? 1 : 0);
 					$ord = strlen($wp) - $mn;
 					if (-$exp >= $ord) {
@@ -107,14 +103,12 @@ 
 							$prefix .= substr($wp, $mn);
 						}
 						$val = $prefix . $dp;
-					}
-					else {
+					} else {
 						$val = substr($wp, 0, $mn + $ord + $exp) . '.' . substr($wp, $mn + $ord + $exp) . $dp;
 					}
 				}
 			}
-		}
-		else {
+		} else {
 			if (!preg_match('~^\s*(-?)(?|(\.[0-9]+)|0*([0-9]+(?:\.[0-9]*)?))\s*$~', (string)$decimalNumber, $m)) {
 				throw new \InvalidArgumentException('decimalNumber');
 			}
@@ -178,8 +172,7 @@ 
 			$minus = ($this->val[0] == '-' ? 1 : 0);
 			if ($decPoint !== false) {
 				$digits = substr($this->val, $minus, $decPoint - $minus);
-			}
-			else {
+			} else {
 				$digits = ($minus ? substr($this->val, $minus) : $this->val);
 			}
 			$len = strlen($digits);
@@ -201,25 +194,21 @@ 
 				$digits = bcadd($digits, $augend, 0);
 			}
 			$this->val = ($minus ? '-' : '') . $digits;
-		}
-		elseif ($decPoint === false) {
+		} elseif ($decPoint === false) {
 			if ($scale > 0) {
 				$this->val .= '.' . str_repeat('0', $scale);
 				$this->scale = $scale;
-			}
-			else {
+			} else {
 				$this->scale = 0;
 			}
-		}
-		else {
+		} else {
 			$len = strlen($this->val);
 			$this->scale = $len - $decPoint - 1;
 			$scale = min(self::SCALE_LIMIT, ($scale === null ? $this->scale : max(0, $scale)));
 			if ($this->scale < $scale) {
 				$this->val .= str_repeat('0', $scale - $this->scale);
 				$this->scale = $scale;
-			}
-			elseif ($this->scale > $scale) {
+			} elseif ($this->scale > $scale) {
 				$newLen = $len - ($this->scale - $scale);
 				$inc = ($this->val[$newLen] >= 5);
 				if ($scale == 0) {
@@ -236,8 +225,7 @@ 
 
 			if ($this->val[0] == '.') {
 				$this->val = '0' . $this->val;
-			}
-			elseif ($this->val[0] == '-' && $this->val[1] == '.') {
+			} elseif ($this->val[0] == '-' && $this->val[1] == '.') {
 				$this->val[0] = '0';
 				$this->val = '-' . $this->val;
 			}
@@ -305,15 +293,12 @@ 
 		if ($this->isNaN()) {
 			if ($arg->isNaN()) {
 				return 0;
-			}
-			else {
+			} else {
 				return 1;
 			}
-		}
-		elseif ($arg->isNaN()) {
+		} elseif ($arg->isNaN()) {
 			return -1;
-		}
-		else {
+		} else {
 			return bccomp($this->val, $arg->val, max($this->scale, $arg->scale));
 		}
 	}
@@ -467,8 +452,7 @@ 
 		$m = $a->subtract($b->multiply($a->divide($b)->floor()));
 		if ($this->isNegative()) {
 			return $m->negate();
-		}
-		else {
+		} else {
 			return $m;
 		}
 	}
@@ -495,8 +479,7 @@ 
 		// NOTE: bcpow() only takes integer powers
 		if ($arg->isInteger()) {
 			return new Decimal(bcpow($this->val, $arg->val, $scale + 1), $scale);
-		}
-		else {
+		} else {
 			if ($this->isNegative()) {
 				throw new \RuntimeException('Negative number raised to a non-integer power yields a complex result');
 			}
@@ -511,8 +494,7 @@ 
 	{
 		if ($this->isNegative()) {
 			return $this->negate();
-		}
-		else {
+		} else {
 			return $this;
 		}
 	}
@@ -524,11 +506,9 @@ 
 	{
 		if ($this->isNaN() || $this->isZero()) {
 			return $this;
-		}
-		elseif ($this->val[0] == '-') {
+		} elseif ($this->val[0] == '-') {
 			return new Decimal(substr($this->val, 1));
-		}
-		else {
+		} else {
 			return new Decimal('-' . $this->val);
 		}
 	}
@@ -586,11 +566,9 @@ 
 		}
 		if ($this->val[0] != '-') {
 			return new Decimal(substr($this->val, 0, $decPoint));
-		}
-		elseif ($this->isInteger()) {
+		} elseif ($this->isInteger()) {
 			return new Decimal($this->val, 0);
-		}
-		else {
+		} else {
 			// negative number with non-zero fractional part
 			return new Decimal(bcsub(substr($this->val, 0, $decPoint), 1, 0));
 		}
@@ -607,11 +585,9 @@ 
 		}
 		if ($this->val[0] == '-') {
 			return new Decimal(substr($this->val, 0, $decPoint));
-		}
-		elseif ($this->isInteger()) {
+		} elseif ($this->isInteger()) {
 			return new Decimal($this->val, 0);
-		}
-		else {
+		} else {
 			// non-negative number with non-zero fractional part
 			return new Decimal(bcadd(substr($this->val, 0, $decPoint), 1, 0));
 		}
@@ -626,8 +602,7 @@ 
 		$arg = self::fromNumber($number);
 		if ($this->lessThan($arg)) {
 			return $arg;
-		}
-		else {
+		} else {
 			return $this;
 		}
 	}
@@ -641,8 +616,7 @@ 
 		$arg = self::fromNumber($number);
 		if ($this->greaterThan($arg)) {
 			return $arg;
-		}
-		else {
+		} else {
 			return $this;
 		}
 	}