Refactor

Author: pushpak1300

src/Install/GuidelineComposer.php

@@ -184,11 +184,13 @@ protected function getPackageGuidelines(): Collection
                     }
                 }
 
-                $guidelines = collect([$guidelineDir.'/core' => $this->resolveGuideline(
-                    $vendorPath ? $vendorPath.DIRECTORY_SEPARATOR.'core' : null,
-                    $guidelineDir.'/core',
-                    $guidelineDir.'/core',
-                )]);
+                $vendorCorePath = $vendorPath !== null
+                    ? $vendorPath.DIRECTORY_SEPARATOR.'core'
+                    : null;
+
+                $guidelines = collect([
+                    $guidelineDir.'/core' => $this->resolveGuideline($vendorCorePath, $guidelineDir.'/core'),
+                ]);
 
                 $packageGuidelines = $this->guidelinesDir($guidelineDir.'/'.$package->majorVersion());
 
@@ -208,17 +210,17 @@ protected function getPackageGuidelines(): Collection
     /**
      * @return array{content: string, name: string, description: string, path: ?string, custom: bool, third_party: bool}
      */
-    private function resolveGuideline(?string $vendorPath, string $aiFallback, string $overrideKey): array
+    private function resolveGuideline(?string $vendorPath, string $guidelineKey): array
     {
         if ($vendorPath !== null) {
             foreach (['.blade.php', '.md'] as $ext) {
                 if (file_exists($vendorPath.$ext)) {
-                    return $this->guideline($vendorPath.$ext, false, $overrideKey);
+                    return $this->guideline($vendorPath.$ext, false, $guidelineKey);
                 }
             }
         }
 
-        return $this->guideline($aiFallback);
+        return $this->guideline($guidelineKey);
     }
 
     /**

tests/Feature/Install/GuidelineComposerTest.php

@@ -813,7 +813,7 @@
         ->makePartial()
         ->shouldAllowMockingProtectedMethods();
     $composer->shouldReceive('resolveFirstPartyBoostPath')
-        ->andReturnUsing(fn (\Laravel\Roster\Package $package, string $subpath): ?string => $package->rawName() === 'pestphp/pest' ? $vendorFixture : null);
+        ->andReturnUsing(fn (Package $package, string $subpath): ?string => $package->rawName() === 'pestphp/pest' ? $vendorFixture : null);
 
     $guidelines = $composer->compose();
 
@@ -854,7 +854,7 @@
         ->makePartial()
         ->shouldAllowMockingProtectedMethods();
     $composer->shouldReceive('resolveFirstPartyBoostPath')
-        ->andReturnUsing(fn (\Laravel\Roster\Package $package, string $subpath): ?string => $package->rawName() === 'pestphp/pest' ? $vendorFixture : null);
+        ->andReturnUsing(fn (Package $package, string $subpath): ?string => $package->rawName() === 'pestphp/pest' ? $vendorFixture : null);
 
     $keys = $composer->used();
 
@@ -876,7 +876,7 @@
     $composer->shouldReceive('customGuidelinePath')
         ->andReturnUsing(fn ($path = ''): string => realpath(testDirectory('Fixtures/.ai/guidelines')).'/'.ltrim((string) $path, '/'));
     $composer->shouldReceive('resolveFirstPartyBoostPath')
-        ->andReturnUsing(fn (\Laravel\Roster\Package $package, string $subpath): ?string => $package->rawName() === 'laravel/framework' ? $vendorFixture : null);
+        ->andReturnUsing(fn (Package $package, string $subpath): ?string => $package->rawName() === 'laravel/framework' ? $vendorFixture : null);
 
     $guidelines = $composer->guidelines();
     $laravelCore = $guidelines->get('laravel/core');
@@ -915,7 +915,7 @@
         ->makePartial()
         ->shouldAllowMockingProtectedMethods();
     $composer->shouldReceive('resolveFirstPartyBoostPath')
-        ->andReturnUsing(fn (\Laravel\Roster\Package $package, string $subpath): ?string => $package->rawName() === '@inertiajs/react' ? $vendorFixture : null);
+        ->andReturnUsing(fn (Package $package, string $subpath): ?string => $package->rawName() === '@inertiajs/react' ? $vendorFixture : null);
 
     $guidelines = $composer->compose();
 
@@ -957,10 +957,10 @@
         ->makePartial()
         ->shouldAllowMockingProtectedMethods();
     $composer->shouldReceive('resolveFirstPartyBoostPath')
-        ->andReturnUsing(fn (\Laravel\Roster\Package $package, string $subpath): ?string => $package->rawName() === '@inertiajs/react' ? $vendorFixture : null);
+        ->andReturnUsing(fn (Package $package, string $subpath): ?string => $package->rawName() === '@inertiajs/react' ? $vendorFixture : null);
 
     $guidelines = $composer->guidelines();
-    $vendorEntries = $guidelines->filter(fn (array $g): bool => str_contains($g['content'], 'Vendor Core Guideline'));
+    $vendorEntries = $guidelines->filter(fn (array $g): bool => str_contains((string) $g['content'], 'Vendor Core Guideline'));
 
     expect($vendorEntries)->toHaveCount(1);
 });
@@ -983,7 +983,7 @@
         ->makePartial()
         ->shouldAllowMockingProtectedMethods();
     $composer->shouldReceive('resolveFirstPartyBoostPath')
-        ->andReturnUsing(fn (\Laravel\Roster\Package $package, string $subpath): ?string => $package->rawName() === 'pestphp/pest' ? $vendorFixture : null);
+        ->andReturnUsing(fn (Package $package, string $subpath): ?string => $package->rawName() === 'pestphp/pest' ? $vendorFixture : null);
     $composer->shouldReceive('customGuidelinePath')
         ->andReturnUsing(fn ($path = ''): string => $mdOverrideDir.'/'.ltrim((string) $path, '/'));
 

tests/Feature/Install/SkillComposerTest.php

@@ -144,7 +144,7 @@
         ->makePartial()
         ->shouldAllowMockingProtectedMethods();
     $composer->shouldReceive('resolveFirstPartyBoostPath')
-        ->andReturnUsing(fn (\Laravel\Roster\Package $package, string $subpath): ?string => $package->rawName() === 'livewire/livewire' ? $vendorFixture : null);
+        ->andReturnUsing(fn (Package $package, string $subpath): ?string => $package->rawName() === 'livewire/livewire' ? $vendorFixture : null);
 
     $skills = $composer->skills();
 
@@ -185,7 +185,7 @@
         ->makePartial()
         ->shouldAllowMockingProtectedMethods();
     $composer->shouldReceive('resolveFirstPartyBoostPath')
-        ->andReturnUsing(fn (\Laravel\Roster\Package $package, string $subpath): ?string => $package->rawName() === '@inertiajs/react' ? $vendorFixture : null);
+        ->andReturnUsing(fn (Package $package, string $subpath): ?string => $package->rawName() === '@inertiajs/react' ? $vendorFixture : null);
 
     $skills = $composer->skills();