Skip to content

Commit 7053ad3

Browse files
author
DKravtsov
committed
Updated framework, packages, added composer tools.
1 parent 68f8b61 commit 7053ad3

39 files changed

+7023
-2169
lines changed

‎.env.dev

+8-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,13 @@ AWS_USE_PATH_STYLE_ENDPOINT=false
4646
PUSHER_APP_ID=
4747
PUSHER_APP_KEY=
4848
PUSHER_APP_SECRET=
49+
PUSHER_HOST=
50+
PUSHER_PORT=443
51+
PUSHER_SCHEME=https
4952
PUSHER_APP_CLUSTER=mt1
5053

51-
MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
52-
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
54+
VITE_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
55+
VITE_PUSHER_HOST="${PUSHER_HOST}"
56+
VITE_PUSHER_PORT="${PUSHER_PORT}"
57+
VITE_PUSHER_SCHEME="${PUSHER_SCHEME}"
58+
VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"

‎.env.prod

+9-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ DB_PASSWORD=secret
1515

1616
BROADCAST_DRIVER=log
1717
CACHE_DRIVER=file
18-
FILESYSTEM_DRIVER=local
18+
FILESYSTEM_DISK=local
1919
QUEUE_CONNECTION=sync
2020
SESSION_DRIVER=file
2121
SESSION_LIFETIME=120
@@ -44,7 +44,13 @@ AWS_USE_PATH_STYLE_ENDPOINT=false
4444
PUSHER_APP_ID=
4545
PUSHER_APP_KEY=
4646
PUSHER_APP_SECRET=
47+
PUSHER_HOST=
48+
PUSHER_PORT=443
49+
PUSHER_SCHEME=https
4750
PUSHER_APP_CLUSTER=mt1
4851

49-
MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
50-
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
52+
VITE_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
53+
VITE_PUSHER_HOST="${PUSHER_HOST}"
54+
VITE_PUSHER_PORT="${PUSHER_PORT}"
55+
VITE_PUSHER_SCHEME="${PUSHER_SCHEME}"
56+
VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"

‎.env.staging

+9-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ DB_PASSWORD=secret
1515

1616
BROADCAST_DRIVER=log
1717
CACHE_DRIVER=file
18-
FILESYSTEM_DRIVER=local
18+
FILESYSTEM_DISK=local
1919
QUEUE_CONNECTION=sync
2020
SESSION_DRIVER=file
2121
SESSION_LIFETIME=120
@@ -44,7 +44,13 @@ AWS_USE_PATH_STYLE_ENDPOINT=false
4444
PUSHER_APP_ID=
4545
PUSHER_APP_KEY=
4646
PUSHER_APP_SECRET=
47+
PUSHER_HOST=
48+
PUSHER_PORT=443
49+
PUSHER_SCHEME=https
4750
PUSHER_APP_CLUSTER=mt1
4851

49-
MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
50-
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
52+
VITE_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
53+
VITE_PUSHER_HOST="${PUSHER_HOST}"
54+
VITE_PUSHER_PORT="${PUSHER_PORT}"
55+
VITE_PUSHER_SCHEME="${PUSHER_SCHEME}"
56+
VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"

‎.env.test

+9-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ DB_PASSWORD=secret
1515

1616
BROADCAST_DRIVER=log
1717
CACHE_DRIVER=file
18-
FILESYSTEM_DRIVER=local
18+
FILESYSTEM_DISK=local
1919
QUEUE_CONNECTION=sync
2020
SESSION_DRIVER=file
2121
SESSION_LIFETIME=120
@@ -44,7 +44,13 @@ AWS_USE_PATH_STYLE_ENDPOINT=false
4444
PUSHER_APP_ID=
4545
PUSHER_APP_KEY=
4646
PUSHER_APP_SECRET=
47+
PUSHER_HOST=
48+
PUSHER_PORT=443
49+
PUSHER_SCHEME=https
4750
PUSHER_APP_CLUSTER=mt1
4851

49-
MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
50-
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
52+
VITE_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
53+
VITE_PUSHER_HOST="${PUSHER_HOST}"
54+
VITE_PUSHER_PORT="${PUSHER_PORT}"
55+
VITE_PUSHER_SCHEME="${PUSHER_SCHEME}"
56+
VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"

‎.env.test-ci

+9-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ DB_PASSWORD=secret
1616

1717
BROADCAST_DRIVER=log
1818
CACHE_DRIVER=file
19-
FILESYSTEM_DRIVER=local
19+
FILESYSTEM_DISK=local
2020
QUEUE_CONNECTION=sync
2121
SESSION_DRIVER=file
2222
SESSION_LIFETIME=120
@@ -45,7 +45,13 @@ AWS_USE_PATH_STYLE_ENDPOINT=false
4545
PUSHER_APP_ID=
4646
PUSHER_APP_KEY=
4747
PUSHER_APP_SECRET=
48+
PUSHER_HOST=
49+
PUSHER_PORT=443
50+
PUSHER_SCHEME=https
4851
PUSHER_APP_CLUSTER=mt1
4952

50-
MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
51-
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
53+
VITE_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
54+
VITE_PUSHER_HOST="${PUSHER_HOST}"
55+
VITE_PUSHER_PORT="${PUSHER_PORT}"
56+
VITE_PUSHER_SCHEME="${PUSHER_SCHEME}"
57+
VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"

‎.gitattributes

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
* text=auto
2-
*.css linguist-vendored
3-
*.scss linguist-vendored
4-
*.js linguist-vendored
2+
*.blade.php diff=html
3+
*.css diff=css
4+
*.html diff=html
5+
*.md diff=markdown
6+
*.php diff=php
7+
/.github export-ignore
58
CHANGELOG.md export-ignore
9+
.styleci.yml export-ignore
610
tools/**/composer.lock binary
711
composer.lock binary

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
/.vscode
33
/.vagrant
44
/node_modules
5+
/public/build
56
/public/hot
67
/public/storage
78
/storage/*.key
@@ -10,6 +11,7 @@
1011
/tools/**/vendor
1112
Homestead.yaml
1213
Homestead.json
14+
auth.json
1315
.env
1416
_ide_helper.php
1517
.phpstorm.meta.php

‎Makefile

+12
Original file line numberDiff line numberDiff line change
@@ -282,3 +282,15 @@ ifeq ($(INSIDE_DOCKER_CONTAINER), 1)
282282
else
283283
@make exec cmd="make phpinsights"
284284
endif
285+
286+
composer-normalize: ## Normalizes composer.json file content
287+
@make exec cmd="composer normalize"
288+
289+
composer-validate: ## Validate composer.json file content
290+
@make exec cmd="composer validate --no-check-version"
291+
292+
composer-require-checker: ## Check the defined dependencies against your code
293+
@make exec-bash cmd="XDEBUG_MODE=off php ./vendor/bin/composer-require-checker"
294+
295+
composer-unused: ## Show unused packages by scanning and comparing package namespaces against your code
296+
@make exec-bash cmd="XDEBUG_MODE=off php ./vendor/bin/composer-unused"

‎app/Http/Kernel.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class Kernel extends HttpKernel
6262
'can' => \Illuminate\Auth\Middleware\Authorize::class,
6363
'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
6464
'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class,
65-
'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
65+
'signed' => \App\Http\Middleware\ValidateSignature::class,
6666
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
6767
'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
6868
];

‎app/Http/Middleware/ValidateSignature.php

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace App\Http\Middleware;
6+
7+
use Illuminate\Routing\Middleware\ValidateSignature as Middleware;
8+
9+
class ValidateSignature extends Middleware
10+
{
11+
/**
12+
* The names of the query string parameters that should be ignored.
13+
*
14+
* @var array<int, string>
15+
*/
16+
protected $except = [
17+
// 'fbclid',
18+
// 'utm_campaign',
19+
// 'utm_content',
20+
// 'utm_medium',
21+
// 'utm_source',
22+
// 'utm_term',
23+
];
24+
}

‎composer-unused.php

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
use ComposerUnused\ComposerUnused\Configuration\Configuration;
6+
use ComposerUnused\ComposerUnused\Configuration\NamedFilter;
7+
use ComposerUnused\ComposerUnused\Configuration\PatternFilter;
8+
use Webmozart\Glob\Glob;
9+
10+
return static function (Configuration $config): Configuration {
11+
return $config
12+
->addPatternFilter(PatternFilter::fromString('/ext-.*/'))
13+
->addPatternFilter(PatternFilter::fromString('/laravel\/.*/'))
14+
->addNamedFilter(NamedFilter::fromString('guzzlehttp/guzzle'))
15+
->addNamedFilter(NamedFilter::fromString('jaybizzle/laravel-migrations-organiser'))
16+
->setAdditionalFilesFor('icanhazstring/composer-unused', [
17+
__FILE__,
18+
...Glob::glob(__DIR__ . '/config/*.php'),
19+
]);
20+
};

‎composer.json

+6-11
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@
3030
"ext-pdo_mysql": "*",
3131
"guzzlehttp/guzzle": "^7.4",
3232
"jaybizzle/laravel-migrations-organiser": "^6.2",
33-
"laravel/framework": "^9.17",
34-
"laravel/sanctum": "^2.15",
33+
"laravel/framework": "^9.19",
34+
"laravel/sanctum": "^3.0",
3535
"laravel/tinker": "^2.7"
3636
},
3737
"require-dev": {
38-
"bamarni/composer-bin-plugin": "^1.5",
38+
"bamarni/composer-bin-plugin": "^1.8",
3939
"barryvdh/laravel-ide-helper": "^2.12",
40-
"ergebnis/composer-normalize": "^2.28",
4140
"fakerphp/faker": "^1.9",
41+
"laravel/pint": "^1.0",
4242
"laravel/sail": "^1.0",
4343
"mockery/mockery": "^1.4",
4444
"neronmoon/scriptsdev": "^0.1",
@@ -53,12 +53,7 @@
5353
},
5454
"preferred-install": "dist",
5555
"sort-packages": true,
56-
"allow-plugins": {
57-
"bamarni/composer-bin-plugin": true,
58-
"composer/package-versions-deprecated": true,
59-
"ergebnis/composer-normalize": true,
60-
"neronmoon/scriptsdev": true
61-
}
56+
"allow-plugins": true
6257
},
6358
"extra": {
6459
"bamarni-bin": {
@@ -107,7 +102,7 @@
107102
],
108103
"post-update-cmd": [
109104
"if test -d vendor/bamarni/composer-bin-plugin; then composer bin all update; fi",
110-
"@php artisan vendor:publish --tag=laravel-assets --ansi"
105+
"@php artisan vendor:publish --tag=laravel-assets --ansi --force"
111106
],
112107
"post-autoload-dump": [
113108
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",

0 commit comments

Comments
 (0)