From 90103a36bfbd408ac7ab7a999d0447f851e5de65 Mon Sep 17 00:00:00 2001 From: Shift Date: Sun, 16 Feb 2025 19:40:32 +0000 Subject: [PATCH 1/3] Bump dependencies for Laravel 12 --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index db722f9..0ccd10f 100644 --- a/composer.json +++ b/composer.json @@ -30,13 +30,13 @@ "require": { "php": "^8.2|^8.3", "guzzlehttp/guzzle": "^7.8", - "illuminate/support": "^11.0", + "illuminate/support": "^11.0|^12.0", "symfony/psr-http-message-bridge": "^7.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^3.50", - "orchestra/testbench": "^9.0", - "phpunit/phpunit": "^10.5" + "orchestra/testbench": "^9.0|^10.0", + "phpunit/phpunit": "^10.5|^11.5.3" }, "autoload": { "psr-4": { From 5ad7102f5a48ec731a8b7e109d9169efbc15f0ea Mon Sep 17 00:00:00 2001 From: Shift Date: Sun, 16 Feb 2025 19:40:32 +0000 Subject: [PATCH 2/3] Update GitHub Actions for Laravel 12 --- .github/workflows/run-tests.yml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index f5ec5b8..be5239a 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -2,24 +2,29 @@ name: run-tests on: push: - branches: [ main ] + branches: + - main pull_request: - branches: [ main ] + branches: + - main jobs: test: runs-on: ${{ matrix.os }} + strategy: fail-fast: true max-parallel: 1 matrix: - os: [ ubuntu-latest, windows-latest ] - php: [ 8.2, 8.3 ] - laravel: [ 11.* ] - stability: [ prefer-lowest, prefer-stable ] + os: [ubuntu-latest, windows-latest] + php: [8.2, 8.3] + laravel: ['11.*', '12.*'] + stability: [prefer-lowest, prefer-stable] include: - laravel: 11.* testbench: 9.* + - laravel: 12.* + testbench: 10.* name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} From 3a2d53dd2c70ab3bcd05f2492fc3f77c965abd17 Mon Sep 17 00:00:00 2001 From: laravel-shift <15991828+laravel-shift@users.noreply.github.com> Date: Sun, 16 Feb 2025 19:40:56 +0000 Subject: [PATCH 3/3] Fix styling --- src/PrerenderMiddleware.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/PrerenderMiddleware.php b/src/PrerenderMiddleware.php index f8dc9b3..69dcf66 100644 --- a/src/PrerenderMiddleware.php +++ b/src/PrerenderMiddleware.php @@ -82,7 +82,7 @@ public function __construct(Guzzle $client) $guzzleConfig = $client->getConfig(); $guzzleConfig['timeout'] = config('prerender.timeout'); - if (!$this->returnSoftHttpCodes) { + if (! $this->returnSoftHttpCodes) { $guzzleConfig['allow_redirects'] = false; } @@ -111,7 +111,7 @@ public function handle(Request $request, Closure $next) if ($prerenderedResponse) { $statusCode = $prerenderedResponse->getStatusCode(); - if (!$this->returnSoftHttpCodes && $statusCode >= 300 && $statusCode < 400) { + if (! $this->returnSoftHttpCodes && $statusCode >= 300 && $statusCode < 400) { $headers = $prerenderedResponse->getHeaders(); return Redirect::to(array_change_key_case($headers, CASE_LOWER)['location'][0], $statusCode); @@ -137,11 +137,11 @@ private function shouldShowPrerenderedPage(Request $request): bool $isRequestingPrerenderedPage = false; - if (!$userAgent) { + if (! $userAgent) { return false; } - if (!$request->isMethod('GET')) { + if (! $request->isMethod('GET')) { return false; } @@ -161,13 +161,13 @@ private function shouldShowPrerenderedPage(Request $request): bool $isRequestingPrerenderedPage = true; } - if (!$isRequestingPrerenderedPage) { + if (! $isRequestingPrerenderedPage) { return false; } // only check whitelist if it is not empty if ($this->whitelist) { - if (!$this->isListed($requestUri, $this->whitelist)) { + if (! $this->isListed($requestUri, $this->whitelist)) { return false; } } @@ -208,7 +208,7 @@ private function getPrerenderedPageResponse(Request $request): ?ResponseInterfac return $this->client->get($this->prerenderUri.'/'.urlencode($url), compact('headers')); } catch (RequestException $exception) { - if (!$this->returnSoftHttpCodes && !empty($exception->getResponse()) && $exception->getResponse()->getStatusCode() === 404) { + if (! $this->returnSoftHttpCodes && ! empty($exception->getResponse()) && $exception->getResponse()->getStatusCode() === 404) { abort(404); } } catch (ConnectException $exception) {