Skip to content

Commit acb309c

Browse files
author
DKravtsov
committed
Updated xdebug, MySQL, documentation. Updated composer dependencies. Improved CI.
1 parent b2328f7 commit acb309c

Some content is hidden

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

56 files changed

+4748
-8610
lines changed

‎.circleci/config.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ jobs:
33
build:
44
working_directory: ~/html
55
machine:
6-
image: ubuntu-2204:2023.04.2
6+
image: ubuntu-2204:2023.04.2
77
branches:
8-
ignore:
9-
- develop
8+
ignore:
9+
- develop
1010
steps:
1111
- checkout
1212

@@ -72,4 +72,4 @@ jobs:
7272
path: reports
7373

7474
- store_test_results:
75-
path: reports
75+
path: reports/junit.xml

‎.env.dev‎

Lines changed: 3 additions & 3 deletions
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.2
10+
XDEBUG_VERSION=3.4.5
1111
###< XDebug docker configuration ###
1212

1313
###> MySQL docker configuration. ###
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
14+
# MySQL version, recommend values: 9.4.0|8.4.6|8.0.43
15+
MYSQL_VERSION=8.4.6
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

‎.env.prod‎

Lines changed: 2 additions & 2 deletions
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.4|8.3.0|8.2.0|8.1.0|8.0.39
8-
MYSQL_VERSION=8.4.4
7+
# MySQL version, recommend values: 9.4.0|8.4.6|8.0.43
8+
MYSQL_VERSION=8.4.6
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

‎.env.staging‎

Lines changed: 2 additions & 2 deletions
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.4|8.3.0|8.2.0|8.1.0|8.0.39
8-
MYSQL_VERSION=8.4.4
7+
# MySQL version, recommend values: 9.4.0|8.4.6|8.0.43
8+
MYSQL_VERSION=8.4.6
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

‎.env.test‎

Lines changed: 3 additions & 3 deletions
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.2
10+
XDEBUG_VERSION=3.4.5
1111
###< XDebug docker configuration ###
1212

1313
###> MySQL docker configuration. ###
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
14+
# MySQL version, recommend values: 9.4.0|8.4.6|8.0.43
15+
MYSQL_VERSION=8.4.6
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

‎.env.test-ci‎

Lines changed: 3 additions & 3 deletions
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.2
12+
XDEBUG_VERSION=3.4.5
1313
###< XDebug docker configuration ###
1414

1515
###> MySQL docker configuration. ###
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
16+
# MySQL version, recommend values: 9.4.0|8.4.6|8.0.43
17+
MYSQL_VERSION=8.4.6
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

‎.github/workflows/ci.yml‎

Lines changed: 73 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,81 @@
11
name: Laravel App
22

33
on:
4-
push:
5-
branches:
6-
- master
7-
- develop
8-
pull_request:
9-
branches:
10-
- master
11-
- develop
12-
release:
13-
types: [published]
4+
push:
5+
branches:
6+
- master
7+
- develop
8+
pull_request:
9+
branches:
10+
- master
11+
- develop
12+
release:
13+
types: [ published ]
1414

1515
jobs:
16-
build:
17-
runs-on: ubuntu-latest
18-
steps:
19-
- uses: actions/checkout@v4
20-
- name: Build the docker images
21-
run: make build-test
22-
- name: Start the docker images
23-
run: make start-test
24-
- name: Check running containers
25-
run: docker ps -a
26-
- name: Wait for database connection
27-
run: make wait-for-db
28-
- name: Run migrations
29-
run: make drop-migrate
30-
- name: Run seeds
31-
run: make seed
32-
- name: Show framework version and additional info, php & composer version
33-
run: make info
34-
- name: Run test suite
35-
run: make phpunit
36-
- name: Archive coverage data for Qodana
37-
uses: actions/upload-artifact@v4
38-
with:
39-
name: php-coverage-data
40-
path: reports/clover.xml
41-
- name: Checks for security vulnerability advisories for installed packages
42-
run: make composer-audit
43-
- name: Run coding standard
44-
run: make ecs
45-
- name: Run codeSniffer
46-
run: make phpcs
47-
- name: Run PHPStan
48-
run: make phpstan
49-
- name: Run PHPInsights
50-
run: make phpinsights
51-
- name: Run php mess detector
52-
run: make phpmd
53-
- name: Run php copy paste detector
54-
run: make phpcpd
55-
- name: Stop the docker images
56-
run: make stop-test
16+
build:
17+
runs-on: ubuntu-latest
18+
steps:
19+
- uses: actions/checkout@v4
20+
- name: Build the docker images
21+
run: make build-test
22+
- name: Start the docker images
23+
run: make start-test
24+
- name: Check running containers
25+
run: docker ps -a
26+
- name: Wait for database connection
27+
run: make wait-for-db
28+
- name: Run migrations
29+
run: make drop-migrate
30+
- name: Run seeds
31+
run: make seed
32+
- name: Show framework version and additional info, php & composer version
33+
run: make info
34+
- name: Run test suite
35+
run: make phpunit
36+
- name: Archive coverage data for Qodana
37+
uses: actions/upload-artifact@v4
38+
with:
39+
name: php-coverage-data
40+
path: reports/clover.xml
41+
- name: Checks for security vulnerability advisories for installed packages
42+
run: make composer-audit
43+
- name: Run coding standard
44+
run: make ecs
45+
- name: Run codeSniffer
46+
run: make phpcs
47+
- name: Run PHPStan
48+
run: make phpstan
49+
- name: Run PHPInsights
50+
run: make phpinsights
51+
- name: Run php mess detector
52+
run: make phpmd
53+
- name: Run php copy paste detector
54+
run: make phpcpd
55+
- name: Stop the docker images
56+
run: make stop-test
57+
58+
build-staging:
59+
needs: build
60+
runs-on: ubuntu-latest
61+
steps:
62+
- uses: actions/checkout@v4
63+
- name: Build the staging docker images
64+
run: make build-staging
65+
- name: Start the staging docker images
66+
run: make start-staging
67+
- name: Check running staging containers
68+
run: docker ps -a
69+
- name: Wait for database connection
70+
run: make wait-for-db
71+
- name: Run migrations
72+
run: make migrate-no-test
73+
- name: Set key for staging application
74+
run: make key-generate
75+
- name: Show framework version and additional info, php & composer version
76+
run: make info
77+
- name: Stop the staging docker images
78+
run: make stop-staging
5779

5880
# Currently local Qodana report differ from CI Qodana report due to some issues https://youtrack.jetbrains.com/issue/QD-7379
5981
# qodana:

‎.idea/externalDependencies.xml‎

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)