Laravel 11 (#120)

* Laravel 11 support
glorand · Mar 13, 2024 · b7e5556 · b7e5556
1 parent aa7b232
commit b7e5556
Show file tree

Hide file tree

Showing 19 changed files with 135 additions and 233 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -2,35 +2,36 @@ name: Test
 
 on:
   push:
-    branches: [ master ]
+    branches:
+      - master
   pull_request:
-    branches: [ master ]
+    branches:
+      - master
 
 jobs:
   test:
-
     runs-on: ubuntu-latest
+
     strategy:
       fail-fast: false
       matrix:
-        php: [8.1]
-        laravel: [10.*]
+        php: ['8.1', '8.2', '8.3']
+        laravel: ['10.*', '11.*']
         dependency-version: [prefer-lowest, prefer-stable]
         include:
           - laravel: 10.*
             testbench: 8.*
+          - laravel: 11.*
+            testbench: 9.*
+        exclude:
+          - laravel: 11.*
+            php: 8.1
 
     name: P ${{ matrix.php }} - L ${{ matrix.laravel }} - ${{ matrix.dependency-version }}
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
-
-      - name: Cache dependencies
-        uses: actions/cache@v2
-        with:
-          path: ~/.composer/cache/files
-          key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

diff --git a/.gitignore b/.gitignore
@@ -3,7 +3,8 @@ vendor/
 /.idea
 .php_cs.cache
 composer.lock
-/.phpunit.result.cache
+/.phpunit.cache
 # Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file
 # You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
 # composer.lock
+/.php-cs-fixer.cache
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
diff --git a/.styleci.yml b/.styleci.yml
diff --git a/.travis.yml b/.travis.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 All notable changes to `glorand/laravel-model-settings` will be documented in this file
 
+## 7.0.0 - 2024-03-13
+### Added
+- Add support for Laravel 11
+- 8.1 min. php version
+
 ## 5.0.0 - 2022-02-10
 ### Added
 - Add support for Laravel 9 by @belzaaron

diff --git a/README.md b/README.md
@@ -23,25 +23,12 @@
  <a href="LICENSE.md">
  <img src="https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat" alt="Software License">
  </a>
-<a href="https://codeclimate.com/github/glorand/laravel-model-settings/maintainability">
-<img src="https://api.codeclimate.com/v1/badges/ea0941afe155dd14f5d8/maintainability" alt="maintainability" />
-</a>
-<br />
-<a href="https://github.styleci.io/repos/163381474">
- <img src="https://github.styleci.io/repos/163381474/shield?branch=master&style=flat" alt="StyleCI">
- </a>
-<a href="https://scrutinizer-ci.com/g/glorand/laravel-model-settings/">
- <img src="https://scrutinizer-ci.com/g/glorand/laravel-model-settings/badges/quality-score.png?b=master" alt="Scrutinizer Code Quality">
- </a>
- <a href="https://scrutinizer-ci.com/g/glorand/laravel-model-settings/?branch=master">
- <img src="https://scrutinizer-ci.com/g/glorand/laravel-model-settings/badges/coverage.png?b=master" alt="Scrutinizer Code Coverage"/>
- </a>
  <br />
  <a title="MadeWithLaravel.com Shield" href="https://madewithlaravel.com/p/laravel-model-settings/shield-link"> <img src="https://madewithlaravel.com/storage/repo-shields/1716-shield.svg"/></a>
 <a title="PHP Version" href="#"><img src="https://img.shields.io/packagist/php-v/glorand/laravel-model-settings" alt="PHP Version" /></a>
 </p>
 
-The package requires PHP 7.3+ and follows the FIG standards PSR-1, PSR-2, PSR-4 and PSR-12
+The package requires PHP 8.1+ and follows the FIG standards PSR-1, PSR-2, PSR-4 and PSR-12
 to ensure a high level of interoperability between shared PHP.
 
 Bug reports, feature requests, and pull requests can be submitted by following our [Contribution Guide](CONTRIBUTING.md).

diff --git a/composer.json b/composer.json
@@ -18,17 +18,17 @@
     ],
     "require": {
         "php": "^8.1",
-        "illuminate/config": "^10.0",
-        "illuminate/database": "^10.0",
-        "illuminate/support": "^10.0",
-        "illuminate/console": "^10.0",
-        "illuminate/filesystem": "^10.0",
-        "illuminate/cache": "^10.0",
+        "illuminate/config": "^10.0|^11.0",
+        "illuminate/database": "^10.0|^11.0",
+        "illuminate/support": "^10.0|^11.0",
+        "illuminate/console": "^10.0|^11.0",
+        "illuminate/filesystem": "^10.0|^11.0",
+        "illuminate/cache": "^10.0|^11.0",
         "ext-json": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.5.10",
-        "orchestra/testbench": "^8.0",
+        "phpunit/phpunit": "^10.5|^11.0",
+        "orchestra/testbench": "^8.0|^9.0",
         "friendsofphp/php-cs-fixer": "^3.14",
         "josiasmontag/laravel-redis-mock": "^1.2"
     },

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -2,20 +2,10 @@
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          bootstrap="vendor/autoload.php"
          backupGlobals="false"
-         backupStaticAttributes="false"
          colors="true"
-         verbose="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-  <coverage processUncoveredFiles="true">
-    <include>
-      <directory suffix=".php">src</directory>
-    </include>
-  </coverage>
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
   <testsuites>
     <testsuite name="Glorand Model Settings Test Suite">
       <directory>tests</directory>
@@ -27,4 +17,9 @@
   <php>
 
     </php>
+  <source>
+    <include>
+      <directory suffix=".php">src</directory>
+    </include>
+  </source>
 </phpunit>