Skip to content

Commit 9fe516a

Browse files
author
DKravtsov
committed
Updated xdebug, MySQL, documentation. Updated composer dependencies. Improved CI.
1 parent c8389dd commit 9fe516a

File tree

24 files changed

+2192
-1749
lines changed

24 files changed

+2192
-1749
lines changed

‎.circleci/config.yml

Lines changed: 5 additions & 5 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

@@ -34,7 +34,7 @@ jobs:
3434
make info
3535
3636
- run:
37-
name: Run unit/application tests
37+
name: Run Application/Integration/Unit tests
3838
command: |
3939
make phpunit
4040
@@ -78,4 +78,4 @@ jobs:
7878
path: reports
7979

8080
- store_test_results:
81-
path: reports
81+
path: reports/junit.xml

‎.env

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ WEB_PORT_SSL=443
2727
# XDEBUG_CONFIG possible values: main|osx. Use main value for Linux and Windows, osx value for MacOS.
2828
XDEBUG_CONFIG=main
2929
# Sometimes we need to use different xdebug versions, list of versions can be found here - https://pecl.php.net/package/xdebug
30-
XDEBUG_VERSION=3.4.4
30+
XDEBUG_VERSION=3.4.5
3131
###< XDebug docker configuration ###
3232

3333
###> MySQL docker configuration. Can be overridden in: .env.local, .env.staging, .env.prod. ###
34-
# MySQL version, recommend values: 9.3.0|8.4.5|8.3.0|8.2.0|8.1.0|8.0.39
35-
MYSQL_VERSION=8.4.5
34+
# MySQL version, recommend values: 9.4.0|8.4.6|8.0.43
35+
MYSQL_VERSION=8.4.6
3636
# 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
3737
INNODB_USE_NATIVE_AIO=1
3838
# 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: 97 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,105 @@
11
name: Symfony Rest API
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: Set Elastic data folder rights
21-
run: chmod 777 var/elasticsearch-data
22-
- name: Build the docker images
23-
run: make build-test
24-
- name: Start the docker images
25-
run: make start-test
26-
- name: Check running containers
27-
run: docker ps -a
28-
- name: Wait for database connection
29-
run: make wait-for-db
30-
- name: Run migrations
31-
run: make drop-migrate
32-
- name: Generate keys
33-
run: make generate-jwt-keys
34-
- name: Create roles and groups
35-
run: make create-roles-groups
36-
- name: Create cron jobs
37-
run: make migrate-cron-jobs
38-
- name: Setup transports for Messenger component
39-
run: make messenger-setup-transports
40-
- name: Wait for Elastic connection
41-
run: make wait-for-elastic
42-
- name: Create or update Elastic index template
43-
run: make elastic-create-or-update-template
44-
- name: Show framework version and additional info, php & composer version
45-
run: make info
46-
- name: Run test suite
47-
run: make phpunit
48-
- name: Archive coverage data for Qodana
49-
uses: actions/upload-artifact@v4
50-
with:
51-
name: php-coverage-data
52-
path: reports/clover.xml
53-
- name: Checks for security vulnerability advisories for installed packages
54-
run: make composer-audit
55-
- name: Run coding standard
56-
run: make ecs
57-
- name: Run codeSniffer
58-
run: make phpcs
59-
- name: Run PHPStan
60-
run: make phpstan
61-
- name: Run PHPInsights
62-
run: make phpinsights
63-
- name: Run php mess detector
64-
run: make phpmd
65-
- name: Run php copy paste detector
66-
run: make phpcpd
67-
- name: Stop the docker images
68-
run: make stop-test
16+
build:
17+
runs-on: ubuntu-latest
18+
steps:
19+
- uses: actions/checkout@v4
20+
- name: Set Elastic data folder rights
21+
run: chmod 777 var/elasticsearch-data
22+
- name: Build the docker images
23+
run: make build-test
24+
- name: Start the docker images
25+
run: make start-test
26+
- name: Check running containers
27+
run: docker ps -a
28+
- name: Wait for database connection
29+
run: make wait-for-db
30+
- name: Run migrations
31+
run: make drop-migrate
32+
- name: Generate keys
33+
run: make generate-jwt-keys
34+
- name: Create roles and groups
35+
run: make create-roles-groups
36+
- name: Create cron jobs
37+
run: make migrate-cron-jobs
38+
- name: Setup transports for Messenger component
39+
run: make messenger-setup-transports
40+
- name: Wait for Elastic connection
41+
run: make wait-for-elastic
42+
- name: Create or update Elastic index template
43+
run: make elastic-create-or-update-template
44+
- name: Show framework version and additional info, php & composer version
45+
run: make info
46+
- name: Run test suite
47+
run: make phpunit
48+
- name: Archive coverage data for Qodana
49+
uses: actions/upload-artifact@v4
50+
with:
51+
name: php-coverage-data
52+
path: reports/clover.xml
53+
- name: Checks for security vulnerability advisories for installed packages
54+
run: make composer-audit
55+
- name: Run coding standard
56+
run: make ecs
57+
- name: Run codeSniffer
58+
run: make phpcs
59+
- name: Run PHPStan
60+
run: make phpstan
61+
- name: Run PHPInsights
62+
run: make phpinsights
63+
- name: Run php mess detector
64+
run: make phpmd
65+
- name: Run php copy paste detector
66+
run: make phpcpd
67+
- name: Stop the docker images
68+
run: make stop-test
69+
70+
build-staging:
71+
needs: build
72+
runs-on: ubuntu-latest
73+
steps:
74+
- uses: actions/checkout@v4
75+
- name: Set Elastic data folder rights
76+
run: chmod 777 var/elasticsearch-data
77+
- name: Build the staging docker images
78+
run: make build-staging
79+
- name: Start the staging docker images
80+
run: make start-staging
81+
- name: Check running staging containers
82+
run: docker ps -a
83+
- name: Wait for database connection
84+
run: make wait-for-db
85+
- name: Run migrations
86+
run: make migrate-no-test
87+
- name: Generate keys
88+
run: make generate-jwt-keys
89+
- name: Create roles and groups
90+
run: make create-roles-groups
91+
- name: Create cron jobs
92+
run: make migrate-cron-jobs
93+
- name: Setup transports for Messenger component
94+
run: make messenger-setup-transports
95+
- name: Wait for Elastic connection
96+
run: make wait-for-elastic
97+
- name: Create or update Elastic index template
98+
run: make elastic-create-or-update-template
99+
- name: Show framework version and additional info, php & composer version
100+
run: make info
101+
- name: Stop the staging docker images
102+
run: make stop-staging
69103

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

‎.idea/htdocs.iml

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

0 commit comments

Comments
 (0)