Skip to content

Commit 8fd5d2a

Browse files
authored
Merge pull request #69 from fey/update-deps
Update deps
2 parents 64e67a0 + 4923086 commit 8fd5d2a

19 files changed

+2702
-4479
lines changed

.github/workflows/phpci.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414

1515
strategy:
1616
matrix:
17-
php-versions: ['8.2']
17+
php-versions: ['8.3']
1818

1919
steps:
20-
- uses: actions/checkout@v2
20+
- uses: actions/checkout@v4
2121

2222
- name: Set up PHP ${{ matrix.php-versions }}
2323
uses: shivammathur/setup-php@v2
@@ -37,7 +37,7 @@ jobs:
3737
run: make test-coverage
3838

3939
- name: Upload coverage to Codecov
40-
uses: codecov/codecov-action@v1
40+
uses: codecov/codecov-action@v4
4141
with:
4242
token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos
4343
file: build/logs/clover.xml
@@ -49,16 +49,16 @@ jobs:
4949
if: ${{ github.event_name == 'push' }}
5050

5151
steps:
52-
- uses: actions/checkout@v2
52+
- uses: actions/checkout@v4
5353

54-
- uses: docker/setup-buildx-action@v1
54+
- uses: docker/setup-buildx-action@v3
5555

5656
- uses: docker/login-action@v1
5757
with:
5858
username: ${{ secrets.DOCKER_USERNAME }}
5959
password: ${{ secrets.DOCKER_PASSWORD }}
6060

61-
- uses: docker/build-push-action@v2
61+
- uses: docker/build-push-action@v5
6262
with:
6363
context: .
6464
push: true

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ build
1616
.phpstorm.meta.php
1717
_ide_helper.php
1818
_ide_helper_models.php
19+
.phpunit.cache

Procfile

Lines changed: 0 additions & 2 deletions
This file was deleted.

Procfile.dev

Lines changed: 0 additions & 2 deletions
This file was deleted.

app/Http/Controllers/ArticleController.php

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,13 @@ class ArticleController extends Controller
1212
*
1313
* @return \Illuminate\Http\Response
1414
*/
15-
public function index()
15+
public function index(Request $request)
1616
{
17-
$articles = Article::paginate();
18-
return view('article.index', compact('articles'));
17+
$articles = $request->get('name')
18+
? Article::where('name', 'like', "%{$request->get('name')}%")->paginate()
19+
: Article::paginate();
20+
$inputName = $request->input('name');
21+
return view('article.index', compact('articles', 'inputName'));
1922
}
2023

2124
/**
@@ -39,7 +42,7 @@ public function store(Request $request)
3942
{
4043
$data = $this->validate($request, [
4144
'name' => 'required|unique:articles',
42-
'body' => 'required|min:100',
45+
'body' => 'required|min:5',
4346
]);
4447

4548
$article = new Article($data);
@@ -81,8 +84,8 @@ public function edit(Article $article)
8184
public function update(Request $request, Article $article)
8285
{
8386
$data = $this->validate($request, [
84-
'name' => 'required|unique:articles,name,' . $article->id,
85-
'body' => 'required|min:100',
87+
'name' => "required|unique:articles,name,{$article->id}",
88+
'body' => 'required|min:5',
8689
]);
8790

8891
$article->fill($data);

app/Http/Kernel.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ class Kernel extends HttpKernel
3939
],
4040

4141
'api' => [
42-
// \Laravel\Sanctum\Http\Middleware\EnsureFrontendRequestsAreStateful::class,
4342
'throttle:api',
4443
\Illuminate\Routing\Middleware\SubstituteBindings::class,
4544
],

app/Models/User.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@
66
use Illuminate\Database\Eloquent\Factories\HasFactory;
77
use Illuminate\Foundation\Auth\User as Authenticatable;
88
use Illuminate\Notifications\Notifiable;
9-
use Laravel\Sanctum\HasApiTokens;
109

1110
class User extends Authenticatable
1211
{
13-
use HasApiTokens, HasFactory, Notifiable;
12+
use HasFactory, Notifiable;
1413

1514
/**
1615
* The attributes that are mass assignable.

composer.json

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,19 @@
99
"license": "MIT",
1010
"require": {
1111
"php": ">=8",
12-
"fideloper/proxy": "^4.4",
13-
"fruitcake/laravel-cors": "^2.0",
1412
"guzzlehttp/guzzle": "^7.0.1",
15-
"laravel/framework": "^9.19",
16-
"laravel/sanctum": "^2.14.1",
13+
"laravel/framework": "^11.0",
1714
"laravel/tinker": "^2.7",
18-
"laravelcollective/html": "^6.2.1"
15+
"spatie/laravel-html": "^3.5"
1916
},
2017
"require-dev": {
21-
"barryvdh/laravel-ide-helper": "^2.12",
22-
"spatie/laravel-ignition": "^1.0",
18+
"barryvdh/laravel-ide-helper": "^3.0",
2319
"fakerphp/faker": "^1.9.1",
2420
"mockery/mockery": "^1.4.4",
25-
"nunomaduro/collision": "^6.1",
26-
"phpunit/phpunit": "^9.5.10",
27-
"squizlabs/php_codesniffer": "^3.5.8"
21+
"nunomaduro/collision": "^8.1",
22+
"phpunit/phpunit": "^11.0",
23+
"spatie/laravel-ignition": "^2.7",
24+
"squizlabs/php_codesniffer": "*"
2825
},
2926
"config": {
3027
"optimize-autoloader": true,

0 commit comments

Comments
 (0)