From 599f44e41fcbe0ceeaefcbdfa2482b47523c74a7 Mon Sep 17 00:00:00 2001 From: Andrey Helldar Date: Mon, 23 Oct 2023 12:50:45 +0900 Subject: [PATCH 01/10] Upload test logs --- .github/workflows/laravel.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/laravel.yml b/.github/workflows/laravel.yml index 8f9b734..653dbc2 100644 --- a/.github/workflows/laravel.yml +++ b/.github/workflows/laravel.yml @@ -58,3 +58,11 @@ jobs: - name: Execute tests run: sudo vendor/bin/phpunit + + - name: Upload logs + uses: actions/upload-artifact@v3 + with: + name: logs-{{ matrix.php}}-{{ matrix.laravel }}.log + path: vendor/orchestra/testbench-core/laravel/storage/logs/laravel.log + retention-days: 1 + From 5e2029c9895d1697b6b0861c8cf3637b69b1e945 Mon Sep 17 00:00:00 2001 From: Andrey Helldar Date: Mon, 23 Oct 2023 12:56:38 +0900 Subject: [PATCH 02/10] Update SetHeaderMiddleware.php --- src/Middlewares/SetHeaderMiddleware.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Middlewares/SetHeaderMiddleware.php b/src/Middlewares/SetHeaderMiddleware.php index e69da41..fe42ac5 100644 --- a/src/Middlewares/SetHeaderMiddleware.php +++ b/src/Middlewares/SetHeaderMiddleware.php @@ -19,6 +19,8 @@ public function handle(Request $request, Closure $next) protected function set(Request $request) { - $response->headers->set(Header::ACCEPT, 'application/json'); + if ($request->headers->missing(Header::ACCEPT)) { + $request->headers->set(Header::ACCEPT, 'application/json'); + } } } From a03869512c1a5a3d7353673051694513045c2dad Mon Sep 17 00:00:00 2001 From: Andrey Helldar Date: Mon, 23 Oct 2023 13:00:53 +0900 Subject: [PATCH 03/10] Update SetHeaderMiddleware.php --- src/Middlewares/SetHeaderMiddleware.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Middlewares/SetHeaderMiddleware.php b/src/Middlewares/SetHeaderMiddleware.php index fe42ac5..a5eb485 100644 --- a/src/Middlewares/SetHeaderMiddleware.php +++ b/src/Middlewares/SetHeaderMiddleware.php @@ -19,7 +19,7 @@ public function handle(Request $request, Closure $next) protected function set(Request $request) { - if ($request->headers->missing(Header::ACCEPT)) { + if (! $request->hasHeader(Header::ACCEPT)) { $request->headers->set(Header::ACCEPT, 'application/json'); } } From ac2a925a1525f7672e3338bd05ab30c755ea1169 Mon Sep 17 00:00:00 2001 From: Andrey Helldar Date: Mon, 23 Oct 2023 13:05:31 +0900 Subject: [PATCH 04/10] Update SetHeaderMiddleware.php --- src/Middlewares/SetHeaderMiddleware.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Middlewares/SetHeaderMiddleware.php b/src/Middlewares/SetHeaderMiddleware.php index a5eb485..4bdb7ae 100644 --- a/src/Middlewares/SetHeaderMiddleware.php +++ b/src/Middlewares/SetHeaderMiddleware.php @@ -12,15 +12,17 @@ class SetHeaderMiddleware { public function handle(Request $request, Closure $next) { - $this->set($request); + $response = $next($this->set($request)); - return $next($request); + return $this->set($response); } - protected function set(Request $request) + protected function set($request) { if (! $request->hasHeader(Header::ACCEPT)) { $request->headers->set(Header::ACCEPT, 'application/json'); } + + return $request; } } From bdf22db8e951194d2e2a91bc40a2809f257c6615 Mon Sep 17 00:00:00 2001 From: Andrey Helldar Date: Mon, 23 Oct 2023 13:08:04 +0900 Subject: [PATCH 05/10] Update SetHeaderMiddleware.php --- src/Middlewares/SetHeaderMiddleware.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Middlewares/SetHeaderMiddleware.php b/src/Middlewares/SetHeaderMiddleware.php index 4bdb7ae..07d9ca1 100644 --- a/src/Middlewares/SetHeaderMiddleware.php +++ b/src/Middlewares/SetHeaderMiddleware.php @@ -12,14 +12,14 @@ class SetHeaderMiddleware { public function handle(Request $request, Closure $next) { - $response = $next($this->set($request)); - - return $this->set($response); + return $this->set( + $next($this->set($request)) + ); } protected function set($request) { - if (! $request->hasHeader(Header::ACCEPT)) { + if (! $request->headers->has(Header::ACCEPT)) { $request->headers->set(Header::ACCEPT, 'application/json'); } From 09b4fc50187af3794e92eabb965a7fdf61f3d352 Mon Sep 17 00:00:00 2001 From: Andrey Helldar Date: Mon, 23 Oct 2023 13:09:14 +0900 Subject: [PATCH 06/10] Update SetHeaderMiddleware.php --- src/Middlewares/SetHeaderMiddleware.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Middlewares/SetHeaderMiddleware.php b/src/Middlewares/SetHeaderMiddleware.php index 07d9ca1..bcd5769 100644 --- a/src/Middlewares/SetHeaderMiddleware.php +++ b/src/Middlewares/SetHeaderMiddleware.php @@ -19,7 +19,7 @@ public function handle(Request $request, Closure $next) protected function set($request) { - if (! $request->headers->has(Header::ACCEPT)) { + if ($request->headers->missing(Header::ACCEPT)) { $request->headers->set(Header::ACCEPT, 'application/json'); } From 4d460fba35db8f4a2de426474fd587321f53be81 Mon Sep 17 00:00:00 2001 From: Andrey Helldar Date: Mon, 23 Oct 2023 13:10:19 +0900 Subject: [PATCH 07/10] Update SetHeaderMiddleware.php --- src/Middlewares/SetHeaderMiddleware.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Middlewares/SetHeaderMiddleware.php b/src/Middlewares/SetHeaderMiddleware.php index bcd5769..07d9ca1 100644 --- a/src/Middlewares/SetHeaderMiddleware.php +++ b/src/Middlewares/SetHeaderMiddleware.php @@ -19,7 +19,7 @@ public function handle(Request $request, Closure $next) protected function set($request) { - if ($request->headers->missing(Header::ACCEPT)) { + if (! $request->headers->has(Header::ACCEPT)) { $request->headers->set(Header::ACCEPT, 'application/json'); } From 3d86e45315522d5a08307cfed484e108e369798d Mon Sep 17 00:00:00 2001 From: Andrey Helldar Date: Mon, 23 Oct 2023 13:11:27 +0900 Subject: [PATCH 08/10] Update SetHeaderMiddleware.php --- src/Middlewares/SetHeaderMiddleware.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Middlewares/SetHeaderMiddleware.php b/src/Middlewares/SetHeaderMiddleware.php index 07d9ca1..ca35414 100644 --- a/src/Middlewares/SetHeaderMiddleware.php +++ b/src/Middlewares/SetHeaderMiddleware.php @@ -12,9 +12,7 @@ class SetHeaderMiddleware { public function handle(Request $request, Closure $next) { - return $this->set( - $next($this->set($request)) - ); + return $next($this->set($request)); } protected function set($request) From 5fc3d705e9ecaa7a9bdf95a3d345c2fddeed89c9 Mon Sep 17 00:00:00 2001 From: Andrey Helldar Date: Mon, 23 Oct 2023 13:12:24 +0900 Subject: [PATCH 09/10] Update SetHeaderMiddleware.php --- src/Middlewares/SetHeaderMiddleware.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Middlewares/SetHeaderMiddleware.php b/src/Middlewares/SetHeaderMiddleware.php index ca35414..07d9ca1 100644 --- a/src/Middlewares/SetHeaderMiddleware.php +++ b/src/Middlewares/SetHeaderMiddleware.php @@ -12,7 +12,9 @@ class SetHeaderMiddleware { public function handle(Request $request, Closure $next) { - return $next($this->set($request)); + return $this->set( + $next($this->set($request)) + ); } protected function set($request) From 3a702b31cc8749ecd8d1fb05d85011c2e64a65d3 Mon Sep 17 00:00:00 2001 From: Andrey Helldar Date: Mon, 23 Oct 2023 13:14:49 +0900 Subject: [PATCH 10/10] Update laravel.yml --- .github/workflows/laravel.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/laravel.yml b/.github/workflows/laravel.yml index 653dbc2..8f9b734 100644 --- a/.github/workflows/laravel.yml +++ b/.github/workflows/laravel.yml @@ -58,11 +58,3 @@ jobs: - name: Execute tests run: sudo vendor/bin/phpunit - - - name: Upload logs - uses: actions/upload-artifact@v3 - with: - name: logs-{{ matrix.php}}-{{ matrix.laravel }}.log - path: vendor/orchestra/testbench-core/laravel/storage/logs/laravel.log - retention-days: 1 -