From 7237c0f8034111d99a326246480ec3cff6c39d25 Mon Sep 17 00:00:00 2001
From: terrafrost <terrafrost@gmail.com>
Date: Sat, 12 Dec 2020 19:34:38 -0600
Subject: [PATCH] fix bad merge

---
 tests/Functional/Net/SSH2Test.php        | 2 +-
 tests/Unit/Crypt/RSA/LoadKeyTest.php     | 1 -
 tests/Unit/Math/BigInteger/PHP64Test.php | 2 +-
 travis/run-phpunit.sh                    | 2 ++
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/Functional/Net/SSH2Test.php b/tests/Functional/Net/SSH2Test.php
index 4b996b10..a5c437dd 100644
--- a/tests/Functional/Net/SSH2Test.php
+++ b/tests/Functional/Net/SSH2Test.php
@@ -14,7 +14,7 @@ class Functional_Net_SSH2Test extends PhpseclibFunctionalTestCase
     {
         $ssh = new SSH2($this->getEnv('SSH_HOSTNAME'));
 
-        $this->assertIsObject
+        $this->assertIsObject(
             $ssh,
             'Could not construct NET_SSH2 object.'
         );
diff --git a/tests/Unit/Crypt/RSA/LoadKeyTest.php b/tests/Unit/Crypt/RSA/LoadKeyTest.php
index 2c04e2b3..c773d581 100644
--- a/tests/Unit/Crypt/RSA/LoadKeyTest.php
+++ b/tests/Unit/Crypt/RSA/LoadKeyTest.php
@@ -574,7 +574,6 @@ mKVKf5kPx2aR2W2KAcgw3TJIu1QX7N+l3kFrf9Owtz1a
 -----END ENCRYPTED PRIVATE KEY-----';
         $pass = 'asdf';
 
-<<<<<<< HEAD
         $this->pkcs8tester($key, $pass);
     }
 
diff --git a/tests/Unit/Math/BigInteger/PHP64Test.php b/tests/Unit/Math/BigInteger/PHP64Test.php
index c44af643..13995a76 100644
--- a/tests/Unit/Math/BigInteger/PHP64Test.php
+++ b/tests/Unit/Math/BigInteger/PHP64Test.php
@@ -36,6 +36,6 @@ class Unit_Math_BigInteger_PHP64Test extends Unit_Math_BigInteger_TestCase
     }
 }
 
-classs PHP64Test extends Unit_Math_BigInteger_PHP64Test
+class PHP64Test extends Unit_Math_BigInteger_PHP64Test
 {
 }
diff --git a/travis/run-phpunit.sh b/travis/run-phpunit.sh
index 2b1d90cc..7e79c46e 100755
--- a/travis/run-phpunit.sh
+++ b/travis/run-phpunit.sh
@@ -27,6 +27,8 @@ then
     find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/n tearDown()/n tearDown(): void/g'
     find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/\(n assertIsArray([^)]*)\)/\1: void/g'
     find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/\(n assertIsString([^)]*)\)/\1: void/g'
+    find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/\(n assertIsResource([^)]*)\)/\1: void/g'
+    find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/\(n assertIsObject([^)]*)\)/\1: void/g'
     find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/\(n assertStringContainsString([^)]*)\)/\1: void/g'
     find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/\(n assertStringNotContainsString([^)]*)\)/\1: void/g'
 fi