vctls / php-interval-graph

index.php

Spacing +7 added lines, -7 removed lines

@@ -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]);
 };
 
@@ -103,7 +103,7 @@ 
     D::intv(2, 3, 3 / 10),
     [$intv3, $intv3],
 ]))
-    ->setBoundToString($longDateFormat);;
+    ->setBoundToString($longDateFormat); ;
 
 $intvGraphs = [];
 foreach (range(0, 20) as $t) {
@@ -190,14 +190,14 @@ 
 <?php
 
 /* ADDITIONAL INFORMATION */
-$toString2 = function ($a) {
+$toString2 = function($a) {
     if ($a === null) {
         return null;
     }
     return $a[0] . '/' . $a[1] . ($a[2] ? '*' : '');
 };
 
-$agg2 = function ($a, $b) {
+$agg2 = function($a, $b) {
     if ($a === null && $b === null) return null;
     return [
         $a[0] + $b[0],

Braces +6 added lines, -2 removed lines

@@ -51,7 +51,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]];
 };
 
@@ -198,7 +200,9 @@ 
 };
 
 $agg2 = function ($a, $b) {
-    if ($a === null && $b === null) return null;
+    if ($a === null && $b === null) {
+        return null;
+    }
     return [
         $a[0] + $b[0],
         $b[1],

src/IntervalGraph.php

Spacing +14 added lines, -14 removed lines

@@ -60,23 +60,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;
             }
@@ -256,7 +256,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;
         });
 
@@ -272,7 +272,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;
         });
 
@@ -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, static function ($i) {
+        usort($numVals, static 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, 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];
         }));
@@ -370,7 +370,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];
         });
 
@@ -407,7 +407,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;
@@ -512,7 +512,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;
         });
         
@@ -541,7 +541,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;
         });
 

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 +4 added lines, -4 removed lines

@@ -25,8 +25,8 @@ 
      */
     public static function intv(int $start, int $end, $value = null): array
     {
-        $start = DateTime::createFromFormat('Y-m-d', '2019-01-01')->add(new DateInterval('P' . $start . 'D'))->setTime(0,0);
-        $end = DateTime::createFromFormat('Y-m-d', '2019-01-01')->add(new DateInterval('P' . $end . 'D'))->setTime(23,59,59);
+        $start = DateTime::createFromFormat('Y-m-d', '2019-01-01')->add(new DateInterval('P' . $start . 'D'))->setTime(0, 0);
+        $end = DateTime::createFromFormat('Y-m-d', '2019-01-01')->add(new DateInterval('P' . $end . 'D'))->setTime(23, 59, 59);
         return [$start, $end, $value];
     }
 
@@ -39,10 +39,10 @@ 
     public static function intvg($intervals = null): IntervalGraph
     {
         $intvg = new IntervalGraph();
-        $intvg->setSubstractStep(static function (DateTime $bound) {
+        $intvg->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)) {