Skip to content

Commit

Permalink
Merge branch 'main' into 174-upgrade-to-Laravel-11
Browse files Browse the repository at this point in the history
  • Loading branch information
alimranahmed committed Jun 22, 2024
2 parents d10587c + 8b75e45 commit 276667e
Show file tree
Hide file tree
Showing 18 changed files with 67 additions and 57 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,12 @@ jobs:
DB_USERNAME: root
DB_PASSWORD: password
run: |
vendor/bin/phpunit --coverage-clover clover.xml
php artisan test --coverage --coverage-clover clover.xml
vendor/bin/pint
- name: Generate test coverage badge
uses: timkrase/phpunit-coverage-badge@v1.2.0
with:
coverage_badge_path: 'badge-coverage.svg'
coverage_badge_path: 'tests/coverage/badge-coverage.svg'
push_badge: true
repo_token: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ _ide_helper.php
*~
*.swp
*.swo
/clover.xml
.phpunit.result.cache
/tests/coverage
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[![Test Coverage](https://raw.githubusercontent.com/alimranahmed/LaraBlog/main/badge-coverage.svg)](https://packagist.org/packages/alimranahmed/LaraBlog)
[![Test Coverage](https://raw.githubusercontent.com/alimranahmed/LaraBlog/main/tests/coverage/badge-coverage.svg)](https://packagist.org/packages/alimranahmed/LaraBlog)
[![MIT Licence](https://badges.frapsoft.com/os/mit/mit.svg?v=103)](https://opensource.org/licenses/mit-license.php)


Expand Down Expand Up @@ -27,7 +27,7 @@ A full-featured blogging system for personal use. No frontend theme and anything
* Can navigate articles based on categories.

### Installation Process
1. Execute `git clone https://github.com/alimranahmed/LaraBlog.git` on your terminal to download this project.
1. Execute `composer create-project alimranahmed/larablog` on your terminal to download this project.
2. Go to the project root directory and execute `composer install` to install all PHP dependencies of the project
3. Create a file named as .env and copy the content of .env.example to newly created .env file
4. Then execute `php artisan key:generate` on your terminal/cmd to generate environment key
Expand Down
1 change: 0 additions & 1 deletion app/Livewire/Backend/Article/Index.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
use Illuminate\Contracts\View\View;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Support\Facades\Auth;
use Livewire\Attributes\On;
use Livewire\Attributes\Url;
use Livewire\Component;

Expand Down
1 change: 0 additions & 1 deletion app/Livewire/Backend/User/Form.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

use App\Models\User;
use Illuminate\Contracts\View\View;
use Illuminate\Http\RedirectResponse;
use Illuminate\Support\Arr;
use Livewire\Component;
use Spatie\Permission\Models\Role;
Expand Down
1 change: 1 addition & 0 deletions app/Livewire/Frontend/Article/Comments.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Mail;
use Livewire\Component;

use function route;
use function view;

Expand Down
1 change: 1 addition & 0 deletions app/Livewire/Frontend/ContactForm.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
use Illuminate\Contracts\View\View;
use Illuminate\Support\Facades\Mail;
use Livewire\Component;

use function route;
use function view;

Expand Down
2 changes: 1 addition & 1 deletion app/Models/Article.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
*/
class Article extends Model
{
use HasFactory;
use CanFormatDates;
use HasFactory;

protected $guarded = ['id'];

Expand Down
2 changes: 1 addition & 1 deletion app/Models/Category.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

class Category extends Model
{
use HasFactory;
use CanFormatDates;
use HasFactory;

protected $guarded = ['id'];

Expand Down
2 changes: 1 addition & 1 deletion app/Models/Comment.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

class Comment extends Model
{
use HasFactory;
use CanFormatDates;
use HasFactory;

protected $guarded = ['id'];

Expand Down
2 changes: 1 addition & 1 deletion app/Models/Keyword.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
*/
class Keyword extends Model
{
use HasFactory;
use CanFormatDates;
use HasFactory;

protected $guarded = ['id'];

Expand Down
2 changes: 1 addition & 1 deletion app/Models/Subscriber.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

class Subscriber extends Model
{
use HasFactory;
use CanFormatDates;
use HasFactory;

protected $guarded = ['id'];
}
2 changes: 1 addition & 1 deletion app/Models/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
*/
class User extends Authenticatable
{
use CanFormatDates;
use HasFactory;
use HasRoles;
use Notifiable;
use CanFormatDates;

protected $casts = [
'email_verified_at' => 'datetime',
Expand Down
4 changes: 1 addition & 3 deletions app/Providers/AppServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,5 @@ public function boot(): void
/**
* Register any application services.
*/
public function register(): void
{
}
public function register(): void {}
}
56 changes: 28 additions & 28 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 8 additions & 12 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tests/TestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@

abstract class TestCase extends BaseTestCase
{
use DatabaseTransactions;
use CreatesApplication;
use DatabaseTransactions;
}
Loading

0 comments on commit 276667e

Please sign in to comment.