Skip to content

Commit 2100e9c

Browse files
authored
Merge pull request #3 from jdsantos/upgrade-to-laravel-12
Upgrade to laravel 12
2 parents 5a72354 + a9784bb commit 2100e9c

File tree

7 files changed

+21
-20
lines changed

7 files changed

+21
-20
lines changed

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
strategy:
1818
matrix:
1919
os: [ubuntu-latest, macos-latest]
20-
php: ['8.2', '8.3']
20+
php: ['8.3']
2121
dependency-version: [prefer-lowest, prefer-stable]
2222

2323
name: PHP ${{ matrix.php }} - ${{ matrix.os }} - ${{ matrix.dependency-version }}

README.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414

1515
### Prerequisites
1616

17-
Ensure you have PHP (8.2+), Composer and Docker installed on your machine before proceeding. This package requires also that you run it inside a Laravel 11+ project:
17+
Ensure you have PHP (8.3+), Composer and Docker installed on your machine before proceeding. This package requires also that you run it inside a Laravel 12+ project:
1818

19-
- [Laravel 11+](https://getcomposer.org/download)
19+
- [Laravel 12+](https://getcomposer.org/download)
2020
- [Docker](https://docs.docker.com/get-docker/)
21-
- [PHP 8.2+](https://php.net/downloads)
21+
- [PHP 8.3+](https://php.net/downloads)
2222
- [Composer](https://getcomposer.org/download)
2323

2424
### 🚀 Installation & Usage
@@ -36,10 +36,10 @@ Inside your Laravel project folder, simply run the following commands:
3636
3. **Try it out!**: Now you can run your Laravel app using Docker like this:
3737

3838
`docker run -p 80:80 -v laravel_storage:/opt/laravel/storage --rm -it $(docker build -q .)`
39-
40-
It works also if you're using [Podman](https://podman.io)
41-
42-
`podman run -p 80:80 -v laravel_storage:/opt/laravel/storage --rm -it $(podman build -q .)`
39+
40+
It works also if you're using [Podman](https://podman.io)
41+
42+
`podman run -p 80:80 -v laravel_storage:/opt/laravel/storage --rm -it $(podman build -q .)`
4343

4444

4545
### 🛢 Databases support
@@ -72,3 +72,4 @@ Please, fork this repository, make any changes and submit a Pull Request and we
7272
The easiest way to seek support is by submiting an issue on this repo.
7373

7474
---
75+

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
"minimum-stability": "stable",
1818
"prefer-stable": true,
1919
"require": {
20-
"laravel/framework": "^11.9",
21-
"php": ">=8.2"
20+
"laravel/framework": "^12.0",
21+
"php": ">=8.3"
2222
},
2323
"require-dev": {
24-
"orchestra/testbench": "^9.3",
24+
"orchestra/testbench": "^10.0",
2525
"laravel/pint": "^1.17",
26-
"larastan/larastan": "^2.9"
26+
"larastan/larastan": "^3.0"
2727
},
2828
"extra": {
2929
"laravel": {

src/Stubs/Dockerfile.stub

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM php:8.3-fpm-alpine
22

33
LABEL org.opencontainers.image.authors="https://jdsantos.github.io"
44

5-
LABEL laradocker.version="1.1.0"
5+
LABEL laradocker.version="2.0.0"
66

77
# Set working directory
88
WORKDIR /opt/laravel

tests/LaradockerInstallCommandTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ protected function tearDown(): void
3535
#[Test]
3636
public function it_can_install_without_additional_databases(): void
3737
{
38-
$this->runInstallationWithConfirmation(false);
38+
$this->run_installation_with_confirmation(false);
3939

40-
$this->assertFilesExist($this->files);
40+
$this->assert_files_exist($this->files);
4141

4242
$this->assertDirectoryExists($this->laravelPath.'/conf.d');
4343
}
@@ -52,7 +52,7 @@ public function it_can_install_with_sqlite_support(): void
5252
->expectsConfirmation('Laradocker will now generate and create all necessary files inside your project. Do you wish to continue?', 'yes')
5353
->run();
5454

55-
$this->assertFilesExist($this->files);
55+
$this->assert_files_exist($this->files);
5656

5757
$this->assertDirectoryExists($this->laravelPath.'/conf.d');
5858
}
@@ -104,7 +104,7 @@ public function it_doesnt_install_without_confirmation(): void
104104
->expectsConfirmation('Laradocker will now generate and create all necessary files inside your project. Do you wish to continue?', 'no')
105105
->run();
106106

107-
$this->assertFilesDoNotExist($this->files);
107+
$this->assert_files_do_not_exist($this->files);
108108

109109
$this->assertDirectoryDoesNotExist($this->laravelPath.'/conf.d');
110110
}

tests/LaradockerUninstallCommandTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public function it_removes_all_created_files_and_directories(): void
3737
->expectsConfirmation('The following files will be deleted from your project folder. Do you wish to continue?', 'yes')
3838
->run();
3939

40-
$this->assertFilesDoNotExist($this->files);
40+
$this->assert_files_do_not_exist($this->files);
4141
}
4242

4343
#[Test]

tests/TestCase.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ protected function getPackageProviders($app)
3131
}
3232

3333
#[Test]
34-
protected function assertFilesExist(array $files): void
34+
protected function assert_files_exist(array $files): void
3535
{
3636
foreach ($files as $file) {
3737
$path = $this->laravelPath."/$file";
@@ -44,7 +44,7 @@ protected function assertFilesExist(array $files): void
4444
}
4545

4646
#[Test]
47-
protected function assertFilesDoNotExist(array $files): void
47+
protected function assert_files_do_not_exist(array $files): void
4848
{
4949
foreach ($files as $file) {
5050
$path = $this->laravelPath."/$file";

0 commit comments

Comments
 (0)