From 993f81f85fd1bf7c8e3e840ebd8e730be4ff0506 Mon Sep 17 00:00:00 2001 From: Jeldrik Hanschke Date: Wed, 30 Oct 2019 08:19:40 +0100 Subject: [PATCH] upgrade slim to latest 3.x version Charset was removed from Content-Type intentionally. See https://github.com/slimphp/Slim/issues/2629 for reasons. --- api/composer.lock | 33 +++++++++++--------- api/tests/api/CreateAnotherUserCept.php | 2 +- api/tests/api/CreatePollCept.php | 2 +- api/tests/api/CreateUserCept.php | 2 +- api/tests/api/GetLegacyPollWithUsersCept.php | 2 +- api/tests/api/GetPollCept.php | 2 +- api/tests/api/GetPollWithUsersCept.php | 2 +- 7 files changed, 24 insertions(+), 21 deletions(-) diff --git a/api/composer.lock b/api/composer.lock index 5d23fea7c..f4c0700ab 100644 --- a/api/composer.lock +++ b/api/composer.lock @@ -234,20 +234,23 @@ }, { "name": "slim/slim", - "version": "3.12.0", + "version": "3.12.2", "source": { "type": "git", "url": "https://github.com/slimphp/Slim.git", - "reference": "f4947cc900b6e51cbfda58b9f1247bca2f76f9f0" + "reference": "200c6143f15baa477601879b64ab2326847aac0b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slimphp/Slim/zipball/f4947cc900b6e51cbfda58b9f1247bca2f76f9f0", - "reference": "f4947cc900b6e51cbfda58b9f1247bca2f76f9f0", + "url": "https://api.github.com/repos/slimphp/Slim/zipball/200c6143f15baa477601879b64ab2326847aac0b", + "reference": "200c6143f15baa477601879b64ab2326847aac0b", "shasum": "" }, "require": { "container-interop/container-interop": "^1.2", + "ext-json": "*", + "ext-libxml": "*", + "ext-simplexml": "*", "nikic/fast-route": "^1.0", "php": ">=5.5.0", "pimple/pimple": "^3.0", @@ -272,25 +275,25 @@ "MIT" ], "authors": [ - { - "name": "Rob Allen", - "email": "rob@akrabat.com", - "homepage": "http://akrabat.com" - }, { "name": "Josh Lockhart", "email": "hello@joshlockhart.com", "homepage": "https://joshlockhart.com" }, - { - "name": "Gabriel Manricks", - "email": "gmanricks@me.com", - "homepage": "http://gabrielmanricks.com" - }, { "name": "Andrew Smith", "email": "a.smith@silentworks.co.uk", "homepage": "http://silentworks.co.uk" + }, + { + "name": "Rob Allen", + "email": "rob@akrabat.com", + "homepage": "http://akrabat.com" + }, + { + "name": "Gabriel Manricks", + "email": "gmanricks@me.com", + "homepage": "http://gabrielmanricks.com" } ], "description": "Slim is a PHP micro framework that helps you quickly write simple yet powerful web applications and APIs", @@ -301,7 +304,7 @@ "micro", "router" ], - "time": "2019-01-15T13:21:25+00:00" + "time": "2019-08-20T18:46:05+00:00" } ], "packages-dev": [ diff --git a/api/tests/api/CreateAnotherUserCept.php b/api/tests/api/CreateAnotherUserCept.php index f6b1f9ed5..572083327 100644 --- a/api/tests/api/CreateAnotherUserCept.php +++ b/api/tests/api/CreateAnotherUserCept.php @@ -16,7 +16,7 @@ $I->wantTo('create a user'); $I->sendPOST('/users', $userJson); $I->seeResponseCodeIs(200); -$I->seeHttpHeader('Content-Type', 'application/json;charset=utf-8'); +$I->seeHttpHeader('Content-Type', 'application/json'); $I->seeHttpHeader('Expires', '-1'); $I->seeResponseIsJson(); $I->seeResponseJsonMatchesJsonPath('user.id'); diff --git a/api/tests/api/CreatePollCept.php b/api/tests/api/CreatePollCept.php index f288cd227..6969b977e 100644 --- a/api/tests/api/CreatePollCept.php +++ b/api/tests/api/CreatePollCept.php @@ -6,7 +6,7 @@ $I->wantTo('create a poll'); $I->sendPOST('/polls', $pollJson); $I->seeResponseCodeIs(200); -$I->seeHttpHeader('Content-Type', 'application/json;charset=utf-8'); +$I->seeHttpHeader('Content-Type', 'application/json'); $I->seeHttpHeader('Expires', '-1'); $I->seeResponseIsJson(); $I->seeResponseJsonMatchesJsonPath('poll.id'); diff --git a/api/tests/api/CreateUserCept.php b/api/tests/api/CreateUserCept.php index a0dac369d..3eded57f0 100644 --- a/api/tests/api/CreateUserCept.php +++ b/api/tests/api/CreateUserCept.php @@ -12,7 +12,7 @@ $I->wantTo('create a user'); $I->sendPOST('/users', $userJson); $I->seeResponseCodeIs(200); -$I->seeHttpHeader('Content-Type', 'application/json;charset=utf-8'); +$I->seeHttpHeader('Content-Type', 'application/json'); $I->seeHttpHeader('Expires', '-1'); $I->seeResponseIsJson(); $I->seeResponseJsonMatchesJsonPath('user.id'); diff --git a/api/tests/api/GetLegacyPollWithUsersCept.php b/api/tests/api/GetLegacyPollWithUsersCept.php index 5ef285816..542d33001 100644 --- a/api/tests/api/GetLegacyPollWithUsersCept.php +++ b/api/tests/api/GetLegacyPollWithUsersCept.php @@ -17,7 +17,7 @@ $I->wantTo('get an existing legacy (v0.3.0) poll with users'); $I->sendGET('/polls/' . $pollId); $I->seeResponseCodeIs(200); -$I->seeHttpHeader('Content-Type', 'application/json;charset=utf-8'); +$I->seeHttpHeader('Content-Type', 'application/json'); $I->seeHttpHeader('Expires', '-1'); $I->seeResponseIsJson(); diff --git a/api/tests/api/GetPollCept.php b/api/tests/api/GetPollCept.php index c3960f031..fc6f5d1a2 100644 --- a/api/tests/api/GetPollCept.php +++ b/api/tests/api/GetPollCept.php @@ -9,7 +9,7 @@ $I->wantTo('get an existing poll'); $I->sendGET('/polls/' . $pollId); $I->seeResponseCodeIs(200); -$I->seeHttpHeader('Content-Type', 'application/json;charset=utf-8'); +$I->seeHttpHeader('Content-Type', 'application/json'); $I->seeHttpHeader('Expires', '-1'); $I->seeResponseIsJson(); diff --git a/api/tests/api/GetPollWithUsersCept.php b/api/tests/api/GetPollWithUsersCept.php index b1ce424ce..39d36bf63 100644 --- a/api/tests/api/GetPollWithUsersCept.php +++ b/api/tests/api/GetPollWithUsersCept.php @@ -21,7 +21,7 @@ $I->wantTo('get an existing poll'); $I->sendGET('/polls/' . $pollId); $I->seeResponseCodeIs(200); -$I->seeHttpHeader('Content-Type', 'application/json;charset=utf-8'); +$I->seeHttpHeader('Content-Type', 'application/json'); $I->seeHttpHeader('Expires', '-1'); $I->seeResponseIsJson();