Merge pull request #202 from kontenta/laravel10

Support Laravel 10

.github/workflows/run-tests.yml

@@ -14,11 +14,16 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         php: [8.2, 8.1, 8.0]
-        laravel: [9.*]
+        laravel: [10.*, 9.*]
         stability: [prefer-lowest, prefer-stable]
-        include:
+        include:  
+          - laravel: 10.*
+            testbench: 8.*
           - laravel: 9.*
             testbench: 7.*
+        exclude:
+          - laravel: 10.*
+            php: 8.0
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }}
 

README.md

@@ -14,7 +14,7 @@ authentication, authorization, validation, views, etc.
 Kontour is there to provide enhancements and reusable elements for your admin
 area.
 
-You need **Laravel 9** to use the latest version of this package.
+You need at least **Laravel 9** to use the latest version of this package.
 
 ## Using Kontour in a Laravel app
 

composer.json

@@ -3,7 +3,7 @@
   "description": "Admin area tool utilities for Laravel",
   "license": "MIT",
   "require": {
-    "laravel/framework": "^9.0",
+    "laravel/framework": "^9.0 || ^10.0",
     "laravel/ui": "^4.0"
   },
   "require-dev": {

phpunit.xml.dist

@@ -1,27 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  backupGlobals="false"
-  backupStaticAttributes="false"
-  beStrictAboutTestsThatDoNotTestAnything="false"
-  bootstrap="vendor/autoload.php"
-  colors="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>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" beStrictAboutTestsThatDoNotTestAnything="false" bootstrap="vendor/autoload.php" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+  <coverage/>
   <testsuites>
-    <testsuite name="Package Tests">
-      <directory suffix="Test.php">./tests</directory>
-    </testsuite>
     <testsuite name="Feature">
       <directory suffix="Test.php">./tests/Feature</directory>
     </testsuite>
@@ -33,4 +13,9 @@
     <env name="APP_KEY" value="AckfSECXIvnK5r28GVIWUAxmbBSjTsmF"/>
     <env name="APP_URL" value="http://127.0.0.1:8001"/>
   </php>
+  <source>
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </source>
 </phpunit>

tests/IntegrationTestSetupTrait.php

@@ -46,9 +46,11 @@ protected function getEnvironmentSetUp($app)
             'driver' => 'eloquent',
             'model' => User::class,
         ]);
+
+        // Use the same password reset table as for the users
         $app['config']->set('auth.passwords.admins', [
             'provider' => 'admins',
-            'table' => 'password_resets',
+            'table' => $app['config']['auth']['passwords']['users']['table'],
             'expire' => 60,
         ]);
         $app['config']->set('kontour.guard', 'admin');