Merge branch 'barry-backport' of https://github.com/scrumble-nl/laravel-ide-helper into barry-backport

This commit is contained in:
stefanScrumble
2024-03-08 11:14:04 +01:00
3 changed files with 8 additions and 3 deletions
+2 -1
View File
@@ -1254,7 +1254,8 @@ class ModelsCommand extends Command
* @param array $namespaceAliases * @param array $namespaceAliases
* @return string|null * @return string|null
*/ */
private function extractTypeAlias(string $typeAlias, array $namespaceAliases): string|null { private function extractTypeAlias(string $typeAlias, array $namespaceAliases): string|null
{
$matches = []; $matches = [];
preg_match('/(\w+)(<.*>)/', $typeAlias, $matches); preg_match('/(\w+)(<.*>)/', $typeAlias, $matches);
$matchCount = count($matches); $matchCount = count($matches);
@@ -1,5 +1,7 @@
<?php <?php
declare(strict_types=1);
namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateMixinCollection\Models; namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateMixinCollection\Models;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
@@ -1,5 +1,7 @@
<?php <?php
declare(strict_types=1);
namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateMixinCollection; namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateMixinCollection;
use Barryvdh\LaravelIdeHelper\Console\ModelsCommand; use Barryvdh\LaravelIdeHelper\Console\ModelsCommand;