Fix tests

Author: denpamusic

.github/workflows/ci.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-version: ['7.4', '8.0', '8.1']
+        php-version: ['8.0', '8.1']
 
     steps:
     - uses: actions/checkout@v2
@@ -18,15 +18,21 @@ jobs:
       uses: shivammathur/setup-php@v2
       with:
         php-version: ${{ matrix.php-version }}
-        tools: phpunit
+        tools: composer
       env:
         COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+    - name: Install dependencies
+      run: |
+        composer self-update
+        composer install --prefer-source --no-interaction
+
     - name: Run tests
-      run: phpunit
+      run: vendor/bin/phpunit
 
     - uses: paambaati/codeclimate-action@v3.0.0
       env:
         CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
       with:
-        coverageLocation: ${{github.workspace}}/clover.xml:clover
+        coverageLocations: |
+          ${{github.workspace}}/clover.xml:clover

composer.json

@@ -8,16 +8,16 @@
     "authors": [
         {
             "name": "Denis Paavilainen",
-            "email": "denpa@netfleet.space",
+            "email": "denpa@denpa.pro",
             "role": "Developer"
         }
     ],
     "require": {
         "php": ">=7.1",
-        "guzzlehttp/guzzle": "^6.5 | ^7.0"
+        "guzzlehttp/guzzle": "^7.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.0 | ^8.0"
+        "phpunit/phpunit": "^9.5"
     },
     "autoload": {
         "psr-4" : {

phpunit.xml.dist

@@ -1,28 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit
-    backupGlobals="false"
-    backupStaticAttributes="false"
-    bootstrap="vendor/autoload.php"
-    colors="true"
-    convertErrorsToExceptions="true"
-    convertNoticesToExceptions="true"
-    convertWarningsToExceptions="true"
-    processIsolation="false"
-    stopOnError="false"
-    stopOnFailure="false"
-    verbose="true"
->
-    <testsuites>
-        <testsuite name="Bitcoin API Test Suite">
-            <directory>tests</directory>
-        </testsuite>
-    </testsuites>
-	<filter>
-		<whitelist processUncoveredFilesFromWhitelist="true">
-			<directory suffix=".php">src</directory>
-		</whitelist>
-	</filter>
-	<logging>
-		<log type="coverage-clover" target="clover.xml"/>
-	</logging>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" bootstrap="vendor/autoload.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnError="false" stopOnFailure="false" verbose="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage processUncoveredFiles="true">
+    <include>
+      <directory suffix=".php">src</directory>
+    </include>
+    <report>
+      <clover outputFile="clover.xml"/>
+    </report>
+  </coverage>
+  <testsuites>
+    <testsuite name="Bitcoin API Test Suite">
+      <directory>tests</directory>
+    </testsuite>
+  </testsuites>
+  <logging/>
 </phpunit>

src/Responses/BitcoindResponse.php

@@ -11,7 +11,6 @@
 class BitcoindResponse extends Response implements
     \ArrayAccess,
     \Countable,
-    \Serializable,
     \JsonSerializable
 {
     use Collection;

src/Traits/Message.php

@@ -11,9 +11,9 @@ trait Message
     /**
      * Retrieves the HTTP protocol version as a string.
      *
-     * @return float
+     * @return string
      */
-    public function getProtocolVersion(): float
+    public function getProtocolVersion(): string
     {
         return $this->response->getProtocolVersion();
     }

src/Traits/SerializableContainer.php

@@ -6,28 +6,6 @@
 
 trait SerializableContainer
 {
-    /**
-     * Returns the string representation of the object.
-     *
-     * @return string
-     */
-    public function serialize(): string
-    {
-        return serialize($this->toContainer());
-    }
-
-    /**
-     * Constructs object from serialized string.
-     *
-     * @param string $serialized
-     *
-     * @return void
-     */
-    public function unserialize($serialized): void
-    {
-        $this->container = unserialize($serialized);
-    }
-
     /**
      * Returns array containing all the necessary state of the object.
      *

tests/Responses/BitcoindResponseTest.php

@@ -470,10 +470,10 @@ public function testCountOnNonArray(): void
      */
     public function testProtocolVersion(): void
     {
-        $response = $this->response->withProtocolVersion(1.0);
+        $response = $this->response->withProtocolVersion('1.1');
         $protocolVersion = $response->getProtocolVersion();
 
-        $this->assertEquals('1.0', $protocolVersion);
+        $this->assertEquals('1.1', $protocolVersion);
     }
 
     /**
@@ -557,14 +557,13 @@ public function testBody(): void
      */
     public function testSerialize(): void
     {
-        $serializedContainer = serialize($this->response->toContainer());
+        $serializedContainer = serialize($this->response->__serialize());
 
         $serialized = sprintf(
-            'C:%u:"%s":%u:{%s}',
+            'O:%u:"%s":1:{%s}',
             strlen(BitcoindResponse::class),
             BitcoindResponse::class,
-            strlen($serializedContainer),
-            $serializedContainer
+            substr($serializedContainer, 5, (strlen($serializedContainer) - 6))
         );
 
         $this->assertEquals(