vctls / php-interval-graph

src/template.php

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
         <?php if (count($v) === 2): // Isolated date.?>
             <div class='bar bar-date bar<?= $k ?>' style='left:<?= $v[0] . ((int)$v[0] !== 0 ? '%' : '') ?>;'
                  data-title='<?= $v[1] ?>'></div>
-        <?php else: ?>
+        <?php else : ?>
             <div class='bar bar-intv bar<?= $k ?> <?= $v[2] ?> <?= strpos($v[5], '*') ? 'striped' : '' ?>'
                  style='left:<?= $v[0] . ((int)$v[0] !== 0 ? '%' : '') ?>;right:<?= $v[1] . ((int)$v[1] !== 0 ? '%' : '') ?>'
                  data-title="<?= $v[3] . ' ➔ ' . $v[4] . (isset($v[5]) ? ' : ' . $v[5] : '') ?>">

Braces +5 added lines, -2 removed lines

@@ -4,11 +4,14 @@
         <?php if (count($v) === 2): // Isolated date.?>
             <div class='bar bar-date bar<?= $k ?>' style='left:<?= $v[0] . ((int)$v[0] !== 0 ? '%' : '') ?>;'
                  data-title='<?= $v[1] ?>'></div>
-        <?php else: ?>
+        <?php else {
+    : ?>
             <div class='bar bar-intv bar<?= $k ?> <?= $v[2] ?> <?= strpos($v[5], '*') ? 'striped' : '' ?>'
                  style='left:<?= $v[0] . ((int)$v[0] !== 0 ? '%' : '') ?>;right:<?= $v[1] . ((int)$v[1] !== 0 ? '%' : '') ?>'
                  data-title="<?= $v[3] . ' ➔ ' . $v[4] . (isset($v[5]) ? ' : ' . $v[5] : '') ?>">
             </div>
-        <?php endif; ?>
+        <?php endif;
+}
+?>
     <?php endforeach; ?>
 </div>
\ No newline at end of file

src/Util/Date.php

Spacing +2 added lines, -2 removed lines

@@ -42,10 +42,10 @@
     {
         $intvg = new IntervalGraph();
         $intvg->getFlattener()
-            ->setSubstractStep(static function (DateTime $bound) {
+            ->setSubstractStep(static function(DateTime $bound) {
                 return (clone $bound)->sub(new DateInterval('PT1S'));
             })
-            ->setAddStep(static function (DateTime $bound) {
+            ->setAddStep(static function(DateTime $bound) {
                 return (clone $bound)->add(new DateInterval('PT1S'));
             });
         if (isset($intervals)) {

src/IntervalGraph.php

Spacing +14 added lines, -14 removed lines

@@ -58,23 +58,23 @@ 
             $this->setIntervals($intervals);
         }
 
-        $this->boundToNumeric = static function (DateTime $bound) {
+        $this->boundToNumeric = static function(DateTime $bound) {
             return $bound->getTimestamp();
         };
 
-        $this->boundToString = static function (DateTime $bound) {
+        $this->boundToString = static function(DateTime $bound) {
             return $bound->format('Y-m-d');
         };
 
-        $this->valueToNumeric = static function ($v) {
+        $this->valueToNumeric = static function($v) {
             return $v === null ? null : (int)($v * 100);
         };
 
-        $this->valueToString = static function ($v) {
+        $this->valueToString = static function($v) {
             return $v === null ? null : ($v * 100 . '%');
         };
 
-        $this->aggregateFunction = static function ($a, $b) {
+        $this->aggregateFunction = static function($a, $b) {
             if ($a === null && $b === null) {
                 return null;
             }
@@ -247,7 +247,7 @@ 
         }
 
         // Order by low bound.
-        uasort($numVals, static function (array $i1, array $i2) {
+        uasort($numVals, static function(array $i1, array $i2) {
             return ($i1[0] < $i2[0]) ? -1 : 1;
         });
 
@@ -263,7 +263,7 @@ 
         }
 
         // Order by high bound.
-        uasort($numVals, static function (array $i1, array $i2) {
+        uasort($numVals, static function(array $i1, array $i2) {
             return ($i1[1] < $i2[1]) ? -1 : 1;
         });
 
@@ -306,7 +306,7 @@ 
                     !empty($originalValues) ? $this->palette->getColor($colval) : 50, // Interval color
                     ($this->boundToString)($lowBound), // Interval start string value
                     ($this->boundToString)($highBound), // Interval end string value
-                    !empty($originalValues) ? $strval : null,// Interval string value
+                    !empty($originalValues) ? $strval : null, // Interval string value
                 ];
             }
         }
@@ -314,7 +314,7 @@ 
         // Put discrete values at the end and reset indices.
         // Reseting indices ensures the processed values are
         // serialized as correctly ordered JSON arrays.
-        usort($numVals, static function ($i) {
+        usort($numVals, static function($i) {
             return count($i) === 2 ? 1 : -1;
         });
 
@@ -336,7 +336,7 @@ 
         $adjacentIntervals = $this->flattener->calcAdjacentIntervals($signedBounds);
 
         // Remove empty interval generated when two or more intervals share a common bound.
-        $adjacentIntervals = array_values(array_filter($adjacentIntervals, static function ($i) {
+        $adjacentIntervals = array_values(array_filter($adjacentIntervals, static function($i) {
             // Use weak comparison in case of object typed bounds.
             return $i[0] != $i[1];
         }));
@@ -364,7 +364,7 @@ 
      */
     public static function extractDiscreteValues(array &$intervals): array
     {
-        $discreteValues = array_filter($intervals, static function ($interval) {
+        $discreteValues = array_filter($intervals, static function($interval) {
             return $interval[0] === $interval[1];
         });
 
@@ -401,7 +401,7 @@ 
             $bounds[] = [$interval[0], '+', true, $key, $interval[2] ?? null];
         }
         // Order the bounds.
-        usort($bounds, static function (array $d1, array $d2) {
+        usort($bounds, static function(array $d1, array $d2) {
             return ($d1[0] < $d2[0]) ? -1 : 1;
         });
         return $bounds;
@@ -428,7 +428,7 @@ 
         }
 
         // Order by high bound.
-        uasort($numericIntervals, static function (array $i1, array $i2) {
+        uasort($numericIntervals, static function(array $i1, array $i2) {
             return ($i1[1] < $i2[1]) ? -1 : 1;
         });
 
@@ -457,7 +457,7 @@ 
         // Put discrete values at the end and reset indices.
         // Reseting indices ensures the processed values are
         // serialized as correctly ordered JSON arrays.
-        usort($numericIntervals, static function ($i) {
+        usort($numericIntervals, static function($i) {
             return !is_array($i) ? 1 : -1;
         });
 

index.php

Spacing +8 added lines, -8 removed lines

@@ -39,7 +39,7 @@ 
     D::intv(6, 9, 2 / 10),
 ];
 
-$longDateFormat = static function (DateTime $bound) {
+$longDateFormat = static function(DateTime $bound) {
     return $bound->format('Y-m-d H:i:s');
 };
 
@@ -50,7 +50,7 @@ 
  */
 
 // An aggregate function for arrays representing fractions with the same denominator.
-$agg = static function ($a, $b) {
+$agg = static function($a, $b) {
     if ($a === null && $b === null) {
         return null;
     }
@@ -58,12 +58,12 @@ 
 };
 
 // A toNumeric function…
-$toNumeric = static function ($a) {
+$toNumeric = static function($a) {
     return $a === null ? null : (int)($a[0] / $a[1] * 100);
 };
 
 // A toString function…
-$toString = static function ($a) {
+$toString = static function($a) {
     return $a === null ? null : ($a[0] . '/' . $a[1]);
 };
 
@@ -86,8 +86,8 @@ 
 /*
  * TRUNCATED INTERVALS
  */
-$intv1 = (DateTime::createFromFormat('Y-m-d', '2019-01-01'))->add(new DateInterval('PT60H'))->setTime(0,0);
-$intv2 = (DateTime::createFromFormat('Y-m-d', '2019-01-01'))->add(new DateInterval('PT108H'))->setTime(23,59,59);
+$intv1 = (DateTime::createFromFormat('Y-m-d', '2019-01-01'))->add(new DateInterval('PT60H'))->setTime(0, 0);
+$intv2 = (DateTime::createFromFormat('Y-m-d', '2019-01-01'))->add(new DateInterval('PT108H'))->setTime(23, 59, 59);
 $intv3 = (clone $intv2)->add(new DateInterval('PT60H'));
 
 $truncated = ($fractim->setIntervals(Truncator::truncate($fractions, $intv1, $intv2)))
@@ -189,14 +189,14 @@ 
 <?php
 
 /* ADDITIONAL INFORMATION */
-$toString2 = static function ($a) {
+$toString2 = static function($a) {
     if ($a === null) {
         return null;
     }
     return $a[0] . '/' . $a[1] . ($a[2] ? '*' : '');
 };
 
-$agg2 = static function ($a, $b) {
+$agg2 = static function($a, $b) {
     if ($a === null && $b === null) {
         return null;
     }