Skip to content

Commit c874a08

Browse files
committed
Fix deprecation
1 parent 2b64649 commit c874a08

File tree

3 files changed

+14
-8
lines changed

3 files changed

+14
-8
lines changed

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
"require": {
1313
"php": "7.x",
1414
"aidantwoods/secureheaders": "^2.0",
15-
"illuminate/http": "^5.4|^6"
15+
"illuminate/http": "^5.4|^6",
16+
"illuminate/support": "^5.4|^6"
1617
},
1718
"require-dev": {
1819
"phpunit/phpunit": "^6.2"

src/ApplySecureHeaders.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
use Closure;
77
use Illuminate\Contracts\Config\Repository;
88
use Illuminate\Http\Request;
9+
use Illuminate\Support\Arr;
910

1011
class ApplySecureHeaders
1112
{
@@ -125,9 +126,9 @@ private function setExpectCT()
125126
{
126127
if ($expectCT = $this->config->get('secure-headers.expectCT', false)) {
127128
$this->headers->expectCT(
128-
array_get($expectCT, 'maxAge'),
129-
array_get($expectCT, 'enforce'),
130-
array_get($expectCT, 'reportUri')
129+
Arr::get($expectCT, 'maxAge'),
130+
Arr::get($expectCT, 'enforce'),
131+
Arr::get($expectCT, 'reportUri')
131132
);
132133
}
133134
}

tests/ApplySecureHeadersTest.php

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use Aidantwoods\SecureHeaders\SecureHeaders;
66
use Illuminate\Contracts\Config\Repository;
77
use Illuminate\Http\Request;
8+
use Illuminate\Support\Arr;
89
use MikeFrancis\LaravelSecureHeaders\ApplySecureHeaders;
910
use PHPUnit\Framework\TestCase;
1011
use Symfony\Component\HttpFoundation\Response;
@@ -326,7 +327,7 @@ private function applySecureHeadersWithConfig(Response $response, array $configM
326327
{
327328
// convert the configMap dot keys into deeply nested array
328329
$configMap = [
329-
'secure-headers' => ! empty($configMap)
330+
'secure-headers' => !empty($configMap)
330331
? array_merge_recursive(...array_map(
331332
[self::class, 'nonMutatingDataFill'],
332333
array_fill(0, count($configMap), []),
@@ -343,17 +344,20 @@ private function applySecureHeadersWithConfig(Response $response, array $configM
343344
->method('get')
344345
->with($this->anything())
345346
->will($this->returnCallback(function (string $key, $default) use ($configMap) {
346-
return array_get($configMap, $key, $default);
347+
return Arr::get($configMap, $key, $default);
347348
}));
348349

349350
$secureHeaders = new SecureHeaders();
350351
$secureHeaders->errorReporting(false);
351352
$middleware = new ApplySecureHeaders($config, $secureHeaders);
352353

353-
return $middleware->handle(new Request, function () use ($response) { return $response; });
354+
return $middleware->handle(new Request, function () use ($response) {
355+
return $response;
356+
});
354357
}
355358

356-
private static function nonMutatingDataFill(array $array, string $key, $value) {
359+
private static function nonMutatingDataFill(array $array, string $key, $value)
360+
{
357361
data_fill($array, $key, $value);
358362
return $array;
359363
}

0 commit comments

Comments
 (0)