Merge branch '11.x'

laravel · Mar 12, 2024 · 7011e0e · 7011e0e
2 parents 128331e + 6089f67
commit 7011e0e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -117,6 +117,7 @@
         "symfony/psr-http-message-bridge": "^7.0"
     },
     "conflict": {
+        "mockery/mockery": ">=1.6.8",
         "tightenco/collect": "<5.5.33"
     },
     "provide": {

diff --git a/src/Illuminate/Log/Context/Repository.php b/src/Illuminate/Log/Context/Repository.php
@@ -3,8 +3,8 @@
 namespace Illuminate\Log\Context;
 
 use __PHP_Incomplete_Class;
+use Illuminate\Contracts\Events\Dispatcher;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
-use Illuminate\Events\Dispatcher;
 use Illuminate\Log\Context\Events\ContextDehydrating as Dehydrating;
 use Illuminate\Log\Context\Events\ContextHydrated as Hydrated;
 use Illuminate\Queue\SerializesModels;