Merge pull request #1805 from spatie/feature/use-config-object

Feature/use config object

composer.json

@@ -65,7 +65,7 @@
  "test": "vendor/bin/pest --compact",
  "format": "vendor/bin/php-cs-fixer fix --allow-risky=yes",
  "analyse": "vendor/bin/phpstan analyse",
- "rector": "./vendor/bin/rector --dry-run",
+ "rector": "vendor/bin/rector --dry-run",
  "baseline": "./vendor/bin/phpstan analyse --generate-baseline --memory-limit=2G"
  },
  "suggest": {

src/BackupDestination/BackupDestination.php

@@ -14,9 +14,7 @@ class BackupDestination
 
  protected ?BackupCollection $backupCollectionCache = null;
 
- public function __construct(protected ?Filesystem $disk, protected string $backupName, protected string $diskName)
- {
- }
+ public function __construct(protected ?Filesystem $disk, protected string $backupName, protected string $diskName) {}
 
  public function disk(): Filesystem
  {

src/BackupServiceProvider.php

@@ -52,15 +52,15 @@ public function packageRegistered(): void
 
  $this->registerDiscordChannel();
 
- $this->app->scoped(Config::class, function (): \Spatie\Backup\Config\Config {
+ $this->app->scoped(Config::class, function (): Config {
  return Config::fromArray(config('backup'));
  });
  }
 
  protected function registerDiscordChannel(): void
  {
  Notification::resolved(function (ChannelManager $service) {
- $service->extend('discord', function ($app): \Spatie\Backup\Notifications\Channels\Discord\DiscordChannel {
+ $service->extend('discord', function ($app): DiscordChannel {
  return new DiscordChannel();
  });
  });

src/Config/Config.php

@@ -11,8 +11,7 @@ protected function __construct(
  public NotificationsConfig $notifications,
  public MonitoredBackupsConfig $monitoredBackups,
  public CleanupConfig $cleanup,
- ) {
- }
+ ) {}
 
  /** @internal used for testing */
  public static function rebind(): void

src/Config/MonitoredBackupConfig.php

@@ -15,8 +15,7 @@ protected function __construct(
  public string $name,
  public array $disks,
  public array $healthChecks,
- ) {
- }
+ ) {}
 
  /** @param array<mixed> $data */
  public static function fromArray(array $data): self

src/Config/MonitoredBackupsConfig.php

@@ -11,8 +11,7 @@ class MonitoredBackupsConfig extends Data
  */
  protected function __construct(
  public array $monitorBackups,
- ) {
- }
+ ) {}
 
  /** @param array<mixed> $data */
  public static function fromArray(array $data): self

src/Config/NotificationDiscordConfig.php

@@ -10,8 +10,7 @@ protected function __construct(
  public string $webhookUrl,
  public string $username,
  public string $avatar_url,
- ) {
- }
+ ) {}
 
  /** @param array<mixed> $data */
  public static function fromArray(array $data): self

src/Config/NotificationMailConfig.php

@@ -10,8 +10,7 @@ class NotificationMailConfig extends Data
  protected function __construct(
  public string $to,
  public NotificationMailSenderConfig $from,
- ) {
- }
+ ) {}
 
  /**
  * @param array<mixed> $data

src/Config/NotificationMailSenderConfig.php

@@ -10,8 +10,7 @@ class NotificationMailSenderConfig extends Data
  protected function __construct(
  public string $address,
  public ?string $name,
- ) {
- }
+ ) {}
 
  /** @param array<mixed> $data */
  public static function fromArray(array $data): self

src/Config/NotificationSlackConfig.php

@@ -11,8 +11,7 @@ protected function __construct(
  public ?string $channel,
  public ?string $username,
  public ?string $icon,
- ) {
- }
+ ) {}
 
  /** @param array<mixed> $data */
  public static function fromArray(array $data): self

src/Config/SourceConfig.php

@@ -12,8 +12,7 @@ class SourceConfig extends Data
  protected function __construct(
  public SourceFilesConfig $files,
  public array $databases,
- ) {
- }
+ ) {}
 
  /** @param array<mixed> $data */
  public static function fromArray(array $data): self

src/Config/SourceFilesConfig.php

@@ -16,8 +16,7 @@ protected function __construct(
  public bool $followLinks,
  public bool $ignoreUnreadableDirectories,
  public ?string $relativePath,
- ) {
- }
+ ) {}
 
  /** @param array<mixed> $data */
  public static function fromArray(array $data): self

src/Config/StrategyConfig.php

@@ -13,8 +13,7 @@ protected function __construct(
  public int $keepMonthlyBackupsForMonths,
  public int $keepYearlyBackupsForYears,
  public int $deleteOldestBackupsWhenUsingMoreMegabytesThan,
- ) {
- }
+ ) {}
 
  /** @param array<mixed> $data */
  public static function fromArray(array $data): self

src/Events/BackupHasFailed.php

@@ -10,6 +10,5 @@ class BackupHasFailed
  public function __construct(
  public Exception $exception,
  public ?BackupDestination $backupDestination = null,
- ) {
- }
+ ) {}
 }

src/Events/BackupManifestWasCreated.php

@@ -8,6 +8,5 @@ class BackupManifestWasCreated
 {
  public function __construct(
  public Manifest $manifest,
- ) {
- }
+ ) {}
 }

src/Events/BackupWasSuccessful.php

@@ -8,6 +8,5 @@ class BackupWasSuccessful
 {
  public function __construct(
  public BackupDestination $backupDestination,
- ) {
- }
+ ) {}
 }

src/Events/BackupZipWasCreated.php

@@ -6,6 +6,5 @@ class BackupZipWasCreated
 {
  public function __construct(
  public string $pathToZip,
- ) {
- }
+ ) {}
 }

src/Events/CleanupHasFailed.php

@@ -10,6 +10,5 @@ class CleanupHasFailed
  public function __construct(
  public Exception $exception,
  public ?BackupDestination $backupDestination = null,
- ) {
- }
+ ) {}
 }

src/Events/CleanupWasSuccessful.php

@@ -8,6 +8,5 @@ class CleanupWasSuccessful
 {
  public function __construct(
  public BackupDestination $backupDestination,
- ) {
- }
+ ) {}
 }

src/Events/DumpingDatabase.php

@@ -8,6 +8,5 @@ class DumpingDatabase
 {
  public function __construct(
  public DbDumper $dbDumper
- ) {
- }
+ ) {}
 }

src/Events/HealthyBackupWasFound.php

@@ -8,6 +8,5 @@ class HealthyBackupWasFound
 {
  public function __construct(
  public BackupDestinationStatus $backupDestinationStatus,
- ) {
- }
+ ) {}
 }

src/Events/UnhealthyBackupWasFound.php

@@ -8,6 +8,5 @@ class UnhealthyBackupWasFound
 {
  public function __construct(
  public BackupDestinationStatus $backupDestinationStatus
- ) {
- }
+ ) {}
 }

src/Notifications/EventHandler.php

@@ -17,8 +17,7 @@ class EventHandler
 {
  public function __construct(
  protected Repository $config
- ) {
- }
+ ) {}
 
  public function subscribe(Dispatcher $events): void
  {

src/Notifications/Notifications/BackupHasFailedNotification.php

@@ -13,8 +13,7 @@ class BackupHasFailedNotification extends BaseNotification
 {
  public function __construct(
  public BackupHasFailed $event,
- ) {
- }
+ ) {}
 
  public function toMail(): MailMessage
  {

src/Notifications/Notifications/BackupWasSuccessfulNotification.php

@@ -13,8 +13,7 @@ class BackupWasSuccessfulNotification extends BaseNotification
 {
  public function __construct(
  public BackupWasSuccessful $event,
- ) {
- }
+ ) {}
 
  public function toMail(): MailMessage
  {

src/Notifications/Notifications/CleanupHasFailedNotification.php

@@ -13,8 +13,7 @@ class CleanupHasFailedNotification extends BaseNotification
 {
  public function __construct(
  public CleanupHasFailed $event,
- ) {
- }
+ ) {}
 
  public function toMail(): MailMessage
  {

src/Notifications/Notifications/CleanupWasSuccessfulNotification.php

@@ -13,8 +13,7 @@ class CleanupWasSuccessfulNotification extends BaseNotification
 {
  public function __construct(
  public CleanupWasSuccessful $event,
- ) {
- }
+ ) {}
 
  public function toMail(): MailMessage
  {

src/Notifications/Notifications/HealthyBackupWasFoundNotification.php

@@ -13,8 +13,7 @@ class HealthyBackupWasFoundNotification extends BaseNotification
 {
  public function __construct(
  public HealthyBackupWasFound $event,
- ) {
- }
+ ) {}
 
  public function toMail(): MailMessage
  {

src/Notifications/Notifications/UnhealthyBackupWasFoundNotification.php

@@ -14,8 +14,7 @@ class UnhealthyBackupWasFoundNotification extends BaseNotification
 {
  public function __construct(
  public UnhealthyBackupWasFound $event,
- ) {
- }
+ ) {}
 
  public function toMail(): MailMessage
  {

src/Tasks/Cleanup/CleanupStrategy.php

@@ -12,8 +12,7 @@ abstract class CleanupStrategy
 
  public function __construct(
  protected Repository $config,
- ) {
- }
+ ) {}
 
  abstract public function deleteOldBackups(BackupCollection $backups): void;
 

src/Tasks/Cleanup/Period.php

@@ -9,8 +9,7 @@ class Period
  public function __construct(
  protected Carbon $startDate,
  protected Carbon $endDate
- ) {
- }
+ ) {}
 
  public function startDate(): Carbon
  {

src/Tasks/Monitor/BackupDestinationStatus.php

@@ -15,8 +15,7 @@ class BackupDestinationStatus
  public function __construct(
  protected BackupDestination $backupDestination,
  protected array $healthChecks = []
- ) {
- }
+ ) {}
 
  public function backupDestination(): BackupDestination
  {

src/Tasks/Monitor/HealthCheckFailure.php

@@ -10,8 +10,7 @@ class HealthCheckFailure
  public function __construct(
  protected HealthCheck $healthCheck,
  protected Exception $exception
- ) {
- }
+ ) {}
 
  public function healthCheck(): HealthCheck
  {

src/Tasks/Monitor/HealthChecks/MaximumAgeInDays.php

@@ -10,8 +10,7 @@ class MaximumAgeInDays extends HealthCheck
 {
  public function __construct(
  protected int $days = 1
- ) {
- }
+ ) {}
 
  public function checkHealth(BackupDestination $backupDestination): void
  {

src/Tasks/Monitor/HealthChecks/MaximumStorageInMegabytes.php

@@ -10,8 +10,7 @@ class MaximumStorageInMegabytes extends HealthCheck
 {
  public function __construct(
  protected int $maximumSizeInMegaBytes = 5000
- ) {
- }
+ ) {}
 
  public function checkHealth(BackupDestination $backupDestination): void
  {