Merge branch 'hammerstonedev:main' into feature/make-function-command

aarondfrancis · Mar 21, 2024 · 8673f26 · 8673f26
2 parents bfee5b2 + 17d5d36
commit 8673f26
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 35 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -14,52 +14,42 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ 7.4, 8.0, 8.1, 8.2 ]
-        laravel: [ 8.*, 9.*, 10.* ]
+        php: [ 8.1, 8.2, 8.3 ]
+        laravel: [ 9.*, 10.*, 11.* ]
         guzzle: [ 6.*, 7.* ]
         dependency-version: [ prefer-lowest, prefer-stable ]
         include:
-          - laravel: 8.*
-            testbench: 6.*
-
           - laravel: 9.*
             testbench: 7.*
 
           - laravel: 10.*
             testbench: 8.*
 
-        exclude:
-            # PHP 8.1 requires Laravel 8.65, so skip lowest
-          - laravel: 8.*
-            php: 8.1
-            dependency-version: prefer-lowest
-
-          - laravel: 9.*
-            php: 7.4
+          - laravel: 11.*
+            testbench: 9.*
 
+        exclude:
             # Laravel 9 requires Guzzle ^7.2
           - laravel: 9.*
             guzzle: 6.*
 
-            # Only test PHP 8.2 with Laravel 9
-          - laravel: 8.*
-            php: 8.2
-
             # PHP 8.2 requires Laravel 9.33 at least, so skip lowest
           - laravel: 9.*
             php: 8.2
             dependency-version: prefer-lowest
 
-            # Laravel 10 requires PHP 8.1
-          - laravel: 10.*
-            php: 7.4
-          - laravel: 10.*
-            php: 8.0
-
             # Laravel 10 requires Guzzle ^7.2
           - laravel: 10.*
             guzzle: 6.*
 
+            # Laravel 11 requires PHP 8.2
+          - laravel: 11.*
+            php: 8.1
+
+            # Laravel 11 requires Guzzle ^7.2
+          - laravel: 11.*
+            guzzle: 6.*
+
     name: P${{ matrix.php }} / L${{ matrix.laravel }} / G${{ matrix.guzzle }} / ${{ matrix.dependency-version }}
 
     steps:

diff --git a/composer.json b/composer.json
@@ -11,17 +11,17 @@
     ],
     "require": {
         "php": "^7.4|^8.0",
-        "illuminate/support": "^8.0|^9.0|^10",
-        "illuminate/filesystem": "^8.0|^9.0|^10",
-        "illuminate/console": "^8.0|^9.0|^10",
+        "illuminate/support": "^8.0|^9.0|^10|^11",
+        "illuminate/filesystem": "^8.0|^9.0|^10|^11",
+        "illuminate/console": "^8.0|^9.0|^10|^11",
         "maennchen/zipstream-php": "^2.1",
         "guzzlehttp/guzzle": "^6.3|^7.2",
         "aws/aws-sdk-php": "^3.216.1"
     },
     "require-dev": {
-        "orchestra/testbench": "^5|^6|^7|^8",
+        "orchestra/testbench": "^5|^6|^7|^8|^9",
         "mockery/mockery": "^1.3.3",
-        "phpunit/phpunit": ">=8.5.23|^9"
+        "phpunit/phpunit": ">=8.5.23|^9|^10"
     },
     "autoload": {
         "psr-4": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
-  <coverage>
-    <include>
-      <directory suffix=".php">src/</directory>
-    </include>
-  </coverage>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+  <coverage/>
   <testsuites>
     <testsuite name="unit">
       <directory>tests/Unit</directory>
@@ -16,4 +12,9 @@
   <php>
 
     </php>
+  <source>
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+  </source>
 </phpunit>
diff --git a/tests/Unit/EnvironmentTest.php b/tests/Unit/EnvironmentTest.php
@@ -26,7 +26,12 @@ public function it_can_be_overridden()
     /** @test */
     public function precedence_is_correct()
     {
-        config(['app.env' => 'app_env']);
+        Sidecar::clearEnvironment();
+
+        config([
+            'sidecar.env' => null,
+            'app.env' => 'app_env'
+        ]);
 
         $this->assertEquals('app_env', Sidecar::getEnvironment());