Skip to content

Commit ec7e8b3

Browse files
Merge pull request #159 from mirko-pagliai/2.14.x-develop
2.14.x develop
2 parents 1b28efe + 23a860c commit ec7e8b3

14 files changed

+182
-293
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# 2.x branch
22
## 2.14 branch
33
### 2.14.1
4+
* many improvements for the `AbstractExecutor` abstract class;
45
* method `AbstractBackupUtility::getExecutor()` now accepts the optional `$Connection` argument. The `getConnection()`
56
method has been removed;
67
* `getExecutable()`, `getExportExecutable()` and `getImportExecutable()` methods provided by `AbstractExecutor` have

resources/locales/database_backup.pot

Lines changed: 47 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
msgid ""
66
msgstr ""
77
"Project-Id-Version: PROJECT VERSION\n"
8-
"POT-Creation-Date: 2024-12-18 19:47+0100\n"
8+
"POT-Creation-Date: 2025-04-15 17:48+0200\n"
99
"PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n"
1010
"Last-Translator: NAME <EMAIL@ADDRESS>\n"
1111
"Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"
@@ -14,191 +14,137 @@ msgstr ""
1414
"Content-Transfer-Encoding: 8bit\n"
1515
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
1616

17-
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/DeleteAllCommand.php:38
18-
msgid "Deletes all database backups"
19-
msgstr ""
20-
21-
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/DeleteAllCommand.php:54
22-
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/RotateCommand.php:66
23-
msgid "No backup has been deleted"
24-
msgstr ""
25-
26-
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/DeleteAllCommand.php:60
27-
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/RotateCommand.php:72
28-
msgid "Backup `{0}` has been deleted"
29-
msgstr ""
30-
31-
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/DeleteAllCommand.php:63
32-
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/RotateCommand.php:75
33-
msgid "Deleted backup files: {0}"
34-
msgstr ""
35-
36-
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/ExportCommand.php:42
17+
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/ExportCommand.php:45
3718
msgid "Exports a database backup"
3819
msgstr ""
3920

40-
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/ExportCommand.php:46
21+
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/ExportCommand.php:55
4122
msgid "Compression type. By default, no compression will be used"
4223
msgstr ""
4324

44-
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/ExportCommand.php:50
25+
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/ExportCommand.php:59
4526
msgid "Filename. It can be an absolute path and may contain patterns. The compression type will be automatically set"
4627
msgstr ""
4728

48-
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/ExportCommand.php:55
29+
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/ExportCommand.php:64
4930
msgid "Rotates backups. You have to indicate the number of backups you want to keep. So, it will delete all backups that are older. By default, no backup will be deleted"
5031
msgstr ""
5132

52-
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/ExportCommand.php:61
33+
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/ExportCommand.php:70
5334
msgid "Sends the backup file via email. You have to indicate the recipient's email address"
5435
msgstr ""
5536

56-
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/ExportCommand.php:66
57-
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/ImportCommand.php:48
37+
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/ExportCommand.php:75
38+
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/ImportCommand.php:50
5839
msgid "Timeout for shell commands. Default value: {0} seconds"
5940
msgstr ""
6041

61-
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/ExportCommand.php:112
62-
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/ImportCommand.php:85
42+
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/ExportCommand.php:137
43+
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/ImportCommand.php:116
6344
msgid "The `{0}` event stopped the operation"
6445
msgstr ""
6546

66-
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/ExportCommand.php:114
47+
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/ExportCommand.php:140
6748
msgid "Backup `{0}` has been exported"
6849
msgstr ""
6950

70-
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/ImportCommand.php:42
71-
msgid "Imports a database backup"
51+
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/ExportCommand.php:147
52+
msgid "Backup `{0}` has been deleted"
53+
msgstr ""
54+
55+
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/ExportCommand.php:150
56+
msgid "Deleted backup files: {0}"
57+
msgstr ""
58+
59+
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/ExportCommand.php:152
60+
msgid "No backup has been deleted"
7261
msgstr ""
7362

7463
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/ImportCommand.php:44
75-
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/SendCommand.php:40
64+
msgid "Imports a database backup"
65+
msgstr ""
66+
67+
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/ImportCommand.php:46
7668
msgid "Filename. It can be an absolute path"
7769
msgstr ""
7870

79-
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/ImportCommand.php:87
71+
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/ImportCommand.php:119
8072
msgid "Backup `{0}` has been imported"
8173
msgstr ""
8274

83-
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/IndexCommand.php:40
75+
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/IndexCommand.php:42
8476
msgid "Lists database backups"
8577
msgstr ""
8678

87-
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/IndexCommand.php:43
79+
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/IndexCommand.php:45
8880
msgid "List database backups in reverse order (oldest first, then newest)"
8981
msgstr ""
9082

91-
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/IndexCommand.php:58
83+
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/IndexCommand.php:60
9284
msgid "Backup files found: {0}"
9385
msgstr ""
9486

95-
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/IndexCommand.php:65
87+
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/IndexCommand.php:67
9688
msgid "Filename"
9789
msgstr ""
9890

99-
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/IndexCommand.php:66
100-
msgid "Extension"
101-
msgstr ""
102-
103-
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/IndexCommand.php:67
91+
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/IndexCommand.php:68
10492
msgid "Compression"
10593
msgstr ""
10694

107-
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/IndexCommand.php:68
95+
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/IndexCommand.php:69
10896
msgid "Size"
10997
msgstr ""
11098

111-
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/IndexCommand.php:69
99+
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/IndexCommand.php:70
112100
msgid "Datetime"
113101
msgstr ""
114102

115-
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/RotateCommand.php:40
116-
msgid "Rotates backups"
117-
msgstr ""
118-
119-
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/RotateCommand.php:42
120-
msgid "Number of backups you want to keep. So, it will delete all backups that are older"
121-
msgstr ""
122-
123-
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/SendCommand.php:37
124-
msgid "Send a database backup via mail"
125-
msgstr ""
126-
127-
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/SendCommand.php:44
128-
msgid "Recipient's email address"
129-
msgstr ""
130-
131-
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Command/SendCommand.php:64
132-
msgid "Backup `{0}` was sent via mail"
133-
msgstr ""
134-
135-
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Console/Command.php:39
103+
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Console/Command.php:61
136104
msgid "Connection: {0}"
137105
msgstr ""
138106

139-
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Console/Command.php:40
107+
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Console/Command.php:62
140108
msgid "Driver: {0}"
141109
msgstr ""
142110

143-
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Console/Command.php:43
111+
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Console/Command.php:66
144112
msgid "Timeout for shell commands: {0} seconds"
145113
msgstr ""
146114

147-
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Driver/AbstractDriver.php:75
148-
msgid "`{0}` parameter should be `{1}` or `{2}`"
149-
msgstr ""
150-
151-
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Driver/AbstractDriver.php:177
115+
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Executor/AbstractExecutor.php:241
152116
msgid "Binary for `{0}` could not be found. You have to set its path manually"
153117
msgstr ""
154118

155-
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Utility/AbstractBackupUtility.php:107
156-
msgid "The `{0}` driver does not exist"
157-
msgstr ""
158-
159-
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Utility/BackupExport.php:82
160-
msgid "Invalid compression type"
119+
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Utility/AbstractBackupUtility.php:153
120+
msgid "The Executor class for the `{0}` driver does not exist"
161121
msgstr ""
162122

163-
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Utility/BackupExport.php:114
164-
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Utility/BackupManager.php:48
123+
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Utility/BackupExport.php:96
165124
msgid "File or directory `{0}` is not writable"
166125
msgstr ""
167126

168-
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Utility/BackupExport.php:117
127+
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Utility/BackupExport.php:101
169128
msgid "File `{0}` already exists"
170129
msgstr ""
171130

172-
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Utility/BackupExport.php:120
173-
msgid "Invalid `{0}` file extension"
174-
msgstr ""
175-
176-
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Utility/BackupExport.php:192
131+
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Utility/BackupExport.php:162
177132
msgid "Export failed with error message: `{0}`"
178133
msgstr ""
179134

180-
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Utility/BackupImport.php:38
181-
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Utility/BackupManager.php:123
135+
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Utility/BackupImport.php:45
182136
msgid "File or directory `{0}` is not readable"
183137
msgstr ""
184138

185-
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Utility/BackupImport.php:42
186-
msgid "Invalid file extension"
187-
msgstr ""
188-
189-
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Utility/BackupImport.php:66
139+
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Utility/BackupImport.php:73
190140
msgid "You must first set the filename"
191141
msgstr ""
192142

193-
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Utility/BackupImport.php:82
143+
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Utility/BackupImport.php:92
194144
msgid "Import failed with error message: `{0}`"
195145
msgstr ""
196146

197-
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Utility/BackupManager.php:103
198-
msgid "Invalid rotate value"
199-
msgstr ""
200-
201-
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Utility/BackupManager.php:130
202-
msgid "Database backup {0} from {1}"
147+
#: ./home/mirko/Libs/Plugins/cakephp-database-backup/src/Utility/BackupManager.php:74
148+
msgid "Invalid `$keep` value"
203149
msgstr ""
204150

0 commit comments

Comments
 (0)