From 15407ad9a38137f5f514222427a9a5bf2d96516f Mon Sep 17 00:00:00 2001 From: James Brooks Date: Wed, 10 Aug 2016 20:28:32 +0100 Subject: [PATCH 1/6] Remove dump and die --- app/Http/Controllers/SubscribeController.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/Http/Controllers/SubscribeController.php b/app/Http/Controllers/SubscribeController.php index 104dfd8c..c2600fa5 100644 --- a/app/Http/Controllers/SubscribeController.php +++ b/app/Http/Controllers/SubscribeController.php @@ -180,8 +180,6 @@ class SubscribeController extends Controller try { dispatch(new UpdateSubscriberSubscriptionCommand($subscriber, Binput::get('subscriptions'))); } catch (ValidationException $e) { - dd($e->getMessageBag()); - return Redirect::route('subscribe.manage', $subscriber->verify_code) ->withInput(Binput::all()) ->withTitle(sprintf('%s %s', trans('dashboard.notifications.whoops'), trans('cachet.subscriber.email.failure'))) From 1b580360ace2244bff92e9d9bf295b89f3b540e3 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Wed, 10 Aug 2016 21:04:17 +0100 Subject: [PATCH 2/6] Updated deps --- composer.lock | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/composer.lock b/composer.lock index 05555626..acd6db49 100644 --- a/composer.lock +++ b/composer.lock @@ -325,16 +325,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.18.37", + "version": "3.18.38", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "0d4abd38caf09fbda9177e8c1fd2a9ec73d71d66" + "reference": "979470feb19af8b5cd2f7a455407618416cdfadc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/0d4abd38caf09fbda9177e8c1fd2a9ec73d71d66", - "reference": "0d4abd38caf09fbda9177e8c1fd2a9ec73d71d66", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/979470feb19af8b5cd2f7a455407618416cdfadc", + "reference": "979470feb19af8b5cd2f7a455407618416cdfadc", "shasum": "" }, "require": { @@ -401,7 +401,7 @@ "s3", "sdk" ], - "time": "2016-08-04 21:27:47" + "time": "2016-08-09 18:09:34" }, { "name": "backup-manager/backup-manager", @@ -2217,16 +2217,16 @@ }, { "name": "league/flysystem", - "version": "1.0.26", + "version": "1.0.27", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "fb3b30dca320b36931ea878fea17ebe136fba1b0" + "reference": "50e2045ed70a7e75a5e30bc3662904f3b67af8a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/fb3b30dca320b36931ea878fea17ebe136fba1b0", - "reference": "fb3b30dca320b36931ea878fea17ebe136fba1b0", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/50e2045ed70a7e75a5e30bc3662904f3b67af8a9", + "reference": "50e2045ed70a7e75a5e30bc3662904f3b67af8a9", "shasum": "" }, "require": { @@ -2296,7 +2296,7 @@ "sftp", "storage" ], - "time": "2016-08-03 09:49:11" + "time": "2016-08-10 08:55:11" }, { "name": "mccool/laravel-auto-presenter", @@ -5561,28 +5561,29 @@ }, { "name": "webmozart/assert", - "version": "1.0.2", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/webmozart/assert.git", - "reference": "30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde" + "reference": "bb2d123231c095735130cc8f6d31385a44c7b308" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozart/assert/zipball/30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde", - "reference": "30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde", + "url": "https://api.github.com/repos/webmozart/assert/zipball/bb2d123231c095735130cc8f6d31385a44c7b308", + "reference": "bb2d123231c095735130cc8f6d31385a44c7b308", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": "^5.3.3|^7.0" }, "require-dev": { - "phpunit/phpunit": "^4.6" + "phpunit/phpunit": "^4.6", + "sebastian/version": "^1.0.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.2-dev" } }, "autoload": { @@ -5606,7 +5607,7 @@ "check", "validate" ], - "time": "2015-08-24 13:29:44" + "time": "2016-08-09 15:02:57" } ], "aliases": [], From c2192d7ef7a987cb0ca4c3bd19a7e6227a2546b8 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Thu, 11 Aug 2016 12:03:28 +0100 Subject: [PATCH 3/6] Backport readme changes --- README.md | 62 +++++++++++++++++++++++++++---------------------------- 1 file changed, 30 insertions(+), 32 deletions(-) diff --git a/README.md b/README.md index 98079509..66beda0e 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,14 @@ # Cachet [![StyleCI](https://styleci.io/repos/26730195/shield)](https://styleci.io/repos/26730195/) -[![Build Status](https://img.shields.io/travis/CachetHQ/Cachet/master.svg?style=flat-square)](https://travis-ci.org/CachetHQ/Cachet) +[![Build Status](https://img.shields.io/travis/CachetHQ/Cachet/2.3.svg?style=flat-square)](https://travis-ci.org/CachetHQ/Cachet) [![Software License](https://img.shields.io/badge/license-BSD3-brightgreen.svg?style=flat-square)](LICENSE) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/cachet/localized.svg)](http://translate.cachethq.io/project/cachet) [![Packagist](https://img.shields.io/packagist/v/cachethq/cachet.svg?style=flat-square)](https://packagist.org/packages/cachethq/cachet) ![Screenshot](https://cachethq.io/img/main-interface.jpg) -Cachet is a beautiful and powerful open source status page system, a free replacement to services such as StatusPage.io, Status.io and others. - -## Supporting Cachet - -Cachet is a BSD-3-licensed open source project. If you'd like to support future development, check out the [Cachet Patreon campaign](https://patreon.com/jbrooksuk). +Cachet is a beautiful and powerful open source status page system. ## Features @@ -25,11 +21,7 @@ Cachet is a BSD-3-licensed open source project. If you'd like to support future - Metrics - Cross-database support: MySQL, PostgreSQL and SQLite - Subscriber notifications via Email -- Two factor authentication, with Google Authenticator - -## Usage in production - -The `master` branch of this repository is a development branch and **should not** be used in production. Instead, please check out the latest tag release. +- Two factor authentication using Google Authenticator ## Requirements @@ -37,15 +29,15 @@ The `master` branch of this repository is a development branch and **should not* - Apache or Nginx server - [Composer](https://getcomposer.org) -## How to contribute +## I'm looking to contribute to this awesome project! -We're always looking for contributions that improve Cachet. It's easy to get started and you don't even need to know how to write a single line of code! +Sweet, we're always looking for contributions that improve Cachet! It's easy to get started and you don't even need to know how to write a single line of code! ### Contributing as a non-developer/non-designer -If you're one of the more linguistically talented people in the world who can speak and write more than just English, we're always looking for new [translations](#translations). +We're always looking for new [translations](#translations). -Of course bug reports, feature requests and [documentation](https://docs.cachethq.io) are always being sought after. +Of course bug reports, feature requests and [documentation](https://docs.cachethq.io) are always appreciated. ### Contributing as a designer @@ -56,26 +48,28 @@ You'll need to install Node.js, Bower and Gulp. To get started you can do the following: 1. Install Node.js and our dev dependencies. -2. Modify the SCSS files in `./resources/assets/sass/` +2. Make your changes to the SCSS files in `./resources/assets/sass/` 3. Run `gulp` -If you're making a lot of changes, you'll find that running `gulp watch` will really help you out! +If you're making a lot of changes, you'll find that running `gulp watch` will make life easier for you! ### Contributing as a developer -Built using [Laravel](https://laravel.com), Cachet is very easy to jump into. Have a look around you'll find it surprisingly easy! +Built using [Laravel](https://laravel.com). -These extra dependencies are required to develop Cachet: +We use these extra dependencies to develop Cachet: - Node.js - Gulp - Git -Once cloned to your local machine, you'll need some demo data! Simply run `php artisan cachet:seed` to get the demo installation on the go. +Once cloned to your local machine, you'll need some demo data! Run `php artisan cachet:seed` to get the demo installation ready for action. ## Installation, Upgrades and Documentation -You can now find our documentation at [https://docs.cachethq.io](https://docs.cachethq.io). +Documentation is found at [https://docs.cachethq.io](https://docs.cachethq.io). + +Here are some useful quick links: - [Installing Cachet](https://docs.cachethq.io/docs/installing-cachet) - [Getting started with Docker](https://docs.cachethq.io/docs/get-started-with-docker) @@ -84,25 +78,29 @@ You can now find our documentation at [https://docs.cachethq.io](https://docs.ca To test out the demo, you may login to the [Dashboard](https://demo.cachethq.io/dashboard) with the following: -- **Username:** test or test@test.com -- **Password:** test123 +- **Username:** `test` or `test@test.com` +- **Password:** `test123` The demo is reset every half hour. ### Release Notes -All releases are listed on the [Releases page](https://github.com/CachetHQ/Cachet/releases) of the [Cachet GitHub repository](https://github.com/CachetHQ/Cachet). On the Releases page, you can also find the release notes for each release. +We list releases on the [Releases page](https://github.com/CachetHQ/Cachet/releases) of the [Cachet GitHub repository](https://github.com/CachetHQ/Cachet). On the Releases page, you can also find the release notes for each release. ## Translations -A special thank you to our [translators](https://crowdin.com/project/cachet/activity_stream), who have allowed us to share Cachet with the world. If you'd like to contribute translations, please check out our [CrowdIn project](https://crowdin.com/project/cachet). +If you'd like to contribute translations, please check out our [CrowdIn project](https://crowdin.com/project/cachet). + +> Thank you to our [translators](https://crowdin.com/project/cachet/activity_stream), who have allowed us to share Cachet with the world! + +## Show your support + +Cachet is a BSD-3-licensed open source project. If you'd like to support future development, check out the [Patreon campaign](https://patreon.com/jbrooksuk). + +## Professional Installation Service + +We offer a professional installation service. To find out more, email us at [support@alt-three.com](mailto:support@alt-three.com?Cachet Installation) ## Security Vulnerabilities -If you discover a security vulnerability within Cachet, please send an e-mail to us at support@alt-three.com. All security vulnerabilities will be promptly addressed. - -## Installations - -We offer a paid installation service, which starts at $99 but is subject to change, dependant on your setup and infrastructure. - -To find out more, email us at support@alt-three.com +If you discover a security vulnerability within Cachet, please send an e-mail to us at support@alt-three.com. We handle all security vulnerabilities on a case-by-case basis. From 2a9d1b48978e048e93a195bb7cdaaa5e05c489e7 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Thu, 11 Aug 2016 12:09:28 +0100 Subject: [PATCH 4/6] Backport new command tests --- .travis.yml | 2 + tests/Functional/AppCommandTest.php | 39 +++++++++++++++++++ ...CommandTest.php => ArtisanCommandTest.php} | 4 +- 3 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 tests/Functional/AppCommandTest.php rename tests/Functional/{CommandTest.php => ArtisanCommandTest.php} (89%) diff --git a/.travis.yml b/.travis.yml index cf51d22d..95760217 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,8 @@ php: sudo: false +before_install: cp .env.example .env + install: travis_retry composer install --no-interaction --no-scripts --prefer-source script: vendor/bin/phpunit diff --git a/tests/Functional/AppCommandTest.php b/tests/Functional/AppCommandTest.php new file mode 100644 index 00000000..9e596c22 --- /dev/null +++ b/tests/Functional/AppCommandTest.php @@ -0,0 +1,39 @@ + + * @author James Brooks + */ +class AppCommandTest extends AbstractTestCase +{ + public function testInstall() + { + $this->assertSame(0, $this->app->make(Kernel::class)->call('app:install')); + } + + public function testReset() + { + $this->assertSame(0, $this->app->make(Kernel::class)->call('app:reset')); + } + + public function testUpdate() + { + $this->assertSame(0, $this->app->make(Kernel::class)->call('app:reset')); + } +} diff --git a/tests/Functional/CommandTest.php b/tests/Functional/ArtisanCommandTest.php similarity index 89% rename from tests/Functional/CommandTest.php rename to tests/Functional/ArtisanCommandTest.php index 43f4b1a3..e8c7bf3e 100644 --- a/tests/Functional/CommandTest.php +++ b/tests/Functional/ArtisanCommandTest.php @@ -16,12 +16,12 @@ use Illuminate\Contracts\Console\Kernel; use Illuminate\Foundation\Testing\DatabaseMigrations; /** - * This is the command test class. + * This is the artisan command test class. * * @author Graham Campbell * @author James Brooks */ -class CommandTest extends AbstractTestCase +class ArtisanCommandTest extends AbstractTestCase { use DatabaseMigrations; From dbf6fe528c1147ec8a763b195fc2065f4f606823 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Thu, 11 Aug 2016 12:16:14 +0100 Subject: [PATCH 5/6] Release v2.3.10 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 66d8a6dc..9fa5f12a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.3.10-dev +2.3.10 From 8d74923e3f45ab0aab049dab72dd2d3f2657017a Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Thu, 11 Aug 2016 12:16:50 +0100 Subject: [PATCH 6/6] Back to dev --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 9fa5f12a..cf9aa43b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.3.10 +2.3.11-dev