From a39a6546ccbd88e29846df63ca3752e8dfd56efb Mon Sep 17 00:00:00 2001
From: Matt Clements <matt@mattclements.co.uk>
Date: Fri, 2 Jan 2015 14:32:31 +0000
Subject: [PATCH] Fixed Styleguide Issues

---
 app/config/app.php                      | 2 +-
 app/routes/app.php                      | 2 +-
 composer.json                           | 4 ++--
 src/Http/Controllers/AtomController.php | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/config/app.php b/app/config/app.php
index 6d41ae0c..bffe61b3 100644
--- a/app/config/app.php
+++ b/app/config/app.php
@@ -125,8 +125,8 @@ return [
         'GrahamCampbell\Binput\BinputServiceProvider',
         'GrahamCampbell\Throttle\ThrottleServiceProvider',
         'GrahamCampbell\Markdown\MarkdownServiceProvider',
-        'Thujohn\Rss\RssServiceProvider',
         'Roumen\Feed\FeedServiceProvider',
+        'Thujohn\Rss\RssServiceProvider',
 
         'CachetHQ\Cachet\Providers\RepositoryServiceProvider',
         'CachetHQ\Cachet\Providers\RoutingServiceProvider',
diff --git a/app/routes/app.php b/app/routes/app.php
index 5ab59d24..dec04878 100644
--- a/app/routes/app.php
+++ b/app/routes/app.php
@@ -12,6 +12,6 @@ Route::group(['before' => 'is_setup', 'namespace' => 'CachetHQ\Cachet\Http\Contr
 });
 
 Route::group(['namespace' => 'CachetHQ\Cachet\Http\Controllers'], function () {
+	Route::get('/atom', 'AtomController@feedAction');
     Route::get('/rss', 'RssController@feedAction');
-    Route::get('/atom', 'AtomController@feedAction');
 });
diff --git a/composer.json b/composer.json
index 9c981b50..1cdc437f 100644
--- a/composer.json
+++ b/composer.json
@@ -19,9 +19,9 @@
         "graham-campbell/markdown": "~2.0",
         "graham-campbell/throttle": "~2.0",
         "guzzlehttp/guzzle": "~5.0",
+        "roumen/feed": "~2.8",
         "thujohn/rss": "~1.0",
-        "watson/validating": "0.10.*",
-        "roumen/feed": "~2.8"
+        "watson/validating": "0.10.*"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.3",
diff --git a/src/Http/Controllers/AtomController.php b/src/Http/Controllers/AtomController.php
index f89a7b0c..a2b1b99e 100644
--- a/src/Http/Controllers/AtomController.php
+++ b/src/Http/Controllers/AtomController.php
@@ -36,7 +36,7 @@ class AtomController extends Controller
                 Setting::get('app_name'),
                 Setting::get('app_domain'),
                 $incident->created_at,
-                ($componentName===null ? $incident->humanStatus : $componentName." ".$incident->humanStatus),
+                ($componentName === null ? $incident->humanStatus : $componentName." ".$incident->humanStatus),
                 $incident->message
             );
         });