From 984f3c067b4e016c82ff7baee5af58a91dad5e3b Mon Sep 17 00:00:00 2001
From: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Wed, 1 Mar 2017 21:01:00 +0000
Subject: [PATCH] Apply fixes from StyleCI

---
 app/Http/Controllers/Admin/ArticlesConrtoller.php | 2 +-
 app/Http/Controllers/Admin/ClientsController.php  | 2 +-
 app/Http/Controllers/Admin/ContactsController.php | 2 +-
 app/Http/Controllers/Admin/NotesController.php    | 2 +-
 app/Http/Controllers/Admin/PlacesController.php   | 2 +-
 app/Services/IndieAuthService.php                 | 3 ++-
 app/Services/NoteService.php                      | 3 +--
 app/Services/PlaceService.php                     | 1 -
 app/Services/TokenService.php                     | 4 +---
 9 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/app/Http/Controllers/Admin/ArticlesConrtoller.php b/app/Http/Controllers/Admin/ArticlesConrtoller.php
index 421fec52..aa8d1b29 100644
--- a/app/Http/Controllers/Admin/ArticlesConrtoller.php
+++ b/app/Http/Controllers/Admin/ArticlesConrtoller.php
@@ -6,7 +6,7 @@ use App\Article;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 
-class ArticlesAdminController extends Controller
+class ArticlesConrtoller extends Controller
 {
     /**
      * List the articles that can be edited.
diff --git a/app/Http/Controllers/Admin/ClientsController.php b/app/Http/Controllers/Admin/ClientsController.php
index 2d5c0199..ed21f34f 100644
--- a/app/Http/Controllers/Admin/ClientsController.php
+++ b/app/Http/Controllers/Admin/ClientsController.php
@@ -5,7 +5,7 @@ namespace App\Http\Controllers\Admin;
 use App\MicropubClient;
 use App\Http\Controllers\Controller;
 
-class ClientsAdminController extends Controller
+class ClientsController extends Controller
 {
     /**
      * Show a list of known clients.
diff --git a/app/Http/Controllers/Admin/ContactsController.php b/app/Http/Controllers/Admin/ContactsController.php
index bea7c669..9182ba6c 100644
--- a/app/Http/Controllers/Admin/ContactsController.php
+++ b/app/Http/Controllers/Admin/ContactsController.php
@@ -8,7 +8,7 @@ use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use Illuminate\Filesystem\Filesystem;
 
-class ContactsAdminController extends Controller
+class ContactsController extends Controller
 {
     /**
      * List the currect contacts that can be edited.
diff --git a/app/Http/Controllers/Admin/NotesController.php b/app/Http/Controllers/Admin/NotesController.php
index bc5ca5b7..1d128fce 100644
--- a/app/Http/Controllers/Admin/NotesController.php
+++ b/app/Http/Controllers/Admin/NotesController.php
@@ -9,7 +9,7 @@ use App\Jobs\SendWebMentions;
 use App\Services\NoteService;
 use App\Http\Controllers\Controller;
 
-class NotesAdminController extends Controller
+class NotesController extends Controller
 {
     protected $noteService;
 
diff --git a/app/Http/Controllers/Admin/PlacesController.php b/app/Http/Controllers/Admin/PlacesController.php
index 0513b9a5..1399074b 100644
--- a/app/Http/Controllers/Admin/PlacesController.php
+++ b/app/Http/Controllers/Admin/PlacesController.php
@@ -8,7 +8,7 @@ use App\Services\PlaceService;
 use App\Http\Controllers\Controller;
 use Phaza\LaravelPostgis\Geometries\Point;
 
-class PlacesAdminController extends Controller
+class PlacesController extends Controller
 {
     protected $placeService;
 
diff --git a/app/Services/IndieAuthService.php b/app/Services/IndieAuthService.php
index ec01370f..b300702a 100644
--- a/app/Services/IndieAuthService.php
+++ b/app/Services/IndieAuthService.php
@@ -14,6 +14,7 @@ class IndieAuthService
     {
         $this->client = new Client();
     }
+
     /**
      * Given a domain, determing the assocaited authorization endpoint,
      * if one exists.
@@ -25,7 +26,7 @@ class IndieAuthService
     {
         $endpoint = $this->client->discoverAuthorizationEndpoint($this->client->normalizeMeURL($domain));
         if ($endpoint === false) {
-            return null;
+            return;
         }
 
         return $endpoint;
diff --git a/app/Services/NoteService.php b/app/Services/NoteService.php
index 9da3fcc8..f5ce84b1 100644
--- a/app/Services/NoteService.php
+++ b/app/Services/NoteService.php
@@ -6,7 +6,6 @@ namespace App\Services;
 
 use App\Note;
 use App\Place;
-use Illuminate\Http\Request;
 use App\Jobs\SendWebMentions;
 use App\Jobs\SyndicateToTwitter;
 use App\Jobs\SyndicateToFacebook;
@@ -65,7 +64,7 @@ class NoteService
         if (in_array('twitter', $data['syndicate'])) {
             dispatch(new SyndicateToTwitter($note));
         }
-        if (in_arraY('facebook', $data['syndicate'])) {
+        if (in_array('facebook', $data['syndicate'])) {
             dispatch(new SyndicateToFacebook($note));
         }
 
diff --git a/app/Services/PlaceService.php b/app/Services/PlaceService.php
index 1da83c15..1a02dff5 100644
--- a/app/Services/PlaceService.php
+++ b/app/Services/PlaceService.php
@@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace App\Services;
 
 use App\Place;
-use Illuminate\Http\Request;
 use Phaza\LaravelPostgis\Geometries\Point;
 
 class PlaceService
diff --git a/app/Services/TokenService.php b/app/Services/TokenService.php
index a2277acc..257bd84c 100644
--- a/app/Services/TokenService.php
+++ b/app/Services/TokenService.php
@@ -45,13 +45,11 @@ class TokenService
         try {
             $token = (new Parser())->parse((string) $token);
         } catch (InvalidArgumentException | RuntimeException $e) {
-            return null;
+            return;
         }
         if ($token->verify($signer, config('app.key'))) {
             //signuture valid
             return $token;
         }
-
-        return null;
     }
 }