Merge branch 'v8' into develop

Author: uberbrady

app/Services/SnipeTranslator.php

@@ -26,17 +26,19 @@ class SnipeTranslator extends Translator {
     public function choice($key, $number, array $replace = [], $locale = null)
     {
         $line = $this->get(
-            $key, $replace, $locale = $this->localeForChoice($locale)
+            $key, [], $locale = $this->localeForChoice($key, $locale)
         );
 
         // If the given "number" is actually an array or countable we will simply count the
         // number of elements in an instance. This allows developers to pass an array of
         // items without having to count it on their end first which gives bad syntax.
-        if (is_array($number) || $number instanceof Countable) {
+        if (is_countable($number)) {
             $number = count($number);
         }
 
-        $replace['count'] = $number;
+        if (!isset($replace['count'])) {
+            $replace['count'] = $number;
+        }
 
         $underscored_locale = str_replace("-","_",$locale); // OUR CHANGE.
         return $this->makeReplacements( // BELOW - that $underscored_locale is the *ONLY* modified part

composer.json

@@ -14,18 +14,22 @@
     {
       "type": "vcs",
       "url": "https://github.com/grokability/laravel-scim-server"
+    },
+    {
+      "type": "vcs",
+      "url": "https://github.com/grokability/html"
     }
   ],
   "require": {
-    "php": "^8.1",
+    "php": "^8.2",
     "ext-curl": "*",
     "ext-fileinfo": "*",
     "ext-iconv": "*",
     "ext-json": "*",
     "ext-mbstring": "*",
     "ext-pdo": "*",
     "alek13/slack": "^2.0",
-    "arietimmerman/laravel-scim-server": "dev-master",
+    "arietimmerman/laravel-scim-server": "dev-laravel_11_compatibility",
     "bacon/bacon-qr-code": "^2.0",
     "barryvdh/laravel-debugbar": "^3.13",
     "barryvdh/laravel-dompdf": "^2.0",
@@ -40,20 +44,20 @@
     "javiereguiluz/easyslugger": "^1.0",
     "laravel-notification-channels/google-chat": "^3.0",
     "laravel-notification-channels/microsoft-teams": "^1.2",
-    "laravel/framework": "^10.0",
+    "laravel/framework": "^11.0",
     "laravel/helpers": "^1.4",
-    "laravel/passport": "^11.0",
-    "laravel/slack-notification-channel": "^2.3",
+    "laravel/passport": "^12.0",
+    "laravel/slack-notification-channel": "^3.4",
     "laravel/socialite": "^5.6",
     "laravel/tinker": "^2.6",
     "laravel/ui": "^4.0",
-    "laravelcollective/html": "^6.2",
+    "laravelcollective/html": "6.x-dev",
     "league/csv": "^9.7",
     "league/flysystem-aws-s3-v3": "^3.0",
     "livewire/livewire": "^3.5",
     "neitanod/forceutf8": "^2.0",
-    "nesbot/carbon": "^2.32",
-    "nunomaduro/collision": "^7.0",
+    "nesbot/carbon": "^3.0",
+    "nunomaduro/collision": "^8.1",
     "okvpn/clock-lts": "^1.0",
     "onelogin/php-saml": "^3.4",
     "onnov/detect-encoding": "^2.0",
@@ -86,8 +90,7 @@
     "phpunit/phpunit": "^10.0",
     "squizlabs/php_codesniffer": "^3.5",
     "symfony/css-selector": "^4.4",
-    "symfony/dom-crawler": "^4.4",
-    "vimeo/psalm": "^5.13"
+    "symfony/dom-crawler": "^4.4"
   },
   "extra": {
     "laravel": {