Revert ioutil.ReadAll migration (#10)

.github/workflows/test-unit.yml

@@ -21,7 +21,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [ 1.16.x, 1.17.x, 1.18.x, 1.19.x ]
+        go-version: [ 1.13.x, 1.14.x, 1.15.x, 1.16.x, 1.17.x, 1.18.x, 1.19.x ]
     runs-on: ubuntu-latest
     steps:
       - name: Install Go stable

.golangci.yml

@@ -52,6 +52,10 @@ linters:
 issues:
   exclude-use-default: false
   exclude-rules:
+    - linters:
+        - staticcheck
+      path: ".go"
+      text: "\"io/ioutil\" has been deprecated since Go 1.16" # Keeping backwards compatibility with go1.13.
     - linters:
         - gomnd
         - goconst

client.go

@@ -7,6 +7,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"io/ioutil"
 	"net/http"
 	"net/http/cookiejar"
 	"net/url"
@@ -230,7 +231,7 @@ func (c *Client) do() (err error) {
 				return
 			}
 
-			body, er := io.ReadAll(resp.Body)
+			body, er := ioutil.ReadAll(resp.Body)
 			if er != nil {
 				return
 			}

client_test.go

@@ -3,7 +3,7 @@ package httpmock_test
 import (
 	"context"
 	"errors"
-	"io"
+	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
 	"sync/atomic"
@@ -18,7 +18,7 @@ func TestNewClient(t *testing.T) {
 	cnt := int64(0)
 	srv := httptest.NewServer(http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
 		assert.Equal(t, "/foo?q=1", r.URL.String())
-		b, err := io.ReadAll(r.Body)
+		b, err := ioutil.ReadAll(r.Body)
 		assert.NoError(t, err)
 		assert.Equal(t, `{"foo":"bar"}`, string(b))
 		assert.Equal(t, "application/json", r.Header.Get("Content-Type"))

server.go

@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io"
+	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
 	"sync"
@@ -191,7 +191,7 @@ func (sm *Server) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
 	}
 
 	if len(sm.expectations) == 0 {
-		body, err := io.ReadAll(req.Body)
+		body, err := ioutil.ReadAll(req.Body)
 		if err == nil && len(body) > 0 {
 			if sm.OnBodyMismatch != nil {
 				sm.OnBodyMismatch(body)
@@ -285,7 +285,7 @@ func (sm *Server) checkRequest(req *http.Request, expectation Expectation) error
 		}
 	}
 
-	reqBody, err := io.ReadAll(req.Body)
+	reqBody, err := ioutil.ReadAll(req.Body)
 	if err != nil {
 		return err
 	}

server_test.go

@@ -3,6 +3,7 @@ package httpmock_test
 import (
 	"bytes"
 	"io"
+	"io/ioutil"
 	"net/http"
 	"strings"
 	"sync"
@@ -37,7 +38,7 @@ func assertRoundTrip(t *testing.T, baseURL string, expectation httpmock.Expectat
 	resp, err := http.DefaultTransport.RoundTrip(req)
 	require.NoError(t, err)
 
-	body, err := io.ReadAll(resp.Body)
+	body, err := ioutil.ReadAll(resp.Body)
 	require.NoError(t, resp.Body.Close())
 	require.NoError(t, err)
 
@@ -160,7 +161,7 @@ func TestServer_ServeHTTP_error(t *testing.T) {
 	resp, err := http.DefaultTransport.RoundTrip(req)
 	require.NoError(t, err)
 
-	respBody, err := io.ReadAll(resp.Body)
+	respBody, err := ioutil.ReadAll(resp.Body)
 	require.NoError(t, resp.Body.Close())
 	require.NoError(t, err)
 
@@ -175,7 +176,7 @@ func TestServer_ServeHTTP_error(t *testing.T) {
 	resp, err = http.DefaultTransport.RoundTrip(req)
 	require.NoError(t, err)
 
-	respBody, err = io.ReadAll(resp.Body)
+	respBody, err = ioutil.ReadAll(resp.Body)
 	require.NoError(t, resp.Body.Close())
 	require.NoError(t, err)
 
@@ -190,7 +191,7 @@ func TestServer_ServeHTTP_error(t *testing.T) {
 	resp, err = http.DefaultTransport.RoundTrip(req)
 	require.NoError(t, err)
 
-	respBody, err = io.ReadAll(resp.Body)
+	respBody, err = ioutil.ReadAll(resp.Body)
 	require.NoError(t, resp.Body.Close())
 	require.NoError(t, err)
 
@@ -205,7 +206,7 @@ func TestServer_ServeHTTP_error(t *testing.T) {
 	resp, err = http.DefaultTransport.RoundTrip(req)
 	require.NoError(t, err)
 
-	respBody, err = io.ReadAll(resp.Body)
+	respBody, err = ioutil.ReadAll(resp.Body)
 	require.NoError(t, resp.Body.Close())
 	require.NoError(t, err)
 
@@ -249,7 +250,7 @@ func TestServer_ServeHTTP_concurrency(t *testing.T) {
 			resp, err := http.DefaultTransport.RoundTrip(req)
 			require.NoError(t, err)
 
-			respBody, err := io.ReadAll(resp.Body)
+			respBody, err := ioutil.ReadAll(resp.Body)
 			require.NoError(t, resp.Body.Close())
 			require.NoError(t, err)
 
@@ -300,7 +301,7 @@ func TestServer_vars(t *testing.T) {
 	resp, err := http.DefaultTransport.RoundTrip(req)
 	require.NoError(t, err)
 
-	body, err := io.ReadAll(resp.Body)
+	body, err := ioutil.ReadAll(resp.Body)
 	require.NoError(t, err)
 
 	require.NoError(t, resp.Body.Close())
@@ -339,7 +340,7 @@ func TestServer_ExpectAsync(t *testing.T) {
 		resp, err := http.DefaultTransport.RoundTrip(req)
 		require.NoError(t, err)
 
-		body, err := io.ReadAll(resp.Body)
+		body, err := ioutil.ReadAll(resp.Body)
 		require.NoError(t, err)
 
 		require.NoError(t, resp.Body.Close())
@@ -356,7 +357,7 @@ func TestServer_ExpectAsync(t *testing.T) {
 			resp, err := http.DefaultTransport.RoundTrip(req)
 			require.NoError(t, err)
 
-			body, err := io.ReadAll(resp.Body)
+			body, err := ioutil.ReadAll(resp.Body)
 			require.NoError(t, err)
 
 			require.NoError(t, resp.Body.Close())
@@ -370,7 +371,7 @@ func TestServer_ExpectAsync(t *testing.T) {
 	resp, err := http.DefaultTransport.RoundTrip(req)
 	require.NoError(t, err)
 
-	body, err := io.ReadAll(resp.Body)
+	body, err := ioutil.ReadAll(resp.Body)
 	require.NoError(t, err)
 
 	require.NoError(t, resp.Body.Close())