Merge branch '7.x' into 8.x

Signed-off-by: Mior Muhammad Zaki <[email protected]>
orchestral · Nov 6, 2024 · ca5e073 · ca5e073
2 parents a9edfc4 + 5cf0b92
commit ca5e073
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 4 deletions.
diff --git a/phpunit.xml b/phpunit.xml
@@ -15,10 +15,6 @@
             <directory suffix="Test.php">./tests/</directory>
         </testsuite>
     </testsuites>
-    <php>
-        <server name="APP_KEY" value="AckfSECXIvnK5r28GVIWUAxmbBSjTsmF"/>
-        <server name="SEND_DEPRECATED_NOTICES_TO_RAY" value="(true)"/>
-    </php>
     <source>
         <include>
             <directory suffix=".php">src/</directory>

diff --git a/tests/DefaultConfigurationTest.php b/tests/DefaultConfigurationTest.php
@@ -7,9 +7,11 @@
 use DateTimeInterface;
 use Illuminate\Foundation\Bootstrap\LoadConfiguration;
 use Illuminate\Support\Facades\Date;
+use Orchestra\Testbench\Attributes\WithConfig;
 use Orchestra\Testbench\Foundation\Env;
 use Orchestra\Testbench\TestCase;
 
+#[WithConfig('app.key', 'AckfSECXIvnK5r28GVIWUAxmbBSjTsmF')]
 class DefaultConfigurationTest extends TestCase
 {
     /** @test */

diff --git a/tests/Foundation/EnvTest.php b/tests/Foundation/EnvTest.php
@@ -11,6 +11,22 @@
  */
 class EnvTest extends TestCase
 {
+    /** {@inheritDoc} */
+    protected function setUp(): void
+    {
+        $_ENV['APP_KEY'] = 'AckfSECXIvnK5r28GVIWUAxmbBSjTsmF';
+
+        parent::setUp();
+    }
+
+    /** {@inheritDoc} */
+    protected function tearDown(): void
+    {
+        unset($_ENV['APP_KEY']);
+
+        parent::tearDown();
+    }
+
     /** @test */
     public function it_can_determined_has_env_values()
     {

diff --git a/tests/Integrations/EncryptionTest.php b/tests/Integrations/EncryptionTest.php
@@ -2,8 +2,10 @@
 
 namespace Orchestra\Testbench\Tests\Integrations;
 
+use Orchestra\Testbench\Attributes\WithConfig;
 use Orchestra\Testbench\TestCase;
 
+#[WithConfig('app.key', 'AckfSECXIvnK5r28GVIWUAxmbBSjTsmF')]
 class EncryptionTest extends TestCase
 {
     /**

diff --git a/tests/Integrations/PhpUnit9DeprecationsTest.php b/tests/Integrations/PhpUnit9DeprecationsTest.php
@@ -3,6 +3,7 @@
 namespace Orchestra\Testbench\Tests\Integrations;
 
 use ErrorException;
+use Orchestra\Testbench\Attributes\WithConfig;
 use Orchestra\Testbench\Exceptions\DeprecatedException;
 use Orchestra\Testbench\TestCase;
 
@@ -11,8 +12,15 @@
  *
  * @requires PHPUnit < 10
  */
+#[WithConfig('ray.send_deprecated_notices_to_ray', false)]
 class PhpUnit9DeprecationsTest extends TestCase
 {
+    /** {@inheritDoc} */
+    public function ignorePackageDiscoveriesFrom()
+    {
+        return ['*', 'spatie/laravel-ray'];
+    }
+
     /**
      * @test
      *

diff --git a/tests/Integrations/RequestTest.php b/tests/Integrations/RequestTest.php
@@ -2,8 +2,10 @@
 
 namespace Orchestra\Testbench\Tests\Integrations;
 
+use Orchestra\Testbench\Attributes\WithConfig;
 use Orchestra\Testbench\TestCase;
 
+#[WithConfig('app.key', 'AckfSECXIvnK5r28GVIWUAxmbBSjTsmF')]
 class RequestTest extends TestCase
 {
     /**

diff --git a/tests/Workbench/DiscoversTest.php b/tests/Workbench/DiscoversTest.php
@@ -5,9 +5,11 @@
 use Composer\InstalledVersions;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Foundation\Testing\Concerns\InteractsWithViews;
+use Orchestra\Testbench\Attributes\WithConfig;
 use Orchestra\Testbench\Concerns\WithWorkbench;
 use Orchestra\Testbench\TestCase;
 
+#[WithConfig('app.key', 'AckfSECXIvnK5r28GVIWUAxmbBSjTsmF')]
 class DiscoversTest extends TestCase
 {
     use InteractsWithViews;