Support PHP 8.1+

.github/workflows/tests.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        php: [8.0, 8.1, 8.2]
+        php: [8.1, 8.2]
         dependency-version: [highest, lowest]
 
     steps:

composer.json

@@ -17,12 +17,12 @@
     ],
     "require": {
         "php": "^8.0",
-        "illuminate/console": "^8.22 || ^9.0 || ^10.0",
+        "illuminate/console": "^9.0 || ^10.0",
         "sven/file-config": "^3.1.0"
     },
     "require-dev": {
-        "graham-campbell/testbench": "^6.0",
-        "phpunit/phpunit": "^9.0 || ^10.0",
+        "orchestra/testbench": "^8.0",
+        "phpunit/phpunit": "^10.0",
         "mockery/mockery": "^1.4"
     },
     "autoload": {

phpunit.xml.dist

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.3/phpunit.xsd"
+         backupGlobals="false"
          colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
          bootstrap="./vendor/autoload.php"
+         cacheDirectory=".phpunit.cache"
+         backupStaticProperties="false"
 >
-    <testsuites>
-        <testsuite name="Flex Env Test Suite">
-            <directory suffix=".php">./tests</directory>
-        </testsuite>
-    </testsuites>
+  <testsuites>
+    <testsuite name="Flex Env Test Suite">
+      <directory suffix="Test.php">./tests</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>

tests/Feature/EnvDeleteTest.php

@@ -17,7 +17,6 @@ public function it_can_delete_an_entry(): void
         );
 
         $this->artisan('env:delete FOO')
-            // ->expectsConfirmation('Are you sure you want to delete "FOO" from your .env file?', 'yes')
             ->expectsQuestion('Are you sure you want to delete "FOO" from your .env file?', true)
             ->expectsOutput('Successfully deleted the entry "FOO" from your .env file.')
             ->assertExitCode(0);
@@ -63,7 +62,6 @@ public function it_does_not_delete_the_entry_when_no_is_answered(): void
         );
 
         $this->artisan('env:delete FOO')
-            // ->expectsConfirmation('Are you sure you want to delete "FOO" from your .env file?', 'no')
             ->expectsQuestion('Are you sure you want to delete "FOO" from your .env file?', false)
             ->expectsOutput('Alright, no changes made.')
             ->assertExitCode(1);

tests/TestCase.php

@@ -3,23 +3,19 @@
 namespace Sven\FlexEnv\Tests;
 
 use GrahamCampbell\TestBench\AbstractPackageTestCase;
+use Orchestra\Testbench\TestCase as OrchestraTestCase;
 use Sven\FlexEnv\ServiceProvider;
 
-abstract class TestCase extends AbstractPackageTestCase
+abstract class TestCase extends OrchestraTestCase
 {
-    public static function getServiceProviderClass(): string
+    protected function getEnvironmentSetUp($app): void
     {
-        return ServiceProvider::class;
-    }
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-
         file_put_contents(__DIR__.'/assets/.env.test', '');
 
-        $this->app->useEnvironmentPath(__DIR__.'/assets');
-        $this->app->loadEnvironmentFrom('.env.test');
+        $app->useEnvironmentPath(__DIR__.'/assets');
+        $app->loadEnvironmentFrom('.env.test');
+
+        $app->register(ServiceProvider::class);
     }
 
     protected function tearDown(): void