Fix styling

This commit is contained in:
awcodes
2023-07-07 20:04:15 +00:00
committed by github-actions[bot]
parent 5bf7e6fd43
commit 09aa247d12
4 changed files with 62 additions and 66 deletions

View File

@@ -43,16 +43,16 @@ writeln("\r");
writeln('------'); writeln('------');
writeln("Author : \e[0;36m{$authorName} ({$authorUsername}, {$authorEmail})\e[0m"); writeln("Author : \e[0;36m{$authorName} ({$authorUsername}, {$authorEmail})\e[0m");
writeln("Vendor : \e[0;36m{$vendorName} ({$vendorSlug})\e[0m"); writeln("Vendor : \e[0;36m{$vendorName} ({$vendorSlug})\e[0m");
writeln('Package : '."\e[0;36m".$packageSlug.($description ? ' <{$description}>' : '')."\e[0m"); writeln('Package : ' . "\e[0;36m" . $packageSlug . ($description ? ' <{$description}>' : '') . "\e[0m");
writeln("Namespace : \e[0;36m{$vendorNamespace}\\{$className}\e[0m"); writeln("Namespace : \e[0;36m{$vendorNamespace}\\{$className}\e[0m");
writeln("Class name : \e[0;36m{$className}\e[0m"); writeln("Class name : \e[0;36m{$className}\e[0m");
writeln('---'); writeln('---');
writeln("\e[1;37mPackages & Utilities\e[0m"); writeln("\e[1;37mPackages & Utilities\e[0m");
writeln('Larastan/PhpStan : '.($usePhpStan ? "\e[0;32mYes" : "\e[0;31mNo")."\e[0m"); writeln('Larastan/PhpStan : ' . ($usePhpStan ? "\e[0;32mYes" : "\e[0;31mNo") . "\e[0m");
writeln('Pint : '.($usePint ? "\e[0;32mYes" : "\e[0;31mNo")."\e[0m"); writeln('Pint : ' . ($usePint ? "\e[0;32mYes" : "\e[0;31mNo") . "\e[0m");
writeln('Use Dependabot : '.($useDependabot ? "\e[0;32mYes" : "\e[0;31mNo")."\e[0m"); writeln('Use Dependabot : ' . ($useDependabot ? "\e[0;32mYes" : "\e[0;31mNo") . "\e[0m");
writeln('Use Ray : '.($useLaravelRay ? "\e[0;32mYes" : "\e[0;31mNo")."\e[0m"); writeln('Use Ray : ' . ($useLaravelRay ? "\e[0;32mYes" : "\e[0;31mNo") . "\e[0m");
writeln('Auto-Changelog : '.($useUpdateChangelogWorkflow ? "\e[0;32mYes" : "\e[0;31mNo")."\e[0m"); writeln('Auto-Changelog : ' . ($useUpdateChangelogWorkflow ? "\e[0;32mYes" : "\e[0;31mNo") . "\e[0m");
if ($formsOnly) { if ($formsOnly) {
writeln("Filament/Forms : \e[0;32mYes\e[0m"); writeln("Filament/Forms : \e[0;32mYes\e[0m");
} elseif ($tablesOnly) { } elseif ($tablesOnly) {
@@ -70,16 +70,16 @@ if (! confirm('Modify files?', true)) {
} }
if ($formsOnly) { if ($formsOnly) {
safeUnlink(__DIR__.'/src/SkeletonTheme.php'); safeUnlink(__DIR__ . '/src/SkeletonTheme.php');
safeUnlink(__DIR__.'/src/SkeletonPlugin.php'); safeUnlink(__DIR__ . '/src/SkeletonPlugin.php');
remove_composer_filament_deps([ remove_composer_filament_deps([
'filament/filament', 'filament/filament',
'filament/tables', 'filament/tables',
]); ]);
} elseif ($tablesOnly) { } elseif ($tablesOnly) {
safeUnlink(__DIR__.'/src/SkeletonTheme.php'); safeUnlink(__DIR__ . '/src/SkeletonTheme.php');
safeUnlink(__DIR__.'/src/SkeletonPlugin.php'); safeUnlink(__DIR__ . '/src/SkeletonPlugin.php');
remove_composer_filament_deps([ remove_composer_filament_deps([
'filament/filament', 'filament/filament',
@@ -87,20 +87,20 @@ if ($formsOnly) {
]); ]);
} else { } else {
if ($isTheme) { if ($isTheme) {
safeUnlink(__DIR__.'/src/SkeletonServiceProvider.php'); safeUnlink(__DIR__ . '/src/SkeletonServiceProvider.php');
safeUnlink(__DIR__.'/src/SkeletonPlugin.php'); safeUnlink(__DIR__ . '/src/SkeletonPlugin.php');
safeUnlink(__DIR__.'/src/Skeleton.php'); safeUnlink(__DIR__ . '/src/Skeleton.php');
removeDirectory(__DIR__.'/config'); removeDirectory(__DIR__ . '/config');
removeDirectory(__DIR__.'/database'); removeDirectory(__DIR__ . '/database');
removeDirectory(__DIR__.'/stubs'); removeDirectory(__DIR__ . '/stubs');
removeDirectory(__DIR__.'/resources/js'); removeDirectory(__DIR__ . '/resources/js');
removeDirectory(__DIR__.'/resources/lang'); removeDirectory(__DIR__ . '/resources/lang');
removeDirectory(__DIR__.'/resources/views'); removeDirectory(__DIR__ . '/resources/views');
removeDirectory(__DIR__.'/src/Commands'); removeDirectory(__DIR__ . '/src/Commands');
removeDirectory(__DIR__.'/src/Facades'); removeDirectory(__DIR__ . '/src/Facades');
removeDirectory(__DIR__.'/src/Testing'); removeDirectory(__DIR__ . '/src/Testing');
} else { } else {
safeUnlink(__DIR__.'/src/SkeletonTheme.php'); safeUnlink(__DIR__ . '/src/SkeletonTheme.php');
} }
remove_composer_filament_deps([ remove_composer_filament_deps([
@@ -128,23 +128,23 @@ foreach ($files as $file) {
]); ]);
match (true) { match (true) {
str_contains($file, determineSeparator('src/Skeleton.php')) => rename($file, determineSeparator('./src/'.$className.'.php')), str_contains($file, determineSeparator('src/Skeleton.php')) => rename($file, determineSeparator('./src/' . $className . '.php')),
str_contains($file, determineSeparator('src/SkeletonServiceProvider.php')) => rename($file, determineSeparator('./src/'.$className.'ServiceProvider.php')), str_contains($file, determineSeparator('src/SkeletonServiceProvider.php')) => rename($file, determineSeparator('./src/' . $className . 'ServiceProvider.php')),
str_contains($file, determineSeparator('src/SkeletonTheme.php')) => rename($file, determineSeparator('./src/'.$className.'Theme.php')), str_contains($file, determineSeparator('src/SkeletonTheme.php')) => rename($file, determineSeparator('./src/' . $className . 'Theme.php')),
str_contains($file, determineSeparator('src/SkeletonPlugin.php')) => rename($file, determineSeparator('./src/'.$className.'Plugin.php')), str_contains($file, determineSeparator('src/SkeletonPlugin.php')) => rename($file, determineSeparator('./src/' . $className . 'Plugin.php')),
str_contains($file, determineSeparator('src/Facades/Skeleton.php')) => rename($file, determineSeparator('./src/Facades/'.$className.'.php')), str_contains($file, determineSeparator('src/Facades/Skeleton.php')) => rename($file, determineSeparator('./src/Facades/' . $className . '.php')),
str_contains($file, determineSeparator('src/Commands/SkeletonCommand.php')) => rename($file, determineSeparator('./src/Commands/'.$className.'Command.php')), str_contains($file, determineSeparator('src/Commands/SkeletonCommand.php')) => rename($file, determineSeparator('./src/Commands/' . $className . 'Command.php')),
str_contains($file, determineSeparator('src/Testing/TestsSkeleton.php')) => rename($file, determineSeparator('./src/Testing/Tests'.$className.'.php')), str_contains($file, determineSeparator('src/Testing/TestsSkeleton.php')) => rename($file, determineSeparator('./src/Testing/Tests' . $className . '.php')),
str_contains($file, determineSeparator('database/migrations/create_skeleton_table.php.stub')) => rename($file, determineSeparator('./database/migrations/create_'.$packageSlugWithoutPrefix.'_table.php.stub')), str_contains($file, determineSeparator('database/migrations/create_skeleton_table.php.stub')) => rename($file, determineSeparator('./database/migrations/create_' . $packageSlugWithoutPrefix . '_table.php.stub')),
str_contains($file, determineSeparator('config/skeleton.php')) => rename($file, determineSeparator('./config/'.$packageSlugWithoutPrefix.'.php')), str_contains($file, determineSeparator('config/skeleton.php')) => rename($file, determineSeparator('./config/' . $packageSlugWithoutPrefix . '.php')),
str_contains($file, 'README.md') => remove_tag($file, 'delete'), str_contains($file, 'README.md') => remove_tag($file, 'delete'),
default => [], default => [],
}; };
} }
if (! $useDependabot) { if (! $useDependabot) {
safeUnlink(__DIR__.'/.github/dependabot.yml'); safeUnlink(__DIR__ . '/.github/dependabot.yml');
safeUnlink(__DIR__.'/.github/workflows/dependabot-auto-merge.yml'); safeUnlink(__DIR__ . '/.github/workflows/dependabot-auto-merge.yml');
} }
if (! $useLaravelRay) { if (! $useLaravelRay) {
@@ -152,9 +152,9 @@ if (! $useLaravelRay) {
} }
if (! $usePhpStan) { if (! $usePhpStan) {
safeUnlink(__DIR__.'/phpstan.neon.dist'); safeUnlink(__DIR__ . '/phpstan.neon.dist');
safeUnlink(__DIR__.'/phpstan-baseline.neon'); safeUnlink(__DIR__ . '/phpstan-baseline.neon');
safeUnlink(__DIR__.'/.github/workflows/phpstan.yml'); safeUnlink(__DIR__ . '/.github/workflows/phpstan.yml');
remove_composer_deps([ remove_composer_deps([
'phpstan/extension-installer', 'phpstan/extension-installer',
@@ -170,8 +170,8 @@ if (! $usePhpStan) {
} }
if (! $usePint) { if (! $usePint) {
safeUnlink(__DIR__.'/.github/workflows/fix-php-code-style-issues.yml'); safeUnlink(__DIR__ . '/.github/workflows/fix-php-code-style-issues.yml');
safeUnlink(__DIR__.'/pint.json'); safeUnlink(__DIR__ . '/pint.json');
remove_composer_deps([ remove_composer_deps([
'laravel/pint', 'laravel/pint',
@@ -181,7 +181,7 @@ if (! $usePint) {
} }
if (! $useUpdateChangelogWorkflow) { if (! $useUpdateChangelogWorkflow) {
safeUnlink(__DIR__.'/.github/workflows/update-changelog.yml'); safeUnlink(__DIR__ . '/.github/workflows/update-changelog.yml');
} }
confirm('Execute `composer install` and run tests?') && run('composer install && composer test'); confirm('Execute `composer install` and run tests?') && run('composer install && composer test');
@@ -193,7 +193,7 @@ if (confirm('Let this script delete itself?', true)) {
function ask(string $question, string $default = ''): string function ask(string $question, string $default = ''): string
{ {
$def = $default ? "\e[0;33m ({$default})" : ''; $def = $default ? "\e[0;33m ({$default})" : '';
$answer = readline("\e[0;32m".$question.$def.": \e[0m"); $answer = readline("\e[0;32m" . $question . $def . ": \e[0m");
if (! $answer) { if (! $answer) {
return $default; return $default;
@@ -215,7 +215,7 @@ function confirm(string $question, bool $default = false): bool
function writeln(string $line): void function writeln(string $line): void
{ {
echo $line.PHP_EOL; echo $line . PHP_EOL;
} }
function run(string $command): string function run(string $command): string
@@ -258,7 +258,7 @@ function remove_prefix(string $prefix, string $content): string
function remove_composer_deps(array $names): void function remove_composer_deps(array $names): void
{ {
$data = json_decode(file_get_contents(__DIR__.'/composer.json'), true); $data = json_decode(file_get_contents(__DIR__ . '/composer.json'), true);
foreach ($data['require-dev'] as $name => $version) { foreach ($data['require-dev'] as $name => $version) {
if (in_array($name, $names, true)) { if (in_array($name, $names, true)) {
@@ -266,12 +266,12 @@ function remove_composer_deps(array $names): void
} }
} }
file_put_contents(__DIR__.'/composer.json', json_encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE)); file_put_contents(__DIR__ . '/composer.json', json_encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
} }
function remove_composer_filament_deps(array $names): void function remove_composer_filament_deps(array $names): void
{ {
$data = json_decode(file_get_contents(__DIR__.'/composer.json'), true); $data = json_decode(file_get_contents(__DIR__ . '/composer.json'), true);
foreach ($data['require'] as $name => $version) { foreach ($data['require'] as $name => $version) {
if (in_array($name, $names, true)) { if (in_array($name, $names, true)) {
@@ -279,12 +279,12 @@ function remove_composer_filament_deps(array $names): void
} }
} }
file_put_contents(__DIR__.'/composer.json', json_encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE)); file_put_contents(__DIR__ . '/composer.json', json_encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
} }
function remove_composer_script(array $scriptNames): void function remove_composer_script(array $scriptNames): void
{ {
$data = json_decode(file_get_contents(__DIR__.'/composer.json'), true); $data = json_decode(file_get_contents(__DIR__ . '/composer.json'), true);
foreach ($data['scripts'] as $name => $script) { foreach ($data['scripts'] as $name => $script) {
if (is_array($script)) { if (is_array($script)) {
@@ -302,12 +302,12 @@ function remove_composer_script(array $scriptNames): void
} }
} }
file_put_contents(__DIR__.'/composer.json', json_encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE)); file_put_contents(__DIR__ . '/composer.json', json_encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
} }
function remove_package_script(array $scriptNames): void function remove_package_script(array $scriptNames): void
{ {
$data = json_decode(file_get_contents(__DIR__.'/package.json'), true); $data = json_decode(file_get_contents(__DIR__ . '/package.json'), true);
foreach ($data['scripts'] as $name => $script) { foreach ($data['scripts'] as $name => $script) {
if (is_array($script)) { if (is_array($script)) {
@@ -341,7 +341,7 @@ function remove_package_script(array $scriptNames): void
} }
} }
file_put_contents(__DIR__.'/package.json', json_encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | file_put_contents(__DIR__ . '/package.json', json_encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES |
JSON_UNESCAPED_UNICODE)); JSON_UNESCAPED_UNICODE));
} }
@@ -351,7 +351,7 @@ function remove_tag(string $file, string $tag): void
file_put_contents( file_put_contents(
$file, $file,
preg_replace('/<!--'.$tag.'-->.*<!--\/'.$tag.'-->/s', '', $contents) ?: $contents preg_replace('/<!--' . $tag . '-->.*<!--\/' . $tag . '-->/s', '', $contents) ?: $contents
); );
} }
@@ -369,12 +369,12 @@ function determineSeparator(string $path): string
function replaceForWindows(): array function replaceForWindows(): array
{ {
return preg_split('/\\r\\n|\\r|\\n/', run('dir /S /B * | findstr /v /i .git\ | findstr /v /i vendor | findstr /v /i '.basename(__FILE__).' | findstr /r /i /M /F:/ ":author :vendor :package VendorName skeleton vendor_name vendor_slug author@domain.com"')); return preg_split('/\\r\\n|\\r|\\n/', run('dir /S /B * | findstr /v /i .git\ | findstr /v /i vendor | findstr /v /i ' . basename(__FILE__) . ' | findstr /r /i /M /F:/ ":author :vendor :package VendorName skeleton vendor_name vendor_slug author@domain.com"'));
} }
function replaceForAllOtherOSes(): array function replaceForAllOtherOSes(): array
{ {
return explode(PHP_EOL, run('grep -E -r -l -i ":author|:vendor|:package|VendorName|skeleton|vendor_name|vendor_slug|author@domain.com" --exclude-dir=vendor ./* ./.github/* | grep -v '.basename(__FILE__))); return explode(PHP_EOL, run('grep -E -r -l -i ":author|:vendor|:package|VendorName|skeleton|vendor_name|vendor_slug|author@domain.com" --exclude-dir=vendor ./* ./.github/* | grep -v ' . basename(__FILE__)));
} }
function removeDirectory($dir): void function removeDirectory($dir): void
@@ -383,10 +383,10 @@ function removeDirectory($dir): void
$objects = scandir($dir); $objects = scandir($dir);
foreach ($objects as $object) { foreach ($objects as $object) {
if ($object != '.' && $object != '..') { if ($object != '.' && $object != '..') {
if (filetype($dir.'/'.$object) == 'dir') { if (filetype($dir . '/' . $object) == 'dir') {
removeDirectory($dir.'/'.$object); removeDirectory($dir . '/' . $object);
} else { } else {
unlink($dir.'/'.$object); unlink($dir . '/' . $object);
} }
} }
} }

View File

@@ -2,17 +2,13 @@
namespace VendorName\Skeleton; namespace VendorName\Skeleton;
use Filament\Panel;
use Filament\Facades\Filament;
use Filament\Support\Assets\AlpineComponent; use Filament\Support\Assets\AlpineComponent;
use Filament\Support\Assets\Asset; use Filament\Support\Assets\Asset;
use Filament\Support\Assets\AssetManager;
use Filament\Support\Assets\Css; use Filament\Support\Assets\Css;
use Filament\Support\Assets\Js; use Filament\Support\Assets\Js;
use Filament\Support\Facades\FilamentAsset; use Filament\Support\Facades\FilamentAsset;
use Filament\Support\Facades\FilamentIcon; use Filament\Support\Facades\FilamentIcon;
use Filament\Support\Icons\Icon; use Filament\Support\Icons\Icon;
use Filament\Support\Icons\IconManager;
use Illuminate\Filesystem\Filesystem; use Illuminate\Filesystem\Filesystem;
use Livewire\Testing\TestableLivewire; use Livewire\Testing\TestableLivewire;
use Spatie\LaravelPackageTools\Commands\InstallCommand; use Spatie\LaravelPackageTools\Commands\InstallCommand;
@@ -88,7 +84,7 @@ class SkeletonServiceProvider extends PackageServiceProvider
// Handle Stubs // Handle Stubs
if (app()->runningInConsole()) { if (app()->runningInConsole()) {
foreach (app(Filesystem::class)->files(__DIR__.'/../stubs/') as $file) { foreach (app(Filesystem::class)->files(__DIR__ . '/../stubs/') as $file) {
$this->publishes([ $this->publishes([
$file->getRealPath() => base_path("stubs/skeleton/{$file->getFilename()}"), $file->getRealPath() => base_path("stubs/skeleton/{$file->getFilename()}"),
], 'skeleton-stubs'); ], 'skeleton-stubs');
@@ -111,8 +107,8 @@ class SkeletonServiceProvider extends PackageServiceProvider
{ {
return [ return [
// AlpineComponent::make('skeleton', __DIR__ . '/../resources/dist/components/skeleton.js'), // AlpineComponent::make('skeleton', __DIR__ . '/../resources/dist/components/skeleton.js'),
Css::make('skeleton-styles', __DIR__.'/../resources/dist/skeleton.js'), Css::make('skeleton-styles', __DIR__ . '/../resources/dist/skeleton.js'),
Js::make('skeleton-scripts', __DIR__.'/../resources/dist/skeleton.js'), Js::make('skeleton-scripts', __DIR__ . '/../resources/dist/skeleton.js'),
]; ];
} }

View File

@@ -2,8 +2,8 @@
namespace VendorName; namespace VendorName;
use Filament\Panel;
use Filament\Contracts\Plugin; use Filament\Contracts\Plugin;
use Filament\Panel;
use Filament\Support\Assets\Theme; use Filament\Support\Assets\Theme;
use Filament\Support\Color; use Filament\Support\Color;
use Filament\Support\Facades\FilamentAsset; use Filament\Support\Facades\FilamentAsset;
@@ -18,7 +18,7 @@ class Skeleton implements Plugin
public function register(Panel $panel): void public function register(Panel $panel): void
{ {
FilamentAsset::register([ FilamentAsset::register([
Theme::make('skeleton', __DIR__.'/../resources/dist/skeleton.css'), Theme::make('skeleton', __DIR__ . '/../resources/dist/skeleton.css'),
]); ]);
$panel $panel

View File

@@ -15,7 +15,7 @@ class TestCase extends Orchestra
parent::setUp(); parent::setUp();
Factory::guessFactoryNamesUsing( Factory::guessFactoryNamesUsing(
fn (string $modelName) => 'VendorName\\Skeleton\\Database\\Factories\\'.class_basename($modelName).'Factory' fn (string $modelName) => 'VendorName\\Skeleton\\Database\\Factories\\' . class_basename($modelName) . 'Factory'
); );
} }