diff options
| -rw-r--r-- | .github/workflows/ci-build.yml | 2 | ||||
| -rw-r--r-- | bors.toml | 4 | ||||
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | service/http/handler_test.go | 12 |
4 files changed, 13 insertions, 7 deletions
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 4e2dc069..930d1c17 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -9,7 +9,7 @@ jobs: strategy: fail-fast: false matrix: - php: [7.2, 7.3, 7.4] + php: [7.3, 7.4, 8.0] go: [1.14, 1.15] os: [ubuntu-latest] env: @@ -1,10 +1,10 @@ status = [ -'Build (PHP 7.2, Go 1.15, OS ubuntu-latest)', -'Build (PHP 7.2, Go 1.14, OS ubuntu-latest)', 'Build (PHP 7.3, Go 1.15, OS ubuntu-latest)', 'Build (PHP 7.3, Go 1.14, OS ubuntu-latest)', 'Build (PHP 7.4, Go 1.15, OS ubuntu-latest)', 'Build (PHP 7.4, Go 1.14, OS ubuntu-latest)', +'Build (PHP 8, Go 1.15, OS ubuntu-latest)', +'Build (PHP 8, Go 1.14, OS ubuntu-latest)', 'runner / golangci-lint', 'Build docker image',] diff --git a/composer.json b/composer.json index 6b817a2e..3ce86754 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^7.2", + "php": "^7.3 || ^8.0", "ext-json": "*", "ext-curl": "*", "spiral/goridge": "^2.4.2", diff --git a/service/http/handler_test.go b/service/http/handler_test.go index cb1cd728..bc22183d 100644 --- a/service/http/handler_test.go +++ b/service/http/handler_test.go @@ -722,8 +722,14 @@ func TestHandler_FormData_POST_Overwrite(t *testing.T) { form := url.Values{} - form.Add("key", "value1") - form.Add("key", "value2") + form.Add("key", "value") + form.Add("name[]", "name1") + form.Add("name[]", "name2") + form.Add("name[]", "name3") + form.Add("arr[x][y][z]", "y") + form.Add("arr[x][y][e]", "f") + form.Add("arr[c]p", "l") + form.Add("arr[c]z", "") req, err := http.NewRequest("POST", "http://localhost"+hs.Addr, strings.NewReader(form.Encode())) assert.NoError(t, err) @@ -746,7 +752,7 @@ func TestHandler_FormData_POST_Overwrite(t *testing.T) { assert.NoError(t, err) assert.Equal(t, 200, r.StatusCode) - assert.Equal(t, `{"key":"value2","arr":{"x":{"y":null}}}`, string(b)) + assert.Equal(t, `{"arr":{"c":{"p":"l","z":""},"x":{"y":{"e":"f","z":"y"}}},"key":"value","name":["name1","name2","name3"]}`, string(b)) } func TestHandler_FormData_POST_Form_UrlEncoded_Charset(t *testing.T) { |