Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 2a86783

Browse files
author
DKravtsov
committed
Updated composer dependencies, recipes, PHPStorm configuration, Qodana, docs.
1 parent 2f65621 commit 2a86783

Some content is hidden

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

48 files changed

+3237
-1586
lines changed

‎.circleci/config.yml

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

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,23 @@
1+
### User-specific stuff:
12
/.git*
2-
/.idea*
3+
/.idea/workspace.xml
34
.dockerignore
4-
.editorconfig
5+
6+
### Other data
57
storage/mysql-data
68
vendor/
7-
/tools/*/vendor/
89
bootstrap/cache
910
!bootstrap/cache/.gitignore
1011
.phpstorm.meta.php
11-
Dockerfile
1212
_ide_helper.php
13+
14+
### Vendor bin dependencies
15+
/tools/*/vendor/
16+
.phpunit.cache
17+
.phpunit.result.cache
18+
19+
### Docker
20+
Dockerfile
1321
docker-compose.yml
1422
docker-compose-test-ci.yml
1523
docker-compose-staging.yml

‎.github/workflows/ci.yml

Lines changed: 40 additions & 25 deletions
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,33 +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
50-
qodana:
51-
runs-on: ubuntu-latest
52-
needs: build
53-
permissions:
54-
contents: write
55-
pull-requests: write
56-
checks: write
57-
steps:
58-
- uses: actions/checkout@v3
59-
with:
60-
ref: ${{ github.event.pull_request.head.sha }} # to check out the actual pull request commit, not the merge commit
61-
fetch-depth: 0 # a full history is required for pull request analysis
62-
- name: 'Qodana Scan'
63-
uses: JetBrains/qodana-action@v2023.2
64-
env:
65-
QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
55+
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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
/.idea
1+
reports/*
2+
!reports/.gitkeep
3+
4+
###> laravel ###
25
/.vscode
36
/.vagrant
47
/node_modules
@@ -16,12 +19,15 @@ auth.json
1619
_ide_helper.php
1720
.phpstorm.meta.php
1821
_ide_helper_models.php
19-
reports/*
20-
!reports/.gitkeep
2122
npm-debug.log
2223
yarn-error.log
24+
###< laravel ###
25+
26+
###> phpunit ###
2327
.phpunit.result.cache
2428
.phpunit.cache
29+
###< phpunit ###
30+
2531
###> friendsofphp/php-cs-fixer ###
2632
.php-cs-fixer.cache
2733
.php_cs

‎.gitlab-ci.yml

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

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

‎.idea/codeStyles/Project.xml

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

‎.idea/codeStyles/codeStyleConfig.xml

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

‎.idea/codeception.xml

Lines changed: 21 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)

AltStyle によって変換されたページ (->オリジナル) /