Skip to content

Commit a2bd5f1

Browse files
freekmurzefreekmurze
committed
Merge branch 'main' of github.com:spatie/laravel-backup
2 parents 7fd3c6c + f8328f9 commit a2bd5f1

10 files changed

+102
-23
lines changed

‎.github/workflows/dependabot-auto-merge.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414

1515
- name: Dependabot metadata
1616
id: metadata
17-
uses: dependabot/fetch-metadata@v2.2.0
17+
uses: dependabot/fetch-metadata@v2
1818
with:
1919
github-token: "${{ secrets.GITHUB_TOKEN }}"
2020

‎.github/workflows/php-cs-fixer.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
ref: ${{ github.head_ref }}
2121

2222
- name: Fix PHP code style issues
23-
uses: aglipanci/laravel-pint-action@2.4
23+
uses: aglipanci/laravel-pint-action@v2
2424

2525
- name: Commit changes
2626
uses: stefanzweifel/git-auto-commit-action@v5

‎.github/workflows/run-tests.yml

+5-6
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,15 @@ jobs:
1818
matrix:
1919
os: [ubuntu-latest]
2020
php: [8.4, 8.3, 8.2]
21-
laravel: [11.*, 10.*]
21+
laravel: [12.*, 11.*, 10.*]
2222
stability: [prefer-lowest, prefer-stable]
23-
carbon: [^2.63]
2423
include:
2524
- laravel: 10.*
2625
testbench: 8.*
2726
- laravel: 11.*
2827
testbench: 9.*
28+
- laravel: 12.*
29+
testbench: 10.*
2930

3031
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
3132

@@ -52,14 +53,12 @@ jobs:
5253
5354
- name: Install dependencies
5455
run: |
55-
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "nesbot/carbon:${{ matrix.os == 'windows-latest' && '^^^' || '' }}${{ matrix.carbon }}" --no-interaction --no-update
56+
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
57+
composer remove "larastan/larastan" --dev --no-interaction --no-update
5658
composer update --${{ matrix.stability }} --prefer-dist --no-interaction
5759
5860
- name: List Installed Dependencies
5961
run: composer show -D
6062

6163
- name: Execute tests
6264
run: vendor/bin/pest --ci
63-
64-
65-

‎CHANGELOG.md

+36
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,42 @@
22

33
All notable changes to `laravel-backup` will be documented in this file.
44

5+
## 9.2.7 - 2025-02-16
6+
7+
### What's Changed
8+
9+
* Kazakh language support 🇰🇿 by @altynbek07 in https://github.com/spatie/laravel-backup/pull/1890
10+
11+
**Full Changelog**: https://github.com/spatie/laravel-backup/compare/9.2.6...9.2.7
12+
13+
## 9.2.6 - 2025-02-14
14+
15+
### What's Changed
16+
17+
* Bump dependabot/fetch-metadata from 2.2.0 to 2.3.0 by @dependabot in https://github.com/spatie/laravel-backup/pull/1883
18+
* NotificationMailSenderConfig - remove redundant [ 'from' ] key by @mho22 in https://github.com/spatie/laravel-backup/pull/1884
19+
* Update Laravel & Spatie Backup Versions in introduction.md by @majdghithan in https://github.com/spatie/laravel-backup/pull/1886
20+
* Laravel 12 Support by @erikn69 in https://github.com/spatie/laravel-backup/pull/1889
21+
22+
### New Contributors
23+
24+
* @majdghithan made their first contribution in https://github.com/spatie/laravel-backup/pull/1886
25+
26+
**Full Changelog**: https://github.com/spatie/laravel-backup/compare/9.2.5...9.2.6
27+
28+
## 9.2.5 - 2025-01-31
29+
30+
### What's Changed
31+
32+
* remove the `only()` from tests by @pxpm in https://github.com/spatie/laravel-backup/pull/1875
33+
* Include all supported databases by @SebKay in https://github.com/spatie/laravel-backup/pull/1876
34+
35+
### New Contributors
36+
37+
* @SebKay made their first contribution in https://github.com/spatie/laravel-backup/pull/1876
38+
39+
**Full Changelog**: https://github.com/spatie/laravel-backup/compare/9.2.4...9.2.5
40+
541
## 9.2.4 - 2025-01-27
642

743
### What's Changed

‎composer.json

+9-9
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
"require": {
2121
"php": "^8.2",
2222
"ext-zip": "^1.14.0",
23-
"illuminate/console": "^10.10.0|^11.0",
24-
"illuminate/contracts": "^10.10.0|^11.0",
25-
"illuminate/events": "^10.10.0|^11.0",
26-
"illuminate/filesystem": "^10.10.0|^11.0",
27-
"illuminate/notifications": "^10.10.0|^11.0",
28-
"illuminate/support": "^10.10.0|^11.0",
23+
"illuminate/console": "^10.10.0|^11.0|^12.0",
24+
"illuminate/contracts": "^10.10.0|^11.0|^12.0",
25+
"illuminate/events": "^10.10.0|^11.0|^12.0",
26+
"illuminate/filesystem": "^10.10.0|^11.0|^12.0",
27+
"illuminate/notifications": "^10.10.0|^11.0|^12.0",
28+
"illuminate/support": "^10.10.0|^11.0|^12.0",
2929
"league/flysystem": "^3.0",
3030
"spatie/db-dumper": "^3.7",
3131
"spatie/laravel-package-tools": "^1.6.2",
@@ -37,12 +37,12 @@
3737
"require-dev": {
3838
"composer-runtime-api": "^2.0",
3939
"ext-pcntl": "*",
40-
"larastan/larastan": "^2.7.0",
40+
"larastan/larastan": "^2.7.0|^3.0",
4141
"laravel/slack-notification-channel": "^2.5|^3.0",
4242
"league/flysystem-aws-s3-v3": "^2.0|^3.0",
4343
"mockery/mockery": "^1.4",
44-
"orchestra/testbench": "^8.0|^9.0",
45-
"pestphp/pest": "^1.20|^2.0",
44+
"orchestra/testbench": "^8.0|^9.0|^10.0",
45+
"pestphp/pest": "^1.20|^2.0|^3.0",
4646
"phpstan/extension-installer": "^1.1",
4747
"phpstan/phpstan-deprecation-rules": "^1.0",
4848
"phpstan/phpstan-phpunit": "^1.1",

‎docs/_index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: v8
2+
title: v9
33
slogan: One day you'll thank us for this
44
githubUrl: https://github.com/spatie/laravel-backup
55
branch: main

‎docs/introduction.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Introduction
33
weight: 1
44
---
55

6-
This Laravel package creates a backup of your application. The backup is a zipfile that contains all files in the directories you specify along with a dump of your database. The backup can be stored on [any of the filesystems](https://laravel.com/docs/10.x/filesystem) you have configured. The package can also notify you via Mail, Slack or any notification provider when something goes wrong with your backups.
6+
This Laravel package creates a backup of your application. The backup is a zipfile that contains all files in the directories you specify along with a dump of your database. The backup can be stored on [any of the filesystems](https://laravel.com/docs/11.x/filesystem) you have configured. The package can also notify you via Mail, Slack or any notification provider when something goes wrong with your backups.
77

88
Feeling paranoid about backups? Don't be! You can backup your application to multiple filesystems at once.
99

@@ -15,7 +15,7 @@ php artisan backup:run
1515

1616
In addition to making the backup, the package can also clean up old backups, monitor the health of the backups, and show an overview of all backups.
1717

18-
If you need to backup multiple servers, take a look at [our laravel-backup-server package](https://spatie.be/docs/laravel-backup-server/v3/introduction).
18+
If you need to backup multiple servers, take a look at [our laravel-backup-server package](https://spatie.be/docs/laravel-backup-server/v4/introduction).
1919

2020
## We have badges!
2121

‎resources/lang/kk/notifications.php

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
<?php
2+
3+
return [
4+
'exception_message' => 'Қате туралы хабарлама: :message',
5+
'exception_trace' => 'Қате туралы мәліметтер: :trace',
6+
'exception_message_title' => 'Қате туралы хабарлама',
7+
'exception_trace_title' => 'Қате туралы мәліметтер',
8+
9+
'backup_failed_subject' => ':application_name бағдарламасының резервтік көшірмесін жасау сәтсіз аяқталды',
10+
'backup_failed_body' => 'Маңызды: :application_name бағдарламасының резервтік көшірмесін жасау барысында қате орын алды',
11+
12+
'backup_successful_subject' => ':application_name бағдарламасының жаңа резервтік көшірмесі сәтті құрылды',
13+
'backup_successful_subject_title' => 'Жаңа резервтік көшірме сәтті құрылды!',
14+
'backup_successful_body' => 'Жақсы жаңалық: :application_name бағдарламасының жаңа резервтік көшірмесі :disk_name дискінде сәтті құрылды.',
15+
16+
'cleanup_failed_subject' => ':application_name бағдарламасының резервтік көшірмелерін тазалау сәтсіз аяқталды',
17+
'cleanup_failed_body' => ':application_name бағдарламасының резервтік көшірмелерін тазалау барысында қате орын алды',
18+
19+
'cleanup_successful_subject' => ':application_name бағдарламасының резервтік көшірмелерін тазалау сәтті өтті',
20+
'cleanup_successful_subject_title' => 'Резервтік көшірмелерді тазалау сәтті аяқталды!',
21+
'cleanup_successful_body' => ':disk_name дискіндегі :application_name бағдарламасының резервтік көшірмелерін тазалау сәтті аяқталды.',
22+
23+
'healthy_backup_found_subject' => ':disk_name дискіндегі :application_name бағдарламасының резервтік көшірмелері қалыпты күйде',
24+
'healthy_backup_found_subject_title' => ':application_name бағдарламасының резервтік көшірмелері қалыпты күйде',
25+
'healthy_backup_found_body' => ':application_name бағдарламасының резервтік көшірмелері толық тексеруден өтті. Өте жақсы!',
26+
27+
'unhealthy_backup_found_subject' => 'Маңызды: :application_name бағдарламасының резервтік көшірмелері жарамсыз күйде',
28+
'unhealthy_backup_found_subject_title' => 'Маңызды: :application_name бағдарламасының резервтік көшірмелері жарамсыз күйде. :problem',
29+
'unhealthy_backup_found_body' => ':disk_name дискіндегі :application_name бағдарламасының резервтік көшірмелері жарамсыз күйде.',
30+
'unhealthy_backup_found_not_reachable' => 'Резервтік көшірме сақтау орнына қол жеткізу мүмкін емес. :error',
31+
'unhealthy_backup_found_empty' => 'Осы бағдарлама бойынша резервтік көшірмелер әлі жасалмаған.',
32+
'unhealthy_backup_found_old' => 'Соңғы резервтік көшірме (:date) тым ескі болып саналады.',
33+
'unhealthy_backup_found_unknown' => 'Кешіріңіз, нақты себебін анықтау мүмкін емес.',
34+
'unhealthy_backup_found_full' => 'Резервтік көшірмелер тым көп орын алып отыр. Ағымдағы пайдалану көлемі :disk_usage, бұл рұқсат етілген шектен :disk_limit аса жоғары.',
35+
36+
'no_backups_info' => 'Әлі резервтік көшірме жасалмаған',
37+
'application_name' => 'Бағдарлама атауы',
38+
'backup_name' => 'Резервтік көшірме атауы',
39+
'disk' => 'Диск',
40+
'newest_backup_size' => 'Соңғы резервтік көшірменің көлемі',
41+
'number_of_backups' => 'Резервтік көшірмелер саны',
42+
'total_storage_used' => 'Жалпы қолданылған сақтау көлемі',
43+
'newest_backup_date' => 'Соңғы резервтік көшірме күні',
44+
'oldest_backup_date' => 'Ең ескі резервтік көшірме күні',
45+
];

‎src/Config/NotificationMailSenderConfig.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ protected function __construct(
1515
/** @param array<mixed> $data */
1616
public static function fromArray(array $data): self
1717
{
18-
$address = $data['from']['address'] ?? config('mail.from.address');
18+
$address = $data['address'] ?? config('mail.from.address');
1919

2020
if ($address === null) {
2121
throw InvalidConfig::missingSender();
@@ -27,7 +27,7 @@ public static function fromArray(array $data): self
2727

2828
return new self(
2929
address: $address,
30-
name: $data['from']['name'] ?? config('mail.from.name'),
30+
name: $data['name'] ?? config('mail.from.name'),
3131
);
3232
}
3333
}

‎tests/Config/ConfigTest.php

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
use Spatie\Backup\Config\BackupConfig;
44
use Spatie\Backup\Config\CleanupConfig;
55
use Spatie\Backup\Config\Config;
6-
use Spatie\Backup\Config\DestinationConfig;
76
use Spatie\Backup\Config\MonitoredBackupsConfig;
87
use Spatie\Backup\Config\NotificationsConfig;
98

0 commit comments

Comments
 (0)