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 9 Mid-Shift #11

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open
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
2 changes: 1 addition & 1 deletion app/Http/Kernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class Kernel extends HttpKernel
protected $middleware = [
// \App\Http\Middleware\TrustHosts::class,
\App\Http\Middleware\TrustProxies::class,
\Fruitcake\Cors\HandleCors::class,
\Illuminate\Http\Middleware\HandleCors::class,
\App\Http\Middleware\PreventRequestsDuringMaintenance::class,
\Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
\App\Http\Middleware\TrimStrings::class,
Expand Down
22 changes: 22 additions & 0 deletions app/Http/Middleware/ValidateSignature.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?php

namespace App\Http\Middleware;

use Illuminate\Routing\Middleware\ValidateSignature as Middleware;

class ValidateSignature extends Middleware
{
/**
* The names of the query string parameters that should be ignored.
*
* @var array<int, string>
*/
protected $except = [
// 'fbclid',
// 'utm_campaign',
// 'utm_content',
// 'utm_medium',
// 'utm_source',
// 'utm_term',
];
}
61 changes: 30 additions & 31 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,64 +9,63 @@
"license": "MIT",
"require": {
"php": "^8.1",
"asantibanez/livewire-charts": "^2.3.0",
"asantibanez/livewire-charts": "^2.4",
"blade-ui-kit/blade-heroicons": "^1.3.0",
"blade-ui-kit/blade-icons": "^1.2.0",
"blade-ui-kit/blade-icons": "^1.4",
"blade-ui-kit/blade-ui-kit": "^0.3.3",
"butschster/meta-tags": "^2.1",
"butschster/meta-tags": "^2.2",
"calebporzio/sushi": "^v2.4.0",
"fruitcake/laravel-cors": "^v2.0.5",
"guzzlehttp/guzzle": "^7.4.1",
"hammerstone/sidecar": "^v0.3.8",
"jantinnerezo/livewire-alert": "^2.2.3",
"laravel/framework": "^9.0",
"laravel/jetstream": "^2.6.3",
"laravel/octane": "^1.2.0",
"laravel/sanctum": "^v2.14.0",
"laravel/framework": "^9.35",
"laravel/jetstream": "^2.12",
"laravel/octane": "^1.3",
"laravel/sanctum": "^3.0",
"laravel/tinker": "^v2.7.0",
"laravel/vapor-core": "^v2.19.1",
"league/flysystem-aws-s3-v3": "^3.0",
"laravel/vapor-core": "^2.24",
"league/flysystem-aws-s3-v3": "^3.5",
"livewire/livewire": "^v2.10.1",
"lostlink/laravel-robots": "^4.0.0",
"pestphp/pest": "^v1.21.1",
"pestphp/pest-plugin-laravel": "^v1.2.0",
"pestphp/pest": "^1.22",
"pestphp/pest-plugin-laravel": "^1.3",
"power-components/livewire-powergrid": "^v1.5.1",
"romanzipp/laravel-seo": "^2.3.0",
"sentry/sentry-laravel": "^2.11.0",
"spatie/browsershot": "^3.52.3",
"romanzipp/laravel-seo": "^2.5",
"sentry/sentry-laravel": "^2.14",
"spatie/browsershot": "^3.57",
"spatie/crypto": "^2.0.0",
"spatie/laravel-activitylog": "^4.4.0",
"spatie/laravel-medialibrary": "^10.0",
"spatie/laravel-activitylog": "^4.6",
"spatie/laravel-medialibrary": "^10.5",
"spatie/laravel-medialibrary-pro": "^2.1.0",
"spatie/laravel-ray": "^1.29.0",
"spatie/laravel-sitemap": "^6.1.0",
"spatie/laravel-sluggable": "^3.3.0",
"staudenmeir/eloquent-has-many-deep": "^1.15",
"spatie/laravel-ray": "^1.31",
"spatie/laravel-sitemap": "^6.2",
"spatie/laravel-sluggable": "^3.4",
"staudenmeir/eloquent-has-many-deep": "^1.16",
"wire-elements/modal": "^1.0.4",
"wnx/sidecar-browsershot": "dev-main"
},
"require-dev": {
"barryvdh/laravel-debugbar": "^v3.6.5",
"barryvdh/laravel-debugbar": "^3.7",
"barryvdh/laravel-ide-helper": "^2.12",
"brainmaestro/composer-git-hooks": "dev-master",
"fakerphp/faker": "^v1.17.0",
"friendsofphp/php-cs-fixer": "^3.6",
"friendsofphp/php-cs-fixer": "^3.12",
"laravel-json-api/testing": "^v1.0.0",
"laravel/sail": "^v1.13.1",
"laravel/vapor-cli": "^v1.36.0",
"laravel/sail": "^1.16",
"laravel/vapor-cli": "^1.44",
"mockery/mockery": "^1.5.0",
"nunomaduro/collision": "^6.1",
"nunomaduro/larastan": "^2.0",
"nunomaduro/collision": "^6.3",
"nunomaduro/larastan": "^2.2",
"pestphp/pest-plugin-livewire": "^v1.0.0",
"phpmd/phpmd": "dev-master",
"phpstan/phpstan": "^1.4.2",
"phpstan/phpstan": "^1.8",
"phpunit/phpunit": "^9.5.12",
"roave/security-advisories": "dev-latest",
"squizlabs/php_codesniffer": "^3.6.2",
"squizlabs/php_codesniffer": "^3.7",
"tightenco/duster": "^v0.3.2",
"tightenco/tighten-coding-standard": "^v1.0.2",
"tightenco/tlint": "^v6.2.1",
"spatie/laravel-ignition": "^1.0"
"tightenco/tlint": "^6.3",
"spatie/laravel-ignition": "^1.5"
},
"autoload": {
"files": [
Expand Down
18 changes: 18 additions & 0 deletions config/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,24 @@

'cipher' => 'AES-256-CBC',

/*
|--------------------------------------------------------------------------
| Maintenance Mode Driver
|--------------------------------------------------------------------------
|
| These configuration options determine the driver used to determine and
| manage Laravel's "maintenance mode" status. The "cache" driver will
| allow maintenance mode to be controlled across multiple machines.
|
| Supported drivers: "file", "cache"
|
*/

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

/*
|--------------------------------------------------------------------------
| Autoloaded Service Providers
Expand Down
7 changes: 5 additions & 2 deletions config/broadcasting.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,11 @@
'secret' => env('PUSHER_APP_SECRET'),
'app_id' => env('PUSHER_APP_ID'),
'options' => [
'cluster' => env('PUSHER_APP_CLUSTER'),
'useTLS' => true,
'host' => env('PUSHER_HOST', 'api-' . env('PUSHER_APP_CLUSTER', 'mt1') . '.pusher.com') ?: '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
Expand Down
5 changes: 4 additions & 1 deletion config/filesystems.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
|
| Here you may configure as many filesystem "disks" as you wish, and you
| may even configure multiple disks of the same driver. Defaults have
| been setup for each driver as an example of the required options.
| been set up for each driver as an example of the required values.
|
| Supported Drivers: "local", "ftp", "sftp", "s3"
|
Expand All @@ -33,13 +33,15 @@
'local' => [
'driver' => 'local',
'root' => storage_path('app'),
'throw' => false,
],

'public' => [
'driver' => 'local',
'root' => storage_path('app/public'),
'url' => env('APP_URL') . '/storage',
'visibility' => 'public',
'throw' => false,
],

's3' => [
Expand All @@ -51,6 +53,7 @@
'url' => env('AWS_URL'),
'endpoint' => env('AWS_ENDPOINT'),
'use_path_style_endpoint' => env('AWS_USE_PATH_STYLE_ENDPOINT', false),
'throw' => false,
],

],
Expand Down
5 changes: 4 additions & 1 deletion config/logging.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,10 @@
|
*/

'deprecations' => env('LOG_DEPRECATIONS_CHANNEL', 'null'),
'deprecations' => [
'channel' => env('LOG_DEPRECATIONS_CHANNEL', 'null'),
'trace' => false,
],

/*
|--------------------------------------------------------------------------
Expand Down
3 changes: 2 additions & 1 deletion config/mail.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
'username' => env('MAIL_USERNAME'),
'password' => env('MAIL_PASSWORD'),
'timeout' => null,
'local_domain' => env('MAIL_EHLO_DOMAIN'),
],

'ses' => [
Expand All @@ -58,7 +59,7 @@

'sendmail' => [
'transport' => 'sendmail',
'path' => env('MAIL_SENDMAIL_PATH', '/usr/sbin/sendmail -t -i'),
'path' => env('MAIL_SENDMAIL_PATH', '/usr/sbin/sendmail -bs -i'),
],

'log' => [
Expand Down
4 changes: 3 additions & 1 deletion config/sanctum.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

use Laravel\Sanctum\Sanctum;

return [

/*
Expand All @@ -16,7 +18,7 @@
'stateful' => explode(',', env('SANCTUM_STATEFUL_DOMAINS', sprintf(
'%s%s',
'localhost,localhost:3000,127.0.0.1,127.0.0.1:8000,::1',
env('APP_URL') ? ',' . parse_url(env('APP_URL'), PHP_URL_HOST) : ''
Sanctum::currentApplicationUrlWithPort()
))),

/*
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?php

use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

return new class extends Migration {
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('personal_access_tokens', function (Blueprint $table) {
$table->timestamp('expires_at')->nullable()->after('last_used_at');
});
}

/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('personal_access_tokens', function (Blueprint $table) {
$table->dropColumn('expires_at');
});
}
};
7 changes: 0 additions & 7 deletions lang/en.json

This file was deleted.

13 changes: 12 additions & 1 deletion lang/en/validation.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@
'digits_between' => 'The :attribute must be between :min and :max digits.',
'dimensions' => 'The :attribute has invalid image dimensions.',
'distinct' => 'The :attribute field has a duplicate value.',
'doesnt_end_with' => 'The :attribute may not end with one of the following: :values.',
'doesnt_start_with' => 'The :attribute may not start with one of the following: :values.',
'email' => 'The :attribute must be a valid email address.',
'ends_with' => 'The :attribute must end with one of the following: :values.',
'enum' => 'The selected :attribute is invalid.',
Expand Down Expand Up @@ -88,6 +90,7 @@
'numeric' => 'The :attribute must not be greater than :max.',
'string' => 'The :attribute must not be greater than :max characters.',
],
'max_digits' => 'The :attribute must not have more than :max digits.',
'mimes' => 'The :attribute must be a file of type: :values.',
'mimetypes' => 'The :attribute must be a file of type: :values.',
'min' => [
Expand All @@ -96,11 +99,18 @@
'numeric' => 'The :attribute must be at least :min.',
'string' => 'The :attribute must be at least :min characters.',
],
'min_digits' => 'The :attribute must have at least :min digits.',
'multiple_of' => 'The :attribute must be a multiple of :value.',
'not_in' => 'The selected :attribute is invalid.',
'not_regex' => 'The :attribute format is invalid.',
'numeric' => 'The :attribute must be a number.',
'password' => 'The password is incorrect.',
'password' => [
'letters' => 'The :attribute must contain at least one letter.',
'mixed' => 'The :attribute must contain at least one uppercase and one lowercase letter.',
'numbers' => 'The :attribute must contain at least one number.',
'symbols' => 'The :attribute must contain at least one symbol.',
'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
],
'present' => 'The :attribute field must be present.',
'prohibited' => 'The :attribute field is prohibited.',
'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
Expand All @@ -110,6 +120,7 @@
'required' => 'The :attribute field is required.',
'required_array_keys' => 'The :attribute field must contain entries for: :values.',
'required_if' => 'The :attribute field is required when :other is :value.',
'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
'required_unless' => 'The :attribute field is required unless :other is in :values.',
'required_with' => 'The :attribute field is required when :values is present.',
'required_with_all' => 'The :attribute field is required when :values are present.',
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"@tailwindcss/typography": "^0.5.0",
"alpinejs": "^3.0.6",
"autoprefixer": "^10.4.0",
"axios": "^0.25",
"axios": "^0.27",
"copy-webpack-plugin": "^10.2.0",
"husky": "^7.0.4",
"imagemin-gifsicle": "^7.0.0",
Expand Down