Skip to content

Commit b5975c9

Browse files
sstoksstok
authored
minor #2 Allow PHP 8 (sstok)
This PR was merged into the 1.0-dev branch. Discussion ---------- Commits ------- 83fc178 Allow PHP 8
2 parents cef8f21 + 83fc178 commit b5975c9

File tree

7 files changed

+111
-40
lines changed

7 files changed

+111
-40
lines changed

‎.github/ISSUE_TEMPLATE.md

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
| Q | A
2+
| ---------------- | -----
3+
| Bug report? | yes/no
4+
| Feature request? | yes/no
5+
| BC Break report? | yes/no
6+
| RFC? | yes/no
7+
8+
<!--
9+
- Make sure to always try the latest version before opening an issue.
10+
- Please fill in this template according to your issue.
11+
- Replace this comment by the description of your issue.
12+
-->

‎.github/PULL_REQUEST_TEMPLATE.md

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
| Q | A
2+
| ------------- | ---
3+
| Bug fix? | yes/no
4+
| New feature? | yes/no
5+
| BC breaks? | yes/no
6+
| Deprecations? | yes/no
7+
| Fixed tickets | #... <!-- #-prefixed issue number(s), if any -->
8+
| License | MIT
9+
10+
<!--
11+
- Please fill in this template according to the PR you're about to submit.
12+
Provide additional information in your description, not the questioner table.
13+
- Replace this comment by a description of what your PR is solving.
14+
-->

‎.github/workflows/ci.yaml

+78
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
name: Full CI process
2+
on:
3+
push:
4+
branches:
5+
- master
6+
pull_request:
7+
branches:
8+
- master
9+
10+
jobs:
11+
test:
12+
name: PHP ${{ matrix.php-versions }}
13+
runs-on: ubuntu-18.04
14+
strategy:
15+
fail-fast: false
16+
matrix:
17+
php-versions: [ '7.2', '7.3', '7.4', '8.0' ]
18+
19+
steps:
20+
# —— Setup Github actions 🐙 —————————————————————————————————————————————
21+
# https://github.com/actions/checkout (official)
22+
-
23+
name: Checkout
24+
uses: actions/checkout@v2
25+
26+
# https://github.com/shivammathur/setup-php (community)
27+
-
28+
name: Setup PHP, extensions and composer with shivammathur/setup-php
29+
uses: shivammathur/setup-php@v2
30+
with:
31+
php-version: ${{ matrix.php-versions }}
32+
extensions: mbstring, ctype, iconv, bcmath, filter, json
33+
coverage: none
34+
env:
35+
update: true
36+
37+
# —— Composer 🧙‍️ —————————————————————————————————————————————————————————
38+
-
39+
name: Install Composer dependencies
40+
env:
41+
SYMFONY_PHPUNIT_DISABLE_RESULT_CACHE: 1
42+
run: |
43+
make install
44+
45+
## —— Tests ✅ ———————————————————————————————————————————————————————————
46+
-
47+
name: Run Tests
48+
run: |
49+
make test
50+
# lint:
51+
# name: PHP-QA
52+
# runs-on: ubuntu-latest
53+
# strategy:
54+
# fail-fast: false
55+
# steps:
56+
# -
57+
# name: Checkout
58+
# uses: actions/checkout@v2
59+
#
60+
# # https://github.com/shivammathur/setup-php (community)
61+
# -
62+
# name: Setup PHP, extensions and composer with shivammathur/setup-php
63+
# uses: shivammathur/setup-php@v2
64+
# with:
65+
# php-version: '7.4'
66+
# extensions: mbstring, ctype, iconv, bcmath, filter, json
67+
# coverage: none
68+
#
69+
# # —— Composer 🧙‍️ —————————————————————————————————————————————————————————
70+
# -
71+
# name: Install Composer dependencies
72+
# run: |
73+
# make install
74+
#
75+
# -
76+
# name: Run PHP-QA
77+
# run: |
78+
# make check

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
/composer.lock
33
/phpcs.xml
44
/var/
5+
.phpunit.result.cache

‎.travis.yml

-34
This file was deleted.

‎Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ ifndef BUILD_ENV
22
BUILD_ENV=php7.2
33
endif
44

5-
QA_DOCKER_IMAGE=parkmanager/phpqa:latest
6-
QA_DOCKER_COMMAND=docker run --init --interactive --tty --rm --env "COMPOSER_HOME=/composer" --user "$(shell id -u):$(shell id -g)" --volume /tmp/tmp-phpqa-$(shell id -u):/tmp:delegated --volume "$(shell pwd):/project:delegated" --volume "${HOME}/.composer:/composer:delegated" --workdir /project ${QA_DOCKER_IMAGE}
5+
QA_DOCKER_IMAGE=jakzal/phpqa:1.34.1-php7.4-alpine
6+
QA_DOCKER_COMMAND=docker run --init -t --rm --user "$(shell id -u):$(shell id -g)" --env "COMPOSER_HOME=/composer" --volume /tmp/tmp-phpqa-$(shell id -u):/tmp:delegated --volume "$(shell pwd):/project:delegated" --volume "${HOME}/.composer:/composer:delegated" --workdir /project ${QA_DOCKER_IMAGE}
77

88
install: composer-install
99
dist: composer-validate cs phpstan psalm test

‎composer.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616
}
1717
],
1818
"require": {
19-
"php": "^7.2",
19+
"php": ">=7.2",
2020
"paragonie/constant_time_encoding": "^2.2",
2121
"paragonie/hidden-string": "^1.0",
2222
"paragonie/sodium_compat": "^1.8"
2323
},
2424
"require-dev": {
25-
"doctrine/coding-standard": "^5.0",
26-
"phpunit/phpunit": "^7.5",
27-
"psalm/plugin-phpunit": "^0.3.0"
25+
"doctrine/coding-standard": "^8.0",
26+
"phpunit/phpunit": "^7.5 || ^8.5",
27+
"psalm/plugin-phpunit": "^0.13.0"
2828
},
2929
"config": {
3030
"preferred-install": {

0 commit comments

Comments
 (0)