vctls / php-interval-graph

index.php

Spacing +8 added lines, -8 removed lines

@@ -25,10 +25,10 @@ 
 $overlapped3 = new IntervalGraph([$base, $date3]);
 $overlapped = new IntervalGraph([$base, $date1, $date2, $date3]);
 
-$withNull1 = new IntervalGraph([$base, [new DateTime('today'), new DateTime('today + 3 days'), 4 / 10],]);
-$withNull2 = new IntervalGraph([$base, [new DateTime('today + 1 day'), new DateTime('today + 2 days')],]);
-$withNull3 = new IntervalGraph([$base, [new DateTime('today + 2 day'), new DateTime('today + 3 days'), 4 / 10],]);
-$withNull4 = new IntervalGraph([$base, [new DateTime('today + 4 day'), new DateTime('today + 5 days'), 5 / 10],]);
+$withNull1 = new IntervalGraph([$base, [new DateTime('today'), new DateTime('today + 3 days'), 4 / 10], ]);
+$withNull2 = new IntervalGraph([$base, [new DateTime('today + 1 day'), new DateTime('today + 2 days')], ]);
+$withNull3 = new IntervalGraph([$base, [new DateTime('today + 2 day'), new DateTime('today + 3 days'), 4 / 10], ]);
+$withNull4 = new IntervalGraph([$base, [new DateTime('today + 4 day'), new DateTime('today + 5 days'), 5 / 10], ]);
 $withNullIntervals = new IntervalGraph([
     [$today, new DateTime('today + 3 days'), 4 / 10],
     [new DateTime('today + 1 day'), new DateTime('today + 2 days')],
@@ -46,7 +46,7 @@ 
     [new DateTime('today + 6 day'), new DateTime('today + 9 days'), 2 / 10],
 ];
 
-$longDateFormat = function (\DateTime $bound){
+$longDateFormat = function(\DateTime $bound) {
     return $bound->format('Y-m-d H:i:s');
 };
 
@@ -57,16 +57,16 @@ 
  */
 
 // 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) {return $a === null ? null : (int)($a[0] / $a[1] * 100);};
+$toNumeric = function($a) {return $a === null ? null : (int)($a[0] / $a[1] * 100); };
 
 // A toString function…
-$toString = function ($a) {return $a === null ? null : ($a[0] . '/' . $a[1]);};
+$toString = function($a) {return $a === null ? null : ($a[0] . '/' . $a[1]); };
 
 $fractions = [
     [$today, new DateTime('today + 3 days'), [2, 10]],

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]];
 };
 

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/IntervalGraph.php

Spacing +20 added lines, -20 removed lines

@@ -46,23 +46,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;
             }
@@ -160,7 +160,7 @@ 
     public static function truncate(array $intervals, $lowerLimit = null, $upperLimit = null, $padding = false)
     {
         if (isset($lowerLimit)) {
-            $intervals = array_map(function ($i) use ($lowerLimit) {
+            $intervals = array_map(function($i) use ($lowerLimit) {
                 if ($i[0] < $lowerLimit) { // If the low bound is before the lower bound...
                     if ($i[1] < $lowerLimit) {
                         // ... and the high bound is also before the lower bound, set the interval to false.
@@ -188,7 +188,7 @@ 
 
         // TODO DRY
         if (isset($upperLimit)) {
-            $intervals = array_map(function ($i) use ($upperLimit) {
+            $intervals = array_map(function($i) use ($upperLimit) {
                 if ($i[1] > $upperLimit) {
                     if ($i[0] > $upperLimit) {
                         // If both bounds are after the given upper limit, set the interval to false.
@@ -290,7 +290,7 @@ 
         $t = array_column($flatIntervals, 2);
 
         // Change bounds to numeric values.
-        $numVals = array_map(function (array $i) {
+        $numVals = array_map(function(array $i) {
             return [
                 ($this->boundToNumeric)($i[0]),
                 ($this->boundToNumeric)($i[1]),
@@ -298,7 +298,7 @@ 
         }, $flatIntervals);
 
         // 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;
         });
 
@@ -306,7 +306,7 @@ 
         $min = reset($numVals)[0];
 
         // Substract min from all timestamps.
-        $numVals = array_map(function ($i) use ($min) {
+        $numVals = array_map(function($i) use ($min) {
             return [
                 $i[0] - $min,
                 $i[1] - $min
@@ -314,7 +314,7 @@ 
         }, $numVals);
 
         // 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;
         });
 
@@ -322,15 +322,15 @@ 
         $max = end($numVals)[1];
 
         // Calculate percentages.
-        $numVals = array_map(function (array $i) use ($max) {
-            return array_map(function ($int) use ($max) {
+        $numVals = array_map(function(array $i) use ($max) {
+            return array_map(function($int) use ($max) {
                 return round($int * 100 / $max);
             }, $i);
         }, $numVals);
 
         // Put values back in, along with the formatted bound.
         // Since we're using associative sorting functions, we know the keys haven't changed.
-        $numVals = array_map(function ($k, array $i) use ($t, $flatIntervals) {
+        $numVals = array_map(function($k, array $i) use ($t, $flatIntervals) {
             if ($flatIntervals[$k][0] === $flatIntervals[$k][1]) {
                 return [
                     $i[0], // Single value position percentage
@@ -347,7 +347,7 @@ 
                     !empty($t) ? $this->palette->getColor($colorval) : 50, // Interval color
                     ($this->boundToString)($flatIntervals[$k][0]), // Interval start string value
                     ($this->boundToString)($flatIntervals[$k][1]), // Interval end string value
-                    !empty($t) ? ($stingval) : null,// Interval string value
+                    !empty($t) ? ($stingval) : null, // Interval string value
                 ];
             }
         }, array_keys($numVals), $numVals);
@@ -355,7 +355,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;
         });
 
@@ -377,7 +377,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];
         }));
@@ -402,7 +402,7 @@ 
      */
     public static function extractDiscreteValues(array &$intervals)
     {
-        $discreteValues = array_filter($intervals, function ($interval) {
+        $discreteValues = array_filter($intervals, function($interval) {
             return $interval[0] === $interval[1];
         });
 
@@ -429,7 +429,7 @@ 
             $bounds[] = [$interval[1], isset($interval[2]) ? $interval[2] : null, '-', $key];
         }
         // 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;
@@ -444,7 +444,7 @@ 
     public function calcAdjacentIntervals($bounds)
     {
         // Get the values of the original intervals, including nulls.
-        $origIntVals = array_map(function ($interval) {
+        $origIntVals = array_map(function($interval) {
             return isset($interval[2]) ? $interval[2] : null;
         }, $this->intervals);