Fix tests and CS

This commit is contained in:
Barry vd. Heuvel
2024-02-07 21:44:48 +01:00
parent 16548fc878
commit 2535f8e6ab
5 changed files with 19 additions and 16 deletions
+1 -1
View File
@@ -70,7 +70,7 @@ namespace <?= $namespace == '__root' ? '' : trim($namespace, '\\') ?> {
<?php endforeach; ?> <?php endforeach; ?>
<?php foreach($real_time_facades as $name): ?> <?php foreach($real_time_facades as $name): ?>
<?php $nested = explode('\\', str_replace('\\'.class_basename($name), '', $name)); ?> <?php $nested = explode('\\', str_replace('\\' . class_basename($name), '', $name)); ?>
namespace <?php echo implode('\\', $nested); ?> { namespace <?php echo implode('\\', $nested); ?> {
/** /**
* @mixin <?= str_replace('Facades', '', $name) ?> * @mixin <?= str_replace('Facades', '', $name) ?>
+9 -8
View File
@@ -158,9 +158,9 @@ class Generator
if ($facade == 'Illuminate\Support\Facades\Redis' && $name == 'Redis' && !class_exists('Predis\Client')) { if ($facade == 'Illuminate\Support\Facades\Redis' && $name == 'Redis' && !class_exists('Predis\Client')) {
continue; continue;
} }
// Skip the swoole // Skip the swoole
if ($facade == 'SwooleTW\Http\Server\Facades\Server' && $name == 'Server' && !class_exists('Swoole\Http\Server')) { if ($facade == 'SwooleTW\Http\Server\Facades\Server' && $name == 'Server' && !class_exists('Swoole\Http\Server')) {
continue; continue;
} }
@@ -183,7 +183,7 @@ class Generator
{ {
$facades = []; $facades = [];
$realTimeFacadeFiles = glob(storage_path('framework/cache/facade-*.php')); $realTimeFacadeFiles = glob(storage_path('framework/cache/facade-*.php'));
foreach($realTimeFacadeFiles as $file) { foreach ($realTimeFacadeFiles as $file) {
try { try {
$name = $this->getFullyQualifiedClassNameInFile($file); $name = $this->getFullyQualifiedClassNameInFile($file);
$facades[$name] = $name; $facades[$name] = $name;
@@ -195,10 +195,11 @@ class Generator
return $facades; return $facades;
} }
protected function getFullyQualifiedClassNameInFile(string $path) { protected function getFullyQualifiedClassNameInFile(string $path)
{
$contents = file_get_contents($path); $contents = file_get_contents($path);
$parsers = new Php7(new Emulative); $parsers = new Php7(new Emulative());
$parsed = collect($parsers->parse($contents) ?: []); $parsed = collect($parsers->parse($contents) ?: []);
@@ -206,14 +207,14 @@ class Generator
return $node instanceof Namespace_; return $node instanceof Namespace_;
}); });
if($namespace) { if ($namespace) {
$name = $namespace->name->toString(); $name = $namespace->name->toString();
$class = collect($namespace->stmts)->first(function ($node) { $class = collect($namespace->stmts)->first(function ($node) {
return $node instanceof Class_; return $node instanceof Class_;
}); });
if($class) { if ($class) {
$name .= '\\' . $class->name->toString(); $name .= '\\' . $class->name->toString();
} }
@@ -1,5 +1,7 @@
<?php <?php
declare(strict_types=1);
namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpDocWithEnumDefaults\Enums; namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpDocWithEnumDefaults\Enums;
enum PostStatus enum PostStatus
@@ -9,4 +11,4 @@ enum PostStatus
case Unpublished; case Unpublished;
case Archived; case Archived;
} }
@@ -4,14 +4,14 @@ declare(strict_types=1);
namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpDocWithEnumDefaults\Models; namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpDocWithEnumDefaults\Models;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Builder;
use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpDocWithEnumDefaults\Enums\PostStatus; use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpDocWithEnumDefaults\Enums\PostStatus;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model;
class Post extends Model class Post extends Model
{ {
public function scopeHasStatus(Builder $query, ?PostStatus $status = PostStatus::Published) public function scopeHasStatus(Builder $query, ?PostStatus $status = PostStatus::Published)
{ {
// //
} }
} }
@@ -4,9 +4,9 @@ declare(strict_types=1);
namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpDocWithEnumDefaults\Models; namespace Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpDocWithEnumDefaults\Models;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Builder;
use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpDocWithEnumDefaults\Enums\PostStatus; use Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpDocWithEnumDefaults\Enums\PostStatus;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model;
/** /**
* Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpDocWithEnumDefaults\Models\Post * Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\GenerateBasicPhpDocWithEnumDefaults\Models\Post
@@ -167,6 +167,6 @@ class Post extends Model
{ {
public function scopeHasStatus(Builder $query, ?PostStatus $status = PostStatus::Published) public function scopeHasStatus(Builder $query, ?PostStatus $status = PostStatus::Published)
{ {
// //
} }
} }