Skip to content

Commit c8f134e

Browse files
committed
Merge branch 'develop'
2 parents 9654df2 + ce0c96d commit c8f134e

Some content is hidden

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

81 files changed

+6523
-4605
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @pchalupa @oliverstasa

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,37 +2,13 @@
22
name: Bug report
33
about: Create a report to help us improve
44
title: ''
5-
labels: ''
5+
labels: bug
66
assignees: ''
77

88
---
99

10-
**Describe the bug**
10+
## Description of the bug
1111
A clear and concise description of what the bug is.
1212

13-
**To Reproduce**
14-
Steps to reproduce the behavior:
15-
1. Go to '...'
16-
2. Click on '....'
17-
3. Scroll down to '....'
18-
4. See error
19-
20-
**Expected behavior**
13+
## Expected behavior
2114
A clear and concise description of what you expected to happen.
22-
23-
**Screenshots**
24-
If applicable, add screenshots to help explain your problem.
25-
26-
**Desktop (please complete the following information):**
27-
- OS: [e.g. iOS]
28-
- Browser [e.g. chrome, safari]
29-
- Version [e.g. 22]
30-
31-
**Smartphone (please complete the following information):**
32-
- Device: [e.g. iPhone6]
33-
- OS: [e.g. iOS8.1]
34-
- Browser [e.g. stock browser, safari]
35-
- Version [e.g. 22]
36-
37-
**Additional context**
38-
Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,10 @@
22
name: Feature request
33
about: Suggest an idea for this project
44
title: ''
5-
labels: ''
5+
labels: enhancement
66
assignees: ''
77

88
---
99

10-
**Is your feature request related to a problem? Please describe.**
11-
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
12-
13-
**Describe the solution you'd like**
14-
A clear and concise description of what you want to happen.
15-
16-
**Describe alternatives you've considered**
17-
A clear and concise description of any alternative solutions or features you've considered.
18-
19-
**Additional context**
20-
Add any other context or screenshots about the feature request here.
10+
## Describe your feature request
11+
A clear and concise description of your feature request.

.github/issue_template.md

Lines changed: 0 additions & 16 deletions
This file was deleted.

.github/pull_request_template.md

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1-
Fixes #
2-
3-
## Proposed Changes
4-
5-
-
1+
# Proposed changes
62
-
73
-
4+
5+
## Summary
6+
Describe your changes in detail.
7+
8+
### Checklist
9+
- [ ] Unit tests for the changes have been added
10+
- [ ] Static analysis exits without any error
11+
- [ ] CS Fix exits without any error

.github/workflows/deploy.yml

Lines changed: 0 additions & 22 deletions
This file was deleted.
Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
name: Main workflow
2+
on:
3+
push:
4+
jobs:
5+
ci:
6+
runs-on: ubuntu-20.04
7+
env:
8+
DB_NAME: test
9+
DB_PASSWORD: root
10+
steps:
11+
- uses: actions/checkout@v2
12+
13+
- uses: shivammathur/setup-php@v2
14+
with:
15+
php-version: '7.4'
16+
extensions: imagick, xdebug, memcached
17+
tools: composer:v2
18+
19+
- uses: getong/mariadb-action@v1.1
20+
with:
21+
mysql database: ${{ env.DB_NAME }}
22+
mysql root password: ${{ env.DB_PASSWORD }}
23+
24+
- name: Install new instance
25+
run: ./bin/install.sh root "$DB_PASSWORD" "$DB_NAME" 127.0.0.1 3306
26+
27+
- name: Cache Composer packages
28+
id: composer-cache
29+
uses: actions/cache@v2
30+
with:
31+
path: vendor
32+
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
33+
restore-keys: |
34+
${{ runner.os }}-php-
35+
36+
- name: Validate DB schema
37+
run: composer orm:validate
38+
39+
- name: Coding Standards
40+
run: composer cs
41+
42+
- name: Static Analysis
43+
run: composer phpstan
44+
45+
- name: Unit tests
46+
run: composer test:coverage
47+
48+
- name: Generate docs
49+
run: composer docs
50+
51+
- name: Archive test coverage
52+
uses: actions/upload-artifact@v2
53+
with:
54+
name: test_coverage
55+
path: public/reports/test-coverage/
56+
retention-days: 7
57+
58+
- name: Archive docs
59+
uses: actions/upload-artifact@v2
60+
with:
61+
name: docs
62+
path: public/docs
63+
retention-days: 7
64+
65+
- name: Publish docs
66+
if: github.ref == 'refs/heads/develop'
67+
uses: peaceiris/actions-gh-pages@v3
68+
with:
69+
github_token: ${{ secrets.GITHUB_TOKEN }}
70+
publish_dir: ./public/docs

.gitignore

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
# Config
2-
config/common.ini
2+
config/*.local.ini
33

44
# Dependencies
55
vendor
66

77
# Cache
8-
.php_cs.cache
9-
.phpunit.result.cache
108
tmp/*
119
!tmp/.gitkeep
1210

@@ -22,3 +20,4 @@ public/storage/images/*
2220

2321
# Misc
2422
.remote-sync.json
23+
.vscode

.php_cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?php
2+
3+
$config = new PhpCsFixer\Config();
4+
return $config->setCacheFile(__DIR__ . '/tmp/.php_cs.cache');

.vscode/launch.json

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)