Use dev HTTP-Kernel so we can generate code coverage again.

An error with the test container will be coming to 4.4.1 (which is not released yet). When it is available we should revert the changes to composer.json.
This commit is contained in:
Jan Böhmer 2019-11-30 22:53:45 +01:00
parent c64e4fe3d6
commit 4f70d8b1da
4 changed files with 11 additions and 14 deletions

View file

@ -12,7 +12,6 @@ php:
- '7.2' - '7.2'
- '7.3' - '7.3'
- '7.4snapshot' - '7.4snapshot'
# - 'nightly'
install: install:
- composer install - composer install
@ -27,8 +26,7 @@ install:
- mysql -e "SET GLOBAL FOREIGN_KEY_CHECKS=1;" - mysql -e "SET GLOBAL FOREIGN_KEY_CHECKS=1;"
script: script:
#- php bin/phpunit --coverage-clover=coverage.xml - php bin/phpunit --coverage-clover=coverage.xml
- php bin/phpunit
# Perform some simple linting if everything is correct # Perform some simple linting if everything is correct
- ./bin/console lint:yaml config --parse-tags - ./bin/console lint:yaml config --parse-tags
- ./bin/console lint:twig templates --env=prod - ./bin/console lint:twig templates --env=prod
@ -42,7 +40,4 @@ after_success:
- bash <(curl -s https://codecov.io/bash) - bash <(curl -s https://codecov.io/bash)
matrix: matrix:
fast_finish: true fast_finish: true
allow_failures:
- php: 7.4snapshot
# - php: nightly

View file

@ -1,6 +1,6 @@
FROM php:7-apache FROM php:7-apache
RUN apt-get update && apt-get install -y curl libcurl4-openssl-dev libicu-dev libpng-dev gnupg zip libzip-dev RUN apt-get update && apt-get install -y curl libcurl4-openssl-dev libicu-dev libpng-dev gnupg zip libzip-dev libonig-dev
RUN docker-php-ext-install pdo_mysql curl intl mbstring bcmath gd zip RUN docker-php-ext-install pdo_mysql curl intl mbstring bcmath gd zip

View file

@ -36,6 +36,7 @@
"symfony/form": "4.4.*", "symfony/form": "4.4.*",
"symfony/framework-bundle": "4.4.*", "symfony/framework-bundle": "4.4.*",
"symfony/http-client": "4.4.*", "symfony/http-client": "4.4.*",
"symfony/http-kernel": "4.4.x-dev",
"symfony/mailer": "4.4.*", "symfony/mailer": "4.4.*",
"symfony/monolog-bundle": "^3.1", "symfony/monolog-bundle": "^3.1",
"symfony/orm-pack": "*", "symfony/orm-pack": "*",

13
composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "9660d2f97bab13484c770ab738af0e6c", "content-hash": "733245d6c57c1dc9a4ebe51098d64efe",
"packages": [ "packages": [
{ {
"name": "clue/stream-filter", "name": "clue/stream-filter",
@ -5299,16 +5299,16 @@
}, },
{ {
"name": "symfony/http-kernel", "name": "symfony/http-kernel",
"version": "v4.4.0", "version": "4.4.x-dev",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/http-kernel.git", "url": "https://github.com/symfony/http-kernel.git",
"reference": "5a5e7237d928aa98ff8952050cbbf0135899b6b0" "reference": "2dd418fc0be40808f2bbe8f63e1fafe7182e5cf3"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/5a5e7237d928aa98ff8952050cbbf0135899b6b0", "url": "https://api.github.com/repos/symfony/http-kernel/zipball/2dd418fc0be40808f2bbe8f63e1fafe7182e5cf3",
"reference": "5a5e7237d928aa98ff8952050cbbf0135899b6b0", "reference": "2dd418fc0be40808f2bbe8f63e1fafe7182e5cf3",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -5385,7 +5385,7 @@
], ],
"description": "Symfony HttpKernel Component", "description": "Symfony HttpKernel Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2019-11-21T07:08:15+00:00" "time": "2019-11-28T08:08:13+00:00"
}, },
{ {
"name": "symfony/inflector", "name": "symfony/inflector",
@ -9835,6 +9835,7 @@
"minimum-stability": "stable", "minimum-stability": "stable",
"stability-flags": { "stability-flags": {
"gregwar/captcha-bundle": 20, "gregwar/captcha-bundle": 20,
"symfony/http-kernel": 20,
"roave/security-advisories": 20 "roave/security-advisories": 20
}, },
"prefer-stable": false, "prefer-stable": false,