Skip to content

Commit e4e74e5

Browse files
author
DKravtsov
committed
Laravel 12. Updated composer dependencies, xdebug and phpcpd. MySQL 8.4.4.
1 parent 9cda7d9 commit e4e74e5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+4876
-3241
lines changed

Diff for: .circleci/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
make phpmd
6565
6666
- run:
67-
name: Run PHP copy past detector
67+
name: Run PHP copy paste detector
6868
command: |
6969
make phpcpd
7070

Diff for: .env.dev

+6-4
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ WEB_PORT_SSL=443
77
# XDEBUG_CONFIG possible values: main|osx. Use main value for Linux and Windows, osx value for MacOS.
88
XDEBUG_CONFIG=main
99
# Sometimes we need to use different xdebug versions, list of versions can be found here - https://pecl.php.net/package/xdebug
10-
XDEBUG_VERSION=3.4.0
10+
XDEBUG_VERSION=3.4.2
1111
###< XDebug docker configuration ###
1212

1313
###> MySQL docker configuration. ###
14-
# MySQL version, recommend values: 9.1.0|9.0.1|8.4.3|8.3.0|8.2.0|8.1.0|8.0.39
15-
MYSQL_VERSION=8.4.3
14+
# MySQL version, recommend values: 9.1.0|9.0.1|8.4.4|8.3.0|8.2.0|8.1.0|8.0.39
15+
MYSQL_VERSION=8.4.4
1616
# MySQL INNODB_USE_NATIVE_AIO possible values: 1|0. Set to 0 when AIO interface is not supported on OSX. https://dev.mysql.com/doc/refman/8.0/en/innodb-parameters.html#sysvar_innodb_use_native_aio
1717
INNODB_USE_NATIVE_AIO=1
1818
# Sometimes AWS MySQL RDS has SQL_MODE="NO_ENGINE_SUBSTITUTION" (https://github.com/awsdocs/amazon-rds-user-guide/issues/160) but MySQL default described here - https://dev.mysql.com/doc/refman/8.0/en/server-system-variables.html#sysvar_sql_mode
@@ -35,6 +35,8 @@ APP_FAKER_LOCALE=en_US
3535
APP_MAINTENANCE_DRIVER=file
3636
APP_MAINTENANCE_STORE=database
3737

38+
PHP_CLI_SERVER_WORKERS=4
39+
3840
BCRYPT_ROUNDS=12
3941

4042
LOG_CHANNEL=stack
@@ -70,11 +72,11 @@ REDIS_PASSWORD=null
7072
REDIS_PORT=6379
7173

7274
MAIL_MAILER=smtp
75+
MAIL_SCHEME=null
7376
MAIL_HOST=mail
7477
MAIL_PORT=1025
7578
MAIL_USERNAME=null
7679
MAIL_PASSWORD=null
77-
MAIL_ENCRYPTION=null
7880
MAIL_FROM_ADDRESS="[email protected]"
7981
MAIL_FROM_NAME="${APP_NAME}"
8082

Diff for: .env.prod

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ WEB_PORT_SSL=443
44
###< Apache docker configuration ###
55

66
###> MySQL docker configuration. ###
7-
# MySQL version, recommend values: 9.1.0|9.0.1|8.4.3|8.3.0|8.2.0|8.1.0|8.0.39
8-
MYSQL_VERSION=8.4.3
7+
# MySQL version, recommend values: 9.1.0|9.0.1|8.4.4|8.3.0|8.2.0|8.1.0|8.0.39
8+
MYSQL_VERSION=8.4.4
99
# MySQL INNODB_USE_NATIVE_AIO possible values: 1|0. Set to 0 when AIO interface is not supported on OSX. https://dev.mysql.com/doc/refman/8.0/en/innodb-parameters.html#sysvar_innodb_use_native_aio
1010
INNODB_USE_NATIVE_AIO=1
1111
# Sometimes AWS MySQL RDS has SQL_MODE="NO_ENGINE_SUBSTITUTION" (https://github.com/awsdocs/amazon-rds-user-guide/issues/160) but MySQL default described here - https://dev.mysql.com/doc/refman/8.0/en/server-system-variables.html#sysvar_sql_mode
@@ -63,11 +63,11 @@ REDIS_PASSWORD=null
6363
REDIS_PORT=6379
6464

6565
MAIL_MAILER=smtp
66+
MAIL_SCHEME=null
6667
MAIL_HOST=mail
6768
MAIL_PORT=1025
6869
MAIL_USERNAME=null
6970
MAIL_PASSWORD=null
70-
MAIL_ENCRYPTION=null
7171
MAIL_FROM_ADDRESS=null
7272
MAIL_FROM_NAME="${APP_NAME}"
7373

Diff for: .env.staging

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ WEB_PORT_SSL=443
44
###< Apache docker configuration ###
55

66
###> MySQL docker configuration. ###
7-
# MySQL version, recommend values: 9.1.0|9.0.1|8.4.3|8.3.0|8.2.0|8.1.0|8.0.39
8-
MYSQL_VERSION=8.4.3
7+
# MySQL version, recommend values: 9.1.0|9.0.1|8.4.4|8.3.0|8.2.0|8.1.0|8.0.39
8+
MYSQL_VERSION=8.4.4
99
# MySQL INNODB_USE_NATIVE_AIO possible values: 1|0. Set to 0 when AIO interface is not supported on OSX. https://dev.mysql.com/doc/refman/8.0/en/innodb-parameters.html#sysvar_innodb_use_native_aio
1010
INNODB_USE_NATIVE_AIO=1
1111
# Sometimes AWS MySQL RDS has SQL_MODE="NO_ENGINE_SUBSTITUTION" (https://github.com/awsdocs/amazon-rds-user-guide/issues/160) but MySQL default described here - https://dev.mysql.com/doc/refman/8.0/en/server-system-variables.html#sysvar_sql_mode
@@ -63,11 +63,11 @@ REDIS_PASSWORD=null
6363
REDIS_PORT=6379
6464

6565
MAIL_MAILER=smtp
66+
MAIL_SCHEME=null
6667
MAIL_HOST=mail
6768
MAIL_PORT=1025
6869
MAIL_USERNAME=null
6970
MAIL_PASSWORD=null
70-
MAIL_ENCRYPTION=null
7171
MAIL_FROM_ADDRESS=null
7272
MAIL_FROM_NAME="${APP_NAME}"
7373

Diff for: .env.test

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ WEB_PORT_SSL=443
77
# XDEBUG_CONFIG possible values: main|osx. Use main value for Linux and Windows, osx value for MacOS.
88
XDEBUG_CONFIG=main
99
# Sometimes we need to use different xdebug versions, list of versions can be found here - https://pecl.php.net/package/xdebug
10-
XDEBUG_VERSION=3.4.0
10+
XDEBUG_VERSION=3.4.2
1111
###< XDebug docker configuration ###
1212

1313
###> MySQL docker configuration. ###
14-
# MySQL version, recommend values: 9.1.0|9.0.1|8.4.3|8.3.0|8.2.0|8.1.0|8.0.39
15-
MYSQL_VERSION=8.4.3
14+
# MySQL version, recommend values: 9.1.0|9.0.1|8.4.4|8.3.0|8.2.0|8.1.0|8.0.39
15+
MYSQL_VERSION=8.4.4
1616
# MySQL INNODB_USE_NATIVE_AIO possible values: 1|0. Set to 0 when AIO interface is not supported on OSX. https://dev.mysql.com/doc/refman/8.0/en/innodb-parameters.html#sysvar_innodb_use_native_aio
1717
INNODB_USE_NATIVE_AIO=1
1818
# Sometimes AWS MySQL RDS has SQL_MODE="NO_ENGINE_SUBSTITUTION" (https://github.com/awsdocs/amazon-rds-user-guide/issues/160) but MySQL default described here - https://dev.mysql.com/doc/refman/8.0/en/server-system-variables.html#sysvar_sql_mode
@@ -70,11 +70,11 @@ REDIS_PASSWORD=null
7070
REDIS_PORT=6379
7171

7272
MAIL_MAILER=smtp
73+
MAIL_SCHEME=null
7374
MAIL_HOST=mail
7475
MAIL_PORT=1025
7576
MAIL_USERNAME=null
7677
MAIL_PASSWORD=null
77-
MAIL_ENCRYPTION=null
7878
MAIL_FROM_ADDRESS=null
7979
MAIL_FROM_NAME="${APP_NAME}"
8080

Diff for: .env.test-ci

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ WEB_PORT_SSL=443
99
# XDEBUG_CONFIG possible values: main|osx. Use main value for Linux and Windows, osx value for MacOS.
1010
XDEBUG_CONFIG=main
1111
# Sometimes we need to use different xdebug versions, list of versions can be found here - https://pecl.php.net/package/xdebug
12-
XDEBUG_VERSION=3.4.0
12+
XDEBUG_VERSION=3.4.2
1313
###< XDebug docker configuration ###
1414

1515
###> MySQL docker configuration. ###
16-
# MySQL version, recommend values: 9.1.0|9.0.1|8.4.3|8.3.0|8.2.0|8.1.0|8.0.39
17-
MYSQL_VERSION=8.4.3
16+
# MySQL version, recommend values: 9.1.0|9.0.1|8.4.4|8.3.0|8.2.0|8.1.0|8.0.39
17+
MYSQL_VERSION=8.4.4
1818
# MySQL INNODB_USE_NATIVE_AIO possible values: 1|0. Set to 0 when AIO interface is not supported on OSX. https://dev.mysql.com/doc/refman/8.0/en/innodb-parameters.html#sysvar_innodb_use_native_aio
1919
INNODB_USE_NATIVE_AIO=1
2020
# Sometimes AWS MySQL RDS has SQL_MODE="NO_ENGINE_SUBSTITUTION" (https://github.com/awsdocs/amazon-rds-user-guide/issues/160) but MySQL default described here - https://dev.mysql.com/doc/refman/8.0/en/server-system-variables.html#sysvar_sql_mode
@@ -72,11 +72,11 @@ REDIS_PASSWORD=null
7272
REDIS_PORT=6379
7373

7474
MAIL_MAILER=smtp
75+
MAIL_SCHEME=null
7576
MAIL_HOST=mail
7677
MAIL_PORT=1025
7778
MAIL_USERNAME=null
7879
MAIL_PASSWORD=null
79-
MAIL_ENCRYPTION=null
8080
MAIL_FROM_ADDRESS=null
8181
MAIL_FROM_NAME="${APP_NAME}"
8282

Diff for: .gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ CHANGELOG.md export-ignore
99
.styleci.yml export-ignore
1010
tools/**/composer.lock binary
1111
composer.lock binary
12+
*.blade.php linguist-detectable=false

Diff for: .github/workflows/ci.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- name: Run test suite
3535
run: make phpunit
3636
- name: Archive coverage data for Qodana
37-
uses: actions/upload-artifact@v3
37+
uses: actions/upload-artifact@v4
3838
with:
3939
name: php-coverage-data
4040
path: reports/clover.xml
@@ -50,7 +50,7 @@ jobs:
5050
run: make phpinsights
5151
- name: Run php mess detector
5252
run: make phpmd
53-
- name: Run php copy past detector
53+
- name: Run php copy paste detector
5454
run: make phpcpd
5555
- name: Stop the docker images
5656
run: make stop-test
@@ -72,7 +72,7 @@ jobs:
7272
# - name: 'Install dependencies'
7373
# run: COMPOSER_MEMORY_LIMIT=-1 composer install
7474
# - name: 'Download coverage data for Qodana'
75-
# uses: actions/download-artifact@v3
75+
# uses: actions/download-artifact@v4
7676
# with:
7777
# name: php-coverage-data
7878
# path: .qodana/code-coverage

Diff for: .gitignore

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,23 @@ reports/*
33

44
###> laravel ###
55
/.vscode
6-
/.vagrant
76
/.fleet
7+
/.nova
8+
/.zed
89
/node_modules
910
/public/build
1011
/public/hot
1112
/public/storage
1213
/storage/*.key
1314
/storage/mysql-data/
15+
/storage/pail
1416
/vendor
1517
/tools/**/vendor
1618
Homestead.yaml
1719
Homestead.json
1820
auth.json
1921
.env
22+
.env.backup
2023
_ide_helper.php
2124
.phpstorm.meta.php
2225
_ide_helper_models.php

Diff for: .idea/htdocs.iml

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

Diff for: .idea/laravel-idea.xml

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

0 commit comments

Comments
 (0)