silly

Author: murrant

LibreNMS/Data/Graphing/Builders/MultiLineGraphBuilder.php

@@ -111,9 +111,8 @@ public function addDataset(
         return $this;
     }
 
-    public function build(array $vars): array
+    public function build(GraphParameters $graph_params): array
     {
-        $graph_params = new GraphParameters($vars);
         $float_precision = $graph_params->float_precision;
 
         if ($this->scaleMin !== null) {

LibreNMS/Data/Graphing/Builders/MultiSimplexSeparatedGraphBuilder.php

@@ -126,9 +126,8 @@ public function addDataset(
         return $this;
     }
 
-    public function build(array $vars): array
+    public function build(GraphParameters $graph_params): array
     {
-        $graph_params = new GraphParameters($vars);
         $float_precision = $graph_params->float_precision;
 
         if ($this->scaleMin !== null) {

LibreNMS/Data/Graphing/Device/ProcessorGraph.php

@@ -34,6 +34,7 @@
 use LibreNMS\Data\Graphing\AbstractGraph;
 use LibreNMS\Data\Graphing\Builders\MultiLineGraphBuilder;
 use LibreNMS\Data\Graphing\Builders\MultiSimplexSeparatedGraphBuilder;
+use LibreNMS\Data\Graphing\GraphParameters;
 
 class ProcessorGraph extends AbstractGraph
 {
@@ -73,14 +74,12 @@ public function getRrdFiles(): array
         return $files;
     }
 
-    public function definition(array $vars = []): array
+    public function definition(GraphParameters $graph_params): array
     {
         if ($this->processors->isEmpty()) {
             throw new \LibreNMS\Exceptions\RrdGraphException('No Processors');
         }
 
-        $vars = array_merge($this->vars, $vars);
-
         // Filter valid datasets and run checkRrdExists exactly once per processor
         $valid_datasets = [];
         foreach ($this->processors as $proc) {
@@ -111,7 +110,7 @@ public function definition(array $vars = []): array
                 $builder->addDataset($dataset['filename'], 'usage', $dataset['descr']);
             }
 
-            return $builder->build($vars);
+            return $builder->build($graph_params);
         }
 
         $builder = (new MultiLineGraphBuilder())
@@ -127,6 +126,6 @@ public function definition(array $vars = []): array
             $builder->addDataset($dataset['filename'], 'usage', $dataset['descr'], area: true);
         }
 
-        return $builder->build($vars);
+        return $builder->build($graph_params);
     }
 }

LibreNMS/Data/Graphing/LegacyGraph.php

@@ -67,7 +67,7 @@ public function __construct(
 
     private function load(array $vars = []): void
     {
-        if ($this->loaded && empty($vars)) {
+        if ($this->loaded) {
             return;
         }
 
@@ -107,7 +107,7 @@ private function load(array $vars = []): void
             return;
         }
 
-        $graph_params = new GraphParameters($vars);
+        $graph_params = app()->bound(GraphParameters::class) ? app(GraphParameters::class) : new GraphParameters($this->vars);
         $type = $graph_params->type;
         $subtype = $graph_params->subtype;
         $height = $graph_params->height;
@@ -149,9 +149,9 @@ public function authorize(): bool
     }
 
 
-    public function definition(array $vars = []): array
+    public function definition(GraphParameters $graph_params): array
     {
-        $this->load($vars);
+        $this->load($graph_params->all());
         return $this->rrdOptions;
     }
 

LibreNMS/Interfaces/Data/Graphing/GraphInterface.php

@@ -25,11 +25,13 @@
 
 namespace LibreNMS\Interfaces\Data\Graphing;
 
+use LibreNMS\Data\Graphing\GraphParameters;
+
 interface GraphInterface
 {
     public function authorize(): bool;
     public function validation(): array;
-    public function definition(array $vars = []): array;
+    public function definition(GraphParameters $graph_params): array;
     public function getPageTitle(): string;
     public function getGraphTitle(): string;
     public function getRrdFiles(): array;

LibreNMS/Util/Graph.php

@@ -110,6 +110,7 @@ public static function get(array|string $vars): GraphImage
         }
 
         $graph_params = new GraphParameters($vars);
+        app()->instance(GraphParameters::class, $graph_params);
         $name = $graph_params->type . '_' . $graph_params->subtype;
 
         /** @var GraphFactory $factory */
@@ -133,7 +134,7 @@ public static function get(array|string $vars): GraphImage
             throw new RrdGraphException('No Authorization', 'No Auth', $graph_params->width, $graph_params->height);
         }
 
-        $rrd_options = $graph->definition($vars);
+        $rrd_options = $graph->definition($graph_params);
 
         if (empty($rrd_options)) {
             throw new RrdGraphException('Graph Definition Error', 'Def Error', $graph_params->width, $graph_params->height);