From 90baf187247ec13e70221a6eee9d71d8146c217a Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Mon, 3 Aug 2015 14:23:46 +0100 Subject: [PATCH 1/4] Backport all fixes from the master to 1.1 --- app/Http/Routes/StatusPageRoutes.php | 19 ------- app/Http/Routes/SubscribeRoutes.php | 49 +++++++++++++++++++ app/Models/Subscriber.php | 3 +- app/Presenters/ComponentPresenter.php | 5 +- ...6_AlterTableSubscribersRemoveDeletedAt.php | 41 ++++++++++++++++ resources/lang/en/forms.php | 7 ++- resources/views/dashboard/team/add.blade.php | 9 ++++ 7 files changed, 109 insertions(+), 24 deletions(-) create mode 100644 app/Http/Routes/SubscribeRoutes.php create mode 100644 database/migrations/2015_08_02_120436_AlterTableSubscribersRemoveDeletedAt.php diff --git a/app/Http/Routes/StatusPageRoutes.php b/app/Http/Routes/StatusPageRoutes.php index 94b70af3..f0a78317 100644 --- a/app/Http/Routes/StatusPageRoutes.php +++ b/app/Http/Routes/StatusPageRoutes.php @@ -31,25 +31,6 @@ class StatusPageRoutes $router->get('/atom/{component_group?}', 'AtomController@feedAction'); $router->get('/rss/{component_group?}', 'RssController@feedAction'); - - $router->group(['middleware' => 'app.subscribers'], function ($router) { - $router->get('subscribe', [ - 'as' => 'subscribe-page', - 'uses' => 'SubscribeController@showSubscribe', - ]); - $router->post('subscribe', [ - 'as' => 'subscribe', - 'uses' => 'SubscribeController@postSubscribe', - ]); - $router->get('subscribe/verify/{code}', [ - 'as' => 'subscribe-verify', - 'uses' => 'SubscribeController@getVerify', - ]); - $router->get('unsubscribe/{code}', [ - 'as' => 'unsubscribe', - 'uses' => 'SubscribeController@getUnsubscribe', - ]); - }); }); } } diff --git a/app/Http/Routes/SubscribeRoutes.php b/app/Http/Routes/SubscribeRoutes.php new file mode 100644 index 00000000..501e3c4d --- /dev/null +++ b/app/Http/Routes/SubscribeRoutes.php @@ -0,0 +1,49 @@ +group(['middleware' => 'app.hasSetting', 'setting' => 'app_name'], function ($router) { + $router->group(['middleware' => 'app.subscribers'], function ($router) { + $router->get('subscribe', [ + 'as' => 'subscribe-page', + 'uses' => 'SubscribeController@showSubscribe', + ]); + + $router->post('subscribe', [ + 'as' => 'subscribe', + 'uses' => 'SubscribeController@postSubscribe', + ]); + + $router->get('subscribe/verify/{code}', [ + 'as' => 'subscribe-verify', + 'uses' => 'SubscribeController@getVerify', + ]); + + $router->get('unsubscribe/{code}', [ + 'as' => 'unsubscribe', + 'uses' => 'SubscribeController@getUnsubscribe', + ]); + }); + }); + } +} diff --git a/app/Models/Subscriber.php b/app/Models/Subscriber.php index 21bd8d14..5587a57d 100644 --- a/app/Models/Subscriber.php +++ b/app/Models/Subscriber.php @@ -13,13 +13,12 @@ namespace CachetHQ\Cachet\Models; use CachetHQ\Cachet\Presenters\SubscriberPresenter; use Illuminate\Database\Eloquent\Model; -use Illuminate\Database\Eloquent\SoftDeletes; use McCool\LaravelAutoPresenter\HasPresenter; use Watson\Validating\ValidatingTrait; class Subscriber extends Model implements HasPresenter { - use SoftDeletes, ValidatingTrait; + use ValidatingTrait; /** * The validation rules. diff --git a/app/Presenters/ComponentPresenter.php b/app/Presenters/ComponentPresenter.php index 8b192d7d..7a68c10b 100644 --- a/app/Presenters/ComponentPresenter.php +++ b/app/Presenters/ComponentPresenter.php @@ -25,8 +25,9 @@ class ComponentPresenter extends AbstractPresenter public function toArray() { return array_merge($this->wrappedObject->toArray(), [ - 'created_at' => $this->created_at(), - 'updated_at' => $this->updated_at(), + 'created_at' => $this->created_at(), + 'updated_at' => $this->updated_at(), + 'status_name' => $this->wrappedObject->humanStatus, ]); } } diff --git a/database/migrations/2015_08_02_120436_AlterTableSubscribersRemoveDeletedAt.php b/database/migrations/2015_08_02_120436_AlterTableSubscribersRemoveDeletedAt.php new file mode 100644 index 00000000..ffb6e5b1 --- /dev/null +++ b/database/migrations/2015_08_02_120436_AlterTableSubscribersRemoveDeletedAt.php @@ -0,0 +1,41 @@ +dropColumn('deleted_at'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('subscribers', function (Blueprint $table) { + $table->softDeletes(); + }); + } +} diff --git a/resources/lang/en/forms.php b/resources/lang/en/forms.php index 946aa7ec..33ea7c07 100755 --- a/resources/lang/en/forms.php +++ b/resources/lang/en/forms.php @@ -127,7 +127,12 @@ return [ 'password' => 'Password', 'api-token' => 'API Token', 'api-token-help' => 'Regenerating your API token will prevent existing applications from accessing Cachet.', - '2fa' => [ + 'user_level' => 'User Level', + 'levels' => [ + 'admin' => 'Admin', + 'user' => 'User', + ], + '2fa' => [ 'help' => 'Enabling two factor authentication increases security of your account. You will need to download Google Authenticator or a similar app on to your mobile device. When you login you will be asked to provide a token generated by the app.', ], ], diff --git a/resources/views/dashboard/team/add.blade.php b/resources/views/dashboard/team/add.blade.php index 41edfb1d..9122b498 100644 --- a/resources/views/dashboard/team/add.blade.php +++ b/resources/views/dashboard/team/add.blade.php @@ -28,6 +28,15 @@ + @if($loggedUser->isAdmin) +
+ + +
+ @endif
From 6cd10581e427bae7fd483d4d272bb0596a2baf3c Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Mon, 3 Aug 2015 14:26:15 +0100 Subject: [PATCH 2/4] Removed incorrect php-cs-fixer config --- .php_cs | 92 --------------------------------------------------------- 1 file changed, 92 deletions(-) delete mode 100644 .php_cs diff --git a/.php_cs b/.php_cs deleted file mode 100644 index 731e2c9f..00000000 --- a/.php_cs +++ /dev/null @@ -1,92 +0,0 @@ -level(Symfony\CS\FixerInterface::NONE_LEVEL) - ->fixers(array( - 'header_comment', - 'psr0', - 'encoding', - 'short_tag', - 'braces', - 'elseif', - 'eof_ending', - 'function_call_space', - 'function_declaration', - 'indentation', - 'line_after_namespace', - 'linefeed', - 'lowercase_constants', - 'lowercase_keywords', - 'method_argument_space', - 'multiple_use', - 'parenthesis', - 'php_closing_tag', - 'single_line_after_imports', - 'trailing_spaces', - 'visibility', - 'blankline_after_open_tag', - 'concat_without_spaces', - 'double_arrow_multiline_whitespaces', - 'duplicate_semicolon', - 'empty_return', - 'extra_empty_lines', - 'include', - 'join_function', - 'list_commas', - 'multiline_array_trailing_comma', - 'namespace_no_leading_whitespace', - 'new_with_braces', - 'no_blank_lines_after_class_opening', - 'no_empty_lines_after_phpdocs', - 'object_operator', - 'operators_spaces', - 'phpdoc_indent', - 'phpdoc_no_access', - 'phpdoc_no_package', - 'phpdoc_params', - 'phpdoc_scalar', - 'phpdoc_separation', - 'phpdoc_short_description', - 'phpdoc_to_comment', - 'phpdoc_trim', - 'phpdoc_type_to_var', - 'phpdoc_var_without_name', - 'remove_leading_slash_use', - 'remove_lines_between_uses', - 'return', - 'self_accessor', - 'single_array_no_trailing_comma', - 'single_blank_line_before_namespace', - 'single_quote', - 'spaces_before_semicolon', - 'spaces_cast', - 'standardize_not_equal', - 'ternary_spaces', - 'trim_array_spaces', - 'unalign_equals', - 'unary_operators_spaces', - 'unused_use', - 'whitespacy_lines', - 'align_double_arrow', - 'multiline_spaces_before_semicolon', - 'ordered_use', - 'phpdoc_order', - 'short_array_syntax', - )) - ->finder( - Symfony\CS\Finder\DefaultFinder::create() - ->exclude('Symfony/CS/Tests/Fixtures') - ->in(__DIR__) - ) -; From ea0a8dfcff560b7704a91a4e469ed4c754e4a75e Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Mon, 3 Aug 2015 14:28:25 +0100 Subject: [PATCH 3/4] Updated dependencies --- composer.lock | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/composer.lock b/composer.lock index e277c634..04cabb6f 100644 --- a/composer.lock +++ b/composer.lock @@ -3591,16 +3591,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "2.2.0", + "version": "2.2.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "e6577d90f61a9adbe94544a6e9a7ca18b5fd9c8f" + "reference": "6526d9bdb56e2af1e8950114d42391044d18cfa7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/e6577d90f61a9adbe94544a6e9a7ca18b5fd9c8f", - "reference": "e6577d90f61a9adbe94544a6e9a7ca18b5fd9c8f", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/6526d9bdb56e2af1e8950114d42391044d18cfa7", + "reference": "6526d9bdb56e2af1e8950114d42391044d18cfa7", "shasum": "" }, "require": { @@ -3608,7 +3608,7 @@ "phpunit/php-file-iterator": "~1.3", "phpunit/php-text-template": "~1.2", "phpunit/php-token-stream": "~1.3", - "sebastian/environment": "~1.3", + "sebastian/environment": "~1.3.1", "sebastian/version": "~1.0" }, "require-dev": { @@ -3649,7 +3649,7 @@ "testing", "xunit" ], - "time": "2015-08-01 05:09:57" + "time": "2015-08-02 04:45:08" }, { "name": "phpunit/php-file-iterator", @@ -4075,16 +4075,16 @@ }, { "name": "sebastian/environment", - "version": "1.3.0", + "version": "1.3.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "4fe0a44cddd8cc19583a024bdc7374eb2fef0b87" + "reference": "6324c907ce7a52478eeeaede764f48733ef5ae44" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/4fe0a44cddd8cc19583a024bdc7374eb2fef0b87", - "reference": "4fe0a44cddd8cc19583a024bdc7374eb2fef0b87", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6324c907ce7a52478eeeaede764f48733ef5ae44", + "reference": "6324c907ce7a52478eeeaede764f48733ef5ae44", "shasum": "" }, "require": { @@ -4121,7 +4121,7 @@ "environment", "hhvm" ], - "time": "2015-07-26 06:42:57" + "time": "2015-08-03 06:14:51" }, { "name": "sebastian/exporter", From 14ec134ac1e30249a2953e973c2fdf3be22ea111 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Mon, 3 Aug 2015 14:46:03 +0100 Subject: [PATCH 4/4] Updated dependencies --- composer.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index 04cabb6f..bc83cc9e 100644 --- a/composer.lock +++ b/composer.lock @@ -1128,16 +1128,16 @@ }, { "name": "graham-campbell/throttle", - "version": "v4.1.0", + "version": "v4.1.1", "source": { "type": "git", "url": "https://github.com/GrahamCampbell/Laravel-Throttle.git", - "reference": "d708acbea68a560c66fcd4657dba1a42f4b3ce9d" + "reference": "35ca0b1e90f7eaf20251cc6005b93462413e2858" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/GrahamCampbell/Laravel-Throttle/zipball/d708acbea68a560c66fcd4657dba1a42f4b3ce9d", - "reference": "d708acbea68a560c66fcd4657dba1a42f4b3ce9d", + "url": "https://api.github.com/repos/GrahamCampbell/Laravel-Throttle/zipball/35ca0b1e90f7eaf20251cc6005b93462413e2858", + "reference": "35ca0b1e90f7eaf20251cc6005b93462413e2858", "shasum": "" }, "require": { @@ -1185,7 +1185,7 @@ "throttle", "throttling" ], - "time": "2015-06-26 17:35:00" + "time": "2015-08-03 13:40:11" }, { "name": "guzzlehttp/guzzle",