From 09aa247d129c15ae07fcea4bab26bd931bf85ec8 Mon Sep 17 00:00:00 2001 From: awcodes Date: Fri, 7 Jul 2023 20:04:15 +0000 Subject: [PATCH] Fix styling --- configure.php | 112 ++++++++++++++++---------------- src/SkeletonServiceProvider.php | 10 +-- src/SkeletonTheme.php | 4 +- tests/TestCase.php | 2 +- 4 files changed, 62 insertions(+), 66 deletions(-) diff --git a/configure.php b/configure.php index 4442e50..438936b 100644 --- a/configure.php +++ b/configure.php @@ -43,16 +43,16 @@ writeln("\r"); writeln('------'); writeln("Author : \e[0;36m{$authorName} ({$authorUsername}, {$authorEmail})\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("Class name : \e[0;36m{$className}\e[0m"); writeln('---'); writeln("\e[1;37mPackages & Utilities\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('Use Dependabot : '.($useDependabot ? "\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('Larastan/PhpStan : ' . ($usePhpStan ? "\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 Ray : ' . ($useLaravelRay ? "\e[0;32mYes" : "\e[0;31mNo") . "\e[0m"); +writeln('Auto-Changelog : ' . ($useUpdateChangelogWorkflow ? "\e[0;32mYes" : "\e[0;31mNo") . "\e[0m"); if ($formsOnly) { writeln("Filament/Forms : \e[0;32mYes\e[0m"); } elseif ($tablesOnly) { @@ -70,16 +70,16 @@ if (! confirm('Modify files?', true)) { } if ($formsOnly) { - safeUnlink(__DIR__.'/src/SkeletonTheme.php'); - safeUnlink(__DIR__.'/src/SkeletonPlugin.php'); + safeUnlink(__DIR__ . '/src/SkeletonTheme.php'); + safeUnlink(__DIR__ . '/src/SkeletonPlugin.php'); remove_composer_filament_deps([ 'filament/filament', 'filament/tables', ]); } elseif ($tablesOnly) { - safeUnlink(__DIR__.'/src/SkeletonTheme.php'); - safeUnlink(__DIR__.'/src/SkeletonPlugin.php'); + safeUnlink(__DIR__ . '/src/SkeletonTheme.php'); + safeUnlink(__DIR__ . '/src/SkeletonPlugin.php'); remove_composer_filament_deps([ 'filament/filament', @@ -87,20 +87,20 @@ if ($formsOnly) { ]); } else { if ($isTheme) { - safeUnlink(__DIR__.'/src/SkeletonServiceProvider.php'); - safeUnlink(__DIR__.'/src/SkeletonPlugin.php'); - safeUnlink(__DIR__.'/src/Skeleton.php'); - removeDirectory(__DIR__.'/config'); - removeDirectory(__DIR__.'/database'); - removeDirectory(__DIR__.'/stubs'); - removeDirectory(__DIR__.'/resources/js'); - removeDirectory(__DIR__.'/resources/lang'); - removeDirectory(__DIR__.'/resources/views'); - removeDirectory(__DIR__.'/src/Commands'); - removeDirectory(__DIR__.'/src/Facades'); - removeDirectory(__DIR__.'/src/Testing'); + safeUnlink(__DIR__ . '/src/SkeletonServiceProvider.php'); + safeUnlink(__DIR__ . '/src/SkeletonPlugin.php'); + safeUnlink(__DIR__ . '/src/Skeleton.php'); + removeDirectory(__DIR__ . '/config'); + removeDirectory(__DIR__ . '/database'); + removeDirectory(__DIR__ . '/stubs'); + removeDirectory(__DIR__ . '/resources/js'); + removeDirectory(__DIR__ . '/resources/lang'); + removeDirectory(__DIR__ . '/resources/views'); + removeDirectory(__DIR__ . '/src/Commands'); + removeDirectory(__DIR__ . '/src/Facades'); + removeDirectory(__DIR__ . '/src/Testing'); } else { - safeUnlink(__DIR__.'/src/SkeletonTheme.php'); + safeUnlink(__DIR__ . '/src/SkeletonTheme.php'); } remove_composer_filament_deps([ @@ -128,23 +128,23 @@ foreach ($files as $file) { ]); match (true) { - 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/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/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/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('config/skeleton.php')) => rename($file, determineSeparator('./config/'.$packageSlugWithoutPrefix.'.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/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/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/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('config/skeleton.php')) => rename($file, determineSeparator('./config/' . $packageSlugWithoutPrefix . '.php')), str_contains($file, 'README.md') => remove_tag($file, 'delete'), default => [], }; } if (! $useDependabot) { - safeUnlink(__DIR__.'/.github/dependabot.yml'); - safeUnlink(__DIR__.'/.github/workflows/dependabot-auto-merge.yml'); + safeUnlink(__DIR__ . '/.github/dependabot.yml'); + safeUnlink(__DIR__ . '/.github/workflows/dependabot-auto-merge.yml'); } if (! $useLaravelRay) { @@ -152,9 +152,9 @@ if (! $useLaravelRay) { } if (! $usePhpStan) { - safeUnlink(__DIR__.'/phpstan.neon.dist'); - safeUnlink(__DIR__.'/phpstan-baseline.neon'); - safeUnlink(__DIR__.'/.github/workflows/phpstan.yml'); + safeUnlink(__DIR__ . '/phpstan.neon.dist'); + safeUnlink(__DIR__ . '/phpstan-baseline.neon'); + safeUnlink(__DIR__ . '/.github/workflows/phpstan.yml'); remove_composer_deps([ 'phpstan/extension-installer', @@ -170,8 +170,8 @@ if (! $usePhpStan) { } if (! $usePint) { - safeUnlink(__DIR__.'/.github/workflows/fix-php-code-style-issues.yml'); - safeUnlink(__DIR__.'/pint.json'); + safeUnlink(__DIR__ . '/.github/workflows/fix-php-code-style-issues.yml'); + safeUnlink(__DIR__ . '/pint.json'); remove_composer_deps([ 'laravel/pint', @@ -181,7 +181,7 @@ if (! $usePint) { } 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'); @@ -193,7 +193,7 @@ if (confirm('Let this script delete itself?', true)) { function ask(string $question, string $default = ''): string { $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) { return $default; @@ -215,7 +215,7 @@ function confirm(string $question, bool $default = false): bool function writeln(string $line): void { - echo $line.PHP_EOL; + echo $line . PHP_EOL; } function run(string $command): string @@ -258,7 +258,7 @@ function remove_prefix(string $prefix, string $content): string 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) { 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 { - $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) { 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 { - $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) { 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 { - $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) { 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)); } @@ -351,7 +351,7 @@ function remove_tag(string $file, string $tag): void file_put_contents( $file, - preg_replace('/.*/s', '', $contents) ?: $contents + preg_replace('/.*/s', '', $contents) ?: $contents ); } @@ -369,12 +369,12 @@ function determineSeparator(string $path): string 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 { - 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 @@ -383,10 +383,10 @@ function removeDirectory($dir): void $objects = scandir($dir); foreach ($objects as $object) { if ($object != '.' && $object != '..') { - if (filetype($dir.'/'.$object) == 'dir') { - removeDirectory($dir.'/'.$object); + if (filetype($dir . '/' . $object) == 'dir') { + removeDirectory($dir . '/' . $object); } else { - unlink($dir.'/'.$object); + unlink($dir . '/' . $object); } } } diff --git a/src/SkeletonServiceProvider.php b/src/SkeletonServiceProvider.php index c54f9a5..5e05ec2 100644 --- a/src/SkeletonServiceProvider.php +++ b/src/SkeletonServiceProvider.php @@ -2,17 +2,13 @@ namespace VendorName\Skeleton; -use Filament\Panel; -use Filament\Facades\Filament; use Filament\Support\Assets\AlpineComponent; use Filament\Support\Assets\Asset; -use Filament\Support\Assets\AssetManager; use Filament\Support\Assets\Css; use Filament\Support\Assets\Js; use Filament\Support\Facades\FilamentAsset; use Filament\Support\Facades\FilamentIcon; use Filament\Support\Icons\Icon; -use Filament\Support\Icons\IconManager; use Illuminate\Filesystem\Filesystem; use Livewire\Testing\TestableLivewire; use Spatie\LaravelPackageTools\Commands\InstallCommand; @@ -88,7 +84,7 @@ class SkeletonServiceProvider extends PackageServiceProvider // Handle Stubs if (app()->runningInConsole()) { - foreach (app(Filesystem::class)->files(__DIR__.'/../stubs/') as $file) { + foreach (app(Filesystem::class)->files(__DIR__ . '/../stubs/') as $file) { $this->publishes([ $file->getRealPath() => base_path("stubs/skeleton/{$file->getFilename()}"), ], 'skeleton-stubs'); @@ -111,8 +107,8 @@ class SkeletonServiceProvider extends PackageServiceProvider { return [ // AlpineComponent::make('skeleton', __DIR__ . '/../resources/dist/components/skeleton.js'), - Css::make('skeleton-styles', __DIR__.'/../resources/dist/skeleton.js'), - Js::make('skeleton-scripts', __DIR__.'/../resources/dist/skeleton.js'), + Css::make('skeleton-styles', __DIR__ . '/../resources/dist/skeleton.js'), + Js::make('skeleton-scripts', __DIR__ . '/../resources/dist/skeleton.js'), ]; } diff --git a/src/SkeletonTheme.php b/src/SkeletonTheme.php index ade8356..9cd589a 100644 --- a/src/SkeletonTheme.php +++ b/src/SkeletonTheme.php @@ -2,8 +2,8 @@ namespace VendorName; -use Filament\Panel; use Filament\Contracts\Plugin; +use Filament\Panel; use Filament\Support\Assets\Theme; use Filament\Support\Color; use Filament\Support\Facades\FilamentAsset; @@ -18,7 +18,7 @@ class Skeleton implements Plugin public function register(Panel $panel): void { FilamentAsset::register([ - Theme::make('skeleton', __DIR__.'/../resources/dist/skeleton.css'), + Theme::make('skeleton', __DIR__ . '/../resources/dist/skeleton.css'), ]); $panel diff --git a/tests/TestCase.php b/tests/TestCase.php index d634f67..ff22f2a 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -15,7 +15,7 @@ class TestCase extends Orchestra parent::setUp(); Factory::guessFactoryNamesUsing( - fn (string $modelName) => 'VendorName\\Skeleton\\Database\\Factories\\'.class_basename($modelName).'Factory' + fn (string $modelName) => 'VendorName\\Skeleton\\Database\\Factories\\' . class_basename($modelName) . 'Factory' ); }