Merge branch '10.4' into 11.4

Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
laravel · Nov 19, 2024 · 495654b · 495654b
2 parents fb9bb2d + 8ded9c5
commit 495654b
Showing 1 changed file with 9 additions and 12 deletions.
diff --git a/composer.json b/composer.json
@@ -9,18 +9,18 @@
     "type": "project",
     "require": {
         "php": "^8.2",
-        "algolia/algoliasearch-client-php": "^3.3",
+        "algolia/algoliasearch-client-php": "^4.0",
         "carbonphp/carbon-doctrine-types": "^3.0",
         "doctrine/dbal": "^4.0",
         "guzzlehttp/guzzle": "^7.8",
         "http-interop/http-factory-guzzle": "^1.2",
-        "laravel/dusk": "^8.0",
-        "laravel/framework": "^11.0.3",
-        "laravel/scout": "^10.8",
+        "laravel/dusk": "^8.2",
+        "laravel/framework": "^11.32",
+        "laravel/scout": "^10.11",
         "laravel/tinker": "^2.9",
         "laravel/vapor-core": "^2.36",
         "league/flysystem-aws-s3-v3": "^3.0",
-        "meilisearch/meilisearch-php": "^1.1",
+        "meilisearch/meilisearch-php": "^1.11",
         "nova-kit/nova-on-vapor": "^1.3",
         "spatie/laravel-ray": "^1.35"
     },
@@ -31,12 +31,9 @@
         "laravel/nova": "@dev",
         "mockery/mockery": "^1.6",
         "nunomaduro/collision": "^8.0",
-        "orchestra/testbench": "^9.0",
-        "orchestra/testbench-dusk": "^9.0",
-        "phpunit/phpunit": "^10.5"
-    },
-    "conflict": {
-        "laravel/dusk": "7.12.2"
+        "orchestra/testbench": "^9.6",
+        "orchestra/testbench-dusk": "^9.9",
+        "phpunit/phpunit": "^10.5.38"
     },
     "autoload": {
         "psr-4": {
@@ -60,7 +57,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "10.5.x-dev"
+            "dev-master": "11.5.x-dev"
         },
         "laravel": {
             "dont-discover": []