From 9260eaa230cd4d2818b3951b746f5486a1384b25 Mon Sep 17 00:00:00 2001
From: Chris Morrell <inxilpro@users.noreply.github.com>
Date: Fri, 12 Apr 2024 16:45:07 -0400
Subject: [PATCH] Get things up-to-date

---
 .github/workflows/php-cs-fixer.yml |  2 +-
 .github/workflows/phpunit.yml      | 24 ++++++++----------------
 .gitignore                         |  2 ++
 .php-cs-fixer.dist.php             |  1 +
 composer.json                      |  6 +++---
 phpunit.xml => phpunit.xml.dist    |  0
 6 files changed, 15 insertions(+), 20 deletions(-)
 rename phpunit.xml => phpunit.xml.dist (100%)

diff --git a/.github/workflows/php-cs-fixer.yml b/.github/workflows/php-cs-fixer.yml
index 5aa86ce..0d914f6 100644
--- a/.github/workflows/php-cs-fixer.yml
+++ b/.github/workflows/php-cs-fixer.yml
@@ -31,7 +31,7 @@ jobs:
       - name: Install dependencies
         env:
           COMPOSER_DISCARD_CHANGES: true
-        run: composer require --no-suggest --no-progress --no-interaction --prefer-dist --update-with-all-dependencies "laravel/framework:^10.0" "orchestra/testbench:^8.0"
+        run: composer require --no-progress --no-interaction --prefer-dist --update-with-all-dependencies "laravel/framework:^10.0" "orchestra/testbench:^8.0"
 
       - name: Run PHP CS Fixer
         run: ./vendor/bin/php-cs-fixer fix --diff --dry-run
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index 54c6660..a35865f 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -12,21 +12,14 @@ jobs:
 
     strategy:
       matrix:
-        php: [ 8.0, 8.1, 8.2 ]
-        laravel: [ ^8.79, ^9.50.2, 10.* ]
+        php: [ 8.1, 8.2, 8.3 ]
+        laravel: [ 10.*, 11.* ]
         dependency-version: [ stable, lowest ]
         include:
-          - laravel: ^8.79
-            testbench: ^6.24
-          - laravel: ^9.50.2
-            testbench: ^7.22
           - laravel: 10.*
             testbench: 8.*
-        exclude:
-          - php: 8.2
-            laravel: ^8.79
-          - php: 8.0
-            laravel: 10.*
+          - laravel: 11.*
+            testbench: 9.*
           
     timeout-minutes: 10
 
@@ -59,10 +52,9 @@ jobs:
             ${{ runner.os }}-composer-
 
       - name: Install dependencies
-        run: composer require --no-interaction --prefer-dist --no-update "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}"
-      
-      - name: Set dependency version
-        run: composer update --no-interaction --prefer-dist --with-all-dependencies --prefer-${{ matrix.dependency-version }}
+        run: |
+          composer require --no-interaction --prefer-dist --no-update "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}"
+          composer update --no-interaction --prefer-dist --with-all-dependencies --prefer-${{ matrix.dependency-version }} 
 
       - name: Execute tests
-        run: vendor/bin/phpunit -v
+        run: vendor/bin/phpunit
diff --git a/.gitignore b/.gitignore
index a294246..d3f1a4d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,11 @@
 vendor/
 composer.phar
 composer.lock
+phpunit.xml
 .phpunit.result.cache
 .php_cs.cache
 .php-cs-fixer.cache
+.env
 
 .DS_Store
 .phpstorm.meta.php
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 069484f..1efe3c3 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -10,6 +10,7 @@
 		'@PSR2' => true,
 		'function_declaration' => [
 			'closure_function_spacing' => 'none',
+			'closure_fn_spacing' => 'none',
 		],
 		'ordered_imports' => [
 			'sort_algorithm' => 'alpha',
diff --git a/composer.json b/composer.json
index bc43460..ab4bdd1 100755
--- a/composer.json
+++ b/composer.json
@@ -13,14 +13,14 @@
   "type": "library",
   "license": "MIT",
   "require": {
-    "illuminate/support": "^9|^10|11.x-dev|dev-master",
+    "illuminate/support": "^10|^11|dev-master",
     "ext-json": "*"
   },
   "require-dev": {
-    "orchestra/testbench": "^6.24|^7.10|^8|9.x-dev|10.x-dev|dev-master",
+    "orchestra/testbench": "^8|^9|10.x-dev|dev-master",
     "friendsofphp/php-cs-fixer": "^3.34",
     "mockery/mockery": "^1.6",
-    "phpunit/phpunit": "^10.3"
+    "phpunit/phpunit": "^10.5"
   },
   "autoload": {
     "psr-4": {
diff --git a/phpunit.xml b/phpunit.xml.dist
similarity index 100%
rename from phpunit.xml
rename to phpunit.xml.dist