Merge pull request #1306 from hydephp/improve-type-support

emmadesilva · web-flow · commit 4dfe608ae15b · 2023-03-17T10:07:30.000+01:00
Improve type and IDE support
diff --git a/packages/framework/src/Console/Commands/DebugCommand.php b/packages/framework/src/Console/Commands/DebugCommand.php
@@ -38,12 +38,12 @@ public function handle(): int
         $this->info('HydePHP Debug Screen');
 
         $this->newLine();
-        $this->comment('Git Version: '.app('git.version'));
+        $this->comment('Git Version: '.(string) app('git.version'));
         $this->comment('Hyde Version: '.(InstalledVersions::getPrettyVersion('hyde/hyde') ?: 'unreleased'));
         $this->comment('Framework Version: '.(InstalledVersions::getPrettyVersion('hyde/framework') ?: 'unreleased'));
 
         $this->newLine();
-        $this->comment('App Env: '.app('env'));
+        $this->comment('App Env: '.(string) app('env'));
 
         $this->newLine();
         if ($this->getOutput()->isVerbose()) {
diff --git a/packages/framework/src/Console/Commands/RouteListCommand.php b/packages/framework/src/Console/Commands/RouteListCommand.php
@@ -49,7 +49,7 @@ protected function stylePageType(string $class): string
                         $page = $this->route->getPage();
                         /** @experimental The typeLabel macro is experimental */
                         if ($page instanceof InMemoryPage && $page->hasMacro('typeLabel')) {
-                            $type .= sprintf(' <fg=gray>(%s)</>', $page->__call('typeLabel', []));
+                            $type .= sprintf(' <fg=gray>(%s)</>', (string) $page->__call('typeLabel', []));
                         }
 
                         return $type;
diff --git a/packages/framework/src/Console/Commands/VendorPublishCommand.php b/packages/framework/src/Console/Commands/VendorPublishCommand.php
@@ -32,7 +32,7 @@ public function handle(): void
 
         // Rename the config group to be more helpful
         if (isset(ServiceProvider::$publishGroups['config'])) {
-            ServiceProvider::$publishGroups['vendor-configs'] = ServiceProvider::$publishGroups['config'];
+            ServiceProvider::$publishGroups['vendor-configs'] = (array) ServiceProvider::$publishGroups['config'];
             unset(ServiceProvider::$publishGroups['config']);
         }
 
diff --git a/packages/framework/src/Foundation/ConsoleKernel.php b/packages/framework/src/Foundation/ConsoleKernel.php
@@ -28,7 +28,7 @@ protected function bootstrappers(): array
         // the default LoadConfiguration bootstrapper class with our implementation.
         // We do this by swapping out the LoadConfiguration class with our own.
 
-        return array_values(tap(array_combine($bootstrappers, $bootstrappers), function (array &$array): void {
+        return array_values((array) tap(array_combine($bootstrappers, $bootstrappers), function (array &$array): void {
             $array[\LaravelZero\Framework\Bootstrap\LoadConfiguration::class] = \Hyde\Foundation\Internal\LoadConfiguration::class;
         }));
     }
diff --git a/packages/framework/src/Foundation/Internal/LoadConfiguration.php b/packages/framework/src/Foundation/Internal/LoadConfiguration.php
@@ -21,7 +21,7 @@ class LoadConfiguration extends BaseLoadConfiguration
     /** Get all the configuration files for the application. */
     protected function getConfigurationFiles(Application $app): array
     {
-        return tap(parent::getConfigurationFiles($app), function (array &$files) use ($app): void {
+        return (array) tap(parent::getConfigurationFiles($app), function (array &$files) use ($app): void {
             // Inject our custom config file which is stored in `app/config.php`.
             $files['app'] = $app->basePath().DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'config.php';
 
@@ -55,7 +55,7 @@ private function mergeConfigurationFile(RepositoryContract $repository, string $
         // if they're present, so we'll merge their changes here.
 
         $repository->set($file, array_merge(
-            require __DIR__."/../../../config/$file.php",
+            (array) require __DIR__."/../../../config/$file.php",
             (array) $repository->get($file, [])
         ));
     }
@@ -72,12 +72,13 @@ private static function providePharSupportIfNeeded(array &$files): void
         // If we're running in a Phar and no project config directory exists,
         // we need to adjust the path to use the bundled static Phar config file.
 
+        /** @var array{app: string} $files */
         if (Phar::running() && (! is_dir($files['app']))) {
             $files['app'] = dirname(__DIR__, 6).DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'app.php';
         }
     }
 
-    private function loadRuntimeConfiguration(Application $app, RepositoryContract $repository)
+    private function loadRuntimeConfiguration(Application $app, RepositoryContract $repository): void
     {
         if ($app->runningInConsole() && isset($_SERVER['argv'])) {
             // Check if the `--pretty-urls` CLI argument is set, and if so, set the config value accordingly.
diff --git a/packages/framework/src/Foundation/Kernel/FileCollection.php b/packages/framework/src/Foundation/Kernel/FileCollection.php
@@ -22,6 +22,8 @@
  *
  * @property array<string, SourceFile> $items The files in the collection.
  *
+ * @method SourceFile|null get(string $key, SourceFile $default = null)
+ *
  * This class is stored as a singleton in the HydeKernel.
  * You would commonly access it via the facade or Hyde helper:
  *
diff --git a/packages/framework/src/Foundation/Kernel/PageCollection.php b/packages/framework/src/Foundation/Kernel/PageCollection.php
@@ -18,6 +18,8 @@
  *
  * @property array<string, HydePage> $items The pages in the collection.
  *
+ * @method HydePage|null get(string $key, HydePage $default = null)
+ *
  * This class is stored as a singleton in the HydeKernel.
  * You would commonly access it via the facade or Hyde helper:
  *
diff --git a/packages/framework/src/Foundation/Kernel/RouteCollection.php b/packages/framework/src/Foundation/Kernel/RouteCollection.php
@@ -18,6 +18,8 @@
  *
  * @property array<string, Route> $items The routes in the collection.
  *
+ * @method Route|null get(string $key, Route $default = null)
+ *
  * This class is stored as a singleton in the HydeKernel.
  * You would commonly access it via the facade or Hyde helper:
  *
diff --git a/packages/framework/src/Framework/Actions/MarkdownFileParser.php b/packages/framework/src/Framework/Actions/MarkdownFileParser.php
@@ -44,7 +44,7 @@ protected function __construct(string $path)
             $document = YamlFrontMatter::markdownCompatibleParse($stream);
 
             if ($document->matter()) {
-                $this->matter = $document->matter();
+                $this->matter = (array) $document->matter();
             }
 
             if ($document->body()) {
diff --git a/packages/framework/src/Framework/Concerns/Internal/ForwardsIlluminateFilesystem.php b/packages/framework/src/Framework/Concerns/Internal/ForwardsIlluminateFilesystem.php
@@ -85,6 +85,7 @@ protected static function getParameterNames(string $name): array
         );
     }
 
+    /** @param  string[]  $parameterNames */
     protected static function qualifyArguments(array $parameterNames, array $arguments): Collection
     {
         return collect($arguments)->mapWithKeys(function (string|array|int|bool $argumentValue, int|string $key) use ($parameterNames): string|array|int|bool {
diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -5,7 +5,6 @@
 namespace Hyde\Framework\Factories;
 
 use Hyde\Facades\Config;
-use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 use Hyde\Pages\MarkdownPost;
 use Hyde\Pages\DocumentationPage;
@@ -127,10 +126,10 @@ private function searchForPriorityInFrontMatter(): ?int
 
     private function searchForLabelInConfig(): ?string
     {
-        return Arr::get(Config::getArray('hyde.navigation.labels', [
+        return Config::getArray('hyde.navigation.labels', [
             'index' => 'Home',
             DocumentationPage::homeRouteName() => 'Docs',
-        ]), $this->routeKey);
+        ])[$this->routeKey] ?? null;
     }
 
     private function searchForPriorityInConfigs(): ?int
@@ -148,8 +147,8 @@ private function searchForPriorityInSidebarConfig(): ?int
         // Adding an offset makes so that pages with a front matter priority that is lower can be shown first.
         // This is all to make it easier to mix ways of adding priorities.
 
-        return $this->offset(Arr::get(
-            array_flip(Config::getArray('docs.sidebar_order', [])), $this->identifier),
+        return $this->offset(
+            array_flip(Config::getArray('docs.sidebar_order', []))[$this->identifier] ?? null,
             self::CONFIG_OFFSET
         );
     }
diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -52,7 +52,11 @@ public function __construct(string $username, ?string $name = null, ?string $web
         $this->website = $website;
     }
 
-    /** Dynamically get or create an author based on a username string or front matter array */
+    /**
+     * Dynamically get or create an author based on a username string or front matter array.
+     *
+     * @param  string|array{username?: string, name?: string, website?: string}  $data
+     */
     public static function getOrCreate(string|array $data): static
     {
         if (is_string($data)) {
@@ -68,7 +72,7 @@ public static function get(string $username): static
         return static::all()->firstWhere('username', strtolower($username)) ?? Author::create($username);
     }
 
-    /** @return \Illuminate\Support\Collection<\Hyde\Framework\Features\Blogging\Models\PostAuthor> */
+    /** @return \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Blogging\Models\PostAuthor> */
     public static function all(): Collection
     {
         return (new Collection(Config::getArray('hyde.authors', [])))->mapWithKeys(function (self $author): array {
@@ -86,6 +90,7 @@ public function getName(): string
         return $this->name ?? $this->username;
     }
 
+    /** @param array{username?: string, name?: string, website?: string} $data */
     protected static function findUsername(array $data): string
     {
         return $data['username'] ?? $data['name'] ?? 'Guest';
diff --git a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
@@ -8,8 +8,7 @@
 use Hyde\Pages\DocumentationPage;
 use Hyde\Framework\Actions\StaticPageBuilder;
 use Hyde\Facades\Config;
-
-use function view;
+use Illuminate\Support\Facades\View;
 
 /**
  * @internal This page is used to render the search page for the documentation.
@@ -42,7 +41,7 @@ public function __construct()
 
     public function compile(): string
     {
-        return view('hyde::pages.documentation-search')->render();
+        return View::make('hyde::pages.documentation-search')->render();
     }
 
     public static function enabled(): bool
diff --git a/packages/framework/src/Framework/Features/Metadata/GlobalMetadataBag.php b/packages/framework/src/Framework/Features/Metadata/GlobalMetadataBag.php
@@ -52,8 +52,8 @@ protected static function filterDuplicateMetadata(GlobalMetadataBag $global, Hyd
         // Reject any metadata from the global metadata bag that is already present in the page metadata bag.
 
         foreach (['links', 'metadata', 'properties', 'generics'] as $type) {
-            $global->$type = array_filter($global->$type, fn (Element $element): bool => ! in_array($element->uniqueKey(),
-                array_map(fn (Element $element): string => $element->uniqueKey(), $page->metadata->$type)
+            $global->$type = array_filter((array) $global->$type, fn (Element $element): bool => ! in_array($element->uniqueKey(),
+                array_map(fn (Element $element): string => $element->uniqueKey(), (array) $page->metadata->$type)
             ));
         }
     }
diff --git a/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/BaseNavigationMenu.php
@@ -13,7 +13,7 @@
 
 abstract class BaseNavigationMenu
 {
-    /** @var \Illuminate\Support\Collection<\Hyde\Framework\Features\Navigation\NavItem> */
+    /** @var \Illuminate\Support\Collection<string, \Hyde\Framework\Features\Navigation\NavItem> */
     public Collection $items;
 
     final protected function __construct()
diff --git a/packages/framework/src/Framework/Features/XmlGenerators/RssFeedGenerator.php b/packages/framework/src/Framework/Features/XmlGenerators/RssFeedGenerator.php
@@ -43,7 +43,7 @@ protected function constructBaseElement(): void
 
     protected function addItem(MarkdownPost $post): void
     {
-        $item = $this->xmlElement->channel->addChild('item');
+        $item = $this->getChannel()->addChild('item');
         $this->addChild($item, 'title', $post->title);
         $this->addChild($item, 'description', $post->description);
 
@@ -79,7 +79,7 @@ protected function addDynamicItemData(SimpleXMLElement $item, MarkdownPost $post
 
     protected function addBaseChannelItems(): void
     {
-        $channel = $this->xmlElement->channel;
+        $channel = $this->getChannel();
 
         $this->addChild($channel, 'title', Site::name());
         $this->addChild($channel, 'link', Site::url());
@@ -91,7 +91,7 @@ protected function addBaseChannelItems(): void
 
     protected function addAtomLinkItem(): void
     {
-        $atomLink = $this->xmlElement->channel->addChild('atom:link', namespace: 'http://www.w3.org/2005/Atom');
+        $atomLink = $this->getChannel()->addChild('atom:link', namespace: 'http://www.w3.org/2005/Atom');
         $atomLink->addAttribute('href', $this->escape(Hyde::url($this->getFilename())));
         $atomLink->addAttribute('rel', 'self');
         $atomLink->addAttribute('type', 'application/rss+xml');
@@ -117,4 +117,9 @@ public static function getDescription(): string
     {
         return Config::getString('hyde.rss.description', Site::name().' RSS Feed');
     }
+
+    protected function getChannel(): SimpleXMLElement
+    {
+        return $this->xmlElement->channel;
+    }
 }
diff --git a/packages/framework/src/Framework/Services/MarkdownService.php b/packages/framework/src/Framework/Services/MarkdownService.php
@@ -14,6 +14,7 @@
 use League\CommonMark\Extension\HeadingPermalink\HeadingPermalinkExtension;
 use League\CommonMark\Extension\DisallowedRawHtml\DisallowedRawHtmlExtension;
 
+use function str_contains;
 use function str_replace;
 use function array_merge;
 use function array_diff;
@@ -38,13 +39,18 @@ class MarkdownService
     protected ?string $pageClass = null;
 
     protected array $config = [];
+
+    /** @var array<class-string<\League\CommonMark\Extension\ExtensionInterface>> */
     protected array $extensions = [];
     protected MarkdownConverter $converter;
 
     protected string $html;
     protected array $features = [];
 
+    /** @var array<class-string<\Hyde\Markdown\Contracts\MarkdownPreProcessorContract>> */
     protected array $preprocessors = [];
+
+    /** @var array<class-string<\Hyde\Markdown\Contracts\MarkdownPostProcessorContract>> */
     protected array $postprocessors = [];
 
     public function __construct(string $markdown, ?string $pageClass = null)
@@ -93,7 +99,7 @@ public function addExtension(string $extensionClassName): void
 
     protected function runPreProcessing(): void
     {
-        /** @var PreProcessor $processor */
+        /** @var class-string<PreProcessor> $preprocessor */
         foreach ($this->preprocessors as $preprocessor) {
             $this->markdown = $preprocessor::preprocess($this->markdown);
         }
@@ -105,7 +111,7 @@ protected function runPostProcessing(): void
             $this->html .= $this->injectTorchlightAttribution();
         }
 
-        /** @var PostProcessor $postprocessor */
+        /** @var class-string<PostProcessor> $postprocessor */
         foreach ($this->postprocessors as $postprocessor) {
             $this->html = $postprocessor::postprocess($this->html);
         }
@@ -229,25 +235,31 @@ public static function normalizeIndentationLevel(string $string): string
 
         foreach ($lines as $lineNumber => $line) {
             if ($lineNumber >= $startNumber) {
-                $lines[$lineNumber] = substr((string) $line, $indentationLevel);
+                $lines[$lineNumber] = substr($line, $indentationLevel);
             }
         }
 
         return implode("\n", $lines);
     }
 
+    /** @return array<int, string> */
     protected static function getNormalizedLines(string $string): array
     {
         return explode("\n", str_replace(["\t", "\r\n"], ['    ', "\n"], $string));
     }
 
-    /** @return int[]  Find the indentation level and position of the first line that has content */
+    /**
+     * Find the indentation level and position of the first line that has content.
+     *
+     * @param  array<int, string>  $lines
+     * @return array<int, int>
+     */
     protected static function findLineContentPositions(array $lines): array
     {
         foreach ($lines as $lineNumber => $line) {
-            if (filled(trim((string) $line))) {
-                $lineLen = strlen((string) $line);
-                $stripLen = strlen(ltrim((string) $line)); // Length of the line without indentation lets us know its indentation level, and thus how much to strip from each line
+            if (filled(trim($line))) {
+                $lineLen = strlen($line);
+                $stripLen = strlen(ltrim($line)); // Length of the line without indentation lets us know its indentation level, and thus how much to strip from each line
 
                 if ($lineLen !== $stripLen) {
                     return [$lineNumber, $lineLen - $stripLen];
diff --git a/packages/framework/src/Pages/Concerns/BaseMarkdownPage.php b/packages/framework/src/Pages/Concerns/BaseMarkdownPage.php
@@ -8,11 +8,11 @@
 use Hyde\Markdown\Contracts\MarkdownDocumentContract;
 use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Markdown\Models\Markdown;
+use Illuminate\Support\Facades\View;
 
 use function dirname;
 use function ltrim;
 use function trim;
-use function view;
 
 /**
  * The base class for all Markdown-based page models.
@@ -51,7 +51,7 @@ public function markdown(): Markdown
     /** @inheritDoc */
     public function compile(): string
     {
-        return view($this->getBladeView())->with([
+        return View::make($this->getBladeView())->with([
             'title' => $this->title,
             'content' => $this->markdown->toHtml(static::class),
         ])->render();
diff --git a/packages/framework/src/Support/BuildWarnings.php b/packages/framework/src/Support/BuildWarnings.php
diff --git a/packages/framework/src/Support/Models/RenderData.php b/packages/framework/src/Support/Models/RenderData.php
diff --git a/packages/framework/src/Support/Models/RouteList.php b/packages/framework/src/Support/Models/RouteList.php
diff --git a/packages/framework/src/helpers.php b/packages/framework/src/helpers.php
diff --git a/psalm.xml b/psalm.xml

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ protected function stylePageType(string $class): string`
`49`	`49`	`$page = $this->route->getPage();`
`50`	`50`	`/** @experimental The typeLabel macro is experimental */`
`51`	`51`	`if ($page instanceof InMemoryPage && $page->hasMacro('typeLabel')) {`
`52`		`- $type .= sprintf(' <fg=gray>(%s)</>', $page->__call('typeLabel', []));`
	`52`	`+ $type .= sprintf(' <fg=gray>(%s)</>', (string) $page->__call('typeLabel', []));`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`return $type;`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public function handle(): void`
`32`	`32`
`33`	`33`	`// Rename the config group to be more helpful`
`34`	`34`	`if (isset(ServiceProvider::$publishGroups['config'])) {`
`35`		`- ServiceProvider::$publishGroups['vendor-configs'] = ServiceProvider::$publishGroups['config'];`
	`35`	`+ ServiceProvider::$publishGroups['vendor-configs'] = (array) ServiceProvider::$publishGroups['config'];`
`36`	`36`	`unset(ServiceProvider::$publishGroups['config']);`
`37`	`37`	`}`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ protected function bootstrappers(): array`
`28`	`28`	`// the default LoadConfiguration bootstrapper class with our implementation.`
`29`	`29`	`// We do this by swapping out the LoadConfiguration class with our own.`
`30`	`30`
`31`		`- return array_values(tap(array_combine($bootstrappers, $bootstrappers), function (array &$array): void {`
	`31`	`+ return array_values((array) tap(array_combine($bootstrappers, $bootstrappers), function (array &$array): void {`
`32`	`32`	`$array[\LaravelZero\Framework\Bootstrap\LoadConfiguration::class] = \Hyde\Foundation\Internal\LoadConfiguration::class;`
`33`	`33`	`}));`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class LoadConfiguration extends BaseLoadConfiguration`
`21`	`21`	`/** Get all the configuration files for the application. */`
`22`	`22`	`protected function getConfigurationFiles(Application $app): array`
`23`	`23`	`{`
`24`		`- return tap(parent::getConfigurationFiles($app), function (array &$files) use ($app): void {`
	`24`	`+ return (array) tap(parent::getConfigurationFiles($app), function (array &$files) use ($app): void {`
`25`	`25`	// Inject our custom config file which is stored in `app/config.php`.
`26`	`26`	`$files['app'] = $app->basePath().DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'config.php';`
`27`	`27`
`@@ -55,7 +55,7 @@ private function mergeConfigurationFile(RepositoryContract $repository, string $`
`55`	`55`	`// if they're present, so we'll merge their changes here.`
`56`	`56`
`57`	`57`	`$repository->set($file, array_merge(`
`58`		`- require __DIR__."/../../../config/$file.php",`
	`58`	`+ (array) require __DIR__."/../../../config/$file.php",`
`59`	`59`	`(array) $repository->get($file, [])`
`60`	`60`	`));`
`61`	`61`	`}`
`@@ -72,12 +72,13 @@ private static function providePharSupportIfNeeded(array &$files): void`
`72`	`72`	`// If we're running in a Phar and no project config directory exists,`
`73`	`73`	`// we need to adjust the path to use the bundled static Phar config file.`
`74`	`74`
	`75`	`+ /** @var array{app: string} $files */`
`75`	`76`	`if (Phar::running() && (! is_dir($files['app']))) {`
`76`	`77`	`$files['app'] = dirname(__DIR__, 6).DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'app.php';`
`77`	`78`	`}`
`78`	`79`	`}`
`79`	`80`
`80`		`- private function loadRuntimeConfiguration(Application $app, RepositoryContract $repository)`
	`81`	`+ private function loadRuntimeConfiguration(Application $app, RepositoryContract $repository): void`
`81`	`82`	`{`
`82`	`83`	`if ($app->runningInConsole() && isset($_SERVER['argv'])) {`
`83`	`84`	// Check if the `--pretty-urls` CLI argument is set, and if so, set the config value accordingly.
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,8 @@`
`22`	`22`	`*`
`23`	`23`	`* @property array<string, SourceFile> $items The files in the collection.`
`24`	`24`	`*`
	`25`	`+ * @method SourceFile\|null get(string $key, SourceFile $default = null)`
	`26`	`+ *`
`25`	`27`	`* This class is stored as a singleton in the HydeKernel.`
`26`	`28`	`* You would commonly access it via the facade or Hyde helper:`
`27`	`29`	`*`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,8 @@`
`18`	`18`	`*`
`19`	`19`	`* @property array<string, HydePage> $items The pages in the collection.`
`20`	`20`	`*`
	`21`	`+ * @method HydePage\|null get(string $key, HydePage $default = null)`
	`22`	`+ *`
`21`	`23`	`* This class is stored as a singleton in the HydeKernel.`
`22`	`24`	`* You would commonly access it via the facade or Hyde helper:`
`23`	`25`	`*`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ protected function __construct(string $path)`
`44`	`44`	`$document = YamlFrontMatter::markdownCompatibleParse($stream);`
`45`	`45`
`46`	`46`	`if ($document->matter()) {`
`47`		`- $this->matter = $document->matter();`
	`47`	`+ $this->matter = (array) $document->matter();`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`if ($document->body()) {`
Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,7 @@ protected static function getParameterNames(string $name): array`
`85`	`85`	`);`
`86`	`86`	`}`
`87`	`87`
	`88`	`+ /** @param string[] $parameterNames */`
`88`	`89`	`protected static function qualifyArguments(array $parameterNames, array $arguments): Collection`
`89`	`90`	`{`
`90`	`91`	`return collect($arguments)->mapWithKeys(function (string\|array\|int\|bool $argumentValue, int\|string $key) use ($parameterNames): string\|array\|int\|bool {`