Merge pull request #1741 from ushahidi/lumen-move-code-out-of-kohana-…

…application

Move code out of kohana application

app/Http/Controllers/API/Posts/GeoJSONController.php

@@ -13,6 +13,9 @@
  * @license    https://www.gnu.org/licenses/agpl-3.0.html GNU Affero General Public License Version 3 (AGPL3)
  */
 
+use Ushahidi\App\Util\Tile;
+use Ushahidi\App\Util\BoundingBox;
+
 class GeoJSONController extends PostsController
 {
 
@@ -27,9 +30,9 @@ public function prepBoundingBox(Request $request)
 		if ($zoom !== false and
 			$x !== false and
 			$y !== false) {
-			$boundingBox = \Util_Tile::tileToBoundingBox($zoom, $x, $y);
+			$boundingBox = Tile::tileToBoundingBox($zoom, $x, $y);
 
-			$request->merge(['bbox' => implode(',', $boundingBox->as_array())]);
+			$request->merge(['bbox' => implode(',', $boundingBox->asArray())]);
 		}
 	}
 

app/Http/Controllers/RESTController.php

@@ -44,10 +44,9 @@ public function __construct(UsecaseFactory $usecaseFactory)
     /**
      * @var array List of HTTP methods which may be cached
      */
-    protected $cacheableMethods = array
-    (
+    protected $cacheableMethods = [
         Request::METHOD_GET,
-    );
+    ];
 
     /**
      * Get current api version

app/Passport/TokenGuard.php

@@ -146,9 +146,10 @@ protected function authenticateViaBearerToken($request)
 
             return $token ? $user->withAccessToken($token) : null;
         } catch (OAuthServerException $e) {
-            // return Container::getInstance()->make(
-            //     ExceptionHandler::class
-            // )->report($e);
+            // Log the error
+            Container::getInstance()->make(
+                ExceptionHandler::class
+            )->report($e);
 
             // Adding WWW-Authenticate ourselves because thephpleague/oauth2-server sucks
             // https://github.com/thephpleague/oauth2-server/issues/738
@@ -157,6 +158,8 @@ protected function authenticateViaBearerToken($request)
                 $e->getMessage(),
                 $e->getHttpHeaders() + ['WWW-Authenticate' => 'Bearer realm="OAuth"']
             );
+
+            return;
         }
     }