bind commonmark as singleton (#51)

* bin commonmark as singleton * use simple singleton binding
spatie · Mar 24, 2020 · cc77c1d · cc77c1d
1 parent 81f0191
commit cc77c1d
Show file tree

Hide file tree

Showing 12 changed files with 34 additions and 30 deletions.
diff --git a/src/SheetsServiceProvider.php b/src/SheetsServiceProvider.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Support\ServiceProvider;
 use League\CommonMark\CommonMarkConverter;
+use League\CommonMark\ConverterInterface;
 use Spatie\Sheets\ContentParsers\MarkdownParser;
 use Spatie\Sheets\ContentParsers\MarkdownWithFrontMatterParser;
 use Spatie\Sheets\PathParsers\SlugParser;
@@ -30,17 +31,9 @@ public function register()
     {
         $this->mergeConfigFrom(__DIR__.'/../config/sheets.php', 'sheets');
 
-        $this->app->when(MarkdownWithFrontMatterParser::class)
-            ->needs(CommonMarkConverter::class)
-            ->give(function () {
-                return new CommonMarkConverter();
-            });
-
-        $this->app->when(MarkdownParser::class)
-            ->needs(CommonMarkConverter::class)
-            ->give(function () {
-                return new CommonMarkConverter();
-            });
+        if (! $this->app->bound(ConverterInterface::class)) {
+            $this->app->singleton(ConverterInterface::class, CommonMarkConverter::class);
+        }
 
         $this->app->singleton(Sheets::class, function () {
             $sheets = new Sheets();

diff --git a/tests/ContentParsers/JsonParserTest.php b/tests/ContentParsers/JsonParserTest.php
@@ -2,15 +2,15 @@
 
 namespace Spatie\Sheets\Tests\ContentParsers;
 
-use PHPUnit\Framework\TestCase;
+use Spatie\Sheets\Tests\TestCase;
 use Spatie\Sheets\ContentParsers\JsonParser;
 
 class JsonParserTest extends TestCase
 {
     /** @test */
     public function it_converts_a_front_matter_document_to_attributes()
     {
-        $jsonParser = new JsonParser();
+        $jsonParser = $this->app->make(JsonParser::class);
 
         $expected = [
             'title' => 'Hello, world!',

diff --git a/tests/ContentParsers/MarkdownParserTest.php b/tests/ContentParsers/MarkdownParserTest.php
@@ -2,18 +2,15 @@
 
 namespace Spatie\Sheets\Tests\ContentParsers;
 
-use League\CommonMark\CommonMarkConverter;
-use PHPUnit\Framework\TestCase;
+use Spatie\Sheets\Tests\TestCase;
 use Spatie\Sheets\ContentParsers\MarkdownParser;
 
 class MarkdownParserTest extends TestCase
 {
     /** @test */
     public function it_converts_a_front_matter_document_to_attributes()
     {
-        $markdownParser = new MarkdownParser(
-            new CommonMarkConverter()
-        );
+        $markdownParser = $this->app->make(MarkdownParser::class);
 
         $contents = '# Hello, world!';
 

diff --git a/tests/ContentParsers/MarkdownWithFrontMatterParserTest.php b/tests/ContentParsers/MarkdownWithFrontMatterParserTest.php
@@ -3,17 +3,15 @@
 namespace Spatie\Sheets\Tests\ContentParsers;
 
 use League\CommonMark\CommonMarkConverter;
-use PHPUnit\Framework\TestCase;
+use Spatie\Sheets\Tests\TestCase;
 use Spatie\Sheets\ContentParsers\MarkdownWithFrontMatterParser;
 
 class MarkdownWithFrontMatterParserTest extends TestCase
 {
     /** @test */
     public function it_converts_a_front_matter_document_to_attributes()
     {
-        $markdownWithFrontMatterParser = new MarkdownWithFrontMatterParser(
-            new CommonMarkConverter()
-        );
+        $markdownWithFrontMatterParser = $this->app->make(MarkdownWithFrontMatterParser::class);
 
         $contents = implode("\n", [
             '---',

diff --git a/tests/ContentParsers/YamlParserTest.php b/tests/ContentParsers/YamlParserTest.php
@@ -2,15 +2,15 @@
 
 namespace Spatie\Sheets\Tests\ContentParsers;
 
-use PHPUnit\Framework\TestCase;
+use Spatie\Sheets\Tests\TestCase;
 use Spatie\Sheets\ContentParsers\YamlParser;
 
 class YamlParserTest extends TestCase
 {
     /** @test */
     public function it_converts_a_front_matter_document_to_attributes()
     {
-        $yamlParser = new YamlParser();
+        $yamlParser = $this->app->make(YamlParser::class);
 
         $contents = implode("\n", [
             'title: Hello, world!',

diff --git a/tests/FactoryTest.php b/tests/FactoryTest.php
@@ -3,7 +3,7 @@
 namespace Spatie\Sheets\Tests;
 
 use League\CommonMark\CommonMarkConverter;
-use PHPUnit\Framework\TestCase;
+use Spatie\Sheets\Tests\TestCase;
 use Spatie\Sheets\ContentParsers\MarkdownWithFrontMatterParser;
 use Spatie\Sheets\Factory;
 use Spatie\Sheets\PathParsers\SlugParser;

diff --git a/tests/PathParsers/SlugParserTest.php b/tests/PathParsers/SlugParserTest.php
@@ -2,7 +2,7 @@
 
 namespace Spatie\Sheets\Tests\PathParsers;
 
-use PHPUnit\Framework\TestCase;
+use Spatie\Sheets\Tests\TestCase;
 use Spatie\Sheets\PathParsers\SlugParser;
 
 class SlugParserTest extends TestCase

diff --git a/tests/PathParsers/SlugWithDateParserTest.php b/tests/PathParsers/SlugWithDateParserTest.php
@@ -3,7 +3,7 @@
 namespace Spatie\Sheets\Tests\PathParsers;
 
 use Illuminate\Support\Carbon;
-use PHPUnit\Framework\TestCase;
+use Spatie\Sheets\Tests\TestCase;
 use Spatie\Sheets\PathParsers\SlugWithDateParser;
 
 class SlugWithDateParserTest extends TestCase

diff --git a/tests/PathParsers/SlugWithOrderParserTest.php b/tests/PathParsers/SlugWithOrderParserTest.php
@@ -2,7 +2,7 @@
 
 namespace Spatie\Sheets\Tests\PathParsers;
 
-use PHPUnit\Framework\TestCase;
+use Spatie\Sheets\Tests\TestCase;
 use Spatie\Sheets\PathParsers\SlugWithOrderParser;
 
 class SlugWithOrderParserTest extends TestCase

diff --git a/tests/Repositories/FilesystemRepositoryTest.php b/tests/Repositories/FilesystemRepositoryTest.php
@@ -3,7 +3,7 @@
 namespace Spatie\Sheets\Tests\Repositories;
 
 use Illuminate\Support\Collection;
-use PHPUnit\Framework\TestCase;
+use Spatie\Sheets\Tests\TestCase;
 use Spatie\Sheets\Repositories\FilesystemRepository;
 use Spatie\Sheets\Sheet;
 use Spatie\Sheets\Tests\Concerns\UsesFactory;

diff --git a/tests/SheetTest.php b/tests/SheetTest.php
@@ -6,7 +6,7 @@
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Contracts\Support\Jsonable;
 use JsonSerializable;
-use PHPUnit\Framework\TestCase;
+use Spatie\Sheets\Tests\TestCase;
 use ReflectionClass;
 use Spatie\Sheets\Sheet;
 

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Spatie\Sheets\Tests;
+
+use Orchestra\Testbench\TestCase as OrchestraTestCase;
+use Spatie\Sheets\SheetsServiceProvider;
+
+abstract class TestCase extends OrchestraTestCase
+{
+    public function getPackageProviders($app)
+    {
+        return [
+            SheetsServiceProvider::class,
+        ];
+    }
+}