ondrej-bouda / ivory

showcase/processing.php

Indentation +3 added lines, -3 removed lines

@@ -23,7 +23,7 @@ 
  * Hence the lessonperson.schedulingstatus attribute, holding enum values "scheduled" or "actual".
  */
 $rel = new StatementRelation(
-	'SELECT lesson.id AS lesson_id, lesson.name AS lesson_name,
+    'SELECT lesson.id AS lesson_id, lesson.name AS lesson_name,
             lp.schedulingstatus,
 	        p.id AS person_id, p.firstname AS person_firstname, p.lastname AS person_lastname,
 	        p.schedabbr AS person_schedabbr
@@ -31,7 +31,7 @@ 
 	      JOIN lessonperson lp ON lp.lesson_id = lesson.id
 	      JOIN person p ON p.id = lp.person_id
 	 WHERE lesson.actual_timerange && %',
-	new DateTimeRange(new \DateTime(), new \DateTime('+1 day'))
+    new DateTimeRange(new \DateTime(), new \DateTime('+1 day'))
 );
 
 // CASE 1; map: lesson ID => row
@@ -49,7 +49,7 @@ 
 
 // CASE 4; map: lesson ID => map: person ID => user function result
 $res = $rel->map('lesson_id')->map('person_id')->col(function ($row) {
-	return ($row['person_schedabbr'] ? : mb_substr($row['person_lastname'], 0, 4));
+    return ($row['person_schedabbr'] ? : mb_substr($row['person_lastname'], 0, 4));
 });
 var_dump($res[4][7]); // prints, e.g., "Brez", which is the scheduling abbreviation of person 7, who teaches in lesson 4
 

Spacing +6 added lines, -6 removed lines

@@ -48,8 +48,8 @@ 
 var_dump($res[4][7]['person_lastname']); // prints, e.g., "Brezina", which is the lastname of person 7, who teaches in lesson 4
 
 // CASE 4; map: lesson ID => map: person ID => user function result
-$res = $rel->map('lesson_id')->map('person_id')->col(function ($row) {
-	return ($row['person_schedabbr'] ? : mb_substr($row['person_lastname'], 0, 4));
+$res = $rel->map('lesson_id')->map('person_id')->col(function($row) {
+	return ($row['person_schedabbr'] ?: mb_substr($row['person_lastname'], 0, 4));
 });
 var_dump($res[4][7]); // prints, e.g., "Brez", which is the scheduling abbreviation of person 7, who teaches in lesson 4
 
@@ -70,7 +70,7 @@ 
 var_dump($res[4]['actual'][1]); // prints, e.g., 89, which is the ID of the second actual teacher returned for lesson 4
 
 // CASE 9; map: lesson ID parity => list: row only with the lesson ID and person ID
-$res = $rel->multimap(function ($row) { return $row['lesson_id'] % 2; })->project(['lesson_id', 'person_id']);
+$res = $rel->multimap(function($row) { return $row['lesson_id'] % 2; })->project(['lesson_id', 'person_id']);
 var_dump($res[1][5]['lesson_id']); // prints, e.g., 631, which is the ID of the sixth returned lesson with odd ID
 
 // CASE 10; map: lesson ID => list of rows with the "actual" scheduling status: person ID
@@ -78,14 +78,14 @@ 
 var_dump($res[4][1]); // prints, e.g., 89, which is the ID of the second actual teacher returned for lesson 4
 
 // CASE 11; map: lesson ID => list of rows with odd person ID: person ID
-$res = $rel->multimap('lesson_id')->filter(function ($row) { return $row['person_id'] % 2 == 1; })->col('person_id');
+$res = $rel->multimap('lesson_id')->filter(function($row) { return $row['person_id'] % 2 == 1; })->col('person_id');
 var_dump($res[4][1]); // prints, e.g., 97, which is the ID of the second teacher returned for lesson 4 who has their person ID odd
 
 // CASE 12; equivalent to CASE 11, but specifying the filter sooner, yet on the application side
-$res = $rel->filter(function ($row) { return $row['person_id'] % 2 == 1; })->multimap('lesson_id')->col('person_id');
+$res = $rel->filter(function($row) { return $row['person_id'] % 2 == 1; })->multimap('lesson_id')->col('person_id');
 
 // CASE 13: equivalent to CASE 11, but with the filter applied to the single-column projection
-$res = $rel->multimap('lesson_id')->col('person_id')->filter(function ($personId) { return $personId % 2 == 1; });
+$res = $rel->multimap('lesson_id')->col('person_id')->filter(function($personId) { return $personId % 2 == 1; });
 
 // CASE 14; list: row only with the lesson_id and person_id attributes
 $res = $rel->project(['lesson_id', 'person_id']);

src/Ivory/Value/Date.php

Spacing +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
         $addYears = 0;
         $dateCreateInput = preg_replace_callback(
             '~\d{5,}(?=-|\d{4})~', // supports both dash-separated date parts and also the form without dash separators
-            function ($y) use (&$addYears) {
+            function($y) use (&$addYears) {
                 $res = $y[0] % 10000;
                 $addYears = $y[0] - $res;
                 return $res;

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

Indentation +56 added lines, -56 removed lines

@@ -17,66 +17,66 @@
  */
 class VarBitString extends BitString
 {
-	/** @var int|null */
-	private $maxLength;
+    /** @var int|null */
+    private $maxLength;
 
-	/**
-	 * @param string $bits the bit string, i.e., a string of 1's and 0's
-	 * @param int|null $maxLength maximal length of the bit string in bits;
-	 *                            <tt>null</tt> for no limit;
-	 *                            if less than <tt>strlen($bits)</tt>, the bits get truncated on the right and a warning
-	 *                              is issued
-	 * @return VarBitString
-	 * @throws \InvalidArgumentException if <tt>$length</tt> is a non-positive number (PostgreSQL forbids it)
-	 */
-	public static function fromString($bits, $maxLength = null)
-	{
-		$bits = (string)$bits;
+    /**
+     * @param string $bits the bit string, i.e., a string of 1's and 0's
+     * @param int|null $maxLength maximal length of the bit string in bits;
+     *                            <tt>null</tt> for no limit;
+     *                            if less than <tt>strlen($bits)</tt>, the bits get truncated on the right and a warning
+     *                              is issued
+     * @return VarBitString
+     * @throws \InvalidArgumentException if <tt>$length</tt> is a non-positive number (PostgreSQL forbids it)
+     */
+    public static function fromString($bits, $maxLength = null)
+    {
+        $bits = (string)$bits;
 
-		if ($maxLength === null) {
-			return new VarBitString($bits, null);
-		}
-		elseif ($maxLength <= 0) {
-			throw new \InvalidArgumentException('maxLength is non-positive');
-		}
-		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 {
-			return new VarBitString($bits, $maxLength);
-		}
-	}
+        if ($maxLength === null) {
+            return new VarBitString($bits, null);
+        }
+        elseif ($maxLength <= 0) {
+            throw new \InvalidArgumentException('maxLength is non-positive');
+        }
+        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 {
+            return new VarBitString($bits, $maxLength);
+        }
+    }
 
-	/**
-	 * @param string $bits
-	 * @param int|null $maxLength
-	 */
-	protected function __construct($bits, $maxLength)
-	{
-		parent::__construct($bits);
+    /**
+     * @param string $bits
+     * @param int|null $maxLength
+     */
+    protected function __construct($bits, $maxLength)
+    {
+        parent::__construct($bits);
 
-		if ($maxLength !== null && $maxLength < 0) { // NOTE: zero max. length permitted for substr() to calculate correctly
-			throw new \InvalidArgumentException('maxLength is negative');
-		}
-		$this->maxLength = $maxLength;
-	}
+        if ($maxLength !== null && $maxLength < 0) { // NOTE: zero max. length permitted for substr() to calculate correctly
+            throw new \InvalidArgumentException('maxLength is negative');
+        }
+        $this->maxLength = $maxLength;
+    }
 
-	public function equals($other)
-	{
-		$parRes = parent::equals($other);
-		if (!$parRes) {
-			return $parRes;
-		}
-		/** @var VarBitString $other */
-		return ($this->maxLength == $other->maxLength);
-	}
+    public function equals($other)
+    {
+        $parRes = parent::equals($other);
+        if (!$parRes) {
+            return $parRes;
+        }
+        /** @var VarBitString $other */
+        return ($this->maxLength == $other->maxLength);
+    }
 
-	/**
-	 * @return int|null maximal length this bit string might have carried, or <tt>null</tt> for unlimited length
-	 */
-	public function getMaxLength()
-	{
-		return $this->maxLength;
-	}
+    /**
+     * @return int|null maximal length this bit string might have carried, or <tt>null</tt> for unlimited length
+     */
+    public function getMaxLength()
+    {
+        return $this->maxLength;
+    }
 }

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

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
         self::GIGABYTE => [self::BYTE, 1024 * 1024 * 1024],
         self::TERABYTE => [self::BYTE, 1024 * 1024 * 1024 * 1024],
 
-        self::MILLISECOND => [self::SECOND, 1/1000],
+        self::MILLISECOND => [self::SECOND, 1 / 1000],
         self::SECOND => [self::SECOND, 1],
         self::MINUTE => [self::SECOND, 60],
         self::HOUR => [self::SECOND, 60 * 60],

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.');
             }
         }