Apply fixes from StyleCI

LibreNMS/Data/Graphing/AbstractGraph.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * AbstractGraph.php
  *
@@ -53,6 +54,7 @@ public function fill(array $vars): self
                 }
             }
         }
+
         return $this;
     }
 }

LibreNMS/Data/Graphing/Builders/MultiLineGraphBuilder.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * MultiLineGraphBuilder.php
  *
@@ -33,7 +34,7 @@
 {
     private string $unitText = '';
     private string $units = '';
     private string $totalUnits = '%';
     private string $colours = 'mixed';
     private ?float $scaleMin = null;
     private ?float $scaleMax = null;
@@ -45,48 +46,56 @@
     public function unitText(string $unitText): self
     {
         $this->unitText = $unitText;
+
         return $this;
     }
 
     public function units(string $units): self
     {
         $this->units = $units;
+
         return $this;
     }
 
     public function totalUnits(string $totalUnits): self
     {
         $this->totalUnits = $totalUnits;
+
         return $this;
     }
 
     public function colours(string $colours): self
     {
         $this->colours = $colours;
+
         return $this;
     }
 
     public function scaleMin(float $scaleMin): self
     {
         $this->scaleMin = $scaleMin;
+
         return $this;
     }
 
     public function scaleMax(float $scaleMax): self
     {
         $this->scaleMax = $scaleMax;
+
         return $this;
     }
 
     public function noTotal(bool $noTotal = true): self
     {
         $this->nototal = $noTotal;
+
         return $this;
     }
 
     public function descrLen(int $descrLen): self
     {
         $this->descrLen = $descrLen;
+
         return $this;
     }
 
@@ -108,6 +117,7 @@
             'areacolour' => $areaColour,
             'invert' => $invert,
         ];
+
         return $this;
     }
 

LibreNMS/Data/Graphing/Builders/MultiSimplexSeparatedGraphBuilder.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * MultiSimplexSeparatedGraphBuilder.php
  *
@@ -32,7 +33,7 @@
 class MultiSimplexSeparatedGraphBuilder
 {
     private string $unitText = '';
     private string $units = '';
     private string $totalUnits = '';
     private string $colours = 'mixed';
     private ?float $scaleMin = null;
@@ -48,66 +49,77 @@
     public function unitText(string $unitText): self
     {
         $this->unitText = $unitText;
+
         return $this;
     }
 
     public function units(string $units): self
     {
         $this->units = $units;
+
         return $this;
     }
 
     public function totalUnits(string $totalUnits): self
     {
         $this->totalUnits = $totalUnits;
+
         return $this;
     }
 
     public function colours(string $colours): self
     {
         $this->colours = $colours;
+
         return $this;
     }
 
     public function scaleMin(float $scaleMin): self
     {
         $this->scaleMin = $scaleMin;
+
         return $this;
     }
 
     public function scaleMax(float $scaleMax): self
     {
         $this->scaleMax = $scaleMax;
+
         return $this;
     }
 
     public function divider(float $divider): self
     {
         $this->divider = $divider;
+
         return $this;
     }
 
     public function multiplier(float $multiplier): self
     {
         $this->multiplier = $multiplier;
+
         return $this;
     }
 
     public function textOrig(bool $textOrig = true): self
     {
         $this->textOrig = $textOrig;
+
         return $this;
     }
 
     public function noTotal(bool $noTotal = true): self
     {
         $this->nototal = $noTotal;
+
         return $this;
     }
 
     public function descrLen(int $descrLen): self
     {
         $this->descrLen = $descrLen;
+
         return $this;
     }
 
@@ -123,6 +135,7 @@
             'descr' => $description,
             'colour' => $colour,
         ];
+
         return $this;
     }
 

LibreNMS/Data/Graphing/Device/ProcessorGraph.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * ProcessorGraph.php
  *
@@ -71,6 +72,7 @@ public function getRrdFiles(): array
         foreach ($this->processors as $proc) {
             $files[] = Rrd::name($this->device->hostname, ['processor', $proc->processor_type, $proc->processor_index]);
         }
+
         return $files;
     }
 

LibreNMS/Data/Graphing/GraphFactory.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * GraphFactory.php
  *
@@ -45,7 +46,7 @@ public function graphFor(string $name, array $vars = []): GraphInterface
         $vars['type'] ??= $name;
 
         // Look for a modern class, e.g. LibreNMS\Data\Graphing\Device\ProcessorSeparateGraph
-        $className = "LibreNMS\\Data\\Graphing\\" . ucfirst($type) . "\\" . \Illuminate\Support\Str::studly($subtype) . "Graph";
+        $className = 'LibreNMS\\Data\\Graphing\\' . ucfirst($type) . '\\' . \Illuminate\Support\Str::studly($subtype) . 'Graph';
         if (class_exists($className)) {
             return app($className, ['vars' => $vars]);
         }

LibreNMS/Data/Graphing/LegacyGraph.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * LegacyGraph.php
  *
@@ -29,6 +30,7 @@
 use App\Models\Device;
 use App\Models\Port;
 use LibreNMS\Exceptions\InvalidGraph;
+
 use function base_path;
 
 class LegacyGraph extends AbstractGraph
@@ -104,6 +106,7 @@ private function load(array $vars = []): void
 
         if (! $auth) {
             $this->loaded = true;
+
             return;
         }
 
@@ -145,19 +148,21 @@ private function load(array $vars = []): void
     public function authorize(): bool
     {
         $this->load();
+
         return $this->authorized;
     }
 
-
     public function definition(GraphParameters $graph_params): array
     {
         $this->load($graph_params->all());
+
         return $this->rrdOptions;
     }
 
     public function getPageTitle(): string
     {
         $this->load();
+
         return $this->pageTitle ?? $this->getGraphTitle();
     }
 
@@ -179,6 +184,7 @@ public function getGraphTitle(): string
     public function getRrdFiles(): array
     {
         $this->load();
+
         return $this->rrdFiles;
     }
 }

LibreNMS/Exceptions/InvalidGraph.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * InvalidGraph.php
  *
@@ -29,8 +30,8 @@
 
 class InvalidGraph extends RrdException
 {
-public function __construct(string $message = "", int $code = 0, ?Throwable $previous = null)
-{
-    parent::__construct($message ?: "Invalid Graph", $code, $previous);
-}
+    public function __construct(string $message = '', int $code = 0, ?Throwable $previous = null)
+    {
+        parent::__construct($message ?: 'Invalid Graph', $code, $previous);
+    }
 }

LibreNMS/Interfaces/Data/Graphing/GraphInterface.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * GraphInterface.php
  *
@@ -30,9 +31,14 @@
 interface GraphInterface
 {
     public function authorize(): bool;
+
     public function validation(): array;
+
     public function definition(GraphParameters $graph_params): array;
+
     public function getPageTitle(): string;
+
     public function getGraphTitle(): string;
+
     public function getRrdFiles(): array;
 }

app/Console/Commands/GraphDetail.php

@@ -21,14 +21,13 @@
             'device' => $device->device_id,
         ]);
 
         $this->line("Type: $graph->type");
         $this->line("Subtype: $graph->subtype");
         $this->line('Authorized: ' . ($graph->authorize() ? 'true' : 'false'));
-        $this->line("Graph Title: " . $graph->getGraphTitle());
-        $this->line("Page Title: " . substr($graph->getPageTitle(), 0, 80));
-        $this->line("Rrd Files: " . implode(', ', array_map(fn($f) => basename($f), $graph->getRrdFiles())));
-        $this->line("Definition: " . substr(implode(' ', $graph->definition()), 80));
-
+        $this->line('Graph Title: ' . $graph->getGraphTitle());
+        $this->line('Page Title: ' . substr($graph->getPageTitle(), 0, 80));
+        $this->line('Rrd Files: ' . implode(', ', array_map(fn ($f) => basename($f), $graph->getRrdFiles())));
+        $this->line('Definition: ' . substr(implode(' ', $graph->definition()), 80));
 
         return 0;
     }