Skip to content

Commit 9e21998

Browse files
Merge pull request #39 from mirko-pagliai/develop
Develop
2 parents cf5b65a + f7260f9 commit 9e21998

File tree

8 files changed

+11
-7
lines changed

8 files changed

+11
-7
lines changed

.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ matrix:
1717
- php: 7.0
1818
env: COVERAGE=1
1919

20+
- php: 7.0
21+
env: CAKEPHP_VERSION="3.7.*"
22+
2023
services:
2124
- mysql
2225
- postgresql
@@ -27,6 +30,7 @@ addons:
2730
install:
2831
- composer self-update
2932
- composer install --prefer-dist --no-interaction
33+
- if [[ ! -z "$CAKEPHP_VERSION" ]]; then composer require --update-with-dependencies cakephp/cakephp:${CAKEPHP_VERSION}; fi
3034

3135
before_script:
3236
- mysql -e 'create database test;'

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.18-nts-Win32-VC15-x86.zip
30+
- curl -fsS -o php.zip https://windows.php.net/downloads/releases/php-7.2.19-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
@@ -38,7 +38,7 @@ protected function buildOptionParser(ConsoleOptionParser $parser)
3838
* Deletes all backup files
3939
* @param \Cake\Console\Arguments $args The command arguments
4040
* @param \Cake\Console\ConsoleIo $io The console io
41-
* @return null|int The exit code or null for success
41+
* @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
4343
* @uses DatabaseBackup\Utility\BackupManager::deleteAll()
4444
*/

src/Command/ExportCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ protected function buildOptionParser(ConsoleOptionParser $parser)
6666
* This command uses `RotateCommand` and `SendCommand`.
6767
* @param \Cake\Console\Arguments $args The command arguments
6868
* @param \Cake\Console\ConsoleIo $io The console io
69-
* @return null|int The exit code or null for success
69+
* @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
7171
* @uses DatabaseBackup\Command\RotateCommand::execute()
7272
* @uses DatabaseBackup\Command\SendCommand::execute()

src/Command/ImportCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ protected function buildOptionParser(ConsoleOptionParser $parser)
4343
* Imports a database backup
4444
* @param \Cake\Console\Arguments $args The command arguments
4545
* @param \Cake\Console\ConsoleIo $io The console io
46-
* @return null|int The exit code or null for success
46+
* @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
4848
* @uses DatabaseBackup\Utility\BackupImport::filename()
4949
* @uses DatabaseBackup\Utility\BackupImport::import()

src/Command/IndexCommand.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
* Lists database backups
4141
* @param \Cake\Console\Arguments $args The command arguments
4242
* @param \Cake\Console\ConsoleIo $io The console io
43-
* @return null|int The exit code or null for success
43+
* @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
4545
* @uses DatabaseBackup\Utility\BackupManager::index()
4646
*/

src/Command/RotateCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ protected function buildOptionParser(ConsoleOptionParser $parser)
4646
* delete all backups that are older. By default, no backup will be deleted
4747
* @param \Cake\Console\Arguments $args The command arguments
4848
* @param \Cake\Console\ConsoleIo $io The console io
49-
* @return null|int The exit code or null for success
49+
* @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
5151
* @uses DatabaseBackup\Utility\BackupManager::rotate()
5252
*/

src/Command/SendCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ protected function buildOptionParser(ConsoleOptionParser $parser)
4949
* Sends a backup file via email
5050
* @param \Cake\Console\Arguments $args The command arguments
5151
* @param \Cake\Console\ConsoleIo $io The console io
52-
* @return null|int The exit code or null for success
52+
* @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
5454
* @uses DatabaseBackup\Utility\BackupManager::send()
5555
*/

0 commit comments

Comments
 (0)