Merge pull request #3368 from CachetHQ/drop-feeds

Drop support for RSS & Atom feeds
cachethq · Dec 27, 2018 · 3763a86 · 3763a86
2 parents 0893985 + b96c36f
commit 3763a86
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 310 deletions.
diff --git a/app/Http/Controllers/FeedController.php b/app/Http/Controllers/FeedController.php
diff --git a/app/Http/Routes/FeedRoutes.php b/app/Http/Routes/FeedRoutes.php
diff --git a/composer.json b/composer.json
@@ -55,7 +55,6 @@
         "nexmo/client": "^1.5",
         "pragmarx/google2fa": "^0.7.1",
         "predis/predis": "^1.1",
-        "roumen/feed": "^2.10",
         "twig/twig": "^1.35"
     },
     "require-dev": {

diff --git a/config/app.php b/config/app.php
@@ -187,7 +187,6 @@
         Laravolt\Avatar\ServiceProvider::class,
         McCool\LaravelAutoPresenter\AutoPresenterServiceProvider::class,
         PragmaRX\Google2FA\Vendor\Laravel\ServiceProvider::class,
-        Roumen\Feed\FeedServiceProvider::class,
 
         /*
          * Application Service Providers...

diff --git a/resources/views/layout/master.blade.php b/resources/views/layout/master.blade.php
@@ -7,9 +7,6 @@
     <meta name="env" content="{{ app('env') }}">
     <meta name="token" content="{{ csrf_token() }}">
 
-    <link rel="alternate" type="application/atom+xml" href="{{ cachet_route('feed.atom') }}" title="{{ $siteTitle }} - Atom Feed">
-    <link rel="alternate" type="application/rss+xml" href="{{ cachet_route('feed.rss') }}" title="{{ $siteTitle }} - RSS Feed">
-
     <!-- Mobile friendliness -->
     <meta name="HandheldFriendly" content="True">
     <meta name="MobileOptimized" content="320">

diff --git a/resources/views/partials/footer.blade.php b/resources/views/partials/footer.blade.php
@@ -26,12 +26,6 @@
                         <a class="btn btn-link" href="{{ cachet_route('auth.logout') }}">{{ trans('dashboard.logout') }}</a>
                     </li>
                     @endif
-                    <li>
-                        <a class="btn btn-link" href="{{ cachet_route('feed.rss') }}">{{ trans('cachet.rss-feed') }}</a>
-                    </li>
-                    <li>
-                        <a class="btn btn-link" href="{{ cachet_route('feed.atom') }}">{{ trans('cachet.atom-feed') }}</a>
-                    </li>
                     @if($enableSubscribers)
                     <li>
                         <a class="btn btn-success btn-outline" href="{{ cachet_route('subscribe') }}">{{ trans('cachet.subscriber.button') }}</a>

diff --git a/resources/views/vendor/feed/atom.blade.php b/resources/views/vendor/feed/atom.blade.php
diff --git a/resources/views/vendor/feed/rss.blade.php b/resources/views/vendor/feed/rss.blade.php
diff --git a/tests/Foundation/Providers/RouteServiceProviderTest.php b/tests/Foundation/Providers/RouteServiceProviderTest.php
@@ -126,8 +126,6 @@ public function testWhenAlwaysAuthenticateIsEnabledAllNormalRoutesAreAuthenticat
             'core::get:schedule',
             'core::get:metric',
             'core::get:component_shield',
-            'core::get:feed.atom',
-            'core::get:feed.rss',
             'core::get:subscribe',
             'core::post:subscribe',
             'core::get:subscribe.manage',
@@ -151,8 +149,6 @@ public function testWhenAlwaysAuthenticateIsDisabledAllNormalRoutesAreUnauthenti
             'core::get:schedule',
             'core::get:metric',
             'core::get:component_shield',
-            'core::get:feed.atom',
-            'core::get:feed.rss',
             'core::get:subscribe',
             'core::post:subscribe',
             'core::get:subscribe.manage',