Support laravel 5.4

* several route methods renamed.
* additional parameters in `make` deprecated.

Author: asvae

src/Entities/RouteInfo.php

@@ -54,16 +54,31 @@ public function __construct($route, $options = [])
     public function toArray()
     {
         return array_merge([
-            'name' => $this->route->getName(),
-            'methods' => $this->route->getMethods(),
-            'domain' => $this->route->domain(),
-            'path' => $this->preparePath(),
-            'action' => $this->route->getAction(),
-            'wheres' => $this->extractWheres(),
-            'errors' => $this->errors,
+            'name'    => $this->route->getName(),
+            'methods' => $this->getMethods(),
+            'domain'  => $this->route->domain(),
+            'path'    => $this->preparePath(),
+            'action'  => $this->route->getAction(),
+            'wheres'  => $this->extractWheres(),
+            'errors'  => $this->errors,
         ], $this->getMeta(), $this->options);
     }
 
+    /**
+     * Cross version get methods.
+     *
+     * @return array
+     */
+    private function getMethods()
+    {
+        // Laravel <5.4
+        if (method_exists($this->route, 'getMethods')) {
+            $this->route->getMethods();
+        }
+        // Laravel 5.4+
+        return $this->route->methods();
+    }
+
     protected function extractWheres()
     {
         $prop = $this->getRouteReflection()->getProperty('wheres');
@@ -73,7 +88,7 @@ protected function extractWheres()
 
         // Хак, чтобы в json всегда был объект
         if (empty($wheres)) {
-            return (object)[];
+            return (object) [];
         }
 
         return $wheres;
@@ -94,7 +109,7 @@ protected function extractAnnotation()
     {
         $reflection = $this->getActionReflection();
 
-        if (!is_null($reflection)) {
+        if (! is_null($reflection)) {
             return $reflection->getDocComment();
         }
 
@@ -114,7 +129,7 @@ protected function extractFormRequest()
             // TODO Write the reasoning behind following lines.
             try {
                 $class = $parameter->getClass();
-            } catch (\ReflectionException $e){
+            } catch (\ReflectionException $e) {
                 break;
             }
 
@@ -170,18 +185,21 @@ protected function getActionReflection()
             list($controller, $action) = explode('@', $uses);
 
             // Если нет контроллера.
-            if (!class_exists($controller)) {
+            if (! class_exists($controller)) {
                 $this->setError('uses', 'controller does not exists');
+
                 return null;
             }
 
             // Если нет метода в контроллере.
-            if (!method_exists($controller, $action)) {
+            if (! method_exists($controller, $action)) {
                 $this->setError('uses', 'controller@method does not exists');
+
                 return null;
             }
 
-            return $this->actionReflection = new \ReflectionMethod($controller, $action);
+            return $this->actionReflection = new \ReflectionMethod($controller,
+                $action);
         }
 
         if (is_callable($uses)) {
@@ -195,14 +213,29 @@ protected function getActionReflection()
 
     protected function preparePath()
     {
-        $path = $this->route->getPath();
+        $path = $this->getUri();
         if ($path === '/') {
             return $path;
         }
 
         return trim($path, '/');
     }
 
+    /**
+     * Backwards compatible uri getter.
+     *
+     * @return string
+     */
+    protected function getUri(){
+        if (method_exists($this->route, 'getPath')){
+            // Laravel <5.4
+            return $this->route->getPath();
+        }
+
+        // Laravel 5.4+
+        return $this->route->uri();
+    }
+
     protected function setError($type, $text, $params = [])
     {
         $this->errors[$type] = trans($text, $params);
@@ -215,9 +248,9 @@ protected function getMeta()
     {
         if ($this->addMeta) {
             return [
-                'annotation' => $this->extractAnnotation(),
+                'annotation'  => $this->extractAnnotation(),
                 'formRequest' => $this->extractFormRequest(),
-                'errors' => $this->errors,
+                'errors'      => $this->errors,
             ];
         }
 

src/Providers/RepositoryServiceProvider.php

@@ -3,6 +3,7 @@
 namespace Asvae\ApiTester\Providers;
 
 
+use Asvae\ApiTester\Collections\RouteCollection;
 use Asvae\ApiTester\Contracts\RequestRepositoryInterface;
 use Asvae\ApiTester\Contracts\RouteRepositoryInterface;
 use Asvae\ApiTester\Repositories\RouteRepository;
@@ -33,7 +34,9 @@ public function register()
                 $repositories[] = $app->make($repository);
             }
 
-            return $app->make(RouteRepository::class, ['repositories' => $repositories]);
+            $routeCollection = $app->make(RouteCollection::class);
+
+            return new RouteRepository($routeCollection, $repositories);
         });
 
         $this->app->singleton(

src/Providers/StorageServiceProvide.php

@@ -9,11 +9,15 @@
 namespace Asvae\ApiTester\Providers;
 
 
+use Asvae\ApiTester\Collections\RequestCollection;
 use Asvae\ApiTester\Contracts\StorageInterface;
 use Asvae\ApiTester\Storages\FireBaseStorage;
+use Asvae\ApiTester\Storages\JsonStorage;
 use Firebase\Token\TokenGenerator;
 use Illuminate\Contracts\Container\Container;
+use Illuminate\Filesystem\Filesystem;
 use Illuminate\Support\ServiceProvider;
+use League\Flysystem\Exception;
 
 class StorageServiceProvide extends ServiceProvider
 {
@@ -35,9 +39,25 @@ public function register()
         // Регистрируем конкретный сторэйдж из списка доступных.
         $this->app->singleton(StorageInterface::class, function (Container $app) {
             // Defined driver
-            $driver = config('api-tester.storage_drivers')[config('api-tester.storage_driver')];
+            $selectedDriver = config('api-tester.storage_driver');
+            $driverClassName = config('api-tester.storage_drivers')[$selectedDriver];
+            $requestCollection = $app->make(RequestCollection::class);
 
-            return $app->make($driver['class'], $driver['options']);
+            if ($selectedDriver === 'firebase'){
+                $tokenGenerator = $app->make(TokenGenerator::class);
+                $base = config('api-tester.storage_drivers.firebase.options.base');
+
+                return new FireBaseStorage($requestCollection, $tokenGenerator, $base);
+            }
+
+            if ($selectedDriver === 'file'){
+                $fileSystem = $app->make(Filesystem::class);
+                $path = config('api-tester.storage_drivers.file.options.path');
+
+                return new JsonStorage($fileSystem, $requestCollection, $path);
+            }
+
+            throw new Exception("Driver $selectedDriver doesn't exist. Use either 'firebase' or 'file'.");
         });
 
         // Регистрация токен-генератора. Привязывается к ключу а не классу,