Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 139ae1a

Browse files
author
DKravtsov
committedJan 21, 2023
Php 8.2, Laravel 9.48, updated composer dependencies.
1 parent d01007a commit 139ae1a

29 files changed

+2303
-1784
lines changed
 

‎Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:8.1-apache
1+
FROM php:8.2-apache
22

33
# set main params
44
ARG BUILD_ARGUMENT_ENV=dev

‎composer.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
}
2222
],
2323
"require": {
24-
"php": "^8.1",
24+
"php": "^8.2",
2525
"ext-ctype": "*",
2626
"ext-iconv": "*",
2727
"ext-json": "*",
@@ -30,7 +30,7 @@
3030
"ext-pdo_mysql": "*",
3131
"guzzlehttp/guzzle": "^7.5",
3232
"jaybizzle/laravel-migrations-organiser": "^6.2",
33-
"laravel/framework": "^9.39",
33+
"laravel/framework": "^9.48",
3434
"laravel/sanctum": "^3.0",
3535
"laravel/tinker": "^2.7"
3636
},
@@ -49,7 +49,7 @@
4949
"config": {
5050
"optimize-autoloader": true,
5151
"platform": {
52-
"php": "8.1.0"
52+
"php": "8.2.0"
5353
},
5454
"preferred-install": "dist",
5555
"sort-packages": true,

‎composer.lock

+423-445
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/broadcasting.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
'secret' => env('PUSHER_APP_SECRET'),
3737
'app_id' => env('PUSHER_APP_ID'),
3838
'options' => [
39-
'host' => env('PUSHER_HOST', 'api-' . env('PUSHER_APP_CLUSTER', 'mt1') . '.pusher.com') ?: 'api-' . env('PUSHER_APP_CLUSTER', 'mt1') . '.pusher.com',
39+
'host' => env('PUSHER_HOST') ?: 'api-'.env('PUSHER_APP_CLUSTER', 'mt1').'.pusher.com',
4040
'port' => env('PUSHER_PORT', 443),
4141
'scheme' => env('PUSHER_SCHEME', 'https'),
4242
'encrypted' => true,

‎database/migrations/2014/10/2014_10_12_100000_create_password_resets_table.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
public function up()
1515
{
1616
Schema::create('password_resets', function (Blueprint $table) {
17-
$table->string('email')->index();
17+
$table->string('email')->primary();
1818
$table->string('token');
1919
$table->timestamp('created_at')->nullable();
2020
});

‎docs/development.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ Rector instantly upgrades and refactors the PHP code of your application. It can
132132
- Instant upgrades
133133
- Automated refactoring
134134

135-
Rector now supports upgrades of your code from PHP 5.3 to 8.1 or upgrades your code for new framework version. This tool supports major open-source projects like Symfony, PHPUnit, Nette, Laravel, CakePHP and Doctrine.
135+
Rector now supports upgrades of your code from PHP 5.3 to 8.2 or upgrades your code for new framework version. This tool supports major open-source projects like Symfony, PHPUnit, Nette, Laravel, CakePHP and Doctrine.
136136
You can find live demo [here](https://symfonycasts.com/screencast/symfony6-upgrade/rector) or more info [here](https://packagist.org/packages/rector/rector).
137137

138138
Rector is available for test/dev environment. If you need to run this tool, please use next local shell command in order to enter inside laravel container shell and then run rector:

‎lang/en/validation.php

+5
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
'alpha_dash' => 'The :attribute must only contain letters, numbers, dashes and underscores.',
2323
'alpha_num' => 'The :attribute must only contain letters and numbers.',
2424
'array' => 'The :attribute must be an array.',
25+
'ascii' => 'The :attribute must only contain single-byte alphanumeric characters and symbols.',
2526
'before' => 'The :attribute must be a date before :date.',
2627
'before_or_equal' => 'The :attribute must be a date before or equal to :date.',
2728
'between' => [
@@ -36,6 +37,7 @@
3637
'date' => 'The :attribute is not a valid date.',
3738
'date_equals' => 'The :attribute must be a date equal to :date.',
3839
'date_format' => 'The :attribute does not match the format :format.',
40+
'decimal' => 'The :attribute must have :decimal decimal places.',
3941
'declined' => 'The :attribute must be declined.',
4042
'declined_if' => 'The :attribute must be declined when :other is :value.',
4143
'different' => 'The :attribute and :other must be different.',
@@ -71,6 +73,7 @@
7173
'ipv4' => 'The :attribute must be a valid IPv4 address.',
7274
'ipv6' => 'The :attribute must be a valid IPv6 address.',
7375
'json' => 'The :attribute must be a valid JSON string.',
76+
'lowercase' => 'The :attribute must be lowercase.',
7477
'lt' => [
7578
'array' => 'The :attribute must have less than :value items.',
7679
'file' => 'The :attribute must be less than :value kilobytes.',
@@ -138,7 +141,9 @@
138141
'timezone' => 'The :attribute must be a valid timezone.',
139142
'unique' => 'The :attribute has already been taken.',
140143
'uploaded' => 'The :attribute failed to upload.',
144+
'uppercase' => 'The :attribute must be uppercase.',
141145
'url' => 'The :attribute must be a valid URL.',
146+
'ulid' => 'The :attribute must be a valid ULID.',
142147
'uuid' => 'The :attribute must be a valid UUID.',
143148

144149
/*

‎package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
"build": "vite build"
66
},
77
"devDependencies": {
8-
"axios": "^0.27",
9-
"laravel-vite-plugin": "^0.6.0",
8+
"axios": "^1.1.2",
9+
"laravel-vite-plugin": "^0.7.2",
1010
"lodash": "^4.17.19",
1111
"postcss": "^8.1.14",
12-
"vite": "^3.0.0"
12+
"vite": "^4.0.0"
1313
}
1414
}

‎readme.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Note: OS recommendation - Linux Ubuntu based.
2020

2121
## Components
2222
1. Apache 2.4
23-
2. PHP 8.1 (Apache handler)
23+
2. PHP 8.2 (Apache handler)
2424
3. MySQL 8
2525
4. Laravel 9
2626

‎resources/js/bootstrap.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
2626
// window.Echo = new Echo({
2727
// broadcaster: 'pusher',
2828
// key: import.meta.env.VITE_PUSHER_APP_KEY,
29-
// wsHost: import.meta.env.VITE_PUSHER_HOST ?? `ws-${import.meta.env.VITE_PUSHER_APP_CLUSTER}.pusher.com`,
29+
// cluster: import.meta.env.VITE_PUSHER_APP_CLUSTER ?? 'mt1',
30+
// wsHost: import.meta.env.VITE_PUSHER_HOST ? import.meta.env.VITE_PUSHER_HOST : `ws-${import.meta.env.VITE_PUSHER_APP_CLUSTER}.pusher.com`,
3031
// wsPort: import.meta.env.VITE_PUSHER_PORT ?? 80,
3132
// wssPort: import.meta.env.VITE_PUSHER_PORT ?? 443,
3233
// forceTLS: (import.meta.env.VITE_PUSHER_SCHEME ?? 'https') === 'https',

‎resources/views/welcome.blade.php

+9-9
Large diffs are not rendered by default.

‎tools/01_phpunit/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"config": {
1010
"allow-plugins": true,
1111
"platform": {
12-
"php": "8.1.0"
12+
"php": "8.2.0"
1313
},
1414
"preferred-install": {
1515
"*": "dist"

‎tools/01_phpunit/composer.lock

+96-69
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tools/02_phpstan/composer.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
"description": "",
44
"require": {},
55
"require-dev": {
6-
"laravel/framework": "^9.39",
7-
"nunomaduro/larastan": "2.2.*",
6+
"laravel/framework": "^9.48",
7+
"nunomaduro/larastan": "2.4.*",
88
"roave/security-advisories": "dev-latest"
99
},
1010
"config": {
1111
"allow-plugins": true,
1212
"platform": {
13-
"php": "8.1.0"
13+
"php": "8.2.0"
1414
},
1515
"preferred-install": {
1616
"*": "dist"

‎tools/02_phpstan/composer.lock

+410-501
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tools/03_ecs/composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
"require": {},
55
"require-dev": {
66
"friendsofphp/php-cs-fixer": "3.13.*",
7-
"symplify/easy-coding-standard": "11.1.*",
7+
"symplify/easy-coding-standard": "11.2.*",
88
"roave/security-advisories": "dev-latest"
99
},
1010
"config": {
1111
"allow-plugins": true,
1212
"platform": {
13-
"php": "8.1.0"
13+
"php": "8.2.0"
1414
},
1515
"preferred-install": {
1616
"*": "dist"

‎tools/03_ecs/composer.lock

+212-140
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tools/04_php-coveralls/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"config": {
1010
"allow-plugins": true,
1111
"platform": {
12-
"php": "8.1.0"
12+
"php": "8.2.0"
1313
},
1414
"preferred-install": {
1515
"*": "dist"

‎tools/04_php-coveralls/composer.lock

+111-83
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tools/05_phpinsights/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"config": {
1010
"allow-plugins": true,
1111
"platform": {
12-
"php": "8.1.0"
12+
"php": "8.2.0"
1313
},
1414
"preferred-install": {
1515
"*": "dist"

‎tools/05_phpinsights/composer.lock

+246-167
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tools/06_phpmd/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"config": {
1010
"allow-plugins": true,
1111
"platform": {
12-
"php": "8.1.0"
12+
"php": "8.2.0"
1313
},
1414
"preferred-install": {
1515
"*": "dist"

‎tools/06_phpmd/composer.lock

+173-72
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tools/07_phpmetrics/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"config": {
1010
"allow-plugins": true,
1111
"platform": {
12-
"php": "8.1.0"
12+
"php": "8.2.0"
1313
},
1414
"preferred-install": {
1515
"*": "dist"

‎tools/07_phpmetrics/composer.lock

+70-43
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tools/08_rector/composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
"description": "",
44
"require": {},
55
"require-dev": {
6-
"rector/rector": "0.14.*",
6+
"rector/rector": "0.15.*",
77
"roave/security-advisories": "dev-latest"
88
},
99
"config": {
1010
"allow-plugins": true,
1111
"platform": {
12-
"php": "8.1.0"
12+
"php": "8.2.0"
1313
},
1414
"preferred-install": {
1515
"*": "dist"

‎tools/08_rector/composer.lock

+77-51
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tools/09_composer/composer.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
"description": "",
44
"require": {},
55
"require-dev": {
6-
"ergebnis/composer-normalize": "^2.28",
6+
"ergebnis/composer-normalize": "^2.29",
77
"icanhazstring/composer-unused": "^0.8",
8-
"maglnet/composer-require-checker": "^4.2",
8+
"maglnet/composer-require-checker": "^4.5",
99
"roave/security-advisories": "dev-latest"
1010
},
1111
"config": {
1212
"allow-plugins": true,
1313
"platform": {
14-
"php": "8.1.0"
14+
"php": "8.2.0"
1515
},
1616
"preferred-install": {
1717
"*": "dist"

‎tools/09_composer/composer.lock

+443-177
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
Please sign in to comment.