From 800ae95b90b812444f19b9fb0636866033d2209e Mon Sep 17 00:00:00 2001
From: Jellyfrog <Jellyfrog@users.noreply.github.com>
Date: Tue, 23 Mar 2021 14:47:38 +0100
Subject: [PATCH] Cleanup (#12641)

---
 app/ApiClients/GoogleMapsApi.php                      | 2 +-
 app/Http/Controllers/Auth/RegisterController.php      | 2 +-
 app/Http/Controllers/Table/RoutesTablesController.php | 4 ++--
 includes/html/common/alerts.inc.php                   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/ApiClients/GoogleMapsApi.php b/app/ApiClients/GoogleMapsApi.php
index d344cf86c4..1fba231b1e 100644
--- a/app/ApiClients/GoogleMapsApi.php
+++ b/app/ApiClients/GoogleMapsApi.php
@@ -41,7 +41,7 @@ class GoogleMapsApi extends BaseApi implements Geocoder
      * @param array $data
      * @return array
      */
-    private function parseLatLng($data)
+    protected function parseLatLng($data)
     {
         return [
             'lat' => isset($data['results'][0]['geometry']['location']['lat']) ? $data['results'][0]['geometry']['location']['lat'] : 0,
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index 81e758c9f2..e474cec39a 100644
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -3,8 +3,8 @@
 namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
+use App\Models\User;
 use App\Providers\RouteServiceProvider;
-use App\User;
 use Illuminate\Foundation\Auth\RegistersUsers;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Validator;
diff --git a/app/Http/Controllers/Table/RoutesTablesController.php b/app/Http/Controllers/Table/RoutesTablesController.php
index d45d58bfa0..97f0735482 100644
--- a/app/Http/Controllers/Table/RoutesTablesController.php
+++ b/app/Http/Controllers/Table/RoutesTablesController.php
@@ -181,7 +181,7 @@ class RoutesTablesController extends TableController
             try {
                 $obj_inetCidrRouteNextHop = IP::parse($route_entry->inetCidrRouteNextHop);
                 $item['inetCidrRouteNextHop'] = $obj_inetCidrRouteNextHop->compressed();
-            } catch (Exception $e) {
+            } catch (\Exception $e) {
                 $item['inetCidrRouteNextHop'] = $route_entry->inetCidrRouteNextHop;
             }
         }
@@ -189,7 +189,7 @@ class RoutesTablesController extends TableController
             try {
                 $obj_inetCidrRouteDest = IP::parse($route_entry->inetCidrRouteDest);
                 $item['inetCidrRouteDest'] = $obj_inetCidrRouteDest->compressed();
-            } catch (Exception $e) {
+            } catch (\Exception $e) {
                 $item['inetCidrRouteDest'] = $route_entry->inetCidrRouteDest;
             }
         }
diff --git a/includes/html/common/alerts.inc.php b/includes/html/common/alerts.inc.php
index 917b9f4e43..720cda1d44 100644
--- a/includes/html/common/alerts.inc.php
+++ b/includes/html/common/alerts.inc.php
@@ -276,7 +276,7 @@ var alerts_grid = $("#alerts_' . $unique_id . '").bootgrid({
         $common_output[] = "proc: '$proc',\n";
     }
 
-    if (isset($sort) && sort != '') {
+    if (isset($sort) && $sort != '') {
         $common_output[] = "sort: '$sort',\n";
     }