Skip to content

Commit

Permalink
Merge pull request #203 from ploi/laravel-10
Browse files Browse the repository at this point in the history
Upgrade to Laravel 10
  • Loading branch information
Cannonb4ll authored Feb 22, 2023
2 parents 965ff65 + 158d2b3 commit 0fae379
Show file tree
Hide file tree
Showing 38 changed files with 1,762 additions and 326 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/php_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
php-version: ${{ matrix.php }}

- name: Validate composer.json and composer.lock
run: composer validate --strict
run: composer validate

- name: Copy .env
run: php -r "file_exists('.env') || copy('.env.example', '.env');"
Expand Down
3 changes: 1 addition & 2 deletions app/Filament/Pages/Settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
use Filament\Forms\Components\TagsInput;
use Filament\Forms\Components\TextInput;
use Filament\Forms\Components\RichEditor;
use SebastiaanKloos\FilamentCodeEditor\Components\CodeEditor;

class Settings extends SettingsPage
{
Expand Down Expand Up @@ -249,7 +248,7 @@ protected function getFormSchema(): array

Tabs\Tab::make('Scripts')
->schema([
CodeEditor::make('custom_scripts')
Textarea::make('custom_scripts')
->label('Custom header script')
->helperText('This allows you to add your own custom widget, or tracking tool. Code inside here will always be placed inside the head section.')
->columnSpan(2),
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Kernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class Kernel extends HttpKernel
*
* @var array<string, class-string|string>
*/
protected $routeMiddleware = [
protected $middlewareAliases = [
'auth' => \App\Http\Middleware\Authenticate::class,
'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
'auth.session' => \Illuminate\Session\Middleware\AuthenticateSession::class,
Expand Down
4 changes: 2 additions & 2 deletions app/Models/Changelog.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ class Changelog extends Model
'user_id',
];

protected $dates = [
'published_at',
protected $casts = [
'published_at' => 'datetime',
];

public function scopePublished(Builder $query): Builder
Expand Down
12 changes: 0 additions & 12 deletions app/Providers/AuthServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,4 @@ class AuthServiceProvider extends ServiceProvider
protected $policies = [
// 'App\Models\Model' => 'App\Policies\ModelPolicy',
];

/**
* Register any authentication / authorization services.
*
* @return void
*/
public function boot()
{
$this->registerPolicies();

//
}
}
54 changes: 31 additions & 23 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,41 +7,40 @@
"require": {
"php": "^8.1.0",
"doctrine/dbal": "^3.3",
"filament/filament": "^2.0",
"filament/spatie-laravel-settings-plugin": "^2.0",
"filament/spatie-laravel-tags-plugin": "^2.0",
"filament/spatie-laravel-translatable-plugin": "^2.16",
"filament/filament": "^2.17.0",
"filament/spatie-laravel-settings-plugin": "^2.17.0",
"filament/spatie-laravel-tags-plugin": "^2.17",
"filament/spatie-laravel-translatable-plugin": "^2.17",
"guzzlehttp/guzzle": "^7.2",
"intervention/image": "^2.7",
"laravel/framework": "^9.2",
"intervention/image": "^2.7.2",
"laravel/framework": "^10.0",
"laravel/octane": "^1.2",
"laravel/sanctum": "^2.14.1",
"laravel/socialite": "^5.5",
"laravel/tinker": "^2.7",
"laravel/ui": "^3.4",
"sebastiaankloos/filament-code-editor": "^1.0",
"laravel/sanctum": "^3.2.1",
"laravel/socialite": "^5.6.1",
"laravel/tinker": "^2.8.0",
"laravel/ui": "^4.2.0",
"spatie/color": "^1.5",
"spatie/laravel-activitylog": "^4.5",
"spatie/laravel-honeypot": "^4.2",
"spatie/laravel-ray": "^1.29",
"spiral/roadrunner": "^2.8.2",
"spatie/laravel-activitylog": "^4.7.3",
"spatie/laravel-honeypot": "^4.3.2",
"spatie/laravel-ray": "^1.32.2",
"spiral/roadrunner": "^2.12.2",
"symfony/http-client": "^6.0",
"symfony/mailgun-mailer": "^6.0",
"symfony/postmark-mailer": "^6.0",
"wire-elements/modal": "^1.0",
"wire-elements/spotlight": "^1.0",
"xetaio/xetaravel-mentions": "^9.0"
"wire-elements/modal": "^1.0.7",
"wire-elements/spotlight": "^1.0.7",
"xetaio/xetaravel-mentions": "*"
},
"require-dev": {
"barryvdh/laravel-debugbar": "^3.6",
"fakerphp/faker": "^1.9.1",
"friendsofphp/php-cs-fixer": "^3.13.1",
"mockery/mockery": "^1.4.4",
"nunomaduro/collision": "^6.1",
"pestphp/pest": "^1.21",
"nunomaduro/collision": "^6.4",
"pestphp/pest": "^1.22.4",
"pestphp/pest-plugin-laravel": "^1.2",
"phpunit/phpunit": "^9.5.10",
"spatie/laravel-ignition": "^1.0"
"phpunit/phpunit": "^9.6.3",
"spatie/laravel-ignition": "^2.0"
},
"autoload": {
"psr-4": {
Expand Down Expand Up @@ -92,5 +91,14 @@
}
},
"minimum-stability": "dev",
"prefer-stable": true
"prefer-stable": true,
"repositories": [
{
"type": "path",
"url": "./packages/xetaravel-mentions",
"options": {
"symlink": true
}
}
]
}
Loading

0 comments on commit 0fae379

Please sign in to comment.