Skip to content

Commit 5a10f2c

Browse files
author
DKravtsov
committed
Updated composer dependencies, recipes, PHPStorm configuration, Qodana, docs.
1 parent 8f74903 commit 5a10f2c

Some content is hidden

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

54 files changed

+3039
-1557
lines changed

.circleci/config.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -44,24 +44,24 @@ jobs:
4444
make phpcs
4545
4646
- run:
47-
name: Run PHP copy/paste detector
47+
name: Run PHPStan
4848
command: |
49-
make phpcpd
49+
make phpstan
5050
5151
- run:
52-
name: Run PHP mess detector
52+
name: Run PHPInsights
5353
command: |
54-
make phpmd
54+
make phpinsights
5555
5656
- run:
57-
name: Run PHPStan static analysis tool
57+
name: Run PHP Mess Detector
5858
command: |
59-
make phpstan
59+
make phpmd
6060
6161
- run:
62-
name: Run Phpinsights PHP quality checks
62+
name: Run PHP copy past detector
6363
command: |
64-
make phpinsights
64+
make phpcpd
6565
6666
- store_artifacts:
6767
path: reports

.dockerignore

+9-4
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,26 @@
11
### User-specific stuff:
22
/.git*
3-
/.idea*
3+
/.idea/workspace.xml
44
.dockerignore
5-
.editorconfig
65

76
###> symfony/framework-bundle ###
87
/.env.local
98
/.env.*.local
109
/.env.local.php
1110
/public/bundles/
12-
/var/mysql-data
13-
/var/rabbitmq
1411
/vendor/
1512
###< symfony/framework-bundle ###
1613

14+
### Other data
15+
/var/mysql-data
16+
/var/rabbitmq
17+
/var/elasticsearch-data
18+
/var/redis
19+
1720
### Vendor bin dependencies
1821
/tools/*/vendor/
22+
.phpunit.cache
23+
.phpunit.result.cache
1924

2025
### Docker
2126
Dockerfile

.github/workflows/ci.yml

+39-25
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
build:
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@v1
19+
- uses: actions/checkout@v4
2020
- name: Build the docker images
2121
run: make build-test
2222
- name: Start the docker images
@@ -33,34 +33,48 @@ jobs:
3333
run: make info
3434
- name: Run test suite
3535
run: make phpunit
36-
- name: Run PHP coding standard
36+
- name: Archive coverage data for Qodana
37+
uses: actions/upload-artifact@v3
38+
with:
39+
name: php-coverage-data
40+
path: reports/clover.xml
41+
- name: Run coding standard
3742
run: make ecs
38-
- name: Run PHP codeSniffer
43+
- name: Run codeSniffer
3944
run: make phpcs
40-
- name: Run PHP copy/paste detector
41-
run: make phpcpd
42-
- name: Run PHP mess detector
43-
run: make phpmd
44-
- name: Run PHPStan static analysis tool
45+
- name: Run PHPStan
4546
run: make phpstan
46-
- name: Run Phpinsights PHP quality checks
47+
- name: Run PHPInsights
4748
run: make phpinsights
49+
- name: Run php mess detector
50+
run: make phpmd
51+
- name: Run php copy past detector
52+
run: make phpcpd
4853
- name: Stop the docker images
4954
run: make stop-test
5055

51-
qodana:
52-
runs-on: ubuntu-latest
53-
needs: build
54-
permissions:
55-
contents: write
56-
pull-requests: write
57-
checks: write
58-
steps:
59-
- uses: actions/checkout@v3
60-
with:
61-
ref: ${{ github.event.pull_request.head.sha }} # to check out the actual pull request commit, not the merge commit
62-
fetch-depth: 0 # a full history is required for pull request analysis
63-
- name: 'Qodana Scan'
64-
uses: JetBrains/qodana-action@v2023.2
65-
env:
66-
QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
56+
# Currently local Qodana report differ from CI Qodana report due to some issues https://youtrack.jetbrains.com/issue/QD-7379
57+
# qodana:
58+
# runs-on: ubuntu-20.04
59+
# needs: build
60+
# permissions:
61+
# contents: write
62+
# pull-requests: write
63+
# checks: write
64+
# steps:
65+
# - uses: actions/checkout@v4
66+
# with:
67+
# ref: ${{ github.event.pull_request.head.sha }} # to check out the actual pull request commit, not the merge commit
68+
# fetch-depth: 0 # a full history is required for pull request analysis
69+
# php-version: '8.2'
70+
# - name: 'Install dependencies'
71+
# run: COMPOSER_MEMORY_LIMIT=-1 composer install
72+
# - name: 'Download coverage data for Qodana'
73+
# uses: actions/download-artifact@v3
74+
# with:
75+
# name: php-coverage-data
76+
# path: .qodana/code-coverage
77+
# - name: 'Qodana Scan'
78+
# uses: JetBrains/qodana-action@v2023.2
79+
# env:
80+
# QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}

.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/.idea
21
reports/*
32
!reports/.gitkeep
43

.gitlab-ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ build:
3333
- make phpunit
3434
- make ecs
3535
- make phpcs
36-
- make phpcpd
37-
- make phpmd
3836
- make phpstan
3937
- make phpinsights
38+
- make phpmd
39+
- make phpcpd
4040
- make stop-test
4141
artifacts:
4242
paths:

.idea/.gitignore

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

.idea/codeStyles/Project.xml

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

.idea/codeStyles/codeStyleConfig.xml

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

.idea/codeception.xml

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

0 commit comments

Comments
 (0)