Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions .github/workflows/phpci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:

strategy:
matrix:
php-versions: ['8.2']
php-versions: ['8.3']

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

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

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

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- uses: docker/setup-buildx-action@v1
- uses: docker/setup-buildx-action@v3

- uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

- uses: docker/build-push-action@v2
- uses: docker/build-push-action@v5
with:
context: .
push: true
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ build
.phpstorm.meta.php
_ide_helper.php
_ide_helper_models.php
.phpunit.cache
2 changes: 0 additions & 2 deletions Procfile

This file was deleted.

2 changes: 0 additions & 2 deletions Procfile.dev

This file was deleted.

15 changes: 9 additions & 6 deletions app/Http/Controllers/ArticleController.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,13 @@ class ArticleController extends Controller
*
* @return \Illuminate\Http\Response
*/
public function index()
public function index(Request $request)
{
$articles = Article::paginate();
return view('article.index', compact('articles'));
$articles = $request->get('name')
? Article::where('name', 'like', "%{$request->get('name')}%")->paginate()
: Article::paginate();
$inputName = $request->input('name');
return view('article.index', compact('articles', 'inputName'));
}

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

$article = new Article($data);
Expand Down Expand Up @@ -81,8 +84,8 @@ public function edit(Article $article)
public function update(Request $request, Article $article)
{
$data = $this->validate($request, [
'name' => 'required|unique:articles,name,' . $article->id,
'body' => 'required|min:100',
'name' => "required|unique:articles,name,{$article->id}",
'body' => 'required|min:5',
]);

$article->fill($data);
Expand Down
1 change: 0 additions & 1 deletion app/Http/Kernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ class Kernel extends HttpKernel
],

'api' => [
// \Laravel\Sanctum\Http\Middleware\EnsureFrontendRequestsAreStateful::class,
'throttle:api',
\Illuminate\Routing\Middleware\SubstituteBindings::class,
],
Expand Down
3 changes: 1 addition & 2 deletions app/Models/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,10 @@
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Foundation\Auth\User as Authenticatable;
use Illuminate\Notifications\Notifiable;
use Laravel\Sanctum\HasApiTokens;

class User extends Authenticatable
{
use HasApiTokens, HasFactory, Notifiable;
use HasFactory, Notifiable;

/**
* The attributes that are mass assignable.
Expand Down
17 changes: 7 additions & 10 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,19 @@
"license": "MIT",
"require": {
"php": ">=8",
"fideloper/proxy": "^4.4",
"fruitcake/laravel-cors": "^2.0",
"guzzlehttp/guzzle": "^7.0.1",
"laravel/framework": "^9.19",
"laravel/sanctum": "^2.14.1",
"laravel/framework": "^11.0",
"laravel/tinker": "^2.7",
"laravelcollective/html": "^6.2.1"
"spatie/laravel-html": "^3.5"
},
"require-dev": {
"barryvdh/laravel-ide-helper": "^2.12",
"spatie/laravel-ignition": "^1.0",
"barryvdh/laravel-ide-helper": "^3.0",
"fakerphp/faker": "^1.9.1",
"mockery/mockery": "^1.4.4",
"nunomaduro/collision": "^6.1",
"phpunit/phpunit": "^9.5.10",
"squizlabs/php_codesniffer": "^3.5.8"
"nunomaduro/collision": "^8.1",
"phpunit/phpunit": "^11.0",
"spatie/laravel-ignition": "^2.7",
"squizlabs/php_codesniffer": "*"
},
"config": {
"optimize-autoloader": true,
Expand Down
Loading