From 4f83e7371d11795242ab0c5f5b9d23aefd90cec1 Mon Sep 17 00:00:00 2001 From: Jimbolino Date: Tue, 17 Aug 2021 13:33:09 +0200 Subject: [PATCH 1/2] Update Compiler.php --- src/Illuminate/View/Compilers/Compiler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Illuminate/View/Compilers/Compiler.php b/src/Illuminate/View/Compilers/Compiler.php index 2a943e0f6309..067b1eb87d84 100755 --- a/src/Illuminate/View/Compilers/Compiler.php +++ b/src/Illuminate/View/Compilers/Compiler.php @@ -68,7 +68,7 @@ public function isExpired($path) return true; } - return $this->files->lastModified($path) >= + return $this->files->lastModified($path) > $this->files->lastModified($compiled); } From 9ad9e21b99bb32a637b8900e8c1c586a8d85d1e3 Mon Sep 17 00:00:00 2001 From: Derek MacDonald Date: Tue, 17 Aug 2021 09:11:32 -0400 Subject: [PATCH 2/2] Make Application@handle() meet Symfony 6's updated interface (#38413) Add return type. This is a great use of our time. --- src/Illuminate/Foundation/Application.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Illuminate/Foundation/Application.php b/src/Illuminate/Foundation/Application.php index 21fcbacc6ebb..57b3aed2037a 100755 --- a/src/Illuminate/Foundation/Application.php +++ b/src/Illuminate/Foundation/Application.php @@ -22,6 +22,7 @@ use Illuminate\Support\Str; use RuntimeException; use Symfony\Component\HttpFoundation\Request as SymfonyRequest; +use Symfony\Component\HttpFoundation\Response as SymfonyResponse; use Symfony\Component\HttpKernel\Exception\HttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\HttpKernel\HttpKernelInterface; @@ -959,7 +960,7 @@ protected function fireAppCallbacks(array $callbacks) /** * {@inheritdoc} */ - public function handle(SymfonyRequest $request, int $type = self::MASTER_REQUEST, bool $catch = true) + public function handle(SymfonyRequest $request, int $type = self::MAIN_REQUEST, bool $catch = true): SymfonyResponse { return $this[HttpKernelContract::class]->handle(Request::createFromBase($request)); }