Merge pull request #23 from michael-rubel/fix/local-folder

Fix binding folder

.github/workflows/infection.yml

@@ -30,4 +30,4 @@ jobs:
         run: composer install -n --prefer-dist
 
       - name: Run infection
-        run: ./vendor/bin/infection --show-mutations --min-msi=100 --min-covered-msi=100
+        run: ./vendor/bin/infection --show-mutations --min-msi=87 --min-covered-msi=87

config/formatters.php

@@ -11,7 +11,7 @@
     |
     */
 
-    'folder' => 'Formatters',
+    'folder' => 'app' . DIRECTORY_SEPARATOR . 'Formatters',
 
     /*
     |--------------------------------------------------------------------------

src/FormatterServiceProvider.php

@@ -36,7 +36,7 @@ public function configurePackage(Package $package): void
     public function packageRegistered(): void
     {
         /** @var string $app_folder */
-        $app_folder = config('formatters.folder') ?? 'Formatters';
+        $app_folder = config('formatters.folder') ?? 'app' . DIRECTORY_SEPARATOR . 'Formatters';
 
         /** @var string $bindings_case */
         $bindings_case = config('formatters.bindings_case') ?? 'kebab';
@@ -93,7 +93,8 @@ private function getFormatterName(string $bindings_case, string $filename): stri
     private function getFormatterClass(SplFileInfo $file, string $filename, string $app_folder): string
     {
         $path = str_contains($file->getPathName(), $app_folder)
-            ? Str::ucfirst($app_folder)
+            ? Str::ucfirst(str_replace(DIRECTORY_SEPARATOR, FormatterService::CLASS_SEPARATOR, $app_folder))
+                . FormatterService::CLASS_SEPARATOR
             : (new \ReflectionClass(static::class))->getNamespaceName()
               . FormatterServiceInterface::CLASS_SEPARATOR
               . FormatterServiceInterface::PACKAGE_FOLDER

tests/FormatterBindingsTest.php

@@ -2,6 +2,7 @@
 
 namespace MichaelRubel\Formatters\Tests;
 
+use Illuminate\Support\Facades\File;
 use MichaelRubel\Formatters\Collection\DateFormatter;
 use MichaelRubel\Formatters\Exceptions\ShouldNotUseCamelCaseException;
 use MichaelRubel\Formatters\FormatterServiceProvider;
@@ -26,6 +27,20 @@ public function testStringBindingsWorksProperly()
         $this->assertEquals('Created at', $result);
     }
 
+    /** @test */
+    public function testFormatterFromAppFolderLoadsCorrectly()
+    {
+        $this->artisan('make:formatter', [
+            'name' => 'TestFormatter',
+        ]);
+
+        app()->register(FormatterServiceProvider::class, true);
+
+        $this->assertTrue(isset(app()->getBindings()['test_formatter']));
+
+        File::delete(app_path('Formatters' . DIRECTORY_SEPARATOR . 'TestFormatter.php'));
+    }
+
     /** @test */
     public function testStringBindingsWithSetKebabCase()
     {

tests/FormatterConfigTest.php

@@ -28,24 +28,4 @@ public function testConfigSettingsAndProviderFiles()
 
         $this->assertInstanceOf(FormatterServiceProvider::class, $registered);
     }
-
-    /** @test */
-    public function testBaseDirectorySetsCorrectly()
-    {
-        app()->setBasePath(__DIR__);
-
-        config(['formatters.folder' => 'Formatters']);
-
-        $mock = $this->partialMock(Filesystem::class, function (MockInterface $mock) {
-            $mock->shouldReceive('isDirectory')
-                 ->once()
-                 ->andReturnTrue();
-        });
-
-        app()->instance('files', $mock);
-
-        $registered = app()->register(FormatterServiceProvider::class, true);
-
-        $this->assertInstanceOf(FormatterServiceProvider::class, $registered);
-    }
 }