Merge pull request #331 from MGatner/tatter/patches

Author: MGatner

app/Common.php

@@ -4,7 +4,7 @@
  * The goal of this file is to allow developers a location
  * where they can overwrite core procedural functions and
  * replace them with their own. This file is loaded during
- * the bootstrap process and is called during the frameworks
+ * the bootstrap process and is called during the framework's
  * execution.
  *
  * This can be looked at as a `master helper` file that is

app/Entities/GitHub/Release.php

@@ -14,12 +14,12 @@
  *
  * @property string     $author
  * @property Time       $created_at
- * @property URI        $download_url
+ * @property URI|null   $download_url
  * @property int|string $id
  * @property string     $name
  * @property bool       $prerelease
  * @property string     $tag
- * @property URI        $url
+ * @property URI|null   $url
  */
 class Release extends Entity
 {

app/Libraries/Blog.php

@@ -35,6 +35,8 @@ public function __construct()
      * subfolder of that name.
      *
      * @throws BlogException
+     *
+     * @return Post[]
      */
     public function getRecentPosts(int $limit = 5, int $offset = 0, ?string $category = null)
     {
@@ -134,6 +136,8 @@ public function getPopularPosts(int $limit = 5)
 
     /**
      * Gets a single post
+     *
+     * @return Post|null
      */
     public function getPost(string $slug)
     {
@@ -142,7 +146,7 @@ public function getPost(string $slug)
         if (! $post = cache($cacheKey)) {
             $files = glob("{$this->config->contentPath}*.{$slug}.md");
 
-            if (! (is_countable($files) ? count($files) : 0)) {
+            if (empty($files)) {
                 throw PageNotFoundException::forPageNotFound();
             }
 
@@ -185,7 +189,7 @@ public function recentPostsWidget(int $limit, string $view = 'blog/_widget'): st
     {
         $posts = $this->getRecentPosts($limit);
 
-        if (! (is_countable($posts) ? count($posts) : 0)) {
+        if ($posts === []) {
             return '';
         }
 
@@ -203,7 +207,7 @@ public function popularPostsWidget(int $limit): string
     {
         $posts = $this->getPopularPosts($limit);
 
-        if (! (is_countable($posts) ? count($posts) : 0)) {
+        if (is_countable($posts) ? count($posts) : 0) {
             return '';
         }
 
@@ -216,6 +220,8 @@ public function popularPostsWidget(int $limit): string
     /**
      * Reads in a post from file and parses it
      * into a Post Entity.
+     *
+     * @return Post|null
      */
     protected function readPost(string $folder, string $filename)
     {
@@ -230,7 +236,7 @@ protected function readPost(string $folder, string $filename)
         // Get slug and date
         preg_match('|^([\d-]+).(\S+).md$|i', $filename, $matches);
 
-        if (! count($matches)) {
+        if ($matches === []) {
             return null;
         }
 
@@ -289,7 +295,7 @@ protected function parseVideoTags(?string $html = null)
         //     ![[ https://youtube.com/watch?v=xlkjsdfhlk ]]
         preg_match_all('|!video\[([\s\w:/.?=&;]*)\]|i', $html, $matches);
 
-        if (! count($matches)) {
+        if ($matches === []) {
             return $html;
         }
 

app/Views/errors/html/error_exception.php

@@ -270,7 +270,7 @@
 
                 <?php endif; ?>
 
-                <?php $headers = $request->getHeaders(); ?>
+                <?php $headers = $request->headers(); ?>
                 <?php if (! empty($headers)) : ?>
 
                     <h3>Headers</h3>
@@ -318,7 +318,7 @@
                     </tr>
                 </table>
 
-                <?php $headers = $response->getHeaders(); ?>
+                <?php $headers = $response->headers(); ?>
                 <?php if (! empty($headers)) : ?>
                     <?php natsort($headers) ?>