Merge remote-tracking branch 'origin/main' into native-models

lunarstorm · Sep 4, 2024 · e59a534 · e59a534
2 parents 0ade9ef + c213e3e
commit e59a534
Show file tree

Hide file tree

Showing 18 changed files with 47 additions and 34 deletions.
diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml
@@ -13,7 +13,7 @@ jobs:
 
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v2.0.0
+        uses: dependabot/fetch-metadata@v2.2.0
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
 

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches: [main]
   pull_request:
-    branches: [main, next]
+    branches: [main, next, develop]
 
 jobs:
   test:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 All notable changes to `laravel-ddd` will be documented in this file.
 
+## [1.1.2] - 2024-09-02
+### Fixed
+- During domain factory autoloading, ensure that `guessFactoryNamesUsing` returns a string when a domain factory is resolved.
+- Resolve issues with failing tests caused by mutations to `composer.json` that weren't rolled back.
+
 ## [1.1.1] - 2024-04-17
 ### Added
 - Ability to ignore folders during autoloading via `config('ddd.autoload_ignore')`, or register a custom filter callback via `DDD::filterAutoloadPathsUsing(callable $filter)`.

diff --git a/composer.json b/composer.json
@@ -53,8 +53,8 @@
     "scripts": {
         "post-autoload-dump": "@php ./vendor/bin/testbench package:discover --ansi",
         "analyse": "vendor/bin/phpstan analyse",
-        "test": "vendor/bin/pest",
-        "test-coverage": "vendor/bin/pest --coverage",
+        "test": "@composer dump-autoload && vendor/bin/pest",
+        "test-coverage": "@composer dump-autoload && vendor/bin/pest --coverage",
         "format": "vendor/bin/pint",
         "lint": "vendor/bin/pint"
     },

diff --git a/src/LaravelDDDServiceProvider.php b/src/LaravelDDDServiceProvider.php
@@ -11,7 +11,7 @@ class LaravelDDDServiceProvider extends PackageServiceProvider
     public function configurePackage(Package $package): void
     {
         $this->app->scoped(DomainManager::class, function () {
-            return new DomainManager();
+            return new DomainManager;
         });
 
         $this->app->bind('ddd', DomainManager::class);
@@ -75,6 +75,6 @@ public function packageBooted()
 
     public function packageRegistered()
     {
-        (new DomainAutoloader())->autoload();
+        (new DomainAutoloader)->autoload();
     }
 }
diff --git a/src/Listeners/CacheClearSubscriber.php b/src/Listeners/CacheClearSubscriber.php
@@ -7,9 +7,7 @@
 
 class CacheClearSubscriber
 {
-    public function __construct()
-    {
-    }
+    public function __construct() {}
 
     public function handle(): void
     {

diff --git a/src/Support/DomainAutoloader.php b/src/Support/DomainAutoloader.php
@@ -109,8 +109,8 @@ protected function handlePolicies(): void
     protected function handleFactories(): void
     {
         Factory::guessFactoryNamesUsing(function (string $modelName) {
-            if (DomainResolver::isDomainClass($modelName)) {
-                return DomainFactory::factoryForModel($modelName);
+            if ($factoryName = DomainFactory::resolveFactoryName($modelName)) {
+                return $factoryName;
             }
 
             $appNamespace = static::appNamespace();

diff --git a/src/ValueObjects/DomainNamespaces.php b/src/ValueObjects/DomainNamespaces.php
@@ -24,8 +24,7 @@ public function __construct(
         public readonly string $notifications,
         public readonly string $resources,
         public readonly string $rules,
-    ) {
-    }
+    ) {}
 
     public static function from(string $domain, ?string $subdomain = null): self
     {

diff --git a/src/ValueObjects/DomainObject.php b/src/ValueObjects/DomainObject.php
@@ -15,8 +15,7 @@ public function __construct(
         public readonly string $fullyQualifiedName,
         public readonly string $path,
         public readonly ?string $type = null,
-    ) {
-    }
+    ) {}
 
     public static function fromClass(string $fullyQualifiedClass, ?string $objectType = null): ?self
     {

diff --git a/src/ValueObjects/DomainObjectNamespace.php b/src/ValueObjects/DomainObjectNamespace.php
@@ -10,8 +10,7 @@ class DomainObjectNamespace
     public function __construct(
         public readonly string $type,
         public readonly string $namespace,
-    ) {
-    }
+    ) {}
 
     public static function make(string $key, string $domain, ?string $subdomain = null): self
     {

diff --git a/tests/.skeleton/bootstrap/providers.php b/tests/.skeleton/bootstrap/providers.php
@@ -0,0 +1,3 @@
+<?php
+
+return [];
diff --git a/tests/Autoload/CommandTest.php b/tests/Autoload/CommandTest.php
@@ -18,7 +18,7 @@
         $this->setupTestApplication();
 
         $this->afterApplicationCreated(function () {
-            (new DomainAutoloader())->autoload();
+            (new DomainAutoloader)->autoload();
         });
     });
 
@@ -35,7 +35,7 @@
         $this->setupTestApplication();
 
         $this->afterApplicationCreated(function () {
-            (new DomainAutoloader())->autoload();
+            (new DomainAutoloader)->autoload();
         });
     });
 
@@ -82,7 +82,7 @@
         DomainCache::set('domain-commands', []);
 
         $this->afterApplicationCreated(function () {
-            (new DomainAutoloader())->autoload();
+            (new DomainAutoloader)->autoload();
         });
 
         // command should not be recognized due to cached empty-state
@@ -94,7 +94,7 @@
         DomainCache::clear();
 
         $this->afterApplicationCreated(function () {
-            (new DomainAutoloader())->autoload();
+            (new DomainAutoloader)->autoload();
         });
 
         $this->artisan('invoice:deliver')->assertSuccessful();

diff --git a/tests/Autoload/FactoryTest.php b/tests/Autoload/FactoryTest.php
@@ -15,7 +15,7 @@
         Config::set('ddd.autoload.factories', true);
 
         $this->afterApplicationCreated(function () {
-            (new DomainAutoloader())->autoload();
+            (new DomainAutoloader)->autoload();
         });
     });
 
@@ -52,7 +52,7 @@
         Config::set('ddd.autoload.factories', false);
 
         $this->afterApplicationCreated(function () {
-            (new DomainAutoloader())->autoload();
+            (new DomainAutoloader)->autoload();
         });
     });
 

diff --git a/tests/Autoload/PolicyTest.php b/tests/Autoload/PolicyTest.php
@@ -11,7 +11,7 @@
     Config::set('ddd.autoload.factories', true);
 
     $this->afterApplicationCreated(function () {
-        (new DomainAutoloader())->autoload();
+        (new DomainAutoloader)->autoload();
     });
 });
 

diff --git a/tests/Autoload/ProviderTest.php b/tests/Autoload/ProviderTest.php
@@ -18,7 +18,7 @@
         ]);
 
         $this->afterApplicationCreated(function () {
-            (new DomainAutoloader())->autoload();
+            (new DomainAutoloader)->autoload();
         });
     });
 
@@ -34,7 +34,7 @@
         ]);
 
         $this->afterApplicationCreated(function () {
-            (new DomainAutoloader())->autoload();
+            (new DomainAutoloader)->autoload();
         });
     });
 
@@ -57,7 +57,7 @@
         DomainCache::set('domain-providers', []);
 
         $this->afterApplicationCreated(function () {
-            (new DomainAutoloader())->autoload();
+            (new DomainAutoloader)->autoload();
         });
 
         expect(fn () => app('invoicing'))->toThrow(Exception::class);
@@ -68,7 +68,7 @@
         DomainCache::clear();
 
         $this->afterApplicationCreated(function () {
-            (new DomainAutoloader())->autoload();
+            (new DomainAutoloader)->autoload();
         });
 
         expect(app('invoicing'))->toEqual('invoicing-singleton');

diff --git a/tests/Command/InstallTest.php b/tests/Command/InstallTest.php
@@ -2,6 +2,10 @@
 
 use Illuminate\Support\Facades\Config;
 
+beforeEach(function () {
+    $this->setupTestApplication();
+});
+
 it('publishes config', function () {
     $path = config_path('ddd.php');
 
@@ -47,6 +51,9 @@
     expect($after)->toEqual(config('ddd.domain_path'));
 
     unlink(config_path('ddd.php'));
+
+    // Reset composer back to the factory state
+    $this->setDomainPathInComposer('Domain', 'src/Domain', reload: true);
 })->with([
     ['src/Domain', 'Domain'],
     ['src/Domains', 'Domains'],

diff --git a/tests/Support/AutoloaderTest.php b/tests/Support/AutoloaderTest.php
@@ -7,7 +7,7 @@
 });
 
 it('can run', function () {
-    $autoloader = new DomainAutoloader();
+    $autoloader = new DomainAutoloader;
 
     $autoloader->autoload();
 })->throwsNoExceptions();
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -7,7 +7,6 @@
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\File;
 use Lunarstorm\LaravelDDD\LaravelDDDServiceProvider;
-use Lunarstorm\LaravelDDD\Support\DomainCache;
 use Orchestra\Testbench\TestCase as Orchestra;
 use Symfony\Component\Process\Process;
 
@@ -136,8 +135,7 @@ protected function composerReload()
 
         (new Process($command, base_path(), ['COMPOSER_MEMORY_LIMIT' => '-1']))
             ->setTimeout(null)
-            ->run(function ($type, $output) {
-            });
+            ->run(function ($type, $output) {});
     }
 
     protected function cleanSlate()
@@ -155,27 +153,32 @@ protected function cleanSlate()
         File::deleteDirectory(base_path('src/Domains'));
         File::deleteDirectory(app_path('Models'));
 
-        DomainCache::clear();
+        File::deleteDirectory(base_path('bootstrap/cache/ddd'));
     }
 
     protected function setupTestApplication()
     {
         File::copyDirectory(__DIR__.'/.skeleton/app', app_path());
         File::copyDirectory(__DIR__.'/.skeleton/database', base_path('database'));
         File::copyDirectory(__DIR__.'/.skeleton/src/Domain', base_path('src/Domain'));
+        File::copy(__DIR__.'/.skeleton/bootstrap/providers.php', base_path('bootstrap/providers.php'));
         File::ensureDirectoryExists(app_path('Models'));
 
         $this->setDomainPathInComposer('Domain', 'src/Domain');
     }
 
-    protected function setDomainPathInComposer($domainNamespace, $domainPath)
+    protected function setDomainPathInComposer($domainNamespace, $domainPath, bool $reload = true)
     {
         $this->updateComposer(
             set: [
                 [['autoload', 'psr-4', $domainNamespace.'\\'], $domainPath],
             ],
         );
 
+        if ($reload) {
+            $this->composerReload();
+        }
+
         return $this;
     }
 }