Skip to content

Commit 8a256e7

Browse files
Merge pull request #40 from mirko-pagliai/develop
Develop
2 parents 9e21998 + ce47292 commit 8a256e7

File tree

13 files changed

+24
-14
lines changed

13 files changed

+24
-14
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# 2.x branch
22
## 2.6 branch
3+
### 2.6.3
4+
* little fixes.
5+
36
### 2.6.2
47
* added `BackupTrait::getDriverName()` method;
58
* `BackupExport::compression()` takes a compression type name as string or

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ before_test:
2727

2828
install:
2929
- cd c:\
30-
- curl -fsS -o php.zip https://windows.php.net/downloads/releases/php-7.2.19-nts-Win32-VC15-x86.zip
30+
- curl -fsS -o php.zip https://windows.php.net/downloads/releases/php-7.2.20-nts-Win32-VC15-x86.zip
3131
- 7z x php.zip -oc:\php > nul
3232
- cd c:\php
3333
- copy php.ini-production php.ini

src/Command/DeleteAllCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ protected function buildOptionParser(ConsoleOptionParser $parser)
4040
* @param \Cake\Console\ConsoleIo $io The console io
4141
* @return int|null The exit code or null for success
4242
* @see https://github.com/mirko-pagliai/cakephp-database-backup/wiki/How-to-use-the-BackupShell#delete_all
43-
* @uses DatabaseBackup\Utility\BackupManager::deleteAll()
43+
* @uses \DatabaseBackup\Utility\BackupManager::deleteAll()
4444
*/
4545
public function execute(Arguments $args, ConsoleIo $io)
4646
{

src/Command/ExportCommand.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,11 @@ protected function buildOptionParser(ConsoleOptionParser $parser)
6868
* @param \Cake\Console\ConsoleIo $io The console io
6969
* @return int|null The exit code or null for success
7070
* @see https://github.com/mirko-pagliai/cakephp-database-backup/wiki/How-to-use-the-BackupShell#export
71-
* @uses DatabaseBackup\Command\RotateCommand::execute()
72-
* @uses DatabaseBackup\Command\SendCommand::execute()
73-
* @uses DatabaseBackup\Utility\BackupExport::compression()
74-
* @uses DatabaseBackup\Utility\BackupExport::export()
75-
* @uses DatabaseBackup\Utility\BackupExport::filename()
71+
* @uses \DatabaseBackup\Command\RotateCommand::execute()
72+
* @uses \DatabaseBackup\Command\SendCommand::execute()
73+
* @uses \DatabaseBackup\Utility\BackupExport::compression()
74+
* @uses \DatabaseBackup\Utility\BackupExport::export()
75+
* @uses \DatabaseBackup\Utility\BackupExport::filename()
7676
*/
7777
public function execute(Arguments $args, ConsoleIo $io)
7878
{

src/Command/ImportCommand.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ protected function buildOptionParser(ConsoleOptionParser $parser)
4545
* @param \Cake\Console\ConsoleIo $io The console io
4646
* @return int|null The exit code or null for success
4747
* @see https://github.com/mirko-pagliai/cakephp-database-backup/wiki/How-to-use-the-BackupShell#import
48-
* @uses DatabaseBackup\Utility\BackupImport::filename()
49-
* @uses DatabaseBackup\Utility\BackupImport::import()
48+
* @uses \DatabaseBackup\Utility\BackupImport::filename()
49+
* @uses \DatabaseBackup\Utility\BackupImport::import()
5050
*/
5151
public function execute(Arguments $args, ConsoleIo $io)
5252
{

src/Command/IndexCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ protected function buildOptionParser(ConsoleOptionParser $parser)
4242
* @param \Cake\Console\ConsoleIo $io The console io
4343
* @return int|null The exit code or null for success
4444
* @see https://github.com/mirko-pagliai/cakephp-database-backup/wiki/How-to-use-the-BackupShell#index
45-
* @uses DatabaseBackup\Utility\BackupManager::index()
45+
* @uses \DatabaseBackup\Utility\BackupManager::index()
4646
*/
4747
public function execute(Arguments $args, ConsoleIo $io)
4848
{

src/Command/RotateCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ protected function buildOptionParser(ConsoleOptionParser $parser)
4848
* @param \Cake\Console\ConsoleIo $io The console io
4949
* @return int|null The exit code or null for success
5050
* @see https://github.com/mirko-pagliai/cakephp-database-backup/wiki/How-to-use-the-BackupShell#rotate
51-
* @uses DatabaseBackup\Utility\BackupManager::rotate()
51+
* @uses \DatabaseBackup\Utility\BackupManager::rotate()
5252
*/
5353
public function execute(Arguments $args, ConsoleIo $io)
5454
{

src/Command/SendCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ protected function buildOptionParser(ConsoleOptionParser $parser)
5151
* @param \Cake\Console\ConsoleIo $io The console io
5252
* @return int|null The exit code or null for success
5353
* @see https://github.com/mirko-pagliai/cakephp-database-backup/wiki/How-to-use-the-BackupShell#send
54-
* @uses DatabaseBackup\Utility\BackupManager::send()
54+
* @uses \DatabaseBackup\Utility\BackupManager::send()
5555
*/
5656
public function execute(Arguments $args, ConsoleIo $io)
5757
{

src/Driver/Driver.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@ protected function _importExecutableWithCompression($filename)
171171
* - Backup.afterExport: will be triggered after export
172172
* @param string $filename Filename where you want to export the database
173173
* @return bool true on success
174+
* @throws \Exception
174175
* @uses _exportExecutableWithCompression()
175176
*/
176177
final public function export($filename)
@@ -213,6 +214,7 @@ final public function getConfig($key = null)
213214
* - Backup.afterImport: will be triggered after import
214215
* @param string $filename Filename from which you want to import the database
215216
* @return bool true on success
217+
* @throws \Exception
216218
* @uses _importExecutableWithCompression()
217219
*/
218220
final public function import($filename)

src/Utility/BackupExport.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,9 @@ public function compression($compression)
131131
* contain patterns
132132
* @return \DatabaseBackup\Utility\BackupExport
133133
* @see https://github.com/mirko-pagliai/cakephp-database-backup/wiki/How-to-use-the-BackupExport-utility#filename
134+
* @throws \Exception
134135
* @throws \InvalidArgumentException
136+
* @throws \Tools\Exception\NotWritableException
135137
* @uses compression()
136138
* @uses $config
137139
* @uses $filename

0 commit comments

Comments
 (0)