revert pr

spatie · Jan 31, 2025 · 3268028 · 3268028
1 parent c86a336
commit 3268028
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/src/Config/Config.php b/src/Config/Config.php
@@ -27,10 +27,10 @@ public static function fromArray(array $data): self
         $source = require dirname(__DIR__, 2).'/config/backup.php';
 
         return new self(
-            backup: BackupConfig::fromArray(array_replace_recursive($source['backup'], $data['backup'] ?? [])),
-            notifications: NotificationsConfig::fromArray(array_replace_recursive($source['notifications'], $data['notifications'] ?? [])),
+            backup: BackupConfig::fromArray(array_merge($source['backup'], $data['backup'] ?? [])),
+            notifications: NotificationsConfig::fromArray(array_merge($source['notifications'], $data['notifications'] ?? [])),
             monitoredBackups: MonitoredBackupsConfig::fromArray($data['monitor_backups'] ?? $source['monitor_backups']),
-            cleanup: CleanupConfig::fromArray(array_replace_recursive($source['cleanup'], $data['cleanup'] ?? []))
+            cleanup: CleanupConfig::fromArray(array_merge($source['cleanup'], $data['cleanup'] ?? []))
         );
     }
 }
diff --git a/tests/Config/ConfigTest.php b/tests/Config/ConfigTest.php
@@ -37,15 +37,6 @@
     expect($tempDirectory->path())->toBe('/foo');
 });
 
-it('merges the published config file with package config file', function () {
-    config()->set('backup.backup.destination', []);
-
-    $config = Config::fromArray(config('backup'));
-
-    expect($config->backup->destination)->toBeInstanceOf(DestinationConfig::class);
-    expect($config->backup->destination->compressionMethod)->toBe(ZipArchive::CM_DEFAULT);
-});
-
 it('merges the published config file with package config file and preserve published config values', function () {
     config()->set('backup.backup.destination', ['compression_method' => ZipArchive::CM_DEFLATE]);