Skip to content

Commit a6d1dd6

Browse files
tonysmtonysm
committed
Support Laravel 12
1 parent eee27f6 commit a6d1dd6

16 files changed

+92
-77
lines changed

‎.github/workflows/run-tests.yml

+8-13
Original file line numberDiff line numberDiff line change
@@ -10,28 +10,23 @@ on:
1010

1111
jobs:
1212
test:
13-
runs-on: ${{ matrix.os }}
13+
runs-on: ubuntu-latest
1414

1515
strategy:
1616
fail-fast: true
1717
matrix:
18-
# os: [ubuntu-latest, windows-latest]
19-
os: [ubuntu-latest]
20-
php: [8.1, 8.2]
21-
laravel: [10.*, 11.*]
18+
php: [8.2, 8.3, 8.4]
19+
laravel: [11.*, 12.*]
2220
stability: [prefer-lowest, prefer-stable]
2321
include:
24-
- laravel: 10.*
25-
testbench: 8.*
26-
collision: ^6.0
2722
- laravel: 11.*
2823
testbench: ^9.0
2924
collision: ^8.1
30-
exclude:
31-
- laravel: 11.*
32-
php: 8.1
25+
- laravel: 12.*
26+
testbench: ^10.0
27+
collision: ^9.0
3328

34-
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
29+
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }}
3530

3631
steps:
3732
- name: Checkout code
@@ -51,7 +46,7 @@ jobs:
5146
5247
- name: Install dependencies
5348
run: |
54-
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "nunomaduro/collision:${{ matrix.collision }}" "nesbot/carbon:^2.64.1" --no-interaction --no-update
49+
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "nunomaduro/collision:${{ matrix.collision }}" --no-interaction --no-update
5550
composer update --${{ matrix.stability }} --prefer-dist --no-interaction
5651
5752
- name: Execute tests

‎composer.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
}
1616
],
1717
"require": {
18-
"php": "^8.1",
18+
"php": "^8.2",
1919
"spatie/laravel-package-tools": "^1.16",
20-
"illuminate/contracts": "^10.0|^11.0"
20+
"illuminate/contracts": "^11.0|^12.0"
2121
},
2222
"require-dev": {
23-
"nunomaduro/collision": "^6.0|^8.1",
24-
"orchestra/testbench": "^8.0|^9.0",
25-
"phpunit/phpunit": "^10.5"
23+
"nunomaduro/collision": "^8.1|^9.0",
24+
"orchestra/testbench": "^9.0|^10.0",
25+
"phpunit/phpunit": "^10.5|^11.0"
2626
},
2727
"autoload": {
2828
"psr-4": {

‎rector.php

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
use Rector\Config\RectorConfig;
6+
use Rector\ValueObject\PhpVersion;
7+
8+
return RectorConfig::configure()
9+
->withPaths([
10+
__DIR__.'/src',
11+
__DIR__.'/tests',
12+
])
13+
->withPreparedSets(
14+
deadCode: true,
15+
codeQuality: true,
16+
typeDeclarations: true,
17+
privatization: true,
18+
earlyReturn: true,
19+
)
20+
->withAttributesSets()
21+
->withPhpSets()
22+
->withPhpVersion(PhpVersion::PHP_82);

‎src/Actions/AppendTailwindTag.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
class AppendTailwindTag
66
{
7-
public function __invoke(string $contents)
7+
public function __invoke(string $contents): ?string
88
{
99
if (str_contains($contents, '{{ tailwindcss(')) {
1010
return $contents;

‎src/Commands/BuildCommand.php

+10-4
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class BuildCommand extends Command
2020

2121
protected $description = 'Generates a new build of Tailwind CSS for your project.';
2222

23-
public function handle()
23+
public function handle(): int
2424
{
2525
$binFile = config('tailwindcss.bin_path');
2626

@@ -57,7 +57,7 @@ public function handle()
5757
'-o', $destinationFileAbsolutePath,
5858
$this->option('watch') ? '--watch=always' : null,
5959
$this->shouldMinify() ? '-m' : null,
60-
]), function ($type, $output) {
60+
]), function ($type, $output): void {
6161
$this->output->write($output);
6262
});
6363

@@ -106,11 +106,17 @@ private function fixOsFilePathToUriPath(string $path): string
106106

107107
private function shouldVersion(): bool
108108
{
109-
return $this->option('digest') || $this->option('prod');
109+
if ($this->option('digest')) {
110+
return true;
111+
}
112+
return (bool) $this->option('prod');
110113
}
111114

112115
private function shouldMinify(): bool
113116
{
114-
return $this->option('minify') || $this->option('prod');
117+
if ($this->option('minify')) {
118+
return true;
119+
}
120+
return (bool) $this->option('prod');
115121
}
116122
}

‎src/Commands/DownloadCommand.php

+5-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class DownloadCommand extends Command
1616

1717
protected $description = 'Downloads the Tailwind CSS binary for the version specified in your config/tailwindcss.php.';
1818

19-
public function handle()
19+
public function handle(): int
2020
{
2121
$os = php_uname('s');
2222
$cpu = php_uname('m');
@@ -57,8 +57,10 @@ public function handle()
5757
return self::FAILURE;
5858
}
5959

60-
File::ensureDirectoryExists(dirname($targetPath));
61-
File::exists($targetPath) && File::delete($targetPath);
60+
File::ensureDirectoryExists(dirname((string) $targetPath));
61+
if (File::exists($targetPath)) {
62+
File::delete($targetPath);
63+
}
6264
File::put($targetPath, $contents);
6365
File::chmod($targetPath, 0755);
6466

‎src/Commands/InstallCommand.php

+15-18
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class InstallCommand extends Command
2020

2121
protected $description = 'Installs the Tailwind CSS scaffolding for new Laravel applications.';
2222

23-
public function handle()
23+
public function handle(): int
2424
{
2525
$this->ensureTailwindConfigExists();
2626
$this->ensureTailwindCliBinaryExists();
@@ -31,32 +31,32 @@ public function handle()
3131

3232
$this->newLine();
3333

34-
$this->components->info('TailwindCSS Laravel was installed successfully.');
34+
$this->components->info('Tailwind CSS Laravel was installed successfully.');
3535

3636
return self::SUCCESS;
3737
}
3838

39-
protected function phpBinary()
39+
protected function phpBinary(): string
4040
{
4141
return (new PhpExecutableFinder)->find(false) ?: 'php';
4242
}
4343

44-
private function ensureTailwindConfigExists()
44+
private function ensureTailwindConfigExists(): void
4545
{
4646
$this->copyStubToApp(
4747
stub: __DIR__ . '/../../stubs/postcss.config.js',
4848
to: base_path('postcss.config.js'),
4949
);
5050

51-
if (! File::exists($appCssFilePath = resource_path('css/app.css')) || empty(trim(File::get($appCssFilePath))) || $this->mainCssIsDefault($appCssFilePath)) {
51+
if (! File::exists($appCssFilePath = resource_path('css/app.css')) || in_array(trim(File::get($appCssFilePath)), ['', '0'], true) || $this->mainCssIsDefault($appCssFilePath)) {
5252
$this->copyStubToApp(
5353
stub: __DIR__ . '/../../stubs/resources/css/app.css',
5454
to: $appCssFilePath,
5555
);
5656
}
5757
}
5858

59-
private function ensureTailwindCliBinaryExists()
59+
private function ensureTailwindCliBinaryExists(): void
6060
{
6161
if (! File::exists(config('tailwindcss.bin_path')) || $this->option('download')) {
6262
Process::forever()->tty(SymfonyProcess::isTtySupported())->run([
@@ -65,7 +65,7 @@ private function ensureTailwindCliBinaryExists()
6565
'tailwindcss:download',
6666
'--cli-version',
6767
$this->option('cli-version') ?: config('tailwindcss.version'),
68-
], function ($_type, $output) {
68+
], function ($_type, $output): void {
6969
$this->output->write($output);
7070
});
7171
}
@@ -80,12 +80,9 @@ private function copyStubToApp(string $stub, string $to): void
8080
/**
8181
* Install the middleware to a group in the application Http Kernel.
8282
*
83-
* @param string $after
84-
* @param string $name
8583
* @param string $group
86-
* @return void
8784
*/
88-
private function installMiddlewareAfter($after, $name, $group = 'web')
85+
private function installMiddlewareAfter(string $after, string $name, $group = 'web'): void
8986
{
9087
$httpKernel = file_get_contents(app_path('Http/Kernel.php'));
9188

@@ -109,7 +106,7 @@ private function installMiddlewareAfter($after, $name, $group = 'web')
109106
));
110107
}
111108

112-
private function appendTailwindStylesToLayouts()
109+
private function appendTailwindStylesToLayouts(): void
113110
{
114111
$this->existingLayoutFiles()
115112
->each(fn ($file) => File::put(
@@ -125,7 +122,7 @@ private function existingLayoutFiles()
125122
->filter(fn ($file) => File::exists($file));
126123
}
127124

128-
private function installMiddleware(string $middleware)
125+
private function installMiddleware(string $middleware): void
129126
{
130127
if (file_exists(app_path('Http/Kernel.php'))) {
131128
$this->installMiddlewareAfter('SubstituteBindings::class', $middleware);
@@ -134,7 +131,7 @@ private function installMiddleware(string $middleware)
134131
}
135132
}
136133

137-
private function installMiddlewareToBootstrap(string $middleware, string $group = 'web', string $modifier = 'append')
134+
private function installMiddlewareToBootstrap(string $middleware, string $group = 'web', string $modifier = 'append'): void
138135
{
139136
$bootstrapApp = file_get_contents(base_path('bootstrap/app.php'));
140137

@@ -155,9 +152,9 @@ private function installMiddlewareToBootstrap(string $middleware, string $group
155152
file_put_contents(base_path('bootstrap/app.php'), $bootstrapApp);
156153
}
157154

158-
private function addIngoreLines()
155+
private function addIngoreLines(): void
159156
{
160-
$binary = basename(config('tailwindcss.bin_path'));
157+
$binary = basename((string) config('tailwindcss.bin_path'));
161158

162159
if (str_contains(File::get(base_path('.gitignore')), $binary)) {
163160
return;
@@ -172,13 +169,13 @@ private function addIngoreLines()
172169
LINES);
173170
}
174171

175-
private function runFirstBuild()
172+
private function runFirstBuild(): void
176173
{
177174
Process::forever()->tty(SymfonyProcess::isTtySupported())->run([
178175
$this->phpBinary(),
179176
'artisan',
180177
'tailwindcss:build',
181-
], function ($_type, $output) {
178+
], function ($_type, $output): void {
182179
$this->output->write($output);
183180
});
184181
}

‎src/Http/Middleware/AddLinkHeaderForPreloadedAssets.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@
66

77
class AddLinkHeaderForPreloadedAssets
88
{
9-
public function __construct(private Manifest $manifest)
9+
public function __construct(private readonly Manifest $manifest)
1010
{
1111
}
1212

1313
public function handle($request, $next)
1414
{
15-
return tap($next($request), function ($response) {
16-
if (count($assets = $this->manifest->assetsForPreloading()) > 0) {
15+
return tap($next($request), function ($response): void {
16+
if (($assets = $this->manifest->assetsForPreloading()) !== []) {
1717
$response->header('Link', trim(implode(', ', array_filter(array_merge(
1818
[$response->headers->get('Link', null)],
19-
collect($assets)->map(fn ($attributes, $asset) => implode('; ', array_merge(
19+
collect($assets)->map(fn ($attributes, $asset): string => implode('; ', array_merge(
2020
["<$asset>"],
2121
collect(array_merge(['rel' => 'preload', 'as' => 'style'], $attributes))
22-
->map(fn ($value, $key) => "{$key}={$value}")
22+
->map(fn ($value, $key): string => "{$key}={$value}")
2323
->all(),
2424
)))->all(),
2525
)))));

‎src/Manifest.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public static function path(): string
2525
return config('tailwindcss.build.manifest_file_path');
2626
}
2727

28-
public function __invoke(string $path, $preload = true)
28+
public function __invoke(string $path, $preload = true): string|\Illuminate\Support\HtmlString
2929
{
3030
static $manifests = [];
3131

@@ -52,9 +52,8 @@ public function __invoke(string $path, $preload = true)
5252
report($exception);
5353

5454
return $path;
55-
} else {
56-
throw $exception;
5755
}
56+
throw $exception;
5857
}
5958

6059
$asset = asset($manifest[$path]);

‎src/TailwindCssServiceProvider.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public function configurePackage(Package $package): void
2525
]);
2626
}
2727

28-
public function packageRegistered()
28+
public function packageRegistered(): void
2929
{
3030
$this->app->scoped(Manifest::class);
3131
}

‎src/Testing/InteractsWithTailwind.php

+1-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ trait InteractsWithTailwind
1212
*/
1313
protected function withoutTailwind(): static
1414
{
15-
$this->swap(Manifest::class, function () {
16-
return new HtmlString('');
17-
});
15+
$this->swap(Manifest::class, fn(): \Illuminate\Support\HtmlString => new HtmlString(''));
1816

1917
return $this;
2018
}

‎src/helpers.php

-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77
/**
88
* Get the path to a versioned TailwindCSS file.
99
*
10-
* @param string $path
1110
* @param bool|array $preload
12-
* @return \Illuminate\Support\HtmlString|string
1311
*/
1412
function tailwindcss(string $path, $preload = true): HtmlString|string
1513
{

‎tests/AppendTailwindTagTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
class AppendTailwindTagTest extends TestCase
88
{
9-
/** @test */
10-
public function append_tailwind_tag_before_closing_head_tag()
9+
#[\PHPUnit\Framework\Attributes\Test]
10+
public function append_tailwind_tag_before_closing_head_tag(): void
1111
{
1212
$contents = <<<'BLADE'
1313
<html>

0 commit comments

Comments
 (0)