Tweaking of code, along with deleting cached view files have got tests working locally again

app/Http/Controllers/ArticlesController.php

@@ -3,7 +3,6 @@
 namespace App\Http\Controllers;
 
 use App\Article;
-use Illuminate\Http\Response;
 use Jonnybarnes\IndieWeb\Numbers;
 
 class ArticlesController extends Controller
@@ -16,11 +15,11 @@ class ArticlesController extends Controller
     public function showAllArticles($year = null, $month = null)
     {
         $articles = Article::where('published', '1')
-                    ->date($year, $month)
-                    ->orderBy('updated_at', 'desc')
-                    ->simplePaginate(5);
+                        ->date($year, $month)
+                        ->orderBy('updated_at', 'desc')
+                        ->simplePaginate(5);
 
-        return view('multipost', ['data' => $articles]);
+        return view('articles', compact('articles'));
     }
 
     /**
@@ -35,7 +34,7 @@ class ArticlesController extends Controller
             throw new \Exception;
         }
 
-        return view('singlepost', ['article' => $article]);
+        return view('article', compact('article'));
     }
 
     /**
@@ -62,8 +61,9 @@ class ArticlesController extends Controller
     {
         $articles = Article::where('published', '1')->orderBy('updated_at', 'desc')->get();
         $buildDate = $articles->first()->updated_at->toRssString();
-        $contents = (string) view('rss', ['articles' => $articles, 'buildDate' => $buildDate]);
 
-        return (new Response($contents, '200'))->header('Content-Type', 'application/rss+xml');
+        return response()
+                    ->view('rss', compact('articles', 'buildDate'), 200)
+                    ->header('Content-Type', 'application/rss+xml');
     }
 }

app/Http/Controllers/ContactsController.php

@@ -25,7 +25,7 @@ class ContactsController extends Controller
                 '/assets/profile-images/default-image';
         }
 
-        return view('contacts', ['contacts' => $contacts]);
+        return view('contacts', compact('contacts'));
     }
 
     /**

app/Http/Controllers/NotesController.php

@@ -63,7 +63,7 @@ class NotesController extends Controller
 
         $homepage = ($request->path() == '/');
 
-        return view('allnotes', ['notes' => $notes, 'homepage' => $homepage]);
+        return view('notes', compact('notes', 'homepage'));
     }
 
     /**
@@ -161,12 +161,7 @@ class NotesController extends Controller
         }
         $note->photoURLs = $photoURLs;
 
-        return view('singlenote', [
-            'note' => $note,
-            'replies' => $replies,
-            'reposts' => $reposts,
-            'likes' => $likes,
-        ]);
+        return view('note', compact('note', 'replies', 'reposts', 'likes'));
     }
 
     /**
@@ -201,7 +196,7 @@ class NotesController extends Controller
             $note->human_time = $note->updated_at->diffForHumans();
         }
 
-        return view('taggednotes', ['notes' => $notes, 'tag' => $tag]);
+        return view('taggednotes', compact('notes', 'tag'));
     }
 
     /**

resources/views/article.blade.php

@@ -0,0 +1,24 @@
+@extends('master')
+
+@section('title')
+{{ strip_tags($article->title) }} « 
+@stop
+
+@section('content')
+@if($article->url != '')<article class="link h-entry">@else<article class="h-entry">@endif
+<header>
+<h1 class="p-name">
+<a href="@if($article->url == ''){{ $article->link }}@else{{ $article->url }}@endif">{{ $article->title }}</a>
+</h1>
+<span class="post-info">Posted <time class="dt-published" title="{{ $article->tooltip_time }}" datetime="{{ $article->w3c_time }}">{{ $article->human_time }}</time> - <a title="Permalink" href="{{ $article->link }}">⚓</a></span>
+</header>
+<div class="e-content">
+{!! $article->main !!}
+</div>
+</article>
+@stop
+
+@section('scripts')
+<script src="/assets/prism/prism.js"></script>
+<link rel="stylesheet" href="/assets/prism/prism.css">
+@stop

resources/views/articles.blade.php

@@ -0,0 +1,36 @@
+@extends('master')
+
+@section('title')
+Articles «
+@stop
+
+@section('content')
+
+@if (count($articles) == 0)
+<p>No articles exist for this time.</p>
+@endif
+
+@foreach ($articles as $article)
+    @if ($article->url != '')<article class="link h-entry">@else<article class="h-entry">@endif
+        <header>
+            <h1 class="p-name">
+            @if($article->url == '')
+                <a href="{{ $article->link }}">{{ $article->title }}</a>
+            @else
+                <a href="{{ $article->url }}">{{ $article->title }}</a>
+            @endif
+            </h1>
+            <span class="post-info">Posted <time class="dt-published" title="{{ $article->tooltip_time }}" datetime="{{ $article->w3c_time }}">{{ $article->human_time }}</time> - <a title="Permalink" href="{{ $article->link }}">⚓</a></span>
+        </header>
+        <div class="e-content">
+            {!! $article['main'] !!}
+        </div>
+    </article>
+@endforeach
+{{ $articles->links() }}
+@stop
+
+@section('scripts')
+<script src="/assets/prism/prism.js"></script>
+<link rel="stylesheet" href="/assets/prism/prism.css">
+@stop

resources/views/contacts.blade.php

@@ -1,11 +1,11 @@
 @extends('master')
 
 @section('title')
-Contacts « 
+Contacts «
 @stop
 
 @section('content')
 @foreach($contacts as $contact)
-@include('templates.contact', array('contact' => $contact))
+    @include('templates.contact', ['contact' => $contact])
 @endforeach
 @stop

resources/views/multipost.blade.php

@@ -1,30 +0,0 @@
-@extends('master')
-
-@section('title')
-Articles « 
-@stop
-
-@section('content')
-@if (count($data) == 0)
-<p>No articles exist for this time.</p>
-@endif
-@foreach ($data as $article)
-@if ($article['url'] != '')<article class="link h-entry">@else<article class="h-entry">@endif
-<header>
-<h1 class="p-name">
-<a href="@if($article['url'] == ''){{ $article['link'] }}@else{{ $article['url'] }}@endif">{{ $article['title'] }}</a>
-</h1>
-<span class="post-info">Posted <time class="dt-published" title="{{ $article['tooltip_time'] }}" datetime="{{ $article['w3c_time'] }}">{{ $article['human_time'] }}</time> - <a title="Permalink" href="{{ $article['link'] }}">⚓</a></span>
-</header>
-<div class="e-content">
-{!! $article['main'] !!}
-</div>
-</article>
-@endforeach
-{!! $data->render() !!}
-@stop
-
-@section('scripts')
-<script src="/assets/prism/prism.js"></script>
-<link rel="stylesheet" href="/assets/prism/prism.css">
-@stop

resources/views/note.blade.php

@@ -0,0 +1,44 @@
+@extends('master')
+
+@section('title')
+{{ strip_tags($note->note) }} « Notes «
+@stop
+
+@section('content')
+    <div class="h-entry">
+      @include('templates.note', ['note' => $note])
+@foreach($replies as $reply)
+      <div class="u-comment h-cite">
+        <a class="u-author h-card mini-h-card" href="{{ $reply['url'] }}">
+          <img src="{{ $reply['photo'] }}" alt="" class="photo u-photo logo"> <span class="fn">{{ $reply['name'] }}</span>
+        </a> said at <a class="dt-published u-url" href="{{ $reply['source'] }}">{{ $reply['date'] }}</a>
+        <div class="e-content p-name">
+          {!! $reply['reply'] !!}
+        </div>
+      </div>
+@endforeach
+@if(count($likes) > 0)<h1 class="notes-subtitle">Likes</h1>@endif
+@foreach($likes as $like)
+    <a href="{{ $like['url'] }}"><img src="{{ $like['photo'] }}" alt="profile picture of {{ $like['name'] }}" class="like-photo"></a>
+@endforeach
+@if(count($reposts) > 0)<h1 class="notes-subtitle">Reposts</h1>@endif
+@foreach($reposts as $repost)
+<p><a class="h-card vcard mini-h-card p-author" href="{{ $repost['url'] }}">
+    <img src="{{ $repost['photo'] }}" alt="profile picture of {{ $repost['name'] }}" class="photo u-photo logo"> <span class="fn">{{ $repost['name'] }}</span>
+</a> reposted this at <a href="{{ $repost['source'] }}">{{ $repost['date'] }}</a>.</p>
+@endforeach
+      <!-- these empty tags are for https://brid.gy’s publishing service -->
+      <a href="https://brid.gy/publish/twitter"></a>
+      <a href="https://brid.gy/publish/facebook"></a>
+    </div>
+@stop
+
+@section('scripts')
+
+<script defer src="/assets/js/links.js"></script>
+<link rel="stylesheet" href="/assets/frontend/mapbox-gl.css">
+<script defer src="/assets/js/maps.js"></script>
+
+<script src="/assets/prism/prism.js"></script>
+<link rel="stylesheet" href="/assets/prism/prism.css">
+@stop

resources/views/notes.blade.php

@@ -0,0 +1,48 @@
+@extends('master')
+
+@section('title')
+Notes «
+@stop
+
+@section('content')
+    <div class="h-feed">
+      <!-- the following span stops microformat parses going haywire generating
+      a name property for the h-feed -->
+      <span class="p-name"></span>
+      @foreach ($notes as $note)
+      <div class="h-entry">
+        @include('templates.note', ['note' => $note])
+      </div>
+      @endforeach
+    </div>
+{!! $notes->render() !!}
+@stop
+
+@section('scripts')
+
+<script defer src="/assets/js/links.js"></script>
+<link rel="stylesheet" href="/assets/frontend/mapbox-gl.css">
+<script defer src="/assets/js/maps.js"></script>
+
+<script defer src="/assets/prism/prism.js"></script>
+<link rel="stylesheet" href="/assets/prism/prism.css">
+@stop
+
+@section('bio')
+    @if ($homepage === true)
+  <div class="h-card">
+    <p>My name is <span class="p-name p-author">Jonny Barnes</span>, and <a rel="me" href="https://jonnybarnes.uk" class="u-url"><code>jonnybarnes.uk</code></a> is my site. I’m from <a href="https://en.wikipedia.org/wiki/Manchester" class="h-adr p-adr"><span class="p-locality">Manchester</span>, <abbr class="p-country-name" title="United Kingdom">UK</abbr></a>.</p>
+    <p>I am active to varying degrees on several <a href="https://indieweb.org/silo">silos</a>:</p>
+    <ul class="social-list">
+      <li>I keep in touch with friends on <a rel="me" href="https://www.facebook.com/jonnybarnes" class="u-url">Facebook</a></li>
+      <li>I follow people I find interesting on <a rel="me" href="https://twitter.com/jonnybarnes" class="u-url">Twitter</a></li>
+      <!--<li>I geek out on <a rel="me" href="https://alpha.app.net/jonnybarnes" class="u-url">app.net</a></li>-->
+      <li>I exist on <a rel="me" href="https://plus.google.com/117317270900655269082" class="u-url">Google+</a></li>
+      <!--<li>I post photos to <a rel="me" href="http://www.flickr.com/photos/22212133@N03/" class="u-url">flickr</a></li>-->
+      <li>I push code to <a rel="me" href="https://github.com/jonnybarnes" class="u-url">GitHub</a></li>
+      <li>I scrobble songs to <a rel="me" href="https://last.fm/user/jonnymbarnes" class="u-url">last.fm</a> that I listen to on <a rel="me" href="https://open.spotify.com/user/jonnybarnes89" class="u-url">Spotify</a></li>
+    </ul>
+    <p>My usual online nickname is normally <code class="nickname">jonnybarnes</code> for other services. Here’s a <a href="/assets/img/jmb-bw.png" class="u-photo photo">profile pic</a>. I also have a <a class="pgpkey" href="/assets/jonnybarnes-public-key-ecc.asc">PGP key</a>, with <a href="/notes/5g">fingerprint</a>.</p>
+  </div>
+    @endif
+@stop

resources/views/rss.blade.php

@@ -11,7 +11,12 @@
   @foreach($articles as $article)
   <item>
     <title>{{ strip_tags($article->title) }}</title>
-    <description><![CDATA[{{ $article->main }}@if($article->url)<p><a href="{{ config('app.url') }}{{ $article->link }}">Permalink</a></p>@endif]]></description>
+    <description>
+        <![CDATA[
+            {{ $article->main }}
+            @if($article->url)<p><a href="{{ config('app.url') }}{{ $article->link }}">Permalink</a></p>@endif
+        ]]>
+    </description>
     <link>@if($article->url != ''){{ $article->url }}@else{{ config('app.url') }}{{ $article->link }}@endif</link>
     <guid>{{ config('app.url') }}{{ $article->link }}</guid>
     <pubDate>{{ $article->pubdate }}</pubDate>