Skip to content

Commit ab7a2a2

Browse files
authored
fix(functions/http_content_type): PHP warning when header doesn't exist (GoogleCloudPlatform#1298)
1 parent fd089b9 commit ab7a2a2

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

functions/http_content_type/index.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ function helloContent(ServerRequestInterface $request): string
2323
{
2424
$name = 'World';
2525
$body = $request->getBody()->getContents();
26-
switch ($request->getHeader('content-type')[0]) {
26+
switch ($request->getHeaderLine('content-type')) {
2727
// '{"name":"John"}'
2828
case 'application/json':
2929
if (!empty($body)) {

functions/slack_slash_command/index.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,10 @@ function isValidSlackWebhook(ServerRequestInterface $request): bool
3131
$SLACK_SECRET = getenv('SLACK_SECRET');
3232

3333
// Check for headers
34-
$timestamp = $request->getHeader('X-Slack-Request-Timestamp');
35-
$signature = $request->getHeader('X-Slack-Signature');
34+
$timestamp = $request->getHeaderLine('X-Slack-Request-Timestamp');
35+
$signature = $request->getHeaderLine('X-Slack-Signature');
3636
if (!$timestamp || !$signature) {
3737
return false;
38-
} else {
39-
$timestamp = $timestamp[0];
40-
$signature = $signature[0];
4138
}
4239

4340
// Compute signature

0 commit comments

Comments
 (0)