Change SysInfo's supported method to static

MauricioFauth · MauricioFauth · commit a2456aa9a36f · 2022-05-30T15:51:55.000-03:00
Enables checking if a class is supported before creating a new instance.

Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/libraries/classes/Server/SysInfo/Base.php b/libraries/classes/Server/SysInfo/Base.php
@@ -41,7 +41,7 @@ public function memory()
     /**
      * Checks whether class is supported in this environment
      */
-    public function supported(): bool
+    public static function isSupported(): bool
     {
         return true;
     }
diff --git a/libraries/classes/Server/SysInfo/Linux.php b/libraries/classes/Server/SysInfo/Linux.php
@@ -66,7 +66,7 @@ public function loadavg()
     /**
      * Checks whether class is supported in this environment
      */
-    public function supported(): bool
+    public static function isSupported(): bool
     {
         return @is_readable('/proc/meminfo') && @is_readable('/proc/stat');
     }
diff --git a/libraries/classes/Server/SysInfo/SunOs.php b/libraries/classes/Server/SysInfo/SunOs.php
@@ -57,7 +57,7 @@ public function loadavg()
     /**
      * Checks whether class is supported in this environment
      */
-    public function supported(): bool
+    public static function isSupported(): bool
     {
         return @is_readable('/proc/meminfo');
     }
diff --git a/libraries/classes/Server/SysInfo/SysInfo.php b/libraries/classes/Server/SysInfo/SysInfo.php
@@ -52,23 +52,20 @@ public static function get()
 
         switch ($php_os) {
             case 'Linux':
-                $sysInfo = new Linux();
-                if ($sysInfo->supported()) {
-                    return $sysInfo;
+                if (Linux::isSupported()) {
+                    return new Linux();
                 }
 
                 break;
             case 'WINNT':
-                $sysInfo = new WindowsNt();
-                if ($sysInfo->supported()) {
-                    return $sysInfo;
+                if (WindowsNt::isSupported()) {
+                    return new WindowsNt();
                 }
 
                 break;
             case 'SunOS':
-                $sysInfo = new SunOs();
-                if ($sysInfo->supported()) {
-                    return $sysInfo;
+                if (SunOs::isSupported()) {
+                    return new SunOs();
                 }
 
                 break;
diff --git a/libraries/classes/Server/SysInfo/WindowsNt.php b/libraries/classes/Server/SysInfo/WindowsNt.php
@@ -41,7 +41,7 @@ public function __construct()
          * @see https://docs.microsoft.com/en-us/windows/win32/wmisdk/swbemlocator
          * @see https://docs.microsoft.com/en-us/windows/win32/wmisdk/swbemservices
          *
-         * @psalm-suppress MixedAssignment, UndefinedMagicMethod
+         * @psalm-suppress MixedAssignment, UndefinedMagicMethod, MixedMethodCall
          */
         $this->wmiService = (new com('WbemScripting.SWbemLocator'))->ConnectServer();
     }
@@ -59,9 +59,9 @@ public function loadavg()
     /**
      * Checks whether class is supported in this environment
      */
-    public function supported(): bool
+    public static function isSupported(): bool
     {
-        return $this->wmiService !== null;
+        return class_exists('com');
     }
 
     /**
diff --git a/test/classes/Server/SysInfo/SysInfoTest.php b/test/classes/Server/SysInfo/SysInfoTest.php
@@ -67,6 +67,6 @@ public function testGetSysInfo(): void
      */
     public function testGetSysInfoSupported(): void
     {
-        $this->assertTrue(SysInfo::get()->supported());
+        $this->assertTrue(SysInfo::get()::isSupported());
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public function memory()`
`41`	`41`	`/**`
`42`	`42`	`* Checks whether class is supported in this environment`
`43`	`43`	`*/`
`44`		`- public function supported(): bool`
	`44`	`+ public static function isSupported(): bool`
`45`	`45`	`{`
`46`	`46`	`return true;`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public function loadavg()`
`66`	`66`	`/**`
`67`	`67`	`* Checks whether class is supported in this environment`
`68`	`68`	`*/`
`69`		`- public function supported(): bool`
	`69`	`+ public static function isSupported(): bool`
`70`	`70`	`{`
`71`	`71`	`return @is_readable('/proc/meminfo') && @is_readable('/proc/stat');`
`72`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public function loadavg()`
`57`	`57`	`/**`
`58`	`58`	`* Checks whether class is supported in this environment`
`59`	`59`	`*/`
`60`		`- public function supported(): bool`
	`60`	`+ public static function isSupported(): bool`
`61`	`61`	`{`
`62`	`62`	`return @is_readable('/proc/meminfo');`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public function __construct()`
`41`	`41`	`* @see https://docs.microsoft.com/en-us/windows/win32/wmisdk/swbemlocator`
`42`	`42`	`* @see https://docs.microsoft.com/en-us/windows/win32/wmisdk/swbemservices`
`43`	`43`	`*`
`44`		`- * @psalm-suppress MixedAssignment, UndefinedMagicMethod`
	`44`	`+ * @psalm-suppress MixedAssignment, UndefinedMagicMethod, MixedMethodCall`
`45`	`45`	`*/`
`46`	`46`	`$this->wmiService = (new com('WbemScripting.SWbemLocator'))->ConnectServer();`
`47`	`47`	`}`
`@@ -59,9 +59,9 @@ public function loadavg()`
`59`	`59`	`/**`
`60`	`60`	`* Checks whether class is supported in this environment`
`61`	`61`	`*/`
`62`		`- public function supported(): bool`
	`62`	`+ public static function isSupported(): bool`
`63`	`63`	`{`
`64`		`- return $this->wmiService !== null;`
	`64`	`+ return class_exists('com');`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,6 @@ public function testGetSysInfo(): void`
`67`	`67`	`*/`
`68`	`68`	`public function testGetSysInfoSupported(): void`
`69`	`69`	`{`
`70`		`- $this->assertTrue(SysInfo::get()->supported());`
	`70`	`+ $this->assertTrue(SysInfo::get()::isSupported());`
`71`	`71`	`}`
`72`	`72`	`}`