put back checks to please phpunit

Author: simonLeary42

resources/lib/UnitySite.php

@@ -52,6 +52,16 @@ public static function getGithubKeys($username)
 
     public static function testValidSSHKey($key_str)
     {
+        // https://github.com/phpseclib/phpseclib/issues/2077
+        // key loader still throws exception, this just mutes a warning for phpunit
+        if (preg_match("/^[0-9]+$/", $key_str)) {
+            return false;
+        }
+        // https://github.com/phpseclib/phpseclib/issues/2076
+        // key loader still throws exception, this just mutes a warning for phpunit
+        if (!is_null(@json_decode($key_str))) {
+            return false;
+        }
         try {
             PublicKeyLoader::load($key_str);
             return true;

test/unit/UnitySiteTest.php

@@ -27,14 +27,6 @@ public static function SSHKeyProvider()
     public function testTestValidSSHKey(bool $expected, string $key)
     {
         $SITE = new UnitySite();
-        // https://github.com/phpseclib/phpseclib/issues/2077
-        if (preg_match("/^[0-9]+$/", $key)) {
-            $this->expectWarning();
-        }
-        // https://github.com/phpseclib/phpseclib/issues/2076
-        if (!is_null(@json_decode($key))) {
-            $this->expectWarning();
-        }
         $this->assertEquals($expected, $SITE->testValidSSHKey($key));
     }