Skip to content

[1.x] Laravel v10 #235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jan 16, 2023
Merged

[1.x] Laravel v10 #235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fa49af8
Laravel v10
driesvints Jan 6, 2023
63b4c92
Update tests.yml
driesvints Jan 6, 2023
58cb3a9
Update tests.yml
driesvints Jan 6, 2023
a73d98e
Update composer.json
driesvints Jan 6, 2023
561b942
Update tests.yml
driesvints Jan 6, 2023
fcc1868
Update tests.yml
driesvints Jan 13, 2023
20807e5
wip
driesvints Jan 16, 2023
0675bc6
wip
driesvints Jan 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,15 @@ jobs:
fail-fast: true
matrix:
stack: [blade, react, vue, api]
laravel: [^9, 10.x-dev]
args: [null, --pest]
include:
- stack: vue
args: --ssr
- stack: react
args: --ssr

name: Test Stubs - ${{ matrix.stack }} ${{ matrix.args }}
name: Test Stubs - Laravel ${{ matrix.laravel }} - ${{ matrix.stack }} ${{ matrix.args }}

steps:
- name: Setup PHP
Expand All @@ -38,7 +39,7 @@ jobs:

- name: Setup Laravel
run: |
composer create-project laravel/laravel:^9 .
composer create-project laravel/laravel:${{ matrix.laravel }} .
composer require laravel/breeze:* --no-interaction --no-update
composer config repositories.breeze '{"type": "path", "url": "breeze"}' --file composer.json

Expand Down
8 changes: 4 additions & 4 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
],
"require": {
"php": "^8.0.2",
"illuminate/console": "^9.21",
"illuminate/filesystem": "^9.21",
"illuminate/support": "^9.21",
"illuminate/validation": "^9.21"
"illuminate/console": "^9.21|^10.0",
"illuminate/filesystem": "^9.21|^10.0",
"illuminate/support": "^9.21|^10.0",
"illuminate/validation": "^9.21|^10.0"
},
"conflict": {
"laravel/framework": "<9.37.0"
Expand Down
4 changes: 2 additions & 2 deletions src/Console/InstallCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ protected function installMiddlewareAfter($after, $name, $group = 'web')
* Installs the given Composer Packages into the application.
*
* @param mixed $packages
* @return void
* @return bool
*/
protected function requireComposerPackages($packages)
{
Expand All @@ -126,7 +126,7 @@ protected function requireComposerPackages($packages)
is_array($packages) ? $packages : func_get_args()
);

(new Process($command, base_path(), ['COMPOSER_MEMORY_LIMIT' => '-1']))
return ! (new Process($command, base_path(), ['COMPOSER_MEMORY_LIMIT' => '-1']))
->setTimeout(null)
->run(function ($type, $output) {
$this->output->write($output);
Expand Down
12 changes: 8 additions & 4 deletions src/Console/InstallsInertiaStacks.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,14 @@ trait InstallsInertiaStacks
/**
* Install the Inertia Vue Breeze stack.
*
* @return void
* @return int|null
*/
protected function installInertiaVueStack()
{
// Install Inertia...
$this->requireComposerPackages('inertiajs/inertia-laravel:^0.6.3', 'laravel/sanctum:^2.8', 'tightenco/ziggy:^1.0');
if (! $this->requireComposerPackages('inertiajs/inertia-laravel:^0.6.3', 'laravel/sanctum:^3.2', 'tightenco/ziggy:^1.0')) {
return 1;
}

// NPM Packages...
$this->updateNodePackages(function ($packages) {
Expand Down Expand Up @@ -136,12 +138,14 @@ protected function installInertiaVueSsrStack()
/**
* Install the Inertia React Breeze stack.
*
* @return void
* @return int|null
*/
protected function installInertiaReactStack()
{
// Install Inertia...
$this->requireComposerPackages('inertiajs/inertia-laravel:^0.6.3', 'laravel/sanctum:^2.8', 'tightenco/ziggy:^1.0');
if (! $this->requireComposerPackages('inertiajs/inertia-laravel:^0.6.3', 'laravel/sanctum:^3.2', 'tightenco/ziggy:^1.0')) {
return 1;
}

// NPM Packages...
$this->updateNodePackages(function ($packages) {
Expand Down