Made fixes from PR !116.

src/Contracts/VersionEnumContract.php

@@ -2,7 +2,8 @@
 
 namespace RonasIT\Support\Contracts;
 
-interface VersionEnumContract {
+interface VersionEnumContract
+{
     public static function values(): array;
 
     public static function toString(string $separator = ','): string;

src/HelpersServiceProvider.php

@@ -17,16 +17,7 @@ class HelpersServiceProvider extends ServiceProvider
 {
     public function boot()
     {
-        $router = $this->app['router'];
-
-        $router->prependMiddlewareToGroup('web', SecurityMiddleware::class);
-        $router->prependMiddlewareToGroup('api', SecurityMiddleware::class);
-
-        $this->extendValidator();
-
-        app(ExcelServiceProvider::class, ['app' => app()])->boot();
-
-        $this->loadViewsFrom(__DIR__ . '/Stubs', 'ronasit');
+        $this->extendRouter();
 
         /**
          * Specify that the route version must be in the range of given values inclusive.
@@ -101,4 +92,18 @@ protected function extendValidator()
                 ->exists();
         });
     }
+
+    protected function extendRouter()
+    {
+        $router = $this->app['router'];
+
+        $router->prependMiddlewareToGroup('web', SecurityMiddleware::class);
+        $router->prependMiddlewareToGroup('api', SecurityMiddleware::class);
+
+        $this->extendValidator();
+
+        app(ExcelServiceProvider::class, ['app' => app()])->boot();
+
+        $this->loadViewsFrom(__DIR__ . '/Stubs', 'ronasit');
+    }
 }

src/Support/Version.php

@@ -2,37 +2,38 @@
 
 namespace RonasIT\Support\Support;
 
+use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Route;
 use RonasIT\Support\Contracts\VersionEnumContract;
 
 class Version
 {
-    public static function current(): string
+    public static function current($pathParamName = 'version'): string
     {
         $route = Route::getRoutes()->match(request());
 
-        return $route->parameters()['version'] ?? str_replace('/v', '', $route->getPrefix());
+        return Arr::get($route->parameters(), $pathParamName, str_replace('/v', '', $route->getPrefix()));
     }
 
-    public static function is(VersionEnumContract $checkedVersion): bool
+    public static function is(VersionEnumContract $expectedVersion): bool
     {
-        return $checkedVersion->value === self::current();
+        return version_compare($expectedVersion->value, self::current(), '=');
     }
 
     public static function between(VersionEnumContract $from, VersionEnumContract $to): bool
     {
         $version = self::current();
 
-        return $version >= $from->value && $version <= $to->value;
+        return version_compare($version, $from->value, '>=') && version_compare($version, $to->value, '<=');
     }
 
-    public static function from(VersionEnumContract $from): bool
+    public static function gte(VersionEnumContract $from): bool
     {
-        return self::current() >= $from->value;
+        return version_compare(self::current(), $from->value, '>=');
     }
 
-    public static function to(VersionEnumContract $to): bool
+    public static function lte(VersionEnumContract $to): bool
     {
-        return self::current() <= $to->value;
+        return version_compare(self::current(), $to->value, '<=');
     }
 }

tests/TestCase.php

@@ -69,13 +69,6 @@ public function callRawRequest(string $method, string $uri, $content, array $hea
         return $this->call($method, $uri, [], [], [], $server, $content);
     }
 
-    public function json($method, $uri, array $data = [], array $headers = [], ?VersionEnumContract $apiVersion = null): TestResponse
-    {
-        $apiVersion = (empty($apiVersion)) ? last(VersionEnumContract::values()) : $apiVersion->value;
-
-        return parent::json($method, "/v{$apiVersion}{$uri}", $data, $headers);
-    }
-
     protected function dontWrapIntoTransaction(): void
     {
         $this->rollbackTransaction();