Skip to content

Commit

Permalink
Merge pull request #121 from sprain/v3-wip
Browse files Browse the repository at this point in the history
Version 3 – the collected changes in one pr
  • Loading branch information
sprain authored May 10, 2021
2 parents ea0cf2e + 0ce5470 commit 9f9eac3
Show file tree
Hide file tree
Showing 59 changed files with 2,044 additions and 1,186 deletions.
2 changes: 2 additions & 0 deletions .scrutinizer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ filter:
- tests/*

build:
environment:
php: 7.4.16
nodes:
analysis:
tests:
Expand Down
6 changes: 2 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
language: php

php:
- 7.2
- 7.3
- 7.4

env:
Expand All @@ -14,12 +12,12 @@ jobs:
include:
- stage: "Integrate"
name: "Coding standard"
php: 7.3
php: 7.4
env:
- PREFER_LOWEST=""
script: vendor/bin/php-cs-fixer --no-interaction --dry-run --diff -v fix src/
- name: "Static analysis"
php: 7.3
php: 7.4
env:
- PREFER_LOWEST=""
script: vendor/bin/phpstan analyse
Expand Down
11 changes: 6 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"type": "library",
"license": "MIT",
"require": {
"php": "^7.2",
"php": "^7.4",
"symfony/validator": "^3.4.31|^4.2|^5.0",
"symfony/intl": "^3.4|^4.2|^5.0",
"khanamiryan/qrcode-detector-decoder": "^1.0.3",
Expand All @@ -13,13 +13,14 @@
},
"require-dev": {
"phpunit/phpunit": "^8.0|^9.0",
"dg/bypass-finals": "^1.3",
"dms/phpunit-arraysubset-asserts": "^0.1|^0.2",
"symfony/css-selector": "^4.2",
"phpstan/phpstan": "^0.12.23",
"fpdf/fpdf": "^1.82",
"friendsofphp/php-cs-fixer": "^2.16",
"phpstan/phpstan": "^0.12.23",
"symfony/css-selector": "^4.2",
"symfony/var-dumper": "^5.1",
"tecnickcom/tcpdf": "^6.3.2",
"fpdf/fpdf": "^1.82"
"tecnickcom/tcpdf": "^6.3.2"
},
"suggest": {
"tecnickcom/tcpdf": "Needed to create pdfs with TcPdfOutput",
Expand Down
Loading

0 comments on commit 9f9eac3

Please sign in to comment.