Skip to content

Commit 46b110d

Browse files
author
Radosław Karkut
committed
Merge branch 'develop' into 'master'
Develop -> Master See merge request integrations/share-code-plugin!64
2 parents 8840ed4 + 98410f2 commit 46b110d

2 files changed

Lines changed: 10 additions & 8 deletions

File tree

.gitlab-ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ stages:
22
- install_dependencies
33
- test
44

5-
composer install:php56:
6-
image: php:5.6-cli
5+
composer install:php72:
6+
image: php:7.2-cli
77
stage: install_dependencies
88
before_script:
99
- apt-get update
@@ -20,8 +20,8 @@ composer install:php56:
2020
except:
2121
- develop
2222

23-
test:app-php56:
24-
image: php:5.6-cli
23+
test:app-php72:
24+
image: php:7.2-cli
2525
stage: test
2626
tags:
2727
- kubernetes-ci
@@ -30,4 +30,4 @@ test:app-php56:
3030
except:
3131
- develop
3232
dependencies:
33-
- composer install:php56
33+
- composer install:php72

src/Api/GetresponseApi.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -675,10 +675,12 @@ private function prepareHeaders( $headers ) {
675675
$headers = explode("\n", $headers);
676676
foreach ($headers as $header) {
677677
$params = explode(':', $header, 2);
678-
$key = isset($params[0]) ? $params[0] : null;
679-
$value = isset($params[1]) ? $params[1] : null;
680-
$headers[trim($key)] = trim($value);
678+
679+
if (count($params) === 2 && !empty($params[0]) && !empty($params[1])) {
680+
$headers[trim($params[0])] = trim($params[1]);
681+
}
681682
}
683+
682684
return $headers;
683685
}
684686

0 commit comments

Comments
 (0)