Compare commits

..

17 Commits

Author SHA1 Message Date
Graham Campbell
9a9ec833eb Released 2.3.7 2016-07-25 22:57:05 +01:00
James Brooks
136cce2d6d Merge pull request #2008 from CachetHQ/analysis-XZnLDb
Applied fixes from StyleCI

[ci skip] [skip ci]
2016-07-25 21:52:31 +01:00
Graham Campbell
880a2d9cd9 Applied fixes from StyleCI
[ci skip] [skip ci]
2016-07-25 16:52:26 -04:00
James Brooks
aea18a51c2 Sync languages 2016-07-25 21:42:49 +01:00
Graham Campbell
84bedf5c60 Merge pull request #2007 from CachetHQ/revert-1976-cli
Revert "Don't use settings caching in cli"
2016-07-25 19:32:16 +01:00
Graham Campbell
309a3f96ef Revert "Don't use settings caching in cli" 2016-07-25 19:25:05 +01:00
Graham Campbell
acd1ac496d Merge pull request #2003 from CachetHQ/analysis
Run the new static analysis checks in the tests
2016-07-24 14:58:03 +01:00
Graham Campbell
8c273b8579 Run the new static analysis checks in the tests 2016-07-24 14:48:59 +01:00
Graham Campbell
b30a774bed Merge pull request #2002 from CachetHQ/imports
Added missing imports
2016-07-24 14:48:03 +01:00
Graham Campbell
3ea1428c23 Added missing imports 2016-07-24 14:47:02 +01:00
James Brooks
d6ab5efd14 Fixes #1998 2016-07-22 11:08:49 +01:00
James Brooks
a94be2efca Update deps 2016-07-22 09:19:58 +01:00
Graham Campbell
f8505a866d Back to dev 2016-07-18 19:34:29 +01:00
Graham Campbell
27235abab2 Released 2.3.6 2016-07-18 19:34:06 +01:00
Graham Campbell
f70bc7a42f Merge pull request #1986 from CachetHQ/deps
Updated dependencies
2016-07-18 18:51:37 +01:00
Graham Campbell
6cf622ae21 Updated dependencies 2016-07-18 18:46:43 +01:00
James Brooks
dd1a14a438 Back to dev 2016-07-17 16:38:52 +01:00
10 changed files with 89 additions and 49 deletions

View File

@@ -79,7 +79,6 @@ You can now find our documentation at [https://docs.cachethq.io](https://docs.ca
- [Installing Cachet](https://docs.cachethq.io/docs/installing-cachet)
- [Getting started with Docker](https://docs.cachethq.io/docs/get-started-with-docker)
- [Getting started with Vagrant](https://docs.cachethq.io/docs/get-started-with-vagrant)
### Demo Account

View File

@@ -1 +1 @@
2.3.5
2.3.7

View File

@@ -35,10 +35,9 @@ class ConfigServiceProvider extends ServiceProvider
public function boot()
{
$env = $this->app->environment();
$cli = $this->app->runningInConsole();
$repo = $this->app->make(Repository::class);
$cache = $this->app->make(Cache::class);
$loaded = $cli ? false : $cache->load($env);
$loaded = $cache->load($env);
$this->app->terminating(function () use ($repo, $cache) {
if ($repo->stale()) {
@@ -47,7 +46,7 @@ class ConfigServiceProvider extends ServiceProvider
});
try {
if ($cli === false && $loaded === false) {
if ($loaded === false) {
$loaded = $repo->all();
$cache->store($env, $loaded);
}

View File

@@ -36,7 +36,7 @@
"graham-campbell/core": "^5.1",
"graham-campbell/exceptions": "^8.6",
"graham-campbell/markdown": "^6.1",
"guzzlehttp/guzzle": "^6.2",
"guzzlehttp/guzzle": "^6.2.1",
"jenssegers/date": "^3.2",
"mccool/laravel-auto-presenter": "^4.3",
"pragmarx/google2fa": "^0.7.1",
@@ -44,7 +44,7 @@
"roumen/feed": "^2.10.4"
},
"require-dev": {
"alt-three/testbench": "^1.4",
"alt-three/testbench": "^1.7",
"filp/whoops": "^2.1",
"fzaninotto/faker": "^1.6",
"graham-campbell/testbench-core": "^1.1",

86
composer.lock generated
View File

@@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"hash": "1e468595f20309ca6658b805a1486282",
"content-hash": "4b3f3e889041139f810c76897b44722a",
"hash": "ccd6111da387c617bd665375c696b486",
"content-hash": "97beb5839c97f13a3fc0a55ef396524d",
"packages": [
{
"name": "alt-three/badger",
@@ -325,20 +325,20 @@
},
{
"name": "aws/aws-sdk-php",
"version": "3.18.28",
"version": "3.18.32",
"source": {
"type": "git",
"url": "https://github.com/aws/aws-sdk-php.git",
"reference": "c75d3ba185d5db6998124fa1a99a63e5d529b247"
"reference": "84b9927ee116b30babf90a9fc723764672543e29"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/c75d3ba185d5db6998124fa1a99a63e5d529b247",
"reference": "c75d3ba185d5db6998124fa1a99a63e5d529b247",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/84b9927ee116b30babf90a9fc723764672543e29",
"reference": "84b9927ee116b30babf90a9fc723764672543e29",
"shasum": ""
},
"require": {
"guzzlehttp/guzzle": "~5.3|~6.0.1|~6.1",
"guzzlehttp/guzzle": "^5.3.1|^6.2.1",
"guzzlehttp/promises": "~1.0",
"guzzlehttp/psr7": "~1.3.1",
"mtdowling/jmespath.php": "~2.2",
@@ -401,7 +401,7 @@
"s3",
"sdk"
],
"time": "2016-07-13 20:34:06"
"time": "2016-07-21 22:30:58"
},
{
"name": "backup-manager/backup-manager",
@@ -1458,16 +1458,16 @@
},
{
"name": "graham-campbell/exceptions",
"version": "v8.6.2",
"version": "v8.7.0",
"source": {
"type": "git",
"url": "https://github.com/GrahamCampbell/Laravel-Exceptions.git",
"reference": "7a36e51547258f750a1e68f6caa717bff26e710b"
"reference": "6610dfaeda39f9103d53eac4dc487ee59eb80894"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/GrahamCampbell/Laravel-Exceptions/zipball/7a36e51547258f750a1e68f6caa717bff26e710b",
"reference": "7a36e51547258f750a1e68f6caa717bff26e710b",
"url": "https://api.github.com/repos/GrahamCampbell/Laravel-Exceptions/zipball/6610dfaeda39f9103d53eac4dc487ee59eb80894",
"reference": "6610dfaeda39f9103d53eac4dc487ee59eb80894",
"shasum": ""
},
"require": {
@@ -1491,7 +1491,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "8.6-dev"
"dev-master": "8.7-dev"
}
},
"autoload": {
@@ -1523,7 +1523,7 @@
"laravel",
"whoops"
],
"time": "2016-07-14 15:54:14"
"time": "2016-07-21 13:26:49"
},
{
"name": "graham-campbell/markdown",
@@ -1646,27 +1646,27 @@
},
{
"name": "guzzlehttp/guzzle",
"version": "6.2.0",
"version": "6.2.1",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
"reference": "d094e337976dff9d8e2424e8485872194e768662"
"reference": "3f808fba627f2c5b69e2501217bf31af349c1427"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/d094e337976dff9d8e2424e8485872194e768662",
"reference": "d094e337976dff9d8e2424e8485872194e768662",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/3f808fba627f2c5b69e2501217bf31af349c1427",
"reference": "3f808fba627f2c5b69e2501217bf31af349c1427",
"shasum": ""
},
"require": {
"guzzlehttp/promises": "~1.0",
"guzzlehttp/psr7": "~1.1",
"php": ">=5.5.0"
"guzzlehttp/promises": "^1.0",
"guzzlehttp/psr7": "^1.3.1",
"php": ">=5.5"
},
"require-dev": {
"ext-curl": "*",
"phpunit/phpunit": "~4.0",
"psr/log": "~1.0"
"phpunit/phpunit": "^4.0",
"psr/log": "^1.0"
},
"type": "library",
"extra": {
@@ -1704,7 +1704,7 @@
"rest",
"web service"
],
"time": "2016-03-21 20:02:09"
"time": "2016-07-15 17:22:37"
},
{
"name": "guzzlehttp/promises",
@@ -2217,16 +2217,16 @@
},
{
"name": "league/flysystem",
"version": "1.0.24",
"version": "1.0.25",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem.git",
"reference": "9aca859a303fdca30370f42b8c611d9cf0dedf4b"
"reference": "a76afa4035931be0c78ca8efc6abf3902362f437"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/9aca859a303fdca30370f42b8c611d9cf0dedf4b",
"reference": "9aca859a303fdca30370f42b8c611d9cf0dedf4b",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/a76afa4035931be0c78ca8efc6abf3902362f437",
"reference": "a76afa4035931be0c78ca8efc6abf3902362f437",
"shasum": ""
},
"require": {
@@ -2239,7 +2239,7 @@
"ext-fileinfo": "*",
"mockery/mockery": "~0.9",
"phpspec/phpspec": "^2.2",
"phpunit/phpunit": "~4.8 || ~5.0"
"phpunit/phpunit": "~4.8"
},
"suggest": {
"ext-fileinfo": "Required for MimeType",
@@ -2296,7 +2296,7 @@
"sftp",
"storage"
],
"time": "2016-06-03 19:11:39"
"time": "2016-07-18 12:22:57"
},
{
"name": "mccool/laravel-auto-presenter",
@@ -4109,16 +4109,16 @@
"packages-dev": [
{
"name": "alt-three/testbench",
"version": "v1.4.0",
"version": "v1.7.0",
"source": {
"type": "git",
"url": "https://github.com/AltThree/TestBench.git",
"reference": "215ca7a1394d79d3ab649b78bc4c55ca63b73531"
"reference": "9bc6029a3a813dd20674548e45db5f6db0d1b4cd"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/AltThree/TestBench/zipball/215ca7a1394d79d3ab649b78bc4c55ca63b73531",
"reference": "215ca7a1394d79d3ab649b78bc4c55ca63b73531",
"url": "https://api.github.com/repos/AltThree/TestBench/zipball/9bc6029a3a813dd20674548e45db5f6db0d1b4cd",
"reference": "9bc6029a3a813dd20674548e45db5f6db0d1b4cd",
"shasum": ""
},
"require": {
@@ -4126,15 +4126,17 @@
"php": ">=5.5.9"
},
"require-dev": {
"nikic/php-parser": "^2.0",
"phpunit/phpunit": "^4.8|^5.0"
},
"suggest": {
"laravel/framework": "Enables the use of every trait."
"laravel/framework": "Enables the use of every trait.",
"nikic/php-parser": "Enables the use of the static analyzer."
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.4-dev"
"dev-master": "1.7-dev"
}
},
"autoload": {
@@ -4166,7 +4168,7 @@
"TestBench",
"app"
],
"time": "2016-03-14 18:08:23"
"time": "2016-07-24 13:16:43"
},
{
"name": "doctrine/instantiator",
@@ -4224,16 +4226,16 @@
},
{
"name": "filp/whoops",
"version": "2.1.2",
"version": "2.1.3",
"source": {
"type": "git",
"url": "https://github.com/filp/whoops.git",
"reference": "d13505b240a6f580bc75ba591da30299d6cb0eec"
"reference": "8828aaa2178e0a19325522e2a45282ff0a14649b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/filp/whoops/zipball/d13505b240a6f580bc75ba591da30299d6cb0eec",
"reference": "d13505b240a6f580bc75ba591da30299d6cb0eec",
"url": "https://api.github.com/repos/filp/whoops/zipball/8828aaa2178e0a19325522e2a45282ff0a14649b",
"reference": "8828aaa2178e0a19325522e2a45282ff0a14649b",
"shasum": ""
},
"require": {
@@ -4280,7 +4282,7 @@
"whoops",
"zf2"
],
"time": "2016-04-07 06:16:25"
"time": "2016-05-06 18:25:35"
},
{
"name": "fzaninotto/faker",

View File

@@ -11,6 +11,7 @@
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class CreateJobsTable extends Migration
{

View File

@@ -11,6 +11,7 @@
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class CreateFailedJobsTable extends Migration
{

View File

@@ -11,6 +11,7 @@
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class CreateInvitesTable extends Migration
{

View File

@@ -11,6 +11,7 @@
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class AlterTableSubscribersAddGlobalColumn extends Migration
{

36
tests/AnalysisTest.php Normal file
View File

@@ -0,0 +1,36 @@
<?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.
*/
namespace CachetHQ\Tests\Cachet;
use AltThree\TestBench\AnalysisTrait;
use PHPUnit_Framework_TestCase as TestCase;
/**
* This is the analysis test class.
*
* @author Graham Campbell <graham@alt-three.com>
*/
class AnalysisTest extends TestCase
{
use AnalysisTrait;
protected function getPaths()
{
return [
realpath(__DIR__.'/../app'),
realpath(__DIR__.'/../bootstrap'),
realpath(__DIR__.'/../config'),
realpath(__DIR__.'/../database'),
realpath(__DIR__),
];
}
}