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

Spacing +21 added lines, -21 removed lines

@@ -46,23 +46,23 @@ 
             $this->setIntervals($intervals);
         }
 
-        $this->boundToStringFunction = function (\DateTime $bound) {
+        $this->boundToStringFunction = function(\DateTime $bound) {
             return $bound->format("Y-m-d");
         };
 
-        $this->boundToNumericFunction = function (\DateTime $bound) {
+        $this->boundToNumericFunction = function(\DateTime $bound) {
             return $bound->getTimestamp();
         };
 
-        $this->valueToNumericFunction = function ($v) {
+        $this->valueToNumericFunction = function($v) {
             return $v === null ? null : (int)($v * 100);
         };
 
-        $this->valueToStringFunction = function ($v) {
+        $this->valueToStringFunction = 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;
             }
@@ -133,7 +133,7 @@ 
         self::checkFormat($intervals);
 
         if (isset($start)) {
-            $intervals = array_map(function ($i) use ($start) {
+            $intervals = array_map(function($i) use ($start) {
                 if ($i[0] < $start) { // If the low bound is before the lower bound...
                     if ($i[1] < $start) {
                         // ... and the high bound is also before the lower bound, set the interval to false.
@@ -161,7 +161,7 @@ 
 
         // TODO DRY
         if (isset($end)) {
-            $intervals = array_map(function ($i) use ($end) {
+            $intervals = array_map(function($i) use ($end) {
                 if ($i[1] > $end) {
                     if ($i[0] > $end) {
                         // If both dates are after the given upper bound, set the interval to false.
@@ -265,7 +265,7 @@ 
         $t = array_column($intervals, 2);
 
         // Change bounds to numeric values.
-        $values = array_map(function (array $i) {
+        $values = array_map(function(array $i) {
             return [
                 ($this->boundToNumericFunction)($i[0]),
                 ($this->boundToNumericFunction)($i[1]),
@@ -273,7 +273,7 @@ 
         }, $intervals);
 
         // Order by low bound.
-        uasort($values, function (array $i1, array $i2) {
+        uasort($values, function(array $i1, array $i2) {
             return ($i1[0] < $i2[0]) ? -1 : 1;
         });
 
@@ -281,7 +281,7 @@ 
         $min = reset($values)[0];
 
         // Substract min from all timestamps.
-        $values = array_map(function ($i) use ($min) {
+        $values = array_map(function($i) use ($min) {
             return [
                 $i[0] - $min,
                 $i[1] - $min
@@ -289,7 +289,7 @@ 
         }, $values);
 
         // Order by high bound.
-        uasort($values, function (array $i1, array $i2) {
+        uasort($values, function(array $i1, array $i2) {
             return ($i1[1] < $i2[1]) ? -1 : 1;
         });
 
@@ -297,15 +297,15 @@ 
         $max = end($values)[1];
 
         // Calculate percentages.
-        $values = array_map(function (array $i) use ($max) {
-            return array_map(function ($int) use ($max) {
+        $values = array_map(function(array $i) use ($max) {
+            return array_map(function($int) use ($max) {
                 return round($int * 100 / $max);
             }, $i);
         }, $values);
 
         // Put values back in, along with the formatted date.
         // Since we're using associative sorting functions, we know the keys haven't changed.
-        $values = array_map(function ($k, array $i) use ($t, $intervals) {
+        $values = array_map(function($k, array $i) use ($t, $intervals) {
             if ($intervals[$k][0] === $intervals[$k][1]) {
                 return [
                     $i[0], // Single value position percentage
@@ -322,7 +322,7 @@ 
                     ) : 50, // Interval color
                     ($this->boundToStringFunction)($intervals[$k][0]), // Interval start string value
                     ($this->boundToStringFunction)($intervals[$k][1]), // Interval end string value
-                    !empty($t) ? (isset($t[$k]) ? ($this->valueToStringFunction)($t[$k]) : null) : null,// Interval string value
+                    !empty($t) ? (isset($t[$k]) ? ($this->valueToStringFunction)($t[$k]) : null) : null, // Interval string value
                 ];
             }
         }, array_keys($values), $values);
@@ -330,8 +330,8 @@ 
         // Put isolated dates at the end and reset indices.
         // Reseting indices ensures the processed values are
         // serialized as correctly ordered JSON arrays.
-        usort($values, function ($i) {
-            return count($i) === 2 ?  1 : -1;
+        usort($values, function($i) {
+            return count($i) === 2 ? 1 : -1;
         });
 
         $this->values = $values;
@@ -355,7 +355,7 @@ 
         $flat = $this->calcNewIntervals($dates);
 
         // Remove empty interval generated when two or more intervals share a common date.
-        $flat = array_values(array_filter($flat, function ($i) {
+        $flat = array_values(array_filter($flat, function($i) {
             return $i[0] !== $i[1];
         }));
 
@@ -379,7 +379,7 @@ 
      */
     public static function extractDates(array &$intervals)
     {
-        $dates = array_filter($intervals, function ($interval) {
+        $dates = array_filter($intervals, function($interval) {
             return $interval[0] === $interval[1];
         });
 
@@ -404,7 +404,7 @@ 
             $dates[] = [$interval[1], isset($interval[2]) ? $interval[2] : null, '-', $key];
         }
         // Order the dates.
-        usort($dates, function (array $d1, array $d2) {
+        usort($dates, function(array $d1, array $d2) {
             return ($d1[0] < $d2[0]) ? -1 : 1;
         });
         return $dates;
@@ -419,7 +419,7 @@ 
     public function calcNewIntervals($dates)
     {
         // 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);
 

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;