vctls / php-interval-graph

index.php

Braces +3 added lines, -1 removed lines

@@ -58,7 +58,9 @@
 
 // An aggregate function for arrays representing fractions with the same denominator.
 $agg = function ($a, $b) {
-    if ($a === null && $b === null) return null;
+    if ($a === null && $b === null) {
+        return null;
+    }
     return [$a[0] + $b[0], $b[1]];
 };
 

Spacing +14 added lines, -14 removed lines

@@ -9,19 +9,19 @@ 
 
 $today = new DateTime('today');
 
-$base = D::intv(0,5);
-$intv1 = D::intv(0,4, 7/10);
-$intv2 = D::intv(1,5,3/10);
-$intv3 = D::intv(2,3,3/10);
+$base = D::intv(0, 5);
+$intv1 = D::intv(0, 4, 7 / 10);
+$intv2 = D::intv(1, 5, 3 / 10);
+$intv3 = D::intv(2, 3, 3 / 10);
 $overlapped1 = D::intvg([$base, $intv1]);
 $overlapped2 = D::intvg([$base, $intv2]);
 $overlapped3 = D::intvg([$base, $intv3]);
 $overlapped = D::intvg([$base, $intv1, $intv2, $intv3]);
 
-$withNull1 = D::intvg([$base, D::intv(0,3,4/10)]);
-$withNull2 = D::intvg([$base, D::intv(1,2)]);
-$withNull3 = D::intvg([$base, D::intv(2,3,4/10)]);
-$withNull4 = D::intvg([$base, D::intv(4,5,5/10)]);
+$withNull1 = D::intvg([$base, D::intv(0, 3, 4 / 10)]);
+$withNull2 = D::intvg([$base, D::intv(1, 2)]);
+$withNull3 = D::intvg([$base, D::intv(2, 3, 4 / 10)]);
+$withNull4 = D::intvg([$base, D::intv(4, 5, 5 / 10)]);
 $withNullIntervals = D::intvg([
     [$today, new DateTime('today + 3 days'), 4 / 10],
     [new DateTime('today + 1 day'), new DateTime('today + 2 days')],
@@ -39,7 +39,7 @@ 
     D::intv(6, 9, 2 / 10),
 ];
 
-$longDateFormat = function (DateTime $bound) {
+$longDateFormat = function(DateTime $bound) {
     return $bound->format('Y-m-d H:i:s');
 };
 
@@ -50,18 +50,18 @@ 
  */
 
 // An aggregate function for arrays representing fractions with the same denominator.
-$agg = function ($a, $b) {
+$agg = function($a, $b) {
     if ($a === null && $b === null) return null;
     return [$a[0] + $b[0], $b[1]];
 };
 
 // A toNumeric function…
-$toNumeric = function ($a) {
+$toNumeric = function($a) {
     return $a === null ? null : (int)($a[0] / $a[1] * 100);
 };
 
 // A toString function…
-$toString = function ($a) {
+$toString = function($a) {
     return $a === null ? null : ($a[0] . '/' . $a[1]);
 };
 
@@ -97,13 +97,13 @@ 
 
 $withDates = (D::intvg([
     [$intv1, $intv1],
-    D::intv(0,4,7/10),
+    D::intv(0, 4, 7 / 10),
     [$intv2, $intv2],
     D::intv(1, 5, 3 / 10),
     D::intv(2, 3, 3 / 10),
     [$intv3, $intv3],
 ]))
-    ->setBoundToString($longDateFormat);;
+    ->setBoundToString($longDateFormat); ;
 
 $intvGraphs = [];
 foreach (range(0, 20) as $t) {

src/template.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <div class='intvg'>
     <?php foreach ($vs as $k => $v) : ?>
-        <?php if (count($v) === 2 ): // Isolated date.?>
+        <?php if (count($v) === 2): // Isolated date.?>
             <div class='bar bar-date bar<?= $k; ?>' style='left:<?= $v[0] ?>%;' data-title='<?= $v[1] ?>'></div>
         <?php else: ?>
             <div class='bar bar-intv bar<?= $k; ?>'

Braces +5 added lines, -2 removed lines

@@ -2,8 +2,11 @@
     <?php foreach ($vs as $k => $v) : ?>
         <?php if (count($v) === 2 ): // Isolated date.?>
             <div class='bar bar-date bar<?= $k; ?>' style='left:<?= $v[0] ?>%;' data-title='<?= $v[1] ?>'></div>
-        <?php else: ?>
-            <div class='bar bar-intv bar<?= $k; ?>'
+        <?php else {
+    : ?>
+            <div class='bar bar-intv bar<?= $k;
+}
+?>'
                  style='left:<?= $v[0] ?>%;right:<?= $v[1] ?>%;background-color:<?= $v[2] ?>'
                  data-title="<?= $v[3] . ' ➔ ' . $v[4] . (isset($v[5]) ? ' : ' . $v[5] : '') ?>">
             </div>

src/Palette.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
      */
     public function setColors(array $palette)
     {
-        usort($palette, function ($p1, $p2) {
+        usort($palette, function($p1, $p2) {
             return $p2[0] - $p1[0];
         });
         $this->palette = $palette;

src/Util/Date.php

Spacing +3 added lines, -3 removed lines

@@ -27,7 +27,7 @@ 
     {
         try {
             $start = new DateTime("today + $start days");
-            $end = (new DateTime("today + $end days"))->setTime(23,59,59);
+            $end = (new DateTime("today + $end days"))->setTime(23, 59, 59);
         } catch (Exception $e) {}
         
         return [$start, $end, $value];
@@ -40,11 +40,11 @@ 
      * @return IntervalGraph
      */
     public static function intvg($args) {
-        $substractStep = function (DateTime $bound) {
+        $substractStep = function(DateTime $bound) {
             return (clone $bound)->sub(new DateInterval('PT1S'));
         };
 
-        $addStep = function (DateTime $bound) {
+        $addStep = function(DateTime $bound) {
             return (clone $bound)->add(new DateInterval('PT1S'));
         };
         return (new IntervalGraph($args))

src/IntervalGraph.php

Spacing +14 added lines, -14 removed lines

@@ -60,23 +60,23 @@ 
             $this->setIntervals($intervals);
         }
 
-        $this->boundToNumeric = function (DateTime $bound) {
+        $this->boundToNumeric = function(DateTime $bound) {
             return $bound->getTimestamp();
         };
 
-        $this->boundToString = function (DateTime $bound) {
+        $this->boundToString = function(DateTime $bound) {
             return $bound->format("Y-m-d");
         };
 
-        $this->valueToNumeric = function ($v) {
+        $this->valueToNumeric = function($v) {
             return $v === null ? null : (int)($v * 100);
         };
 
-        $this->valueToString = function ($v) {
+        $this->valueToString = function($v) {
             return $v === null ? null : ($v * 100 . '%');
         };
 
-        $this->aggregateFunction = function ($a, $b) {
+        $this->aggregateFunction = function($a, $b) {
             if ($a === null && $b === null) {
                 return null;
             }
@@ -256,7 +256,7 @@ 
         }
 
         // Order by low bound.
-        uasort($numVals, function (array $i1, array $i2) {
+        uasort($numVals, function(array $i1, array $i2) {
             return ($i1[0] < $i2[0]) ? -1 : 1;
         });
 
@@ -272,7 +272,7 @@ 
         }
 
         // Order by high bound.
-        uasort($numVals, function (array $i1, array $i2) {
+        uasort($numVals, function(array $i1, array $i2) {
             return ($i1[1] < $i2[1]) ? -1 : 1;
         });
 
@@ -315,7 +315,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
                 ];
             }
         }
@@ -323,7 +323,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, function ($i) {
+        usort($numVals, function($i) {
             return count($i) === 2 ? 1 : -1;
         });
 
@@ -345,7 +345,7 @@ 
         $adjacentIntervals = $this->calcAdjacentIntervals($signedBounds);
 
         // Remove empty interval generated when two or more intervals share a common bound.
-        $adjacentIntervals = array_values(array_filter($adjacentIntervals, function ($i) {
+        $adjacentIntervals = array_values(array_filter($adjacentIntervals, function($i) {
             // Use weak comparison in case of object typed bounds.
             return $i[0] != $i[1];
         }));
@@ -370,7 +370,7 @@ 
      */
     public static function extractDiscreteValues(array &$intervals)
     {
-        $discreteValues = array_filter($intervals, function ($interval) {
+        $discreteValues = array_filter($intervals, function($interval) {
             return $interval[0] === $interval[1];
         });
 
@@ -407,7 +407,7 @@ 
             $bounds[] = [$interval[0], '+', true, $key, isset($interval[2]) ? $interval[2] : null];
         }
         // Order the bounds.
-        usort($bounds, function (array $d1, array $d2) {
+        usort($bounds, function(array $d1, array $d2) {
             return ($d1[0] < $d2[0]) ? -1 : 1;
         });
         return $bounds;
@@ -511,7 +511,7 @@ 
         }
 
         // Order by high bound.
-        uasort($numericIntervals, function (array $i1, array $i2) {
+        uasort($numericIntervals, function(array $i1, array $i2) {
             return ($i1[1] < $i2[1]) ? -1 : 1;
         });
         
@@ -540,7 +540,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, function ($i) {
+        usort($numericIntervals, function($i) {
             return !is_array($i) ? 1 : -1;
         });