Update to v3 (#34)

.gitattributes

@@ -6,12 +6,9 @@
 /.gitattributes          export-ignore
 /.github                 export-ignore
 /.gitignore              export-ignore
-/.php-cs-fixer.dist.php  export-ignore
-/.php_cs.dist            export-ignore
 /bin                     export-ignore
 /docs                    export-ignore
-/phpunit.xml.dist        export-ignore
+/phpstan.neon.dist       export-ignore
 /phpunit.xml.dist        export-ignore
 /pint.json               export-ignore
-/psalm.xml.dist          export-ignore
 /tests                   export-ignore

.github/workflows/larastan.yml

@@ -0,0 +1,26 @@
+name: Larastan
+
+on:
+    push:
+        paths:
+            - '**.php'
+            - 'phpstan.neon.dist'
+
+jobs:
+    larastan:
+        name: larastan
+        runs-on: ubuntu-latest
+        steps:
+            -   uses: actions/checkout@v3
+
+            -   name: Setup PHP
+                uses: shivammathur/setup-php@v2
+                with:
+                    php-version: '8.2'
+                    coverage: none
+
+            -   name: Install dependencies
+                uses: ramsey/composer-install@v2
+
+            -   name: Run Larastan
+                run: ./vendor/bin/phpstan --error-format=github

.github/workflows/markdown-normalize.yml

@@ -5,6 +5,9 @@ on:
         paths:
             - "*.md"
 
+permissions:
+    contents: write
+
 jobs:
     normalize:
         timeout-minutes: 1

.github/workflows/pint.yml

@@ -1,34 +1,38 @@
 name: PHP Linting (Pint)
 
 on:
-  workflow_dispatch:
-  push:
-    branches-ignore:
-      - 'dependabot/npm_and_yarn/*'
+    workflow_dispatch:
+    push:
+        branches-ignore:
+            - 'dependabot/npm_and_yarn/*'
+
+permissions:
+    contents: write
 
 jobs:
-  phplint:
-    runs-on: ubuntu-latest
+    phplint:
+        runs-on: ubuntu-latest
 
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 2
+        steps:
+            -   name: Checkout code
+                uses: actions/checkout@v4
+                with:
+                    fetch-depth: 2
+                    ref: ${{ github.head_ref }}
 
-      - name: Laravel pint
-        uses: aglipanci/[email protected]
-        with:
-          preset: laravel
+            -   name: Laravel pint
+                uses: aglipanci/[email protected]
+                with:
+                    preset: laravel
 
-      - name: Extract branch name
-        shell: bash
-        run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
-        id: extract_branch
+            -   name: Extract branch name
+                shell: bash
+                run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
+                id: extract_branch
 
-      - name: Commit Changes
-        uses: stefanzweifel/git-auto-commit-action@v4
-        with:
-          commit_message: PHP Linting (Pint)
-          branch: ${{ steps.extract_branch.outputs.branch }}
-          skip_fetch: true
+            -   name: Commit Changes
+                uses: stefanzweifel/git-auto-commit-action@v4
+                with:
+                    commit_message: PHP Linting (Pint)
+                    branch: ${{ steps.extract_branch.outputs.branch }}
+                    skip_fetch: true

.github/workflows/run-tests.yml

@@ -2,35 +2,24 @@ name: Tests
 
 on:
     push:
-        paths-ignore:
-            - '**.md'
-    pull_request:
-        paths-ignore:
-            - '**.md'
+        paths:
+            - '**.php'
+            - 'phpunit.xml.dist'
+            - '.github/workflows/run-tests.yml'
+            - 'composer.json'
 
 jobs:
     test:
         runs-on: ubuntu-latest
         strategy:
             fail-fast: true
             matrix:
-                php: [8.2, 8.1]
-                laravel: [10.*, 9.*, 8.*,]
+                php: [8.3, 8.2, 8.1]
+                laravel: [10.*]
                 dependency-version: [prefer-lowest, prefer-stable]
                 include:
                     -   laravel: 10.*
                         testbench: 8.*
-                    -   laravel: 9.*
-                        testbench: 7.*
-                    -   laravel: 8.*
-                        testbench: ^6.23
-                exclude:
-                    -   laravel: 8.*
-                        php: 8.2
-                        dependency-version: prefer-lowest
-                    -   laravel: 9.*
-                        php: 8.2
-                        dependency-version: prefer-lowest
 
         name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
 
@@ -59,4 +48,4 @@ jobs:
                 run: composer show -D
 
             -   name: Execute tests
-                run: vendor/bin/pest -p
+                run: vendor/bin/pest --stop-on-failure --parallel --display-skipped

.gitignore

@@ -1,7 +1,7 @@
 .idea
+.php-cs-fixer.cache
 .php_cs
 .php_cs.cache
-.php-cs-fixer.cache
 .phpunit.result.cache
 build
 composer.lock

CHANGELOG.md

@@ -6,93 +6,93 @@ All notable changes to `laravel-settings` will be documented in this file
 
 ### What's Changed
 
-- Bump creyD/prettier_action from 4.2 to 4.3 by @dependabot in https://github.com/rawilk/laravel-settings/pull/15
-- Bump aglipanci/laravel-pint-action from 2.1.0 to 2.2.0 by @dependabot in https://github.com/rawilk/laravel-settings/pull/17
-- Add Laravel 10.x Support by @rawilk in https://github.com/rawilk/laravel-settings/pull/18
-- Add Php 8.2 compatibility by @rawilk in https://github.com/rawilk/laravel-settings/pull/19
+-   Bump creyD/prettier_action from 4.2 to 4.3 by @dependabot in https://github.com/rawilk/laravel-settings/pull/15
+-   Bump aglipanci/laravel-pint-action from 2.1.0 to 2.2.0 by @dependabot in https://github.com/rawilk/laravel-settings/pull/17
+-   Add Laravel 10.x Support by @rawilk in https://github.com/rawilk/laravel-settings/pull/18
+-   Add Php 8.2 compatibility by @rawilk in https://github.com/rawilk/laravel-settings/pull/19
 
 **Full Changelog**: https://github.com/rawilk/laravel-settings/compare/v2.2.1...v2.2.2
 
 ## v2.2.1 - 2023-02-07
 
 ### What's Changed
 
-- Bump dependabot/fetch-metadata from 1.3.5 to 1.3.6 by @dependabot in https://github.com/rawilk/laravel-settings/pull/13
-- Bump aglipanci/laravel-pint-action from 1.0.0 to 2.1.0 by @dependabot in https://github.com/rawilk/laravel-settings/pull/10
-- Improve internal handling of the Context object on Settings service class
-- Prevent decryption errors when checking if a value should be persisted or not on `set()`
+-   Bump dependabot/fetch-metadata from 1.3.5 to 1.3.6 by @dependabot in https://github.com/rawilk/laravel-settings/pull/13
+-   Bump aglipanci/laravel-pint-action from 1.0.0 to 2.1.0 by @dependabot in https://github.com/rawilk/laravel-settings/pull/10
+-   Improve internal handling of the Context object on Settings service class
+-   Prevent decryption errors when checking if a value should be persisted or not on `set()`
 
 **Full Changelog**: https://github.com/rawilk/laravel-settings/compare/v2.2.0...v2.2.1
 
 ## v2.2.0 - 2022-12-07
 
 ### What's Changed
 
-- Allow cache to be temporarily disabled (via `temporarilyDisableCache()`)
+-   Allow cache to be temporarily disabled (via `temporarilyDisableCache()`)
 
 **Full Changelog**: https://github.com/rawilk/laravel-settings/compare/v2.1.1...v2.2.0
 
 ## v2.1.1 - 2022-12-06
 
 ### What's Changed
 
-- Bump dependabot/fetch-metadata from 1.3.4 to 1.3.5 by @dependabot in https://github.com/rawilk/laravel-settings/pull/8
-- Bump actions/checkout from 2 to 3 by @dependabot in https://github.com/rawilk/laravel-settings/pull/9
-- Prevent non-strings from being unserialized or decrypted
+-   Bump dependabot/fetch-metadata from 1.3.4 to 1.3.5 by @dependabot in https://github.com/rawilk/laravel-settings/pull/8
+-   Bump actions/checkout from 2 to 3 by @dependabot in https://github.com/rawilk/laravel-settings/pull/9
+-   Prevent non-strings from being unserialized or decrypted
 
 **Full Changelog**: https://github.com/rawilk/laravel-settings/compare/v2.1.0...v2.1.1
 
 ## v2.1.0 - 2022-11-01
 
 ### Added
 
-- Feature: model settings by @rawilk in https://github.com/rawilk/laravel-settings/pull/7
+-   Feature: model settings by @rawilk in https://github.com/rawilk/laravel-settings/pull/7
 
 ### Changed
 
-- Composer: Update doctrine/dbal requirement from ^2.12 to ^3.5 by @dependabot in https://github.com/rawilk/laravel-settings/pull/5
-- Bump creyD/prettier_action from 3.0 to 4.2 by @dependabot in https://github.com/rawilk/laravel-settings/pull/6
-- Drop official PHP 8.0 support
+-   Composer: Update doctrine/dbal requirement from ^2.12 to ^3.5 by @dependabot in https://github.com/rawilk/laravel-settings/pull/5
+-   Bump creyD/prettier_action from 3.0 to 4.2 by @dependabot in https://github.com/rawilk/laravel-settings/pull/6
+-   Drop official PHP 8.0 support
 
 **Full Changelog**: https://github.com/rawilk/laravel-settings/compare/v2.0.1...v2.1.0
 
 ## 2.0.1 - 2022-02-23
 
 ### Updated
 
-- Add support for Laravel 9.*
-- Add support for PHP 8.1
+-   Add support for Laravel 9.\*
+-   Add support for PHP 8.1
 
 ## 2.0.0 - 2020-12-01
 
 ### Breaking Changes
 
-- Drop support for Laravel v6 and v7
-- Drop support for php 7
+-   Drop support for Laravel v6 and v7
+-   Drop support for php 7
 
 ### Updated
 
-- Add support for php 8
-- Update some of code base to use php 8 features
+-   Add support for php 8
+-   Update some of code base to use php 8 features
 
 ## 1.0.3 - 2020-10-26
 
 ### Fixed
 
-- Fix bug with context being reset when saving ([#3](https://github.com/rawilk/laravel-settings/issues/3))
+-   Fix bug with context being reset when saving ([#3](https://github.com/rawilk/laravel-settings/issues/3))
 
 ## 1.0.2 - 2020-10-09
 
 ### Fixed
 
-- Wrap decrypting values in a try/catch to help prevent decryption errors when caching is used - [#2](https://github.com/rawilk/laravel-settings/issues/2)
+-   Wrap decrypting values in a try/catch to help prevent decryption errors when caching is used - [#2](https://github.com/rawilk/laravel-settings/issues/2)
 
 ## 1.0.1 - 2020-09-09
 
 ### Added
 
-- Add support for Laravel 8
+-   Add support for Laravel 8
 
 ## 1.0.0 - 2020-08-02
 
-- initial release
+-   initial release

README.md

@@ -76,6 +76,10 @@ If you discover any security related issues, please email [email protected]
 -   [Randall Wilk](https://github.com/rawilk)
 -   [All Contributors](../../contributors)
 
+## Alternatives
+
+-   [spatie/laravel-settings](https://github.com/spatie/laravel-settings)
+
 ## Disclaimer
 
 This package is not affiliated with, maintained, authorized, endorsed or sponsored by Laravel or any of its affiliates.

composer.json

@@ -19,21 +19,18 @@
         }
     ],
     "require": {
-        "php": "^8.0|^8.1|^8.2",
-        "illuminate/database": "^8.0|^9.0|^10.0",
-        "illuminate/support": "^8.0|^9.0|^10.0",
-        "spatie/laravel-package-tools": "^1.2|^1.13"
+        "php": "^8.1|^8.2|^8.3",
+        "illuminate/database": "^10.0",
+        "illuminate/support": "^10.0",
+        "spatie/laravel-package-tools": "^1.13"
     },
     "require-dev": {
-        "doctrine/dbal": "^3.5",
         "laravel/pint": "^1.2",
-        "mockery/mockery": "^1.4.2",
-        "orchestra/testbench": "^6.5|^7.0|^8.0",
-        "pestphp/pest": "^1.22",
-        "pestphp/pest-plugin-laravel": "^1.3",
-        "pestphp/pest-plugin-parallel": "^1.0|^1.2",
-        "phpunit/phpunit": "^9.4",
-        "spatie/laravel-ray": "^1.0|^1.31"
+        "nunomaduro/larastan": "^2.6",
+        "orchestra/testbench": "^8.0",
+        "pestphp/pest": "^2.10",
+        "pestphp/pest-plugin-laravel": "^2.2",
+        "spatie/laravel-ray": "^1.31"
     },
     "autoload": {
         "psr-4": {
@@ -52,8 +49,9 @@
         "post-autoload-dump": [
             "@php ./vendor/bin/testbench package:discover --ansi"
         ],
+        "analyse": "vendor/bin/phpstan analyse",
         "test": "vendor/bin/pest -p",
-        "format": "vendor/bin/pint"
+        "format": "vendor/bin/pint --dirty"
     },
     "config": {
         "sort-packages": true,