added support on PHP 7.4 (#1355)

This commit is contained in:
Kevin Papst
2020-01-07 21:43:33 +01:00
committed by GitHub
parent e57b69973f
commit a8824f92a1
3 changed files with 114 additions and 82 deletions

View File

@@ -9,11 +9,12 @@ matrix:
include:
- stage: Code quality
env: CODECOVERAGE=0 DB=sqlite
php: '7.2'
php: '7.3'
script:
- composer validate --no-check-all --strict
- composer kimai:codestyle
- composer kimai:phpstan
- composer kimai:code-lint
- stage: Test
php: '7.2'
env: CODECOVERAGE=0 DB=mysql
@@ -26,13 +27,21 @@ matrix:
sudo: required
services:
- mysql
- stage: Test
php: '7.4'
env: CODECOVERAGE=0 DB=mysql
sudo: required
services:
- mysql
- stage: Test
php: '7.2'
env: CODECOVERAGE=0 DB=sqlite
- stage: Test
#php: '7.4snapshot'
php: '7.3'
env: CODECOVERAGE=0 DB=sqlite
- stage: Test
php: '7.4'
env: CODECOVERAGE=0 DB=sqlite
- stage: Test
php: '7.2'
env: CODECOVERAGE=0 DB=mariadb
@@ -51,6 +60,15 @@ matrix:
- mysql
before_script:
- mysql -u root -e 'CREATE USER IF NOT EXISTS travis@localhost; GRANT ALL ON *.* TO travis@localhost;'
- stage: Test
php: '7.4'
env: CODECOVERAGE=0 DB=mariadb
addons:
mariadb: '10.2'
services:
- mysql
before_script:
- mysql -u root -e 'CREATE USER IF NOT EXISTS travis@localhost; GRANT ALL ON *.* TO travis@localhost;'
- stage: Code coverage
php: '7.3'
env: CODECOVERAGE=1 DB=sqlite

View File

@@ -28,7 +28,7 @@
"kimai/kimai2-composer": "^0.1",
"laravolt/avatar": "^3.0",
"league/csv": "^9.4",
"mpdf/mpdf": "^7.1",
"mpdf/mpdf": "^8.0",
"nelmio/api-doc-bundle": "^3.2",
"nelmio/cors-bundle": "^1.5",
"ocramius/proxy-manager": "^2.1.1",

172
composer.lock generated
View File

@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "aabd51b3ad056e27e4f4e4f1b8724ff6",
"content-hash": "d1152442cf46f399dc9a21dce43f71c4",
"packages": [
{
"name": "beberlei/doctrineextensions",
@@ -409,16 +409,16 @@
},
{
"name": "doctrine/dbal",
"version": "v2.10.0",
"version": "v2.10.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/dbal.git",
"reference": "0c9a646775ef549eb0a213a4f9bd4381d9b4d934"
"reference": "c2b8e6e82732a64ecde1cddf9e1e06cb8556e3d8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/dbal/zipball/0c9a646775ef549eb0a213a4f9bd4381d9b4d934",
"reference": "0c9a646775ef549eb0a213a4f9bd4381d9b4d934",
"url": "https://api.github.com/repos/doctrine/dbal/zipball/c2b8e6e82732a64ecde1cddf9e1e06cb8556e3d8",
"reference": "c2b8e6e82732a64ecde1cddf9e1e06cb8556e3d8",
"shasum": ""
},
"require": {
@@ -497,7 +497,7 @@
"sqlserver",
"sqlsrv"
],
"time": "2019-11-03T16:50:43+00:00"
"time": "2020-01-04T12:56:21+00:00"
},
{
"name": "doctrine/doctrine-bundle",
@@ -2551,16 +2551,16 @@
},
{
"name": "illuminate/cache",
"version": "v6.8.0",
"version": "v6.10.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/cache.git",
"reference": "e06b7fbe402bc143ecbe12d3e314894c7aabb090"
"reference": "f64335a4678512440c94c2511d0df423de496aee"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/illuminate/cache/zipball/e06b7fbe402bc143ecbe12d3e314894c7aabb090",
"reference": "e06b7fbe402bc143ecbe12d3e314894c7aabb090",
"url": "https://api.github.com/repos/illuminate/cache/zipball/f64335a4678512440c94c2511d0df423de496aee",
"reference": "f64335a4678512440c94c2511d0df423de496aee",
"shasum": ""
},
"require": {
@@ -2578,7 +2578,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "6.0-dev"
"dev-master": "6.x-dev"
}
},
"autoload": {
@@ -2598,20 +2598,20 @@
],
"description": "The Illuminate Cache package.",
"homepage": "https://laravel.com",
"time": "2019-12-05T11:59:48+00:00"
"time": "2020-01-07T13:47:03+00:00"
},
{
"name": "illuminate/contracts",
"version": "v6.8.0",
"version": "v6.10.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/contracts.git",
"reference": "484727dc42f1c9dbffb2182f6fb0d01ca1aba556"
"reference": "f1326dfae72c646a8598138b446347954f5e991e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/illuminate/contracts/zipball/484727dc42f1c9dbffb2182f6fb0d01ca1aba556",
"reference": "484727dc42f1c9dbffb2182f6fb0d01ca1aba556",
"url": "https://api.github.com/repos/illuminate/contracts/zipball/f1326dfae72c646a8598138b446347954f5e991e",
"reference": "f1326dfae72c646a8598138b446347954f5e991e",
"shasum": ""
},
"require": {
@@ -2622,7 +2622,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "6.0-dev"
"dev-master": "6.x-dev"
}
},
"autoload": {
@@ -2642,20 +2642,20 @@
],
"description": "The Illuminate Contracts package.",
"homepage": "https://laravel.com",
"time": "2019-12-06T13:40:59+00:00"
"time": "2020-01-07T13:47:03+00:00"
},
{
"name": "illuminate/support",
"version": "v6.8.0",
"version": "v6.10.0",
"source": {
"type": "git",
"url": "https://github.com/illuminate/support.git",
"reference": "1536bbc476208a022805cb5b95ab72094d6d1b42"
"reference": "564b8b6ae8ca7660143c6b807effb289d5fd2616"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/illuminate/support/zipball/1536bbc476208a022805cb5b95ab72094d6d1b42",
"reference": "1536bbc476208a022805cb5b95ab72094d6d1b42",
"url": "https://api.github.com/repos/illuminate/support/zipball/564b8b6ae8ca7660143c6b807effb289d5fd2616",
"reference": "564b8b6ae8ca7660143c6b807effb289d5fd2616",
"shasum": ""
},
"require": {
@@ -2680,7 +2680,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "6.0-dev"
"dev-master": "6.x-dev"
}
},
"autoload": {
@@ -2703,7 +2703,7 @@
],
"description": "The Illuminate Support package.",
"homepage": "https://laravel.com",
"time": "2019-12-12T14:16:31+00:00"
"time": "2020-01-07T13:47:03+00:00"
},
{
"name": "intervention/image",
@@ -3159,16 +3159,16 @@
},
{
"name": "laravolt/avatar",
"version": "3.0.5",
"version": "3.0.6",
"source": {
"type": "git",
"url": "https://github.com/laravolt/avatar.git",
"reference": "c49e6502957a5b31019c69bc751785d5be283ca0"
"reference": "bec46869822ffa85284216c839ab41c9c967ff9d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravolt/avatar/zipball/c49e6502957a5b31019c69bc751785d5be283ca0",
"reference": "c49e6502957a5b31019c69bc751785d5be283ca0",
"url": "https://api.github.com/repos/laravolt/avatar/zipball/bec46869822ffa85284216c839ab41c9c967ff9d",
"reference": "bec46869822ffa85284216c839ab41c9c967ff9d",
"shasum": ""
},
"require": {
@@ -3221,7 +3221,7 @@
"laravel",
"laravolt"
],
"time": "2019-12-26T23:36:55+00:00"
"time": "2020-01-07T14:30:43+00:00"
},
{
"name": "league/csv",
@@ -3536,16 +3536,16 @@
},
{
"name": "mpdf/mpdf",
"version": "v7.1.9",
"version": "v8.0.4",
"source": {
"type": "git",
"url": "https://github.com/mpdf/mpdf.git",
"reference": "a0fc1215d2306aa3b4ba6e97bd6ebe4bab6a88fb"
"reference": "d3147a0d790b6d11936fd9c73fa31a7ed45e3f6f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/mpdf/mpdf/zipball/a0fc1215d2306aa3b4ba6e97bd6ebe4bab6a88fb",
"reference": "a0fc1215d2306aa3b4ba6e97bd6ebe4bab6a88fb",
"url": "https://api.github.com/repos/mpdf/mpdf/zipball/d3147a0d790b6d11936fd9c73fa31a7ed45e3f6f",
"reference": "d3147a0d790b6d11936fd9c73fa31a7ed45e3f6f",
"shasum": ""
},
"require": {
@@ -3553,14 +3553,15 @@
"ext-mbstring": "*",
"myclabs/deep-copy": "^1.7",
"paragonie/random_compat": "^1.4|^2.0|9.99.99",
"php": "^5.6 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0",
"php": "^5.6 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0",
"psr/log": "^1.0",
"setasign/fpdi": "1.6.*"
"setasign/fpdi": "^2.1"
},
"require-dev": {
"mockery/mockery": "^0.9.5",
"mpdf/qrcode": "^1.0.0",
"phpunit/phpunit": "^5.0",
"squizlabs/php_codesniffer": "^2.7.0",
"squizlabs/php_codesniffer": "^3.5.0",
"tracy/tracy": "^2.4"
},
"suggest": {
@@ -3600,7 +3601,7 @@
"php",
"utf-8"
],
"time": "2019-02-06T13:32:19+00:00"
"time": "2019-11-28T09:39:33+00:00"
},
{
"name": "myclabs/deep-copy",
@@ -4905,32 +4906,39 @@
},
{
"name": "setasign/fpdi",
"version": "1.6.2",
"version": "v2.2.0",
"source": {
"type": "git",
"url": "https://github.com/Setasign/FPDI.git",
"reference": "a6ad58897a6d97cc2d2cd2adaeda343b25a368ea"
"reference": "3c266002f8044f61b17329f7cd702d44d73f0f7f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Setasign/FPDI/zipball/a6ad58897a6d97cc2d2cd2adaeda343b25a368ea",
"reference": "a6ad58897a6d97cc2d2cd2adaeda343b25a368ea",
"url": "https://api.github.com/repos/Setasign/FPDI/zipball/3c266002f8044f61b17329f7cd702d44d73f0f7f",
"reference": "3c266002f8044f61b17329f7cd702d44d73f0f7f",
"shasum": ""
},
"require": {
"ext-zlib": "*",
"php": "^5.6 || ^7.0"
},
"require-dev": {
"phpunit/phpunit": "~5.7",
"setasign/fpdf": "~1.8",
"setasign/tfpdf": "1.25",
"tecnickcom/tcpdf": "~6.2"
},
"suggest": {
"setasign/fpdf": "FPDI will extend this class but as it is also possible to use \"tecnickcom/tcpdf\" as an alternative there's no fixed dependency configured.",
"setasign/fpdf": "FPDI will extend this class but as it is also possible to use TCPDF or tFPDF as an alternative. There's no fixed dependency configured.",
"setasign/fpdi-fpdf": "Use this package to automatically evaluate dependencies to FPDF.",
"setasign/fpdi-tcpdf": "Use this package to automatically evaluate dependencies to TCPDF."
"setasign/fpdi-tcpdf": "Use this package to automatically evaluate dependencies to TCPDF.",
"setasign/fpdi-tfpdf": "Use this package to automatically evaluate dependencies to tFPDF."
},
"type": "library",
"autoload": {
"classmap": [
"filters/",
"fpdi.php",
"fpdf_tpl.php",
"fpdi_pdf_parser.php",
"pdf_context.php"
]
"psr-4": {
"setasign\\Fpdi\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -4941,6 +4949,11 @@
"name": "Jan Slabon",
"email": "jan.slabon@setasign.com",
"homepage": "https://www.setasign.com"
},
{
"name": "Maximilian Kresse",
"email": "maximilian.kresse@setasign.com",
"homepage": "https://www.setasign.com"
}
],
"description": "FPDI is a collection of PHP classes facilitating developers to read pages from existing PDF documents and use them as templates in FPDF. Because it is also possible to use FPDI with TCPDF, there are no fixed dependencies defined. Please see suggestions for packages which evaluates the dependencies automatically.",
@@ -4950,7 +4963,7 @@
"fpdi",
"pdf"
],
"time": "2017-05-11T14:25:49+00:00"
"time": "2019-01-30T14:11:19+00:00"
},
{
"name": "swiftmailer/swiftmailer",
@@ -9941,20 +9954,20 @@
},
{
"name": "nette/finder",
"version": "v2.5.1",
"version": "v2.5.2",
"source": {
"type": "git",
"url": "https://github.com/nette/finder.git",
"reference": "14164e1ddd69e9c5f627ff82a10874b3f5bba5fe"
"reference": "4ad2c298eb8c687dd0e74ae84206a4186eeaed50"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nette/finder/zipball/14164e1ddd69e9c5f627ff82a10874b3f5bba5fe",
"reference": "14164e1ddd69e9c5f627ff82a10874b3f5bba5fe",
"url": "https://api.github.com/repos/nette/finder/zipball/4ad2c298eb8c687dd0e74ae84206a4186eeaed50",
"reference": "4ad2c298eb8c687dd0e74ae84206a4186eeaed50",
"shasum": ""
},
"require": {
"nette/utils": "^2.4 || ~3.0.0",
"nette/utils": "^2.4 || ^3.0",
"php": ">=7.1"
},
"conflict": {
@@ -9962,6 +9975,7 @@
},
"require-dev": {
"nette/tester": "^2.0",
"phpstan/phpstan": "^0.12",
"tracy/tracy": "^2.3"
},
"type": "library",
@@ -9999,7 +10013,7 @@
"iterator",
"nette"
],
"time": "2019-07-11T18:02:17+00:00"
"time": "2020-01-03T20:35:40+00:00"
},
{
"name": "nette/neon",
@@ -10065,24 +10079,25 @@
},
{
"name": "nette/php-generator",
"version": "v3.3.1",
"version": "v3.3.2",
"source": {
"type": "git",
"url": "https://github.com/nette/php-generator.git",
"reference": "4240fd7adf499138c07b814ef9b9a6df9f6d7187"
"reference": "facde285ba959366e7eee09c7f198f2d9ef176ca"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nette/php-generator/zipball/4240fd7adf499138c07b814ef9b9a6df9f6d7187",
"reference": "4240fd7adf499138c07b814ef9b9a6df9f6d7187",
"url": "https://api.github.com/repos/nette/php-generator/zipball/facde285ba959366e7eee09c7f198f2d9ef176ca",
"reference": "facde285ba959366e7eee09c7f198f2d9ef176ca",
"shasum": ""
},
"require": {
"nette/utils": "^2.4.2 || ~3.0.0",
"nette/utils": "^2.4.2 || ^3.0",
"php": ">=7.1"
},
"require-dev": {
"nette/tester": "^2.0",
"phpstan/phpstan": "^0.12",
"tracy/tracy": "^2.3"
},
"type": "library",
@@ -10112,7 +10127,7 @@
"homepage": "https://nette.org/contributors"
}
],
"description": "🐘 Nette PHP Generator: generates neat PHP code for you. Supports new PHP 7.3 features.",
"description": "🐘 Nette PHP Generator: generates neat PHP code for you. Supports new PHP 7.4 features.",
"homepage": "https://nette.org",
"keywords": [
"code",
@@ -10120,7 +10135,7 @@
"php",
"scaffolding"
],
"time": "2019-11-22T11:12:11+00:00"
"time": "2020-01-03T19:49:13+00:00"
},
{
"name": "nette/robot-loader",
@@ -10187,31 +10202,30 @@
},
{
"name": "nette/schema",
"version": "v1.0.1",
"version": "v1.0.2",
"source": {
"type": "git",
"url": "https://github.com/nette/schema.git",
"reference": "337117df1dade22e2ba1fdc4a4b832c1e9b06b76"
"reference": "febf71fb4052c824046f5a33f4f769a6e7fa0cb4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nette/schema/zipball/337117df1dade22e2ba1fdc4a4b832c1e9b06b76",
"reference": "337117df1dade22e2ba1fdc4a4b832c1e9b06b76",
"url": "https://api.github.com/repos/nette/schema/zipball/febf71fb4052c824046f5a33f4f769a6e7fa0cb4",
"reference": "febf71fb4052c824046f5a33f4f769a6e7fa0cb4",
"shasum": ""
},
"require": {
"nette/utils": "^3.0.1",
"nette/utils": "^3.1",
"php": ">=7.1"
},
"require-dev": {
"nette/tester": "^2.2",
"phpstan/phpstan-nette": "^0.12",
"tracy/tracy": "^2.3"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0-dev"
}
"branch-alias": []
},
"autoload": {
"classmap": [
@@ -10240,20 +10254,20 @@
"config",
"nette"
],
"time": "2019-10-31T20:52:19+00:00"
"time": "2020-01-06T22:52:48+00:00"
},
{
"name": "nette/utils",
"version": "v3.0.3",
"version": "v3.1.0",
"source": {
"type": "git",
"url": "https://github.com/nette/utils.git",
"reference": "f1b5ce0fae07f13e066e64f9a8f59e53b8f4982e"
"reference": "d6cd63d77dd9a85c3a2fae707e1255e44c2bc182"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nette/utils/zipball/f1b5ce0fae07f13e066e64f9a8f59e53b8f4982e",
"reference": "f1b5ce0fae07f13e066e64f9a8f59e53b8f4982e",
"url": "https://api.github.com/repos/nette/utils/zipball/d6cd63d77dd9a85c3a2fae707e1255e44c2bc182",
"reference": "d6cd63d77dd9a85c3a2fae707e1255e44c2bc182",
"shasum": ""
},
"require": {
@@ -10276,7 +10290,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "3.0-dev"
"dev-master": "3.1-dev"
}
},
"autoload": {
@@ -10318,7 +10332,7 @@
"utility",
"validation"
],
"time": "2019-12-27T03:47:50+00:00"
"time": "2020-01-03T18:13:31+00:00"
},
{
"name": "nikic/php-parser",