Some more phpcs fixes
This commit is contained in:
parent
ed2b83fba7
commit
20a3048aee
2 changed files with 14 additions and 12 deletions
|
@ -3,20 +3,22 @@
|
|||
namespace App\Http\Middleware;
|
||||
|
||||
use Closure;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
class CSPHeader
|
||||
{
|
||||
/**
|
||||
* Handle an incoming request.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param \Closure $next
|
||||
* @param Request $request
|
||||
* @param Closure $next
|
||||
* @return mixed
|
||||
*/
|
||||
public function handle($request, Closure $next)
|
||||
{
|
||||
// headers have to be single-line strings,
|
||||
// so we concat multiple lines
|
||||
// phpcs:disable
|
||||
return $next($request)
|
||||
->header(
|
||||
'Content-Security-Policy',
|
||||
|
@ -65,12 +67,13 @@ block-all-mixed-content; \
|
|||
report-to csp-endpoint; \
|
||||
report-uri https://jonnybarnes.report-uri.io/r/default/csp/enforce;")
|
||||
)->header(
|
||||
'Report-To',
|
||||
'{' .
|
||||
"'url': 'https://jonnybarnes.report-uri.io/r/default/csp/enforce', " .
|
||||
"'group': 'csp-endpoint'," .
|
||||
"'max-age': 10886400" .
|
||||
'}'
|
||||
);
|
||||
'Report-To',
|
||||
'{' .
|
||||
"'url': 'https://jonnybarnes.report-uri.io/r/default/csp/enforce', " .
|
||||
"'group': 'csp-endpoint'," .
|
||||
"'max-age': 10886400" .
|
||||
'}'
|
||||
);
|
||||
// phpcs:enable
|
||||
}
|
||||
}
|
||||
|
|
|
@ -7,7 +7,6 @@ namespace App\Jobs;
|
|||
use App\Models\Note;
|
||||
use GuzzleHttp\Client;
|
||||
use GuzzleHttp\Psr7\Uri;
|
||||
use function GuzzleHttp\Psr7\uri_for;
|
||||
use Illuminate\Bus\Queueable;
|
||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||
use Illuminate\Queue\InteractsWithQueue;
|
||||
|
@ -137,13 +136,13 @@ class SendWebMentions implements ShouldQueue
|
|||
*/
|
||||
public function resolveUri(string $url, string $base): string
|
||||
{
|
||||
$endpoint = uri_for($url);
|
||||
$endpoint = \GuzzleHttp\Psr7\uri_for($url);
|
||||
if ($endpoint->getScheme() != '') {
|
||||
return (string) $endpoint;
|
||||
}
|
||||
|
||||
return (string) Uri::resolve(
|
||||
uri_for($base),
|
||||
\GuzzleHttp\Psr7\uri_for($base),
|
||||
$endpoint
|
||||
);
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue