Refactor metrics to autopopulate

DivineOmega · DivineOmega · commit 94d3effb6a53 · 2019-08-10T21:12:19.000+01:00
diff --git a/src/Metrics.php b/src/Metrics.php
@@ -45,7 +45,7 @@ public function __construct(Server $server)
     public function all(): array
     {
         return array_map(function($metricClass) {
-            return $this->get($metricClass);
+            return new $metricClass($this->server);
         }, self::METRIC_CLASSES);
     }
 
@@ -60,12 +60,4 @@ public function toArray()
         return $values;
     }
 
-    public function get(string $metricClass = null): MetricInterface
-    {
-        /** @var MetricInterface $metric */
-        $metric = new $metricClass($this->server);
-        $metric->populate();
-
-        return $metric;
-    }
 }
diff --git a/src/Metrics/ActiveHttpConnection.php b/src/Metrics/ActiveHttpConnection.php
@@ -2,10 +2,7 @@
 
 namespace DivineOmega\ServerInfo\Metrics;
 
-use DivineOmega\ServerInfo\Interfaces\MetricInterface;
-use DivineOmega\ServerInfo\Server;
-
-class ActiveHttpConnection extends BaseMetric implements MetricInterface
+class ActiveHttpConnection extends BaseMetric
 {
     public function populate()
     {
diff --git a/src/Metrics/ApacheServerRunning.php b/src/Metrics/ApacheServerRunning.php
@@ -2,10 +2,7 @@
 
 namespace DivineOmega\ServerInfo\Metrics;
 
-use DivineOmega\ServerInfo\Interfaces\MetricInterface;
-use DivineOmega\ServerInfo\Server;
-
-class ApacheServerRunning extends BaseMetric implements MetricInterface
+class ApacheServerRunning extends BaseMetric
 {
     public function populate()
     {
diff --git a/src/Metrics/BaseMetric.php b/src/Metrics/BaseMetric.php
@@ -13,6 +13,7 @@ abstract class BaseMetric implements MetricInterface
     public function __construct(Server $server)
     {
         $this->connection = $server->connection();
+        $this->populate();
     }
 
     public function getValue()
diff --git a/src/Metrics/DiskUsagePercentage.php b/src/Metrics/DiskUsagePercentage.php
@@ -2,11 +2,7 @@
 
 namespace DivineOmega\ServerInfo\Metrics;
 
-use DivineOmega\ServerInfo\Interfaces\MetricInterface;
-use DivineOmega\ServerInfo\Server;
-use phpseclib\Crypt\Base;
-
-class DiskUsagePercentage extends BaseMetric implements MetricInterface
+class DiskUsagePercentage extends BaseMetric
 {
     public function populate()
     {
diff --git a/src/Metrics/Hostname.php b/src/Metrics/Hostname.php
@@ -2,10 +2,7 @@
 
 namespace DivineOmega\ServerInfo\Metrics;
 
-use DivineOmega\ServerInfo\Interfaces\MetricInterface;
-use DivineOmega\ServerInfo\Server;
-
-class Hostname extends BaseMetric implements MetricInterface
+class Hostname extends BaseMetric
 {
     public function populate()
     {
diff --git a/src/Metrics/LoadAverages.php b/src/Metrics/LoadAverages.php
@@ -2,10 +2,7 @@
 
 namespace DivineOmega\ServerInfo\Metrics;
 
-use DivineOmega\ServerInfo\Interfaces\MetricInterface;
-use DivineOmega\ServerInfo\Server;
-
-class LoadAverages extends BaseMetric implements MetricInterface
+class LoadAverages extends BaseMetric
 {
     public function populate()
     {
diff --git a/src/Metrics/MemoryUsagePercentage.php b/src/Metrics/MemoryUsagePercentage.php
@@ -2,10 +2,7 @@
 
 namespace DivineOmega\ServerInfo\Metrics;
 
-use DivineOmega\ServerInfo\Interfaces\MetricInterface;
-use DivineOmega\ServerInfo\Server;
-
-class MemoryUsagePercentage extends BaseMetric implements MetricInterface
+class MemoryUsagePercentage extends BaseMetric
 {
     public function populate()
     {
diff --git a/src/Metrics/MySqlServerRunning.php b/src/Metrics/MySqlServerRunning.php
@@ -2,10 +2,7 @@
 
 namespace DivineOmega\ServerInfo\Metrics;
 
-use DivineOmega\ServerInfo\Interfaces\MetricInterface;
-use DivineOmega\ServerInfo\Server;
-
-class MySqlServerRunning extends BaseMetric implements MetricInterface
+class MySqlServerRunning extends BaseMetric
 {
     public function populate()
     {
diff --git a/src/Metrics/NginxServerRunning.php b/src/Metrics/NginxServerRunning.php
@@ -2,10 +2,7 @@
 
 namespace DivineOmega\ServerInfo\Metrics;
 
-use DivineOmega\ServerInfo\Interfaces\MetricInterface;
-use DivineOmega\ServerInfo\Server;
-
-class NginxServerRunning extends BaseMetric implements MetricInterface
+class NginxServerRunning extends BaseMetric
 {
     public function populate()
     {
diff --git a/src/Metrics/SwapUsagePercentage.php b/src/Metrics/SwapUsagePercentage.php
@@ -2,10 +2,7 @@
 
 namespace DivineOmega\ServerInfo\Metrics;
 
-use DivineOmega\ServerInfo\Interfaces\MetricInterface;
-use DivineOmega\ServerInfo\Server;
-
-class SwapUsagePercentage extends BaseMetric implements MetricInterface
+class SwapUsagePercentage extends BaseMetric
 {
     public function populate()
     {
diff --git a/src/Metrics/TotalDiskSpaceBytes.php b/src/Metrics/TotalDiskSpaceBytes.php
@@ -2,10 +2,7 @@
 
 namespace DivineOmega\ServerInfo\Metrics;
 
-use DivineOmega\ServerInfo\Interfaces\MetricInterface;
-use DivineOmega\ServerInfo\Server;
-
-class TotalDiskSpaceBytes extends BaseMetric implements MetricInterface
+class TotalDiskSpaceBytes extends BaseMetric
 {
     public function populate()
     {
diff --git a/src/Metrics/TotalMemoryBytes.php b/src/Metrics/TotalMemoryBytes.php
@@ -2,10 +2,7 @@
 
 namespace DivineOmega\ServerInfo\Metrics;
 
-use DivineOmega\ServerInfo\Interfaces\MetricInterface;
-use DivineOmega\ServerInfo\Server;
-
-class TotalMemoryBytes extends BaseMetric implements MetricInterface
+class TotalMemoryBytes extends BaseMetric
 {
     public function populate()
     {
diff --git a/src/Metrics/TotalSwapBytes.php b/src/Metrics/TotalSwapBytes.php
@@ -2,10 +2,7 @@
 
 namespace DivineOmega\ServerInfo\Metrics;
 
-use DivineOmega\ServerInfo\Interfaces\MetricInterface;
-use DivineOmega\ServerInfo\Server;
-
-class TotalSwapBytes extends BaseMetric implements MetricInterface
+class TotalSwapBytes extends BaseMetric
 {
     public function populate()
     {
diff --git a/src/Metrics/Uptime.php b/src/Metrics/Uptime.php
@@ -2,10 +2,7 @@
 
 namespace DivineOmega\ServerInfo\Metrics;
 
-use DivineOmega\ServerInfo\Interfaces\MetricInterface;
-use DivineOmega\ServerInfo\Server;
-
-class Uptime extends BaseMetric implements MetricInterface
+class Uptime extends BaseMetric
 {
     public function populate()
     {

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public function __construct(Server $server)`
`45`	`45`	`public function all(): array`
`46`	`46`	`{`
`47`	`47`	`return array_map(function($metricClass) {`
`48`		`- return $this->get($metricClass);`
	`48`	`+ return new $metricClass($this->server);`
`49`	`49`	`}, self::METRIC_CLASSES);`
`50`	`50`	`}`
`51`	`51`
`@@ -60,12 +60,4 @@ public function toArray()`
`60`	`60`	`return $values;`
`61`	`61`	`}`
`62`	`62`
`63`		`- public function get(string $metricClass = null): MetricInterface`
`64`		`- {`
`65`		`- /** @var MetricInterface $metric */`
`66`		`- $metric = new $metricClass($this->server);`
`67`		`- $metric->populate();`
`68`		`-`
`69`		`- return $metric;`
`70`		`- }`
`71`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace DivineOmega\ServerInfo\Metrics;`
`4`	`4`
`5`		`-use DivineOmega\ServerInfo\Interfaces\MetricInterface;`
`6`		`-use DivineOmega\ServerInfo\Server;`
`7`		`-`
`8`		`-class ActiveHttpConnection extends BaseMetric implements MetricInterface`
	`5`	`+class ActiveHttpConnection extends BaseMetric`
`9`	`6`	`{`
`10`	`7`	`public function populate()`
`11`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ abstract class BaseMetric implements MetricInterface`
`13`	`13`	`public function __construct(Server $server)`
`14`	`14`	`{`
`15`	`15`	`$this->connection = $server->connection();`
	`16`	`+ $this->populate();`
`16`	`17`	`}`
`17`	`18`
`18`	`19`	`public function getValue()`
Original file line number	Diff line number	Diff line change
`@@ -2,11 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace DivineOmega\ServerInfo\Metrics;`
`4`	`4`
`5`		`-use DivineOmega\ServerInfo\Interfaces\MetricInterface;`
`6`		`-use DivineOmega\ServerInfo\Server;`
`7`		`-use phpseclib\Crypt\Base;`
`8`		`-`
`9`		`-class DiskUsagePercentage extends BaseMetric implements MetricInterface`
	`5`	`+class DiskUsagePercentage extends BaseMetric`
`10`	`6`	`{`
`11`	`7`	`public function populate()`
`12`	`8`	`{`