From 4f70d8b1dad133e621090c69009478ee300fb9c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20B=C3=B6hmer?= <jan.h.boehmer@gmx.de>
Date: Sat, 30 Nov 2019 22:53:45 +0100
Subject: [PATCH] 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.
---
 .travis.yml   |  9 ++-------
 Dockerfile    |  2 +-
 composer.json |  1 +
 composer.lock | 13 +++++++------
 4 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 21cf95c1..6cf5ea20 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,6 @@ php:
   - '7.2'
   - '7.3'
   - '7.4snapshot'
- # - 'nightly'
 
 install:
   - composer install
@@ -27,8 +26,7 @@ install:
   - mysql -e "SET GLOBAL FOREIGN_KEY_CHECKS=1;"
 
 script:
-  #- php bin/phpunit --coverage-clover=coverage.xml
-  - php bin/phpunit
+  - php bin/phpunit --coverage-clover=coverage.xml
   # Perform some simple linting if everything is correct
   - ./bin/console lint:yaml config --parse-tags
   - ./bin/console lint:twig templates --env=prod
@@ -42,7 +40,4 @@ after_success:
   - bash <(curl -s https://codecov.io/bash)
 
 matrix:
-  fast_finish: true
-  allow_failures:
-    - php: 7.4snapshot
-   # - php: nightly
\ No newline at end of file
+  fast_finish: true
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 9f776276..bc2913d5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 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
 
diff --git a/composer.json b/composer.json
index f2afbf59..9b25077f 100644
--- a/composer.json
+++ b/composer.json
@@ -36,6 +36,7 @@
         "symfony/form": "4.4.*",
         "symfony/framework-bundle": "4.4.*",
         "symfony/http-client": "4.4.*",
+        "symfony/http-kernel": "4.4.x-dev",
         "symfony/mailer": "4.4.*",
         "symfony/monolog-bundle": "^3.1",
         "symfony/orm-pack": "*",
diff --git a/composer.lock b/composer.lock
index 97943c7c..c3d7ebc9 100644
--- a/composer.lock
+++ b/composer.lock
@@ -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": "9660d2f97bab13484c770ab738af0e6c",
+    "content-hash": "733245d6c57c1dc9a4ebe51098d64efe",
     "packages": [
         {
             "name": "clue/stream-filter",
@@ -5299,16 +5299,16 @@
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v4.4.0",
+            "version": "4.4.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "5a5e7237d928aa98ff8952050cbbf0135899b6b0"
+                "reference": "2dd418fc0be40808f2bbe8f63e1fafe7182e5cf3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/5a5e7237d928aa98ff8952050cbbf0135899b6b0",
-                "reference": "5a5e7237d928aa98ff8952050cbbf0135899b6b0",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/2dd418fc0be40808f2bbe8f63e1fafe7182e5cf3",
+                "reference": "2dd418fc0be40808f2bbe8f63e1fafe7182e5cf3",
                 "shasum": ""
             },
             "require": {
@@ -5385,7 +5385,7 @@
             ],
             "description": "Symfony HttpKernel Component",
             "homepage": "https://symfony.com",
-            "time": "2019-11-21T07:08:15+00:00"
+            "time": "2019-11-28T08:08:13+00:00"
         },
         {
             "name": "symfony/inflector",
@@ -9835,6 +9835,7 @@
     "minimum-stability": "stable",
     "stability-flags": {
         "gregwar/captcha-bundle": 20,
+        "symfony/http-kernel": 20,
         "roave/security-advisories": 20
     },
     "prefer-stable": false,