Fixing double echo's, template cleanup

templates/partials/comments.blade.php

@@ -1,11 +1,11 @@
-<?php
+@php
 if (post_password_required()) {
   return;
 }
-?>
+@endphp
 
 <section id="comments" class="comments">
-  @if(have_comments())
+  @if (have_comments())
     <h2>
       {!! sprintf(_nx('One response to &ldquo;%2$s&rdquo;', '%1$s responses to &ldquo;%2$s&rdquo;', get_comments_number(), 'comments title', 'sage'), number_format_i18n(get_comments_number()), '<span>' . get_the_title() . '</span>') !!}
     </h2>
@@ -14,13 +14,13 @@ if (post_password_required()) {
       {!! wp_list_comments(['style' => 'ol', 'short_ping' => true]) !!}
     </ol>
 
-    @if(get_comment_pages_count() > 1 && get_option('page_comments'))
+    @if (get_comment_pages_count() > 1 && get_option('page_comments'))
       <nav>
         <ul class="pager">
-          @if(get_previous_comments_link())
+          @if (get_previous_comments_link())
             <li class="previous">{!! previous_comments_link(__('&larr; Older comments', 'sage')) !!}</li>
           @endif
-          @if(get_next_comments_link())
+          @if (get_next_comments_link())
             <li class="next">{!! next_comments_link(__('Newer comments &rarr;', 'sage')) !!}</li>
           @endif
         </ul>
@@ -28,11 +28,11 @@ if (post_password_required()) {
     @endif
   @endif
 
-  @if(!comments_open() && get_comments_number() != '0' && post_type_supports(get_post_type(), 'comments'))
+  @if (!comments_open() && get_comments_number() != '0' && post_type_supports(get_post_type(), 'comments'))
     <div class="alert alert-warning">
       {{ __('Comments are closed.', 'sage') }}
     </div>
   @endif
 
-  {!! comment_form() !!}
+  @php comment_form() @endphp
 </section>

templates/partials/content-page.blade.php

@@ -1,2 +1,2 @@
-{!! the_content() !!}
+@php the_content() @endphp
 {!! wp_link_pages(['before' => '<nav class="page-nav"><p>' . __('Pages:', 'sage'), 'after' => '</p></nav>']) !!}

templates/partials/content-search.blade.php

@@ -1,11 +1,11 @@
-<article {!! post_class() !!}>
+<article @php post_class() @endphp>
   <header>
     <h2 class="entry-title"><a href="{{ get_permalink() }}">{{ get_the_title() }}</a></h2>
-    @if(get_post_type() === 'post')
+    @if (get_post_type() === 'post')
       @include('partials/entry-meta')
     @endif
   </header>
   <div class="entry-summary">
-    {!! the_excerpt() !!}
+    @php the_excerpt() @endphp
   </div>
 </article>

templates/partials/content-single.blade.php

@@ -1,13 +1,13 @@
-<article {!! post_class() !!}>
+<article @php post_class() @endphp>
   <header>
     <h1 class="entry-title">{{ get_the_title() }}</h1>
     @include('partials/entry-meta')
   </header>
   <div class="entry-content">
-    {!! the_content() !!}
+    @php the_content() @endphp
   </div>
   <footer>
     {!! wp_link_pages(['before' => '<nav class="page-nav"><p>' . __('Pages:', 'sage'), 'after' => '</p></nav>']) !!}
   </footer>
-  {!! comments_template('/templates/partials/comments.blade.php') !!}
+  @php comments_template('/templates/partials/comments.blade.php') @endphp
 </article>

templates/partials/content.blade.php

@@ -1,9 +1,9 @@
-<article {!! post_class() !!}>
+<article @php post_class() @endphp>
   <header>
     <h2 class="entry-title"><a href="{{ get_permalink() }}">{{ get_the_title() }}</a></h2>
     @include('partials/entry-meta')
   </header>
   <div class="entry-summary">
-    {!! the_excerpt() !!}
+    @php the_excerpt() @endphp
   </div>
 </article>

templates/partials/head.blade.php

@@ -2,5 +2,5 @@
   <meta charset="utf-8">
   <meta http-equiv="x-ua-compatible" content="ie=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-  {!! wp_head() !!}
+  @php wp_head() @endphp
 </head>

templates/partials/header.blade.php

@@ -1,8 +1,8 @@
 <header class="banner">
   <div class="container">
-    <a class="brand" href="{{ esc_url(home_url('/')) }}">{{ get_bloginfo('name', 'display') }}</a>
+    <a class="brand" href="{{ home_url('/') }}">{{ get_bloginfo('name', 'display') }}</a>
     <nav class="nav-primary">
-      @if(has_nav_menu('primary_navigation'))
+      @if (has_nav_menu('primary_navigation'))
         {!! wp_nav_menu(['theme_location' => 'primary_navigation', 'menu_class' => 'nav']) !!}
       @endif
     </nav>