Merge branch 'release/1.1.1'

Author: DannyvdSluijs

CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.1.1] - 2020-07-12
+### Fixed
+- Make JsonMapperInterface availalbe in ServiceProvider
+
 ## [1.1.0] - 2020-07-12
 ### Fixed
 - Optimised composer dependencies. [PR#2](https://github.com/JsonMapper/LaravelPackage/pull/2)

Version

@@ -1 +1 @@
-1.1.0
+1.1.1

src/ServiceProvider.php

@@ -7,6 +7,7 @@
 use Illuminate\Support\ServiceProvider as BaseServiceProvider;
 use JsonMapper\JsonMapper;
 use JsonMapper\JsonMapperFactory;
+use JsonMapper\JsonMapperInterface;
 
 class ServiceProvider extends BaseServiceProvider
 {
@@ -19,19 +20,18 @@ public function register()
     {
         $this->mergeConfigFrom(self::CONFIG_FILE, 'json-mapper');
 
-        switch (config('json-mapper.type')) {
-            case 'best-fit':
-                $this->app->singleton(JsonMapper::class, function () {
+        $config = config('json-mapper.type');
+        $this->app->singleton(JsonMapperInterface::class, static function () use ($config) {
+            switch ($config) {
+                case 'best-fit':
                     return (new JsonMapperFactory())->bestFit();
-                });
-                break;
-            case 'default':
-            default:
-                $this->app->singleton(JsonMapper::class, function () {
+                case 'default':
+                default:
                     return (new JsonMapperFactory())->default();
-                });
-                break;
-        }
+            }
+        });
+
+        $this->app->alias(JsonMapperInterface::class, JsonMapper::class);
     }
 
     /**

tests/Unit/ServiceProviderTest.php

@@ -6,6 +6,7 @@
 
 use Illuminate\Config\Repository;
 use JsonMapper\JsonMapper;
+use JsonMapper\JsonMapperInterface;
 use JsonMapper\LaravelPackage\ServiceProvider;
 use PHPUnit\Framework\TestCase;
 
@@ -38,6 +39,9 @@ public function testRegisterMakesJsonMapperAvailableInApp(): void
 
         $serviceProvider->register();
 
+        self::assertTrue($app->has(JsonMapperInterface::class));
+        self::assertInstanceOf(JsonMapperInterface::class, $app->make(JsonMapperInterface::class));
+
         self::assertTrue($app->has(JsonMapper::class));
         self::assertInstanceOf(JsonMapper::class, $app->make(JsonMapper::class));
     }