Code refactoring

.editorconfig

@@ -8,8 +8,8 @@ indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
 
+[*.{js,jsx,mjs,cjs,ts,tsx,mts,cts,vue,css,scss,sass,less,styl}]
+indent_size = 2
+
 [*.md]
 trim_trailing_whitespace = false
-
-[*.{yml,yaml}]
-indent_size = 2

.gitattributes

@@ -1,20 +1,11 @@
-# Path-based git attributes
-# https://www.kernel.org/pub/software/scm/git/docs/gitattributes.html
+* text=auto eol=lf
 
-# Ignore all test and documentation with "export-ignore".
-/.github            export-ignore
-/.gitattributes     export-ignore
-/.gitignore         export-ignore
-/phpunit.xml.dist   export-ignore
-/art                export-ignore
-/docs               export-ignore
-/tests              export-ignore
-/workbench          export-ignore
-/.editorconfig      export-ignore
-/.php_cs.dist.php   export-ignore
-/psalm.xml          export-ignore
-/psalm.xml.dist     export-ignore
-/testbench.yaml     export-ignore
-/UPGRADING.md       export-ignore
-/phpstan.neon.dist  export-ignore
-/phpstan-baseline.neon  export-ignore
+*.blade.php diff=html
+*.css diff=css
+*.html diff=html
+*.md diff=markdown
+*.php diff=php
+
+/.github export-ignore
+CHANGELOG.md export-ignore
+.styleci.yml export-ignore

.github/dependabot.yml

@@ -3,7 +3,6 @@
 
 version: 2
 updates:
-
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:

.github/workflows/run-tests.yml

@@ -17,14 +17,12 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest]
-        php: [8.3, 8.2]
-        stability: [prefer-lowest, prefer-stable]
+        php: [8.4, 8.3]
         include:
-          - laravel: 11.*
-            testbench: 9.*
-            carbon: ^3.1.1
+          - laravel: 12.*
+            carbon: ^3.9.1
 
-    name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
+    name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.os }}
 
     steps:
       - name: Checkout code
@@ -44,8 +42,8 @@ jobs:
 
       - name: Install dependencies
         run: |
-          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "nesbot/carbon:${{ matrix.os == 'windows-latest' && '^^^' || '' }}${{ matrix.carbon }}" --no-interaction --no-update
-          composer update --${{ matrix.stability }} --prefer-dist --no-interaction
+          composer require "laravel/framework:${{ matrix.laravel }}" "nesbot/carbon:${{ matrix.carbon }}" --no-interaction --no-update
+          composer update --prefer-dist --no-interaction
 
       - name: List Installed Dependencies
         run: composer show -D

.gitignore

@@ -1,32 +1,31 @@
-# Composer Related
-composer.lock
-/vendor
-
-# Frontend Assets
-/node_modules
-
-# Logs
-npm-debug.log
-yarn-error.log
-
-# Caches
-.phpunit.cache
-.phpunit.result.cache
-/build
-
-# IDE Helper
-_ide_helper.php
 _ide_helper_models.php
+_ide_helper.php
+!.env.example
+.cache
+.data
+.DS_Store
+.env
+.env.*
+.fleet
+.idea
+.output
+.phpactor.json
 .phpstorm.meta.php
-
-# Editors
-/.idea
-/.fleet
-/.vscode
-
-# Misc
-phpunit.xml
-phpstan.neon
-testbench.yaml
-/docs
-/coverage
+.phpunit.cache
+.phpunit.result.cache
+.pnpm-store
+.vscode
+.zed
+*.log
+composer.lock
+/auth.json
+/bootstrap/ssr
+/dist
+/node_modules
+/public/build
+/public/hot
+/public/storage
+/public/vendor
+/storage/*.key
+/storage/pail
+/vendor

composer.json

@@ -2,11 +2,11 @@
     "name": "foxws/laravel-modelcache",
     "description": "Cache helpers for Laravel Eloquent models",
     "keywords": [
-        "foxws",
         "laravel",
         "laravel-modelcache",
         "eloquent",
         "model",
+        "models",
         "cache",
         "caching"
     ],
@@ -21,26 +21,23 @@
     ],
     "require": {
         "php": "^8.2",
-        "illuminate/cache": "^10.0|^11.0",
-        "illuminate/console": "^10.0|^11.0",
-        "illuminate/container": "^10.0|^11.0",
-        "illuminate/contracts": "^10.0||^11.0",
-        "illuminate/support": "^10.0|^11.0",
-        "nesbot/carbon": "^2.63|^3.0",
-        "spatie/laravel-package-tools": "^1.17"
+        "illuminate/cache": "^11.0|^12.0",
+        "illuminate/console": "^11.0|^12.0",
+        "illuminate/contracts": "^11.0|^12.0",
+        "illuminate/support": "^11.0|^12.0",
+        "spatie/laravel-package-tools": "^1.9"
     },
     "require-dev": {
-        "laravel/pint": "^1.14",
-        "nunomaduro/collision": "^8.1.1||^7.10.0",
-        "larastan/larastan": "^2.9",
-        "orchestra/testbench": "^9.0.0||^8.22.0",
-        "pestphp/pest": "^2.34",
-        "pestphp/pest-plugin-arch": "^2.7",
-        "pestphp/pest-plugin-laravel": "^2.3",
-        "phpstan/extension-installer": "^1.3",
-        "phpstan/phpstan-deprecation-rules": "^1.1",
-        "phpstan/phpstan-phpunit": "^1.3",
-        "spatie/laravel-ray": "^1.35"
+        "larastan/larastan": "^3.4",
+        "laravel/pint": "^1.22",
+        "nunomaduro/collision": "^8.8",
+        "orchestra/testbench": "^10.0",
+        "pestphp/pest": "^3.7",
+        "pestphp/pest-plugin-arch": "^3.1",
+        "pestphp/pest-plugin-laravel": "^3.4",
+        "phpstan/extension-installer": "^1.4.3",
+        "phpstan/phpstan-deprecation-rules": "^2.0",
+        "phpstan/phpstan-phpunit": "^2.0"
     },
     "autoload": {
         "psr-4": {