From 0f636e49e94212a83d5369e91544a1bd756e8464 Mon Sep 17 00:00:00 2001
From: Alexis Saettler <alexis@saettler.org>
Date: Wed, 1 Nov 2023 13:19:40 +0100
Subject: [PATCH] fix: fix contact tags count (#6994)

---
 .github/workflows/tests.yml                 |  2 +-
 app/Http/Controllers/ContactsController.php |  4 ++--
 composer.json                               |  2 +-
 composer.lock                               | 21 ++++++++++++---------
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 48cc1e2e73f..5f8e3ee2c3f 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -250,7 +250,7 @@ jobs:
 
     # Test
       - name: Upgrade Chrome Driver
-        run: php artisan dusk:chrome-driver $(google-chrome -version | awk '{ print $3 }' | cut -d . -f 1)
+        run: php artisan dusk:chrome-driver --detect
       - name: Start Chrome Driver
         run: |
           chmod -R 0755 vendor/laravel/dusk/bin/
diff --git a/app/Http/Controllers/ContactsController.php b/app/Http/Controllers/ContactsController.php
index ee51d890d9f..4011c014b9c 100644
--- a/app/Http/Controllers/ContactsController.php
+++ b/app/Http/Controllers/ContactsController.php
@@ -85,8 +85,8 @@ private function contacts(Request $request, bool $active)
         }
 
         $tagsCount = Tag::contactsCount();
-        $contactsWithoutTagsCount = $contacts->doesntHave('tags')->count();
-        
+        $contactsWithoutTagsCount = (clone $contacts)->doesntHave('tags')->count();
+
         $tags = null;
         $url = null;
         $count = 1;
diff --git a/composer.json b/composer.json
index 255babfb749..d75cb05b848 100644
--- a/composer.json
+++ b/composer.json
@@ -66,7 +66,7 @@
         "barryvdh/laravel-debugbar": "^3",
         "fakerphp/faker": "^1.10",
         "khanamiryan/qrcode-detector-decoder": "^2.0",
-        "laravel/dusk": "^7.0",
+        "laravel/dusk": "^7.11",
         "laravel/legacy-factories": "^1.0",
         "laravel/tinker": "^2.6",
         "matthiasnoback/live-code-coverage": "^1",
diff --git a/composer.lock b/composer.lock
index 1c92f14a84f..80ce1325b91 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "97cdf44688f77f53c96285c17f322f1b",
+    "content-hash": "8c2a9ddbec63b22cf6bb27edd741f02d",
     "packages": [
         {
             "name": "asbiin/laravel-adorable",
@@ -13729,21 +13729,22 @@
         },
         {
             "name": "laravel/dusk",
-            "version": "v7.4.0",
+            "version": "v7.11.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/dusk.git",
-                "reference": "c15e0e2d2d7fe3281c015e6172df9288c6597cbb"
+                "reference": "ef474f54ab24989f480c77ba92dc39d07d499dee"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/dusk/zipball/c15e0e2d2d7fe3281c015e6172df9288c6597cbb",
-                "reference": "c15e0e2d2d7fe3281c015e6172df9288c6597cbb",
+                "url": "https://api.github.com/repos/laravel/dusk/zipball/ef474f54ab24989f480c77ba92dc39d07d499dee",
+                "reference": "ef474f54ab24989f480c77ba92dc39d07d499dee",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
                 "ext-zip": "*",
+                "guzzlehttp/guzzle": "^7.2",
                 "illuminate/console": "^9.0|^10.0",
                 "illuminate/support": "^9.0|^10.0",
                 "nesbot/carbon": "^2.0",
@@ -13756,8 +13757,10 @@
             },
             "require-dev": {
                 "mockery/mockery": "^1.4.2",
-                "orchestra/testbench": "^7.0|^8.0",
-                "phpunit/phpunit": "^9.0"
+                "orchestra/testbench": "^7.33|^8.13",
+                "phpstan/phpstan": "^1.10",
+                "phpunit/phpunit": "^9.5.10|^10.0.1",
+                "psy/psysh": "^0.11.12"
             },
             "suggest": {
                 "ext-pcntl": "Used to gracefully terminate Dusk when tests are running."
@@ -13796,9 +13799,9 @@
             ],
             "support": {
                 "issues": "https://github.com/laravel/dusk/issues",
-                "source": "https://github.com/laravel/dusk/tree/v7.4.0"
+                "source": "https://github.com/laravel/dusk/tree/v7.11.3"
             },
-            "time": "2023-01-06T16:04:32+00:00"
+            "time": "2023-10-17T13:53:17+00:00"
         },
         {
             "name": "laravel/legacy-factories",