Skip to content

Commit 61f7fa0

Browse files
author
Manuele Vaccari
committed
Merge branch 'release/2.1.2'
2 parents 5d5b4ce + a8993f4 commit 61f7fa0

31 files changed

Lines changed: 701 additions & 286 deletions

.gitattributes

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
* text=auto eol=lf
2+
3+
*.conf text eol=lf
4+
*.html text eol=lf
5+
*.ini text eol=lf
6+
*.js text eol=lf
7+
*.json text eol=lf
8+
*.md text eol=lf
9+
*.php text eol=lf
10+
*.sh text eol=lf
11+
*.yaml text eol=lf
12+
*.yml text eol=lf
13+
14+
.travis.yml export-ignore
15+
README.md export-ignore

.github/FUNDING.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# These are supported funding model platforms
2+
3+
github: [D3strukt0r] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
4+
patreon: d3strukt0r # Replace with a single Patreon username
5+
#open_collective: # Replace with a single Open Collective username
6+
#ko_fi: # Replace with a single Ko-fi username
7+
#tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
8+
#community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
9+
#liberapay: # Replace with a single Liberapay username
10+
#issuehunt: # Replace with a single IssueHunt username
11+
#otechie: # Replace with a single Otechie username
12+
#custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**Describe the bug**
11+
A clear and concise description of what the bug is.
12+
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**
21+
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.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
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.

.github/workflows/ci-cd.yml

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
name: CI/CD
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
- develop
8+
9+
# Run tests for any PRs.
10+
pull_request:
11+
12+
workflow_dispatch:
13+
14+
jobs:
15+
test:
16+
runs-on: ubuntu-latest
17+
strategy:
18+
matrix:
19+
php:
20+
- 7.1
21+
- 7.2
22+
- 7.3
23+
- 7.4
24+
25+
name: Test on PHP v${{ matrix.php }}
26+
27+
steps:
28+
- name: Checkout code
29+
uses: actions/checkout@v2
30+
31+
- name: Setup PHP
32+
uses: shivammathur/setup-php@v2
33+
with:
34+
php-version: '${{ matrix.php }}'
35+
coverage: xdebug
36+
37+
- name: Setup problem matchers for PHP
38+
run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
39+
40+
- name: Setup problem matchers for PHPUnit
41+
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
42+
43+
- name: Setup Composer
44+
run: composer self-update
45+
46+
- name: Check versions
47+
run: |
48+
php -v
49+
composer -v
50+
51+
# https://github.com/actions/cache/blob/main/examples.md#php---composer
52+
- name: Get Composer Cache Directory
53+
id: composer-cache-dir-path
54+
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
55+
- uses: actions/cache@v2
56+
id: composer-cache # use this to check for `cache-hit` (`steps.composer-cache.outputs.cache-hit != 'true'`)
57+
with:
58+
path: ${{ steps.composer-cache-dir-path.outputs.dir }}
59+
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
60+
restore-keys: |
61+
${{ runner.os }}-composer-
62+
63+
- name: Install dependencies
64+
run: composer install --prefer-dist --no-progress --no-suggest
65+
66+
- name: Test with phpUnit
67+
run: ./vendor/bin/phpunit
68+
69+
- name: Test with phpcs
70+
run: ./vendor/bin/phpcs
71+
72+
- name: Test whether code follows Symfony Code Syntax rules
73+
run: ./vendor/bin/php-cs-fixer fix --diff --dry-run -v
74+
75+
- name: Check if clover report exists
76+
if: github.event_name == 'push' && matrix.php == '7.4'
77+
id: check-if-clover-exists
78+
continue-on-error: true
79+
run: test -f build/logs/clover.xml
80+
81+
# https://github.com/php-coveralls/php-coveralls
82+
- name: Setup Coveralls
83+
if: github.event_name == 'push' && steps.check-if-clover-exists.outcome == 'success' && matrix.php == '7.4'
84+
run: wget https://github.com/php-coveralls/php-coveralls/releases/latest/download/php-coveralls.phar
85+
86+
- name: Upload coverage report to Coveralls
87+
if: github.event_name == 'push' && steps.check-if-clover-exists.outcome == 'success' && matrix.php == '7.4'
88+
env:
89+
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
90+
run: php php-coveralls.phar -v
91+
92+
# https://scrutinizer-ci.com/docs/tools/external-code-coverage/
93+
# https://github.com/scrutinizer-ci/ocular
94+
- name: Setup Ocular (Scrutinizer)
95+
if: github.event_name == 'push' && steps.check-if-clover-exists.outcome == 'success' && matrix.php == '7.4'
96+
run: wget https://scrutinizer-ci.com/ocular.phar
97+
98+
- name: Upload coverage report to Scrutinizer
99+
if: github.event_name == 'push' && steps.check-if-clover-exists.outcome == 'success' && matrix.php == '7.4'
100+
# run: php ocular.phar code-coverage:upload --repository=g/D3strukt0r/votifier-client-php --revision=$(git rev-parse HEAD) --format=php-clover build/logs/clover.xml
101+
run: php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml

.gitignore

Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# Created by https://www.gitignore.io/api/macos,phpunit,windows,composer,phpstorm,phpcodesniffer
2-
# Edit at https://www.gitignore.io/?templates=macos,phpunit,windows,composer,phpstorm,phpcodesniffer
1+
# Created by https://www.toptal.com/developers/gitignore/api/linux,macos,phpunit,windows,composer,phpstorm,phpcodesniffer
2+
# Edit at https://www.toptal.com/developers/gitignore?templates=linux,macos,phpunit,windows,composer,phpstorm,phpcodesniffer
33

44
### Composer ###
55
composer.phar
@@ -9,6 +9,21 @@ composer.phar
99
# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
1010
composer.lock
1111

12+
### Linux ###
13+
*~
14+
15+
# temporary files which can be created if a process still has a handle open of a deleted file
16+
.fuse_hidden*
17+
18+
# KDE directory preferences
19+
.directory
20+
21+
# Linux trash folder which might appear on any partition or disk
22+
.Trash-*
23+
24+
# .nfs files are created when an open file is removed but is still being accessed
25+
.nfs*
26+
1227
### macOS ###
1328
# General
1429
.DS_Store
@@ -44,7 +59,7 @@ Temporary Items
4459
/wpcs/*
4560

4661
### PhpStorm ###
47-
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
62+
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
4863
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
4964

5065
# User-specific stuff
@@ -74,6 +89,9 @@ Temporary Items
7489
# When using Gradle or Maven with auto-import, you should exclude module files,
7590
# since they will be recreated, and may cause churn. Uncomment if using
7691
# auto-import.
92+
# .idea/artifacts
93+
# .idea/compiler.xml
94+
# .idea/jarRepositories.xml
7795
# .idea/modules.xml
7896
# .idea/*.iml
7997
# .idea/modules
@@ -122,15 +140,27 @@ fabric.properties
122140
# *.ipr
123141

124142
# Sonarlint plugin
143+
# https://plugins.jetbrains.com/plugin/7973-sonarlint
125144
.idea/**/sonarlint/
126145

127146
# SonarQube Plugin
147+
# https://plugins.jetbrains.com/plugin/7238-sonarqube-community-plugin
128148
.idea/**/sonarIssues.xml
129149

130150
# Markdown Navigator plugin
151+
# https://plugins.jetbrains.com/plugin/7896-markdown-navigator-enhanced
131152
.idea/**/markdown-navigator.xml
153+
.idea/**/markdown-navigator-enh.xml
132154
.idea/**/markdown-navigator/
133155

156+
# Cache file creation bug
157+
# See https://youtrack.jetbrains.com/issue/JBR-2257
158+
.idea/$CACHE_FILE$
159+
160+
# CodeStream plugin
161+
# https://plugins.jetbrains.com/plugin/12206-codestream
162+
.idea/codestream.xml
163+
134164
### PHPUnit ###
135165
# Covers PHPUnit
136166
# Reference: https://phpunit.de/
@@ -171,7 +201,7 @@ $RECYCLE.BIN/
171201
# Windows shortcuts
172202
*.lnk
173203

174-
# End of https://www.gitignore.io/api/macos,phpunit,windows,composer,phpstorm,phpcodesniffer
204+
# End of https://www.toptal.com/developers/gitignore/api/linux,macos,phpunit,windows,composer,phpstorm,phpcodesniffer
175205

176206
# Sphinx documentation
177207
docs/_build/

.idea/codeStyles/Project.xml

Lines changed: 49 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/inspectionProfiles/Project_Default.xml

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