Skip to content

Commit b0de668

Browse files
tonysmtonysm
authored
Merge pull request #22 from hotwired-laravel/tm/l11
Adds Laravel 11 support
2 parents 44a25ac + ee0dcad commit b0de668

8 files changed

+102
-112
lines changed

‎.github/workflows/run-tests.yml

+9-3
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,19 @@ jobs:
1414
matrix:
1515
os: [ubuntu-latest, windows-latest]
1616
php: [8.1, 8.2]
17-
laravel: [9.*, 10.*]
17+
laravel: [10.*, 11.*]
1818
stability: [prefer-lowest, prefer-stable]
1919
include:
20-
- laravel: 9.*
21-
testbench: 7.*
2220
- laravel: 10.*
2321
testbench: 8.*
22+
- laravel: 11.*
23+
testbench: 9.*
24+
exclude:
25+
- laravel: 11.*
26+
php: 8.1
27+
- laravel: 11.*
28+
php: 8.2
29+
os: windows-latest
2430

2531
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
2632

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
.idea
22
.phpunit.result.cache
3+
.phpunit.cache
34
build
45
composer.lock
56
coverage

‎composer.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
}
1919
],
2020
"require": {
21-
"php": "^8.1",
21+
"php": "^8.1|^8.2",
2222
"spatie/laravel-package-tools": "^1.9.2",
23-
"illuminate/contracts": "^9.0|^10.0"
23+
"illuminate/contracts": "^10.0|^11.0"
2424
},
2525
"require-dev": {
2626
"laravel/pint": "^1.0",
27-
"nunomaduro/collision": "^6.0",
28-
"orchestra/testbench": "^7.0|^8.0",
29-
"phpunit/phpunit": "^9.5"
27+
"nunomaduro/collision": "^7.10|^8.1",
28+
"orchestra/testbench": "^8.0|^9.1",
29+
"phpunit/phpunit": "^10.5"
3030
},
3131
"autoload": {
3232
"psr-4": {

‎phpunit.xml.dist

+12-30
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,21 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
5-
backupGlobals="false"
6-
backupStaticAttributes="false"
7-
bootstrap="vendor/autoload.php"
8-
colors="true"
9-
convertErrorsToExceptions="true"
10-
convertNoticesToExceptions="true"
11-
convertWarningsToExceptions="true"
12-
processIsolation="false"
13-
stopOnFailure="false"
14-
executionOrder="random"
15-
failOnWarning="true"
16-
failOnRisky="true"
17-
failOnEmptyTestSuite="true"
18-
beStrictAboutOutputDuringTests="true"
19-
verbose="true"
20-
>
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" backupGlobals="false"
4+
bootstrap="vendor/autoload.php" colors="true" processIsolation="false" stopOnFailure="false"
5+
executionOrder="random" failOnWarning="true" failOnRisky="true" failOnEmptyTestSuite="true"
6+
beStrictAboutOutputDuringTests="true" cacheDirectory=".phpunit.cache"
7+
backupStaticProperties="false">
218
<testsuites>
22-
<testsuite name="Tonysm Test Suite">
9+
<testsuite name="Stimulus Laravel Test Suite">
2310
<directory>tests</directory>
2411
</testsuite>
2512
</testsuites>
26-
<coverage>
13+
<logging>
14+
<junit outputFile="build/report.junit.xml" />
15+
</logging>
16+
<source>
2717
<include>
2818
<directory suffix=".php">./src</directory>
2919
</include>
30-
<report>
31-
<html outputDirectory="build/coverage"/>
32-
<text outputFile="build/coverage.txt"/>
33-
<clover outputFile="build/logs/clover.xml"/>
34-
</report>
35-
</coverage>
36-
<logging>
37-
<junit outputFile="build/report.junit.xml"/>
38-
</logging>
20+
</source>
3921
</phpunit>

‎src/Commands/Concerns/InstallsForImportmap.php

+39-34
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace HotwiredLaravel\StimulusLaravel\Commands\Concerns;
44

55
use Illuminate\Support\Facades\File;
6+
use Illuminate\Support\Facades\Process;
67

78
/**
89
* @mixin \HotwiredLaravel\StimulusLaravel\Commands\InstallCommand
@@ -17,51 +18,55 @@ protected function installsForImportmaps()
1718

1819
protected function publishJsFilesForImportmaps()
1920
{
20-
$this->components->task('publishing JS files', function () {
21-
File::ensureDirectoryExists(resource_path('js/controllers'));
22-
File::ensureDirectoryExists(resource_path('js/libs'));
21+
File::ensureDirectoryExists(resource_path('js/controllers'));
22+
File::ensureDirectoryExists(resource_path('js/libs'));
2323

24-
File::copy(__DIR__.'/../../../stubs/resources/js/libs/stimulus.js', resource_path('js/libs/stimulus.js'));
25-
File::copy(__DIR__.'/../../../stubs/resources/js/controllers/hello_controller.js', resource_path('js/controllers/hello_controller.js'));
26-
File::copy(__DIR__.'/../../../stubs/resources/js/controllers/index-importmap.js', resource_path('js/controllers/index.js'));
24+
File::copy(__DIR__.'/../../../stubs/resources/js/libs/stimulus.js', resource_path('js/libs/stimulus.js'));
25+
File::copy(__DIR__.'/../../../stubs/resources/js/controllers/hello_controller.js', resource_path('js/controllers/hello_controller.js'));
26+
File::copy(__DIR__.'/../../../stubs/resources/js/controllers/index-importmap.js', resource_path('js/controllers/index.js'));
2727

28-
$libsIndexFile = resource_path('js/libs/index.js');
29-
$libsIndexSourceFile = __DIR__.'/../../../stubs/resources/js/libs/index-importmap.js';
28+
$libsIndexFile = resource_path('js/libs/index.js');
29+
$libsIndexSourceFile = __DIR__.'/../../../stubs/resources/js/libs/index-importmap.js';
3030

31-
if (File::exists($libsIndexFile)) {
32-
$importLine = trim(File::get($libsIndexSourceFile));
31+
if (File::exists($libsIndexFile)) {
32+
$importLine = trim(File::get($libsIndexSourceFile));
3333

34-
if (! str_contains(File::get($libsIndexFile), $importLine)) {
35-
File::append($libsIndexFile, PHP_EOL.$importLine.PHP_EOL);
36-
}
37-
} else {
38-
File::copy($libsIndexSourceFile, $libsIndexFile);
34+
if (! str_contains(File::get($libsIndexFile), $importLine)) {
35+
File::append($libsIndexFile, PHP_EOL.$importLine.PHP_EOL);
3936
}
40-
41-
return true;
42-
});
37+
} else {
38+
File::copy($libsIndexSourceFile, $libsIndexFile);
39+
}
4340
}
4441

4542
protected function registerImportmapPins()
4643
{
47-
$this->components->task('pinning JS dependency (importmap)', function () {
48-
$this->callSilently('importmap:pin', [
49-
'packages' => collect($this->jsPackages())
50-
->map(fn ($version, $package) => "{$package}@{$version}")
51-
->values()
52-
->all(),
53-
]);
54-
55-
// Publishes the `@hotwired/stimulus-loading` package to public/
56-
$this->callSilently('vendor:publish', [
57-
'--tag' => 'stimulus-laravel-assets',
58-
]);
44+
$dependencies = collect($this->jsPackages())
45+
->map(fn ($version, $package) => "{$package}@{$version}")
46+
->values()
47+
->all();
5948

60-
File::append($this->importmapsFile(), <<<'IMPORTMAP'
61-
Importmap::pin("@hotwired/stimulus-loading", to: "vendor/stimulus-laravel/stimulus-loading.js", preload: true);
62-
IMPORTMAP);
49+
Process::forever()->run(array_merge([
50+
$this->phpBinary(),
51+
'artisan',
52+
'importmap:pin',
53+
], $dependencies), function ($_type, $output) {
54+
$this->output->write($output);
55+
});
6356

64-
return true;
57+
// Publishes the `@hotwired/stimulus-loading` package to public/vendor
58+
Process::forever()->run([
59+
$this->phpBinary(),
60+
'artisan',
61+
'vendor:publish',
62+
'--tag',
63+
'stimulus-laravel-assets',
64+
], function ($_type, $output) {
65+
$this->output->write($output);
6566
});
67+
68+
File::append($this->importmapsFile(), <<<'IMPORTMAP'
69+
Importmap::pin("@hotwired/stimulus-loading", to: "vendor/stimulus-laravel/stimulus-loading.js", preload: true);
70+
IMPORTMAP);
6671
}
6772
}

‎src/Commands/Concerns/InstallsForNode.php

+24-32
Original file line numberDiff line numberDiff line change
@@ -17,49 +17,41 @@ protected function installsForNode()
1717

1818
protected function publishJsFilesForNode()
1919
{
20-
$this->components->task('publishing JS files', function () {
21-
File::ensureDirectoryExists(resource_path('js/controllers'));
22-
File::ensureDirectoryExists(resource_path('js/libs'));
20+
File::ensureDirectoryExists(resource_path('js/controllers'));
21+
File::ensureDirectoryExists(resource_path('js/libs'));
2322

24-
File::copy(__DIR__.'/../../../stubs/resources/js/libs/stimulus.js', resource_path('js/libs/stimulus.js'));
25-
File::copy(__DIR__.'/../../../stubs/resources/js/controllers/hello_controller.js', resource_path('js/controllers/hello_controller.js'));
26-
File::copy(__DIR__.'/../../../stubs/resources/js/controllers/index-node.js', resource_path('js/controllers/index.js'));
23+
File::copy(__DIR__.'/../../../stubs/resources/js/libs/stimulus.js', resource_path('js/libs/stimulus.js'));
24+
File::copy(__DIR__.'/../../../stubs/resources/js/controllers/hello_controller.js', resource_path('js/controllers/hello_controller.js'));
25+
File::copy(__DIR__.'/../../../stubs/resources/js/controllers/index-node.js', resource_path('js/controllers/index.js'));
2726

28-
$libsIndexFile = resource_path('js/libs/index.js');
29-
$libsIndexSourceFile = __DIR__.'/../../../stubs/resources/js/libs/index-node.js';
27+
$libsIndexFile = resource_path('js/libs/index.js');
28+
$libsIndexSourceFile = __DIR__.'/../../../stubs/resources/js/libs/index-node.js';
3029

31-
if (File::exists($libsIndexFile)) {
32-
$importLine = trim(File::get($libsIndexSourceFile));
30+
if (File::exists($libsIndexFile)) {
31+
$importLine = trim(File::get($libsIndexSourceFile));
3332

34-
if (! str_contains(File::get($libsIndexFile), $importLine)) {
35-
File::append($libsIndexFile, $importLine.PHP_EOL);
36-
}
37-
} else {
38-
File::copy($libsIndexSourceFile, $libsIndexFile);
33+
if (! str_contains(File::get($libsIndexFile), $importLine)) {
34+
File::append($libsIndexFile, $importLine.PHP_EOL);
3935
}
36+
} else {
37+
File::copy($libsIndexSourceFile, $libsIndexFile);
38+
}
4039

41-
if (! str_contains(File::get(resource_path('js/app.js')), "import './libs';")) {
42-
File::append(resource_path('js/app.js'), <<<'JS'
43-
import './libs';
44-
45-
JS);
46-
}
40+
if (! str_contains(File::get(resource_path('js/app.js')), "import './libs';")) {
41+
File::append(resource_path('js/app.js'), <<<'JS'
42+
import './libs';
4743

48-
return true;
49-
});
44+
JS);
45+
}
5046
}
5147

5248
protected function updateNpmPackagesForNode()
5349
{
54-
$this->components->task('registering NPM dependency', function () {
55-
$this->updateNodePackages(function ($packages) {
56-
return array_merge(
57-
$packages,
58-
$this->jsPackages(),
59-
);
60-
});
61-
62-
return true;
50+
$this->updateNodePackages(function ($packages) {
51+
return array_merge(
52+
$packages,
53+
$this->jsPackages(),
54+
);
6355
});
6456
}
6557

‎src/Commands/InstallCommand.php

+10-6
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use Illuminate\Console\Command;
66
use Illuminate\Support\Facades\File;
77
use RuntimeException;
8+
use Symfony\Component\Process\PhpExecutableFinder;
89
use Symfony\Component\Process\Process;
910

1011
class InstallCommand extends Command
@@ -20,8 +21,6 @@ class InstallCommand extends Command
2021

2122
public function handle(): int
2223
{
23-
$this->components->info('Installing Stimulus Laravel');
24-
2524
if ($this->usingImportmaps()) {
2625
$this->installsForImportmaps();
2726
} else {
@@ -37,8 +36,8 @@ public function handle(): int
3736
}
3837

3938
$this->newLine();
40-
$this->components->info('Done');
41-
$this->newLine();
39+
40+
$this->components->info('Stimulus Laravel was installed successfully.');
4241

4342
return self::SUCCESS;
4443
}
@@ -74,13 +73,18 @@ protected function runCommands($commands)
7473
});
7574
}
7675

77-
protected function usingImportmaps(): bool
76+
private function usingImportmaps(): bool
7877
{
7978
return File::exists($this->importmapsFile());
8079
}
8180

82-
protected function importmapsFile(): string
81+
private function importmapsFile(): string
8382
{
8483
return base_path('routes/importmap.php');
8584
}
85+
86+
protected function phpBinary()
87+
{
88+
return (new PhpExecutableFinder())->find(false) ?: 'php';
89+
}
8690
}

‎src/StimulusGenerator.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public function __construct(private ?string $targetFolder = null)
1212
$this->targetFolder ??= rtrim(resource_path('js/controllers'), '/');
1313
}
1414

15-
public function create(string $name, string $stub = null, callable $replacementsCallback = null): array
15+
public function create(string $name, ?string $stub = null, ?callable $replacementsCallback = null): array
1616
{
1717
$replacementsCallback ??= fn ($replacements) => $replacements;
1818
$controllerName = $this->controllerName($name);
@@ -36,7 +36,7 @@ public function create(string $name, string $stub = null, callable $replacements
3636
];
3737
}
3838

39-
public function createStrada(string $prefix, string $name, string $bridgeName = null): array
39+
public function createStrada(string $prefix, string $name, ?string $bridgeName = null): array
4040
{
4141
return $this->create("$prefix/$name", stub: __DIR__.'/../stubs/strada.stub', replacementsCallback: function (array $replacements) use ($bridgeName) {
4242
return array_merge(

0 commit comments

Comments
 (0)