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 v10 #299

Merged
merged 21 commits into from
Nov 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
e8c3a78
⬆️ Laravel v10
QWp6t Jun 25, 2023
15d84fa
👷 php 8.1 no longer supported
QWp6t Jun 25, 2023
7e413cb
⬆ Bump `illuminate/foundation` to latest version
Log1x Nov 16, 2023
f2a1e26
⬆ Bump dependencies
Log1x Nov 16, 2023
454eef8
🔧 Update default Acorn configuration
Log1x Nov 16, 2023
90cf69f
🔥 Remove deprecated Facade class
Log1x Nov 16, 2023
195a189
🔥 Remove deprecated SageFeatures class and provider
Log1x Nov 16, 2023
cf8df08
🎨 Improve provider config property name on the AcornServiceProvider
Log1x Nov 16, 2023
2ca90b5
🐛 Add missing appended `$path` variable to the `bootstrapPath` method
Log1x Nov 16, 2023
fedb4af
🎨 Improve the `Sage` class `filter()` method
Log1x Nov 16, 2023
f2f97ce
🔧 Remove `SageFeatures` from the `Kernel` bootstrap classes
Log1x Nov 16, 2023
4eb8099
⏪ Undeprecate the ServiceProvider class
Log1x Nov 16, 2023
a28a596
🚨 Run phpcbf
Log1x Nov 16, 2023
c6aa09b
🩹 Add missing namespace
Log1x Nov 16, 2023
3d1c31a
🩹 Fix bootstrap path
Log1x Nov 16, 2023
02ac3d7
🔥 Remove deprecated calls to `SageFeatures`
Log1x Nov 16, 2023
680b820
🩹 Fix `timezone_string` sometimes returning an empty string
Log1x Nov 16, 2023
a2ca2ec
➕ Replace deprecated `pestphp/pest-plugin-mock` package with `mockery…
Log1x Nov 16, 2023
491dab8
🐛 Filter out default providers from `illuminate/foundation`
Log1x Nov 16, 2023
349b5c6
🔧 Comment out the `ThemeServiceProvider` example
Log1x Nov 16, 2023
f5394b0
🧑‍💻 Change `Roots\Acorn\ServiceProvider` to `final`
Log1x Nov 16, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
if: "!contains(github.event.head_commit.message, '[ci skip]')"
strategy:
matrix:
php: ['8.0', '8.1', '8.2']
php: ['8.1', '8.2']

steps:
- name: Checkout the project
Expand Down
41 changes: 21 additions & 20 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,36 +40,37 @@
}
},
"require": {
"php": "^8.0",
"php": ">=8.1",
"ext-json": "*",
"ext-mbstring": "*",
"illuminate/cache": "^9.52",
"illuminate/config": "^9.52",
"illuminate/console": "^9.52",
"illuminate/container": "^9.52",
"illuminate/contracts": "^9.52",
"illuminate/database": "^9.52",
"illuminate/events": "^9.52",
"illuminate/filesystem": "^9.52",
"illuminate/http": "^9.52",
"illuminate/log": "^9.52",
"illuminate/routing": "^9.52",
"illuminate/support": "^9.52",
"illuminate/view": "^9.52",
"league/flysystem": "^3.0",
"ramsey/uuid": "^4.2.2",
"illuminate/cache": "^10.23",
"illuminate/config": "^10.23",
"illuminate/console": "^10.23",
"illuminate/container": "^10.23",
"illuminate/contracts": "^10.23",
"illuminate/database": "^10.23",
"illuminate/events": "^10.23",
"illuminate/filesystem": "^10.23",
"illuminate/http": "^10.23",
"illuminate/log": "^10.23",
"illuminate/routing": "^10.23",
"illuminate/support": "^10.23",
"illuminate/view": "^10.23",
"laravel/prompts": "^0.1.7",
"league/flysystem": "^3.8",
"ramsey/uuid": "^4.7",
"roots/support": "^1.0",
"symfony/error-handler": "^6.0",
"symfony/var-dumper": "^6.0",
"symfony/error-handler": "^6.2",
"symfony/var-dumper": "^6.2",
"vlucas/phpdotenv": "^5.4.1"
},
"require-dev": {
"dealerdirect/phpcodesniffer-composer-installer": "^1.0.0",
"mockery/mockery": "^1.6",
"pestphp/pest": "^1.0",
"pestphp/pest-plugin-mock": "^1.0",
"phpcompatibility/php-compatibility": "^9.3",
"roave/security-advisories": "dev-master",
"spatie/laravel-ignition": "^1.6",
"spatie/laravel-ignition": "^2.1",
"spatie/pest-plugin-snapshots": "^1.0",
"spatie/temporary-directory": "^2.0",
"squizlabs/php_codesniffer": "^3.5",
Expand Down
45 changes: 8 additions & 37 deletions config/app.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?php

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

use function Roots\env;

Expand Down Expand Up @@ -58,6 +59,8 @@

'url' => env('APP_URL', home_url()),

'asset_url' => env('ASSET_URL'),

/*
|--------------------------------------------------------------------------
| Application Timezone
Expand All @@ -69,7 +72,7 @@
|
*/

'timezone' => get_option('timezone_string', 'UTC'),
'timezone' => get_option('timezone_string') ?: 'UTC',

/*
|--------------------------------------------------------------------------
Expand Down Expand Up @@ -140,7 +143,7 @@

'maintenance' => [
'driver' => 'file',
// 'store' => 'redis',
// 'store' => 'redis',
],

/*
Expand All @@ -154,38 +157,7 @@
|
*/

'providers' => [

/*
* Framework Service Providers...
*/
Illuminate\Auth\AuthServiceProvider::class,
Illuminate\Broadcasting\BroadcastServiceProvider::class,
Illuminate\Bus\BusServiceProvider::class,
Illuminate\Cache\CacheServiceProvider::class,
Illuminate\Cookie\CookieServiceProvider::class,
Illuminate\Database\DatabaseServiceProvider::class,
Illuminate\Database\MigrationServiceProvider::class,
Illuminate\Encryption\EncryptionServiceProvider::class,
Illuminate\Foundation\Providers\ComposerServiceProvider::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\Routing\RoutingServiceProvider::class,
Illuminate\Auth\Passwords\PasswordResetServiceProvider::class,
Illuminate\Session\SessionServiceProvider::class,
Illuminate\Translation\TranslationServiceProvider::class,
Illuminate\Validation\ValidationServiceProvider::class,
Roots\Acorn\Assets\AssetsServiceProvider::class,
Roots\Acorn\Filesystem\FilesystemServiceProvider::class,
Roots\Acorn\Providers\AcornServiceProvider::class,
Roots\Acorn\Providers\RouteServiceProvider::class,
Roots\Acorn\View\ViewServiceProvider::class,

'providers' => ServiceProvider::defaultProviders()->merge([
/*
* Package Service Providers...
*/
Expand All @@ -194,8 +166,7 @@
* Application Service Providers...
*/
// App\Providers\ThemeServiceProvider::class,

],
])->toArray(),

/*
|--------------------------------------------------------------------------
Expand All @@ -209,7 +180,7 @@
*/

'aliases' => Facade::defaultAliases()->merge([
// 'ExampleClass' => App\Example\ExampleClass::class,
// 'Example' => App\Facades\Example::class,
])->toArray(),

];
8 changes: 6 additions & 2 deletions config/auth.php
Original file line number Diff line number Diff line change
Expand Up @@ -80,16 +80,20 @@
| than one user table or model in the application and you want to have
| separate password reset settings based on the specific user types.
|
| The expire time is the number of minutes that the reset token should be
| The expiry time is the number of minutes that each reset token will be
| considered valid. This security feature keeps tokens short-lived so
| they have less time to be guessed. You may change this as needed.
|
| The throttle setting is the number of seconds a user must wait before
| generating more password reset tokens. This prevents the user from
| quickly generating a very large amount of password reset tokens.
|
*/

'passwords' => [
'users' => [
'provider' => 'users',
'table' => 'password_resets',
'table' => 'password_reset_tokens',
'expire' => 60,
'throttle' => 60,
],
Expand Down
1 change: 1 addition & 0 deletions config/broadcasting.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
'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'),
Expand Down
1 change: 1 addition & 0 deletions config/cache.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
'file' => [
'driver' => 'file',
'path' => storage_path('framework/cache/data'),
'lock_path' => storage_path('framework/cache/data'),
],

'memcached' => [
Expand Down
4 changes: 3 additions & 1 deletion config/hashing.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
*/

'bcrypt' => [
'rounds' => env('BCRYPT_ROUNDS', 10),
'rounds' => env('BCRYPT_ROUNDS', 12),
'verify' => true,
],

/*
Expand All @@ -47,6 +48,7 @@
'memory' => 65536,
'threads' => 1,
'time' => 4,
'verify' => true,
],

];
9 changes: 9 additions & 0 deletions config/logging.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
use Monolog\Handler\NullHandler;
use Monolog\Handler\StreamHandler;
use Monolog\Handler\SyslogUdpHandler;
use Monolog\Processor\PsrLogMessageProcessor;

return [

Expand Down Expand Up @@ -61,13 +62,15 @@
'driver' => 'single',
'path' => storage_path('logs/application.log'),
'level' => env('LOG_LEVEL', 'debug'),
'replace_placeholders' => true,
],

'daily' => [
'driver' => 'daily',
'path' => storage_path('logs/application.log'),
'level' => env('LOG_LEVEL', 'debug'),
'days' => 14,
'replace_placeholders' => true,
],

'slack' => [
Expand All @@ -76,6 +79,7 @@
'username' => 'Application Log',
'emoji' => ':boom:',
'level' => env('LOG_LEVEL', 'critical'),
'replace_placeholders' => true,
],

'papertrail' => [
Expand All @@ -87,6 +91,7 @@
'port' => env('PAPERTRAIL_PORT'),
'connectionString' => 'tls://'.env('PAPERTRAIL_URL').':'.env('PAPERTRAIL_PORT'),
],
'processors' => [PsrLogMessageProcessor::class],
],

'stderr' => [
Expand All @@ -97,16 +102,20 @@
'with' => [
'stream' => 'php://stderr',
],
'processors' => [PsrLogMessageProcessor::class],
],

'syslog' => [
'driver' => 'syslog',
'level' => env('LOG_LEVEL', 'debug'),
'facility' => LOG_USER,
'replace_placeholders' => true,
],

'errorlog' => [
'driver' => 'errorlog',
'level' => env('LOG_LEVEL', 'debug'),
'replace_placeholders' => true,
],

'null' => [
Expand Down
10 changes: 9 additions & 1 deletion config/mail.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,15 @@
| while sending an e-mail. You will specify which one you are using for
| your mailers below. You are free to add additional mailers as required.
|
| Supported: "smtp", "sendmail", "mailgun", "ses",
| Supported: "smtp", "sendmail", "mailgun", "ses", "ses-v2",
| "postmark", "log", "array", "failover"
|
*/

'mailers' => [
'smtp' => [
'transport' => 'smtp',
'url' => env('MAIL_URL'),
'host' => env('MAIL_HOST', 'smtp.mailgun.org'),
'port' => env('MAIL_PORT', 587),
'encryption' => env('MAIL_ENCRYPTION', 'tls'),
Expand All @@ -51,10 +52,17 @@

'mailgun' => [
'transport' => 'mailgun',
// 'client' => [
// 'timeout' => 5,
// ],
],

'postmark' => [
'transport' => 'postmark',
// 'message_stream_id' => null,
// 'client' => [
// 'timeout' => 5,
// ],
],

'sendmail' => [
Expand Down
16 changes: 16 additions & 0 deletions config/queue.php
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,22 @@

],

/*
|--------------------------------------------------------------------------
| Job Batching
|--------------------------------------------------------------------------
|
| The following options configure the database and table that store job
| batching information. These options can be updated to any database
| connection and table which has been defined by your application.
|
*/

'batching' => [
'database' => env('DB_CONNECTION', 'mysql'),
'table' => 'job_batches',
],

/*
|--------------------------------------------------------------------------
| Failed Queue Jobs
Expand Down
22 changes: 19 additions & 3 deletions config/sanctum.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,28 @@ class_exists(Sanctum::class)
|--------------------------------------------------------------------------
|
| This value controls the number of minutes until an issued token will be
| considered expired. If this value is null, personal access tokens do
| not expire. This won't tweak the lifetime of first-party sessions.
| considered expired. This will override any values set in the token's
| "expires_at" attribute, but first-party sessions are not affected.
|
*/

'expiration' => null,

/*
|--------------------------------------------------------------------------
| Token Prefix
|--------------------------------------------------------------------------
|
| Sanctum can prefix new tokens in order to take advantage of various
| security scanning initiaives maintained by open source platforms
| that alert developers if they commit tokens into repositories.
|
| See: https://docs.github.com/en/code-security/secret-scanning/about-secret-scanning
|
*/

'token_prefix' => env('SANCTUM_TOKEN_PREFIX', ''),

/*
|--------------------------------------------------------------------------
| Sanctum Middleware
Expand All @@ -62,8 +77,9 @@ class_exists(Sanctum::class)
*/

'middleware' => [
'verify_csrf_token' => App\Http\Middleware\VerifyCsrfToken::class,
'authenticate_session' => Laravel\Sanctum\Http\Middleware\AuthenticateSession::class,
'encrypt_cookies' => App\Http\Middleware\EncryptCookies::class,
'verify_csrf_token' => App\Http\Middleware\VerifyCsrfToken::class,
],

];
Loading
Loading