Merge branch 'laravel-7-support' of github.com:stancl/tenancy into laravel-7-support

Dockerfile

@@ -5,7 +5,6 @@ LABEL maintainer="Samuel Štancl"
 ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update
-
 RUN apt-get install -y software-properties-common
 RUN add-apt-repository -y ppa:ondrej/php
 
@@ -16,12 +15,10 @@ RUN apt-get install -y curl zip unzip git sqlite3 \
     php7.4-imap php7.4-mysql php7.4-mbstring \
     php7.4-xml php7.4-zip php7.4-bcmath php7.4-soap \
     php7.4-intl php7.4-readline php7.4-xdebug \
-    php-msgpack php-igbinary \
+    php7.4-redis php-msgpack php-igbinary \
     && php -r "readfile('http://getcomposer.org/installer');" | php -- --install-dir=/usr/bin/ --filename=composer \
     && mkdir /run/php
 
-RUN apt-get install -y php7.4-redis
-
 RUN apt-get install -y python3
 
 RUN apt-get install -y php7.4-dev php-pear
@@ -32,4 +29,4 @@ RUN apt-get -y autoremove \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-WORKDIR /var/www/html
+WORKDIR /var/www/html

composer.json

@@ -20,7 +20,7 @@
         "laravel/framework": "^6.0|^7.0",
         "orchestra/testbench-browser-kit": "^4.0|^5.0",
         "league/flysystem-aws-s3-v3": "~1.0",
-        "phpunit/phpcov": "^6.0|^7.0"
+        "phpunit/phpcov": "dev-master"
     },
     "autoload": {
         "psr-4": {