Merge pull request #3196 from nstapelbroek/feature/remove-backup-manager

Removed backup manager
This commit is contained in:
James Brooks
2018-07-24 20:57:17 +01:00
committed by GitHub
7 changed files with 138 additions and 520 deletions

View File

@@ -15,7 +15,6 @@ use CachetHQ\Cachet\Bus\Events\System\SystemWasInstalledEvent;
use CachetHQ\Cachet\Bus\Events\System\SystemWasResetEvent;
use CachetHQ\Cachet\Bus\Events\System\SystemWasUpdatedEvent;
use CachetHQ\Cachet\Settings\Cache;
use Exception;
use Illuminate\Console\Command;
use Illuminate\Contracts\Config\Repository;
use Illuminate\Contracts\Events\Dispatcher;
@@ -128,7 +127,7 @@ class CommandSubscriber
}
/**
* Handle the main bulk of the command, clear the settings and backup the database.
* Handle the main bulk of the command, clear the settings.
*
* @param \Illuminate\Console\Command $command
*
@@ -141,27 +140,6 @@ class CommandSubscriber
$this->cache->clear();
$command->line('Settings cache cleared!');
// SQLite does not backup.
if ($this->config->get('database.default') === 'sqlite') {
$command->line('Backup skipped: SQLite is not supported.');
return;
}
$command->line('Backing up database...');
try {
$command->call('backup:run', [
'--only-db' => true,
'--no-interaction' => true,
]);
} catch (Exception $e) {
$command->error($e->getMessage());
$command->line('Backup skipped!');
}
$command->line('Backup completed!');
}
/**

View File

@@ -50,8 +50,7 @@
"pragmarx/google2fa": "^0.7.1",
"predis/predis": "^1.1",
"roumen/feed": "^2.10",
"spatie/laravel-backup": "^5.9",
"twig/twig": "^1.26.1"
"twig/twig": "^1"
},
"require-dev": {
"ext-sqlite3": "*",

422
composer.lock generated
View File

@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"content-hash": "6370efbcdaf729667eb595daf9dfff52",
"content-hash": "905973a718f0eda0f42d1e0b85dda721",
"packages": [
{
"name": "alt-three/badger",
@@ -409,16 +409,16 @@
},
{
"name": "aws/aws-sdk-php",
"version": "3.62.9",
"version": "3.63.5",
"source": {
"type": "git",
"url": "https://github.com/aws/aws-sdk-php.git",
"reference": "c4bca5798cad053f3b594434c61320c13f0ebb72"
"reference": "e12a6fb9045720fd96bd75e801b23e2877aa1245"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/c4bca5798cad053f3b594434c61320c13f0ebb72",
"reference": "c4bca5798cad053f3b594434c61320c13f0ebb72",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/e12a6fb9045720fd96bd75e801b23e2877aa1245",
"reference": "e12a6fb9045720fd96bd75e801b23e2877aa1245",
"shasum": ""
},
"require": {
@@ -485,7 +485,7 @@
"s3",
"sdk"
],
"time": "2018-07-05T21:14:33+00:00"
"time": "2018-07-20T21:01:32+00:00"
},
{
"name": "bacon/bacon-qr-code",
@@ -2151,16 +2151,16 @@
},
{
"name": "laravel/framework",
"version": "v5.6.26",
"version": "v5.6.28",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "7047df295e77cecb6a2f84736a732af66cc6789c"
"reference": "40ba2ee0e61cb4bc3c9f1dab04908e6acf06b86f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/7047df295e77cecb6a2f84736a732af66cc6789c",
"reference": "7047df295e77cecb6a2f84736a732af66cc6789c",
"url": "https://api.github.com/repos/laravel/framework/zipball/40ba2ee0e61cb4bc3c9f1dab04908e6acf06b86f",
"reference": "40ba2ee0e61cb4bc3c9f1dab04908e6acf06b86f",
"shasum": ""
},
"require": {
@@ -2286,7 +2286,7 @@
"framework",
"laravel"
],
"time": "2018-06-20T14:21:11+00:00"
"time": "2018-07-17T14:15:36+00:00"
},
{
"name": "laravel/tinker",
@@ -2974,33 +2974,29 @@
},
{
"name": "paragonie/random_compat",
"version": "v2.0.17",
"version": "v9.99.99",
"source": {
"type": "git",
"url": "https://github.com/paragonie/random_compat.git",
"reference": "29af24f25bab834fcbb38ad2a69fa93b867e070d"
"reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/paragonie/random_compat/zipball/29af24f25bab834fcbb38ad2a69fa93b867e070d",
"reference": "29af24f25bab834fcbb38ad2a69fa93b867e070d",
"url": "https://api.github.com/repos/paragonie/random_compat/zipball/84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
"reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
"shasum": ""
},
"require": {
"php": ">=5.2.0"
"php": "^7"
},
"require-dev": {
"phpunit/phpunit": "4.*|5.*"
"phpunit/phpunit": "4.*|5.*",
"vimeo/psalm": "^1"
},
"suggest": {
"ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
},
"type": "library",
"autoload": {
"files": [
"lib/random.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
@@ -3019,7 +3015,7 @@
"pseudorandom",
"random"
],
"time": "2018-07-04T16:31:37+00:00"
"time": "2018-07-02T15:55:56+00:00"
},
{
"name": "php-http/guzzle6-adapter",
@@ -3559,21 +3555,22 @@
},
{
"name": "ramsey/uuid",
"version": "3.7.3",
"version": "3.8.0",
"source": {
"type": "git",
"url": "https://github.com/ramsey/uuid.git",
"reference": "44abcdad877d9a46685a3a4d221e3b2c4b87cb76"
"reference": "d09ea80159c1929d75b3f9c60504d613aeb4a1e3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/ramsey/uuid/zipball/44abcdad877d9a46685a3a4d221e3b2c4b87cb76",
"reference": "44abcdad877d9a46685a3a4d221e3b2c4b87cb76",
"url": "https://api.github.com/repos/ramsey/uuid/zipball/d09ea80159c1929d75b3f9c60504d613aeb4a1e3",
"reference": "d09ea80159c1929d75b3f9c60504d613aeb4a1e3",
"shasum": ""
},
"require": {
"paragonie/random_compat": "^1.0|^2.0",
"php": "^5.4 || ^7.0"
"paragonie/random_compat": "^1.0|^2.0|9.99.99",
"php": "^5.4 || ^7.0",
"symfony/polyfill-ctype": "^1.8"
},
"replace": {
"rhumsaa/uuid": "self.version"
@@ -3581,16 +3578,17 @@
"require-dev": {
"codeception/aspect-mock": "^1.0 | ~2.0.0",
"doctrine/annotations": "~1.2.0",
"goaop/framework": "1.0.0-alpha.2 | ^1.0 | ^2.1",
"goaop/framework": "1.0.0-alpha.2 | ^1.0 | ~2.1.0",
"ircmaxell/random-lib": "^1.1",
"jakub-onderka/php-parallel-lint": "^0.9.0",
"mockery/mockery": "^0.9.9",
"moontoast/math": "^1.1",
"php-mock/php-mock-phpunit": "^0.3|^1.1",
"phpunit/phpunit": "^4.7|^5.0",
"phpunit/phpunit": "^4.7|^5.0|^6.5",
"squizlabs/php_codesniffer": "^2.3"
},
"suggest": {
"ext-ctype": "Provides support for PHP Ctype functions",
"ext-libsodium": "Provides the PECL libsodium extension for use with the SodiumRandomGenerator",
"ext-uuid": "Provides the PECL UUID extension for use with the PeclUuidTimeGenerator and PeclUuidRandomGenerator",
"ircmaxell/random-lib": "Provides RandomLib for use with the RandomLibAdapter",
@@ -3635,7 +3633,7 @@
"identifier",
"uuid"
],
"time": "2018-01-20T00:28:24+00:00"
"time": "2018-07-19T23:38:55+00:00"
},
{
"name": "roumen/feed",
@@ -3748,187 +3746,18 @@
],
"time": "2016-01-31T02:09:25+00:00"
},
{
"name": "spatie/db-dumper",
"version": "2.10.0",
"source": {
"type": "git",
"url": "https://github.com/spatie/db-dumper.git",
"reference": "ee745fba17bcf77c916f231a571bbde8dae8e001"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/spatie/db-dumper/zipball/ee745fba17bcf77c916f231a571bbde8dae8e001",
"reference": "ee745fba17bcf77c916f231a571bbde8dae8e001",
"shasum": ""
},
"require": {
"php": "^7.0",
"symfony/process": "^3.0|^4.0"
},
"require-dev": {
"phpunit/phpunit": "^6.0"
},
"type": "library",
"autoload": {
"psr-4": {
"Spatie\\DbDumper\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Freek Van der Herten",
"email": "freek@spatie.be",
"homepage": "https://spatie.be",
"role": "Developer"
}
],
"description": "Dump databases",
"homepage": "https://github.com/spatie/db-dumper",
"keywords": [
"database",
"db-dumper",
"dump",
"mysqldump",
"spatie"
],
"time": "2018-04-27T15:10:51+00:00"
},
{
"name": "spatie/laravel-backup",
"version": "5.9.1",
"source": {
"type": "git",
"url": "https://github.com/spatie/laravel-backup.git",
"reference": "ad85988480db742937345c8b086346a30959e814"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/spatie/laravel-backup/zipball/ad85988480db742937345c8b086346a30959e814",
"reference": "ad85988480db742937345c8b086346a30959e814",
"shasum": ""
},
"require": {
"illuminate/console": "~5.5.0|~5.6.0",
"illuminate/contracts": "~5.5.0|~5.6.0",
"illuminate/events": "~5.5.0|~5.6.0",
"illuminate/filesystem": "~5.5.0|~5.6.0",
"illuminate/notifications": "~5.5.0|~5.6.0",
"illuminate/support": "~5.5.0|~5.6.0",
"league/flysystem": "^1.0.27",
"php": "^7.1",
"spatie/db-dumper": "^2.10",
"spatie/temporary-directory": "^1.1",
"symfony/finder": "^3.3|^4.0"
},
"require-dev": {
"mockery/mockery": "^1.0",
"orchestra/testbench": "~3.5.0|~3.6.0",
"phpunit/phpunit": "^6.5 || ^7.0"
},
"suggest": {
"guzzlehttp/guzzle": "Allows notifications to be sent via Slack"
},
"type": "library",
"extra": {
"laravel": {
"providers": [
"Spatie\\Backup\\BackupServiceProvider"
]
}
},
"autoload": {
"psr-4": {
"Spatie\\Backup\\": "src"
},
"files": [
"src/Helpers/functions.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Freek Van der Herten",
"email": "freek@spatie.be",
"homepage": "https://spatie.be",
"role": "Developer"
}
],
"description": "A Laravel 5 package to backup your application",
"homepage": "https://github.com/spatie/laravel-backup",
"keywords": [
"backup",
"database",
"laravel-backup",
"spatie"
],
"time": "2018-06-19T21:20:28+00:00"
},
{
"name": "spatie/temporary-directory",
"version": "1.1.4",
"source": {
"type": "git",
"url": "https://github.com/spatie/temporary-directory.git",
"reference": "5e1799fa2297363ebfb4df296fea90afbd4ef9b7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/spatie/temporary-directory/zipball/5e1799fa2297363ebfb4df296fea90afbd4ef9b7",
"reference": "5e1799fa2297363ebfb4df296fea90afbd4ef9b7",
"shasum": ""
},
"require": {
"php": "^7.0"
},
"require-dev": {
"phpunit/phpunit": "^6.3"
},
"type": "library",
"autoload": {
"psr-4": {
"Spatie\\TemporaryDirectory\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Alex Vanderbist",
"email": "alex@spatie.be",
"homepage": "https://spatie.be",
"role": "Developer"
}
],
"description": "Easily create, use and destroy temporary directories",
"homepage": "https://github.com/spatie/temporary-directory",
"keywords": [
"spatie",
"temporary-directory"
],
"time": "2018-04-12T09:34:43+00:00"
},
{
"name": "swiftmailer/swiftmailer",
"version": "v6.1.1",
"version": "v6.1.2",
"source": {
"type": "git",
"url": "https://github.com/swiftmailer/swiftmailer.git",
"reference": "aa899fef280b1c1aec8d5d4ac069af7f80c89a23"
"reference": "7d760881d266d63c5e7a1155cbcf2ac656a31ca8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/aa899fef280b1c1aec8d5d4ac069af7f80c89a23",
"reference": "aa899fef280b1c1aec8d5d4ac069af7f80c89a23",
"url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/7d760881d266d63c5e7a1155cbcf2ac656a31ca8",
"reference": "7d760881d266d63c5e7a1155cbcf2ac656a31ca8",
"shasum": ""
},
"require": {
@@ -3974,20 +3803,20 @@
"mail",
"mailer"
],
"time": "2018-07-04T11:12:44+00:00"
"time": "2018-07-13T07:04:35+00:00"
},
{
"name": "symfony/console",
"version": "v4.1.1",
"version": "v4.1.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "70591cda56b4b47c55776ac78e157c4bb6c8b43f"
"reference": "5c31f6a97c1c240707f6d786e7e59bfacdbc0219"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/70591cda56b4b47c55776ac78e157c4bb6c8b43f",
"reference": "70591cda56b4b47c55776ac78e157c4bb6c8b43f",
"url": "https://api.github.com/repos/symfony/console/zipball/5c31f6a97c1c240707f6d786e7e59bfacdbc0219",
"reference": "5c31f6a97c1c240707f6d786e7e59bfacdbc0219",
"shasum": ""
},
"require": {
@@ -4042,11 +3871,11 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
"time": "2018-05-31T10:17:53+00:00"
"time": "2018-07-16T14:05:40+00:00"
},
{
"name": "symfony/css-selector",
"version": "v3.4.12",
"version": "v3.4.13",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
@@ -4099,16 +3928,16 @@
},
{
"name": "symfony/debug",
"version": "v4.1.1",
"version": "v4.1.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
"reference": "dbe0fad88046a755dcf9379f2964c61a02f5ae3d"
"reference": "a1f2118cedb8731c45e945cdd2b808ca82abc4b5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/debug/zipball/dbe0fad88046a755dcf9379f2964c61a02f5ae3d",
"reference": "dbe0fad88046a755dcf9379f2964c61a02f5ae3d",
"url": "https://api.github.com/repos/symfony/debug/zipball/a1f2118cedb8731c45e945cdd2b808ca82abc4b5",
"reference": "a1f2118cedb8731c45e945cdd2b808ca82abc4b5",
"shasum": ""
},
"require": {
@@ -4151,20 +3980,20 @@
],
"description": "Symfony Debug Component",
"homepage": "https://symfony.com",
"time": "2018-06-08T09:39:36+00:00"
"time": "2018-07-06T14:52:28+00:00"
},
{
"name": "symfony/event-dispatcher",
"version": "v4.1.1",
"version": "v4.1.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
"reference": "2391ed210a239868e7256eb6921b1bd83f3087b5"
"reference": "00d64638e4f0703a00ab7fc2c8ae5f75f3b4020f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/2391ed210a239868e7256eb6921b1bd83f3087b5",
"reference": "2391ed210a239868e7256eb6921b1bd83f3087b5",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/00d64638e4f0703a00ab7fc2c8ae5f75f3b4020f",
"reference": "00d64638e4f0703a00ab7fc2c8ae5f75f3b4020f",
"shasum": ""
},
"require": {
@@ -4214,11 +4043,11 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
"time": "2018-04-06T07:35:57+00:00"
"time": "2018-07-10T11:02:47+00:00"
},
{
"name": "symfony/finder",
"version": "v4.1.1",
"version": "v4.1.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
@@ -4267,16 +4096,16 @@
},
{
"name": "symfony/http-foundation",
"version": "v4.1.1",
"version": "v4.1.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
"reference": "4f9c7cf962e635b0b26b14500ac046e07dbef7f3"
"reference": "8da9ea68ab2d80dfabd41e0d14b9606bb47a10c0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/4f9c7cf962e635b0b26b14500ac046e07dbef7f3",
"reference": "4f9c7cf962e635b0b26b14500ac046e07dbef7f3",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/8da9ea68ab2d80dfabd41e0d14b9606bb47a10c0",
"reference": "8da9ea68ab2d80dfabd41e0d14b9606bb47a10c0",
"shasum": ""
},
"require": {
@@ -4317,20 +4146,20 @@
],
"description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com",
"time": "2018-06-19T21:38:16+00:00"
"time": "2018-07-16T14:05:40+00:00"
},
{
"name": "symfony/http-kernel",
"version": "v4.1.1",
"version": "v4.1.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
"reference": "29c094a1c4f8209b7e033f612cbbd69029e38955"
"reference": "ebd28f4f88a2ca0a0488882ad73c4004f3afdbe3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/29c094a1c4f8209b7e033f612cbbd69029e38955",
"reference": "29c094a1c4f8209b7e033f612cbbd69029e38955",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/ebd28f4f88a2ca0a0488882ad73c4004f3afdbe3",
"reference": "ebd28f4f88a2ca0a0488882ad73c4004f3afdbe3",
"shasum": ""
},
"require": {
@@ -4404,7 +4233,7 @@
],
"description": "Symfony HttpKernel Component",
"homepage": "https://symfony.com",
"time": "2018-06-25T13:06:45+00:00"
"time": "2018-07-23T17:16:22+00:00"
},
{
"name": "symfony/polyfill-ctype",
@@ -4577,7 +4406,7 @@
},
{
"name": "symfony/process",
"version": "v4.1.1",
"version": "v4.1.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
@@ -4626,16 +4455,16 @@
},
{
"name": "symfony/routing",
"version": "v4.1.1",
"version": "v4.1.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
"reference": "b38b9797327b26ea2e4146a40e6e2dc9820a6932"
"reference": "73770bf3682b4407b017c2bdcb2b11cdcbce5322"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/routing/zipball/b38b9797327b26ea2e4146a40e6e2dc9820a6932",
"reference": "b38b9797327b26ea2e4146a40e6e2dc9820a6932",
"url": "https://api.github.com/repos/symfony/routing/zipball/73770bf3682b4407b017c2bdcb2b11cdcbce5322",
"reference": "73770bf3682b4407b017c2bdcb2b11cdcbce5322",
"shasum": ""
},
"require": {
@@ -4699,20 +4528,20 @@
"uri",
"url"
],
"time": "2018-06-19T21:38:16+00:00"
"time": "2018-06-28T06:30:33+00:00"
},
{
"name": "symfony/translation",
"version": "v4.1.1",
"version": "v4.1.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
"reference": "b6d8164085ee0b6debcd1b7a131fd6f63bb04854"
"reference": "2dd74d6b2dcbd46a93971e6ce7d245cf3123e957"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/translation/zipball/b6d8164085ee0b6debcd1b7a131fd6f63bb04854",
"reference": "b6d8164085ee0b6debcd1b7a131fd6f63bb04854",
"url": "https://api.github.com/repos/symfony/translation/zipball/2dd74d6b2dcbd46a93971e6ce7d245cf3123e957",
"reference": "2dd74d6b2dcbd46a93971e6ce7d245cf3123e957",
"shasum": ""
},
"require": {
@@ -4768,20 +4597,20 @@
],
"description": "Symfony Translation Component",
"homepage": "https://symfony.com",
"time": "2018-06-22T08:59:39+00:00"
"time": "2018-07-23T08:20:20+00:00"
},
{
"name": "symfony/var-dumper",
"version": "v4.1.1",
"version": "v4.1.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
"reference": "b2eebaec085d1f2cafbad7644733d494a3bbbc9b"
"reference": "9f882aed43f364de1d43038e8fb39703c577afc1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/b2eebaec085d1f2cafbad7644733d494a3bbbc9b",
"reference": "b2eebaec085d1f2cafbad7644733d494a3bbbc9b",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/9f882aed43f364de1d43038e8fb39703c577afc1",
"reference": "9f882aed43f364de1d43038e8fb39703c577afc1",
"shasum": ""
},
"require": {
@@ -4843,7 +4672,7 @@
"debug",
"dump"
],
"time": "2018-06-23T12:23:56+00:00"
"time": "2018-07-05T11:54:23+00:00"
},
{
"name": "tijsverkoyen/css-to-inline-styles",
@@ -4894,20 +4723,21 @@
},
{
"name": "twig/twig",
"version": "v1.35.3",
"version": "v1.35.4",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
"reference": "b48680b6eb7d16b5025b9bfc4108d86f6b8af86f"
"reference": "7e081e98378a1e78c29cc9eba4aefa5d78a05d2a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/b48680b6eb7d16b5025b9bfc4108d86f6b8af86f",
"reference": "b48680b6eb7d16b5025b9bfc4108d86f6b8af86f",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/7e081e98378a1e78c29cc9eba4aefa5d78a05d2a",
"reference": "7e081e98378a1e78c29cc9eba4aefa5d78a05d2a",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
"php": ">=5.3.3",
"symfony/polyfill-ctype": "^1.8"
},
"require-dev": {
"psr/container": "^1.0",
@@ -4946,16 +4776,16 @@
},
{
"name": "Twig Team",
"homepage": "http://twig.sensiolabs.org/contributors",
"homepage": "https://twig.symfony.com/contributors",
"role": "Contributors"
}
],
"description": "Twig, the flexible, fast, and secure template language for PHP",
"homepage": "http://twig.sensiolabs.org",
"homepage": "https://twig.symfony.com",
"keywords": [
"templating"
],
"time": "2018-03-20T04:25:58+00:00"
"time": "2018-07-13T07:12:17+00:00"
},
{
"name": "vlucas/phpdotenv",
@@ -5009,16 +4839,16 @@
},
{
"name": "zendframework/zend-diactoros",
"version": "1.8.0",
"version": "1.8.2",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-diactoros.git",
"reference": "11c9c1835e60eef6f9234377a480fcec096ebd9e"
"reference": "273c18bf6aaab20be9667a3aa4e7702e1e4e7ced"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/11c9c1835e60eef6f9234377a480fcec096ebd9e",
"reference": "11c9c1835e60eef6f9234377a480fcec096ebd9e",
"url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/273c18bf6aaab20be9667a3aa4e7702e1e4e7ced",
"reference": "273c18bf6aaab20be9667a3aa4e7702e1e4e7ced",
"shasum": ""
},
"require": {
@@ -5068,7 +4898,7 @@
"psr",
"psr-7"
],
"time": "2018-06-27T18:52:43+00:00"
"time": "2018-07-19T18:38:31+00:00"
}
],
"packages-dev": [
@@ -5311,16 +5141,16 @@
},
{
"name": "fzaninotto/faker",
"version": "v1.7.1",
"version": "v1.8.0",
"source": {
"type": "git",
"url": "https://github.com/fzaninotto/Faker.git",
"reference": "d3ed4cc37051c1ca52d22d76b437d14809fc7e0d"
"reference": "f72816b43e74063c8b10357394b6bba8cb1c10de"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/fzaninotto/Faker/zipball/d3ed4cc37051c1ca52d22d76b437d14809fc7e0d",
"reference": "d3ed4cc37051c1ca52d22d76b437d14809fc7e0d",
"url": "https://api.github.com/repos/fzaninotto/Faker/zipball/f72816b43e74063c8b10357394b6bba8cb1c10de",
"reference": "f72816b43e74063c8b10357394b6bba8cb1c10de",
"shasum": ""
},
"require": {
@@ -5328,7 +5158,7 @@
},
"require-dev": {
"ext-intl": "*",
"phpunit/phpunit": "^4.0 || ^5.0",
"phpunit/phpunit": "^4.8.35 || ^5.7",
"squizlabs/php_codesniffer": "^1.5"
},
"type": "library",
@@ -5357,7 +5187,7 @@
"faker",
"fixtures"
],
"time": "2017-08-15T16:48:10+00:00"
"time": "2018-07-12T10:23:15+00:00"
},
{
"name": "graham-campbell/analyzer",
@@ -5703,22 +5533,22 @@
},
{
"name": "phar-io/manifest",
"version": "1.0.1",
"version": "1.0.3",
"source": {
"type": "git",
"url": "https://github.com/phar-io/manifest.git",
"reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0"
"reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phar-io/manifest/zipball/2df402786ab5368a0169091f61a7c1e0eb6852d0",
"reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0",
"url": "https://api.github.com/repos/phar-io/manifest/zipball/7761fcacf03b4d4f16e7ccb606d4879ca431fcf4",
"reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4",
"shasum": ""
},
"require": {
"ext-dom": "*",
"ext-phar": "*",
"phar-io/version": "^1.0.1",
"phar-io/version": "^2.0",
"php": "^5.6 || ^7.0"
},
"type": "library",
@@ -5754,20 +5584,20 @@
}
],
"description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
"time": "2017-03-05T18:14:27+00:00"
"time": "2018-07-08T19:23:20+00:00"
},
{
"name": "phar-io/version",
"version": "1.0.1",
"version": "2.0.1",
"source": {
"type": "git",
"url": "https://github.com/phar-io/version.git",
"reference": "a70c0ced4be299a63d32fa96d9281d03e94041df"
"reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phar-io/version/zipball/a70c0ced4be299a63d32fa96d9281d03e94041df",
"reference": "a70c0ced4be299a63d32fa96d9281d03e94041df",
"url": "https://api.github.com/repos/phar-io/version/zipball/45a2ec53a73c70ce41d55cedef9063630abaf1b6",
"reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6",
"shasum": ""
},
"require": {
@@ -5801,7 +5631,7 @@
}
],
"description": "Library for handling version information and constraints",
"time": "2017-03-05T17:38:23+00:00"
"time": "2018-07-08T19:19:57+00:00"
},
{
"name": "phpdocumentor/reflection-common",
@@ -6269,16 +6099,16 @@
},
{
"name": "phpunit/phpunit",
"version": "7.2.6",
"version": "7.2.7",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "400a3836ee549ae6f665323ac3f21e27eac7155f"
"reference": "8e878aff7917ef66e702e03d1359b16eee254e2c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/400a3836ee549ae6f665323ac3f21e27eac7155f",
"reference": "400a3836ee549ae6f665323ac3f21e27eac7155f",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/8e878aff7917ef66e702e03d1359b16eee254e2c",
"reference": "8e878aff7917ef66e702e03d1359b16eee254e2c",
"shasum": ""
},
"require": {
@@ -6289,8 +6119,8 @@
"ext-mbstring": "*",
"ext-xml": "*",
"myclabs/deep-copy": "^1.7",
"phar-io/manifest": "^1.0.1",
"phar-io/version": "^1.0",
"phar-io/manifest": "^1.0.2",
"phar-io/version": "^2.0",
"php": "^7.1",
"phpspec/prophecy": "^1.7",
"phpunit/php-code-coverage": "^6.0.7",
@@ -6349,7 +6179,7 @@
"testing",
"xunit"
],
"time": "2018-06-21T13:13:39+00:00"
"time": "2018-07-15T05:20:50+00:00"
},
{
"name": "sebastian/code-unit-reverse-lookup",
@@ -6398,16 +6228,16 @@
},
{
"name": "sebastian/comparator",
"version": "3.0.1",
"version": "3.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/comparator.git",
"reference": "591a30922f54656695e59b1f39501aec513403da"
"reference": "5de4fc177adf9bce8df98d8d141a7559d7ccf6da"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/591a30922f54656695e59b1f39501aec513403da",
"reference": "591a30922f54656695e59b1f39501aec513403da",
"url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/5de4fc177adf9bce8df98d8d141a7559d7ccf6da",
"reference": "5de4fc177adf9bce8df98d8d141a7559d7ccf6da",
"shasum": ""
},
"require": {
@@ -6458,7 +6288,7 @@
"compare",
"equality"
],
"time": "2018-06-14T15:05:28+00:00"
"time": "2018-07-12T15:12:46+00:00"
},
{
"name": "sebastian/diff",
@@ -6916,16 +6746,16 @@
},
{
"name": "symfony/dom-crawler",
"version": "v3.4.12",
"version": "v3.4.13",
"source": {
"type": "git",
"url": "https://github.com/symfony/dom-crawler.git",
"reference": "201b210fafcdd193c1e45b2994bf7133fb6263e8"
"reference": "54c9e817b74c7be1840344bf4feaa7a7d02abfb8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/dom-crawler/zipball/201b210fafcdd193c1e45b2994bf7133fb6263e8",
"reference": "201b210fafcdd193c1e45b2994bf7133fb6263e8",
"url": "https://api.github.com/repos/symfony/dom-crawler/zipball/54c9e817b74c7be1840344bf4feaa7a7d02abfb8",
"reference": "54c9e817b74c7be1840344bf4feaa7a7d02abfb8",
"shasum": ""
},
"require": {
@@ -6969,7 +6799,7 @@
],
"description": "Symfony DomCrawler Component",
"homepage": "https://symfony.com",
"time": "2018-05-01T22:53:27+00:00"
"time": "2018-07-05T11:53:23+00:00"
},
{
"name": "theseer/tokenizer",

View File

@@ -187,7 +187,6 @@ return [
Laravolt\Avatar\ServiceProvider::class,
McCool\LaravelAutoPresenter\AutoPresenterServiceProvider::class,
PragmaRX\Google2FA\Vendor\Laravel\ServiceProvider::class,
Spatie\Backup\BackupServiceProvider::class,
Roumen\Feed\FeedServiceProvider::class,
/*

View File

@@ -1,196 +0,0 @@
<?php
/*
* This file is part of Cachet.
*
* (c) Alt Three Services Limited
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
return [
'backup' => [
/*
* The name of this application. You can use this name to monitor
* the backups.
*/
'name' => config('app.name'),
'source' => [
'files' => [
/*
* The list of directories and files that will be included in the backup.
*/
'include' => [
base_path(),
],
/*
* These directories and files will be excluded from the backup.
*
* Directories used by the backup process will automatically be excluded.
*/
'exclude' => [
base_path('vendor'),
base_path('node_modules'),
],
/*
* Determines if symlinks should be followed.
*/
'followLinks' => false,
],
/*
* The names of the connections to the databases that should be backed up
* MySQL, PostgreSQL, SQLite and Mongo databases are supported.
*/
'databases' => [
'mysql',
],
],
/*
* The database dump can be gzipped to decrease diskspace usage.
*/
'gzip_database_dump' => false,
'destination' => [
/*
* The filename prefix used for the backup zip file.
*/
'filename_prefix' => '',
/*
* The disk names on which the backups will be stored.
*/
'disks' => [
'database',
],
],
/*
* The directory where the temporary files will be stored.
*/
'temporary_directory' => storage_path('app/backup-temp'),
],
/*
* You can get notified when specific events occur. Out of the box you can use 'mail' and 'slack'.
* For Slack you need to install guzzlehttp/guzzle.
*
* You can also use your own notification classes, just make sure the class is named after one of
* the `Spatie\Backup\Events` classes.
*/
'notifications' => [
'notifications' => [
\Spatie\Backup\Notifications\Notifications\BackupHasFailed::class => ['mail'],
\Spatie\Backup\Notifications\Notifications\UnhealthyBackupWasFound::class => ['mail'],
\Spatie\Backup\Notifications\Notifications\CleanupHasFailed::class => ['mail'],
\Spatie\Backup\Notifications\Notifications\BackupWasSuccessful::class => ['mail'],
\Spatie\Backup\Notifications\Notifications\HealthyBackupWasFound::class => ['mail'],
\Spatie\Backup\Notifications\Notifications\CleanupWasSuccessful::class => ['mail'],
],
/*
* Here you can specify the notifiable to which the notifications should be sent. The default
* notifiable will use the variables specified in this config file.
*/
'notifiable' => \Spatie\Backup\Notifications\Notifiable::class,
'mail' => [
'to' => 'your@example.com',
],
'slack' => [
'webhook_url' => '',
/*
* If this is set to null the default channel of the webhook will be used.
*/
'channel' => null,
'username' => null,
'icon' => null,
],
],
/*
* Here you can specify which backups should be monitored.
* If a backup does not meet the specified requirements the
* UnHealthyBackupWasFound event will be fired.
*/
'monitorBackups' => [
[
'name' => config('app.name'),
'disks' => ['database'],
'newestBackupsShouldNotBeOlderThanDays' => 1,
'storageUsedMayNotBeHigherThanMegabytes' => 5000,
],
/*
[
'name' => 'name of the second app',
'disks' => ['local', 's3'],
'newestBackupsShouldNotBeOlderThanDays' => 1,
'storageUsedMayNotBeHigherThanMegabytes' => 5000,
],
*/
],
'cleanup' => [
/*
* The strategy that will be used to cleanup old backups. The default strategy
* will keep all backups for a certain amount of days. After that period only
* a daily backup will be kept. After that period only weekly backups will
* be kept and so on.
*
* No matter how you configure it the default strategy will never
* delete the newest backup.
*/
'strategy' => \Spatie\Backup\Tasks\Cleanup\Strategies\DefaultStrategy::class,
'defaultStrategy' => [
/*
* The number of days for which backups must be kept.
*/
'keepAllBackupsForDays' => 7,
/*
* The number of days for which daily backups must be kept.
*/
'keepDailyBackupsForDays' => 16,
/*
* The number of weeks for which one weekly backup must be kept.
*/
'keepWeeklyBackupsForWeeks' => 8,
/*
* The number of months for which one monthly backup must be kept.
*/
'keepMonthlyBackupsForMonths' => 4,
/*
* The number of years for which one yearly backup must be kept.
*/
'keepYearlyBackupsForYears' => 2,
/*
* After cleaning up the backups remove the oldest backup until
* this amount of megabytes has been reached.
*/
'deleteOldestBackupsWhenUsingMoreMegabytesThan' => 5000,
],
],
];

View File

@@ -1,2 +0,0 @@
*
!.gitignore

View File

@@ -0,0 +1,10 @@
# Upgrading cachet 2.3 to 2.4
# PHP 7
Cachet 2.4 is build using the Laravel 5.6 which requires at least PHP 7.1.3 or higher.
# Backups
In previous versions Cachet would ship with `backup-manager/laravel` to create database backups at certain points when
running the software. This is no longer provided by default in 2.4. You are free to implement your custom backup
solution when running cachet on your environments. If you do prefer a backup solution close to the pre 2.4 Cachet version:
Spatie has created [a backup manager](https://github.com/spatie/laravel-backup) that comes close to the original implementation.