Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Laravel 10 Mid-Shift #1407

Closed
wants to merge 3 commits into from
Closed
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
30 changes: 15 additions & 15 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@
"junaidnasir/larainvite": "^5.0",
"kevinlebrun/colors.php": "^1.0",
"laravel/framework": "^10.23",
"laravel/horizon": "^5.17",
"laravel/horizon": "^5.20",
"laravel/scout": "^9.0",
"laravel/telescope": "^4.15",
"laravel/telescope": "^4.16",
"laravel/tinker": "^2.8",
"laravel/ui": "^4.2",
"laravelcollective/html": "^6.4",
Expand All @@ -86,7 +86,7 @@
"monicahq/laravel-cloudflare": "^3.5",
"monolog/monolog": "^3.4",
"mtownsend/xml-to-array": "^2.0",
"nesbot/carbon": "^2.68",
"nesbot/carbon": "^2.70",
"opis/closure": "^3.6",
"pear/net_nntp": "^1.6.0",
"php-ffmpeg/php-ffmpeg": "^1.1",
Expand All @@ -96,14 +96,14 @@
"predis/predis": "^2.2",
"propaganistas/laravel-disposable-email": "^2.2",
"ramsey/uuid": "^4.7",
"sentry/sentry-laravel": "^3.6",
"sentry/sentry-laravel": "^3.8",
"smarty/smarty": "^4.3",
"spatie/async": "^1.5",
"spatie/laravel-backup": "^8.1",
"spatie/async": "^1.6",
"spatie/laravel-backup": "^8.3",
"spatie/laravel-directory-cleanup": "^1.9",
"spatie/laravel-fractal": "^6.0",
"spatie/laravel-ignition": "^2.2",
"spatie/laravel-permission": "^5.10",
"spatie/laravel-ignition": "^2.3",
"spatie/laravel-permission": "^5.11",
"sspat/es-query-sanitizer": "^1.0",
"stechstudio/laravel-zipstream": "^4.13",
"symfony/http-client": "^6.0",
Expand All @@ -117,18 +117,18 @@
"require-dev": {
"barryvdh/laravel-ide-helper": "^2.13",
"beyondcode/laravel-dump-server": "^1.9",
"captainhook/captainhook": "^5.1",
"captainhook/plugin-composer": "^5.1",
"captainhook/captainhook": "^5.16",
"captainhook/plugin-composer": "^5.3",
"driftingly/rector-laravel": "^0.24.1",
"ergebnis/composer-normalize": "^2.30",
"friendsofphp/php-cs-fixer": "^3.21",
"ergebnis/composer-normalize": "^2.37",
"friendsofphp/php-cs-fixer": "^3.26",
"jubeki/laravel-code-style": "^2.0",
"laravel/pint": "^1.6",
"laravel/sail": "^1.21",
"laravel/pint": "^1.13",
"laravel/sail": "^1.25",
"mockery/mockery": "^1.4.4",
"nunomaduro/collision": "^7.0",
"nunomaduro/larastan": "^2.6",
"php-coveralls/php-coveralls": "^2.0",
"php-coveralls/php-coveralls": "^2.6",
"phpunit/phpunit": "^8.0 || ^9.0 || ^10.0",
"rector/rector": "^0.18.0"
},
Expand Down
35 changes: 5 additions & 30 deletions config/app.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<?php

use Illuminate\Support\Facades\Facade;
use Illuminate\Support\ServiceProvider;

return [

/*
Expand Down Expand Up @@ -120,34 +123,7 @@
|
*/

'providers' => [

/*
* Laravel Framework Service Providers...
*/
Illuminate\Auth\AuthServiceProvider::class,
Illuminate\Broadcasting\BroadcastServiceProvider::class,
Illuminate\Bus\BusServiceProvider::class,
Illuminate\Cache\CacheServiceProvider::class,
Illuminate\Foundation\Providers\ConsoleSupportServiceProvider::class,
Illuminate\Cookie\CookieServiceProvider::class,
Illuminate\Database\DatabaseServiceProvider::class,
Illuminate\Encryption\EncryptionServiceProvider::class,
Illuminate\Filesystem\FilesystemServiceProvider::class,
Illuminate\Foundation\Providers\FoundationServiceProvider::class,
Illuminate\Hashing\HashServiceProvider::class,
Illuminate\Mail\MailServiceProvider::class,
Illuminate\Notifications\NotificationServiceProvider::class,
Illuminate\Pagination\PaginationServiceProvider::class,
Illuminate\Pipeline\PipelineServiceProvider::class,
Illuminate\Queue\QueueServiceProvider::class,
Illuminate\Redis\RedisServiceProvider::class,
Illuminate\Auth\Passwords\PasswordResetServiceProvider::class,
Illuminate\Session\SessionServiceProvider::class,
Illuminate\Translation\TranslationServiceProvider::class,
Illuminate\Validation\ValidationServiceProvider::class,
Illuminate\View\ViewServiceProvider::class,

'providers' => ServiceProvider::defaultProviders()->merge([
/*
* Package Service Providers...
*/
Expand All @@ -165,8 +141,7 @@
Jrean\UserVerification\UserVerificationServiceProvider::class,
App\Providers\RouteServiceProvider::class,
App\Providers\UserServiceProvider::class,

],
])->toArray(),

/*
|--------------------------------------------------------------------------
Expand Down
17 changes: 15 additions & 2 deletions config/broadcasting.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
| framework when an event needs to be broadcast. You may set this to
| any of the connections defined in the "connections" array below.
|
| Supported: "pusher", "redis", "log", "null"
| Supported: "pusher", "ably", "redis", "log", "null"
|
*/

Expand All @@ -36,8 +36,21 @@
'secret' => env('PUSHER_APP_SECRET'),
'app_id' => env('PUSHER_APP_ID'),
'options' => [
//
'cluster' => env('PUSHER_APP_CLUSTER'),
'host' => env('PUSHER_HOST') ?: 'api-'.env('PUSHER_APP_CLUSTER', 'mt1').'.pusher.com',
'port' => env('PUSHER_PORT', 443),
'scheme' => env('PUSHER_SCHEME', 'https'),
'encrypted' => true,
'useTLS' => env('PUSHER_SCHEME', 'https') === 'https',
],
'client_options' => [
// Guzzle client options: https://docs.guzzlephp.org/en/stable/request-options.html
],
],

'ably' => [
'driver' => 'ably',
'key' => env('ABLY_KEY'),
],

'redis' => [
Expand Down
19 changes: 0 additions & 19 deletions resources/lang/en/auth.php

This file was deleted.

19 changes: 0 additions & 19 deletions resources/lang/en/pagination.php

This file was deleted.

22 changes: 0 additions & 22 deletions resources/lang/en/passwords.php

This file was deleted.

121 changes: 0 additions & 121 deletions resources/lang/en/validation.php

This file was deleted.

Loading