Updated conflict on Application class name

Author: kinncj

src/Statflo/HTTP/Main.php

@@ -8,6 +8,8 @@
     require_once $vendor;
 }
 
+use Silex\Application as BaseApplication;
+
 class Main
 {
     private $config = [];
@@ -19,12 +21,12 @@ private function __construct(array $config)
         }
     }
 
-    public static function run(\Silex\Application $app = null, array $config = [])
+    public static function run(BaseApplication $app = null, array $config = [])
     {
         $nonExistentApp = is_null($app);
 
         if ($nonExistentApp) {
-            $app = new Application();
+            $app = new \Statflo\HTTP\Application();
             $app['debug'] = $config['debug'];
         }
 
@@ -37,7 +39,7 @@ public static function run(\Silex\Application $app = null, array $config = [])
         }
     }
 
-    public function start(\Silex\Application $app)
+    public function start(BaseApplication $app)
     {
         $config = $this->config;
         $routes = $this->config['controllers'];

src/Statflo/HTTP/Router.php

@@ -2,18 +2,18 @@
 
 namespace Statflo\HTTP;
 
-use Silex\Application;
+use Silex\Application as BaseApplication;
 
 class Router
 {
     private function __construct(){}
 
-    public static function register(array $routes, Application $app)
+    public static function register(array $routes, BaseApplication $app)
     {
         (new self())->run($routes, $app);
     }
 
-    public function run(array $routes, Application $app)
+    public function run(array $routes, BaseApplication $app)
     {
         $this->defineServices($routes, $app);
 
@@ -22,7 +22,7 @@ public function run(array $routes, Application $app)
         }
     }
 
-    private function defineServices($routes, Application $app)
+    private function defineServices($routes, BaseApplication $app)
     {
         $classNames = [];
         foreach ($routes as $route => $configs) {
@@ -49,7 +49,7 @@ private function defineServices($routes, Application $app)
         }
     }
 
-    private function defineRoutes($route, array $configs, Application $app)
+    private function defineRoutes($route, array $configs, BaseApplication $app)
     {
         $checkReference = array_values($configs);
         $check          = array_pop($checkReference);
@@ -63,7 +63,7 @@ private function defineRoutes($route, array $configs, Application $app)
         }
     }
 
-    private function defineRoute($route, array $config, Application $app)
+    private function defineRoute($route, array $config, BaseApplication $app)
     {
         if (substr($route, -1) !== "/") {
             $app->{$config['method']}($route . "/", $config['id']);