diff --git a/.travis.yml b/.travis.yml index 87f9f300..4a06db1f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,10 @@ -# env: -# - LARAVEL_VERSION="^6.0" TESTBENCH_VERSION="~4.0" REDIS_DRIVER=phpredis +env: + - LARAVEL_VERSION="^6.0" + - LARAVEL_VERSION="^7.0" language: php php: - - '7.2' + - '7.4' services: - docker @@ -11,8 +12,8 @@ services: before_install: - docker-compose up -d -# install: -# - travis_retry docker-compose exec test composer require --no-interaction "laravel/framework:$LARAVEL_VERSION" "orchestra/testbench:$TESTBENCH_VERSION" +install: + - travis_retry docker-compose exec test composer require --no-interaction "laravel/framework:$LARAVEL_VERSION" install: - travis_retry docker-compose exec test composer install --no-interaction diff --git a/Dockerfile b/Dockerfile index a6512668..bd2bfae6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,27 +4,29 @@ LABEL maintainer="Samuel Ć tancl" ENV DEBIAN_FRONTEND=noninteractive -RUN apt-get update \ - && apt-get install -y curl zip unzip git sqlite3 \ - php7.2-fpm php7.2-cli \ - php7.2-pgsql php7.2-sqlite3 php7.2-gd \ - php7.2-curl php7.2-memcached \ - php7.2-imap php7.2-mysql php7.2-mbstring \ - php7.2-xml php7.2-zip php7.2-bcmath php7.2-soap \ - php7.2-intl php7.2-readline php7.2-xdebug \ +RUN apt-get update + +RUN apt-get install -y software-properties-common +RUN add-apt-repository -y ppa:ondrej/php + +RUN apt-get install -y curl zip unzip git sqlite3 \ + php7.4-fpm php7.4-cli \ + php7.4-pgsql php7.4-sqlite3 php7.4-gd \ + php7.4-curl php7.4-memcached \ + 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 \ && php -r "readfile('http://getcomposer.org/installer');" | php -- --install-dir=/usr/bin/ --filename=composer \ && mkdir /run/php -RUN apt-get install -y php7.2-redis +RUN apt-get install -y php7.4-redis RUN apt-get install -y python3 -RUN apt-get install -y php7.2-dev php-pear +RUN apt-get install -y php7.4-dev php-pear RUN pecl install xdebug -# RUN echo '' > /etc/php/7.2/cli/conf.d/20-xdebug.ini -# RUN echo 'zend_extension=/usr/lib/php/20170718/xdebug.so' >> /etc/php/7.2/cli/php.ini -RUN echo 'zend_extension=/usr/lib/php/20170718/xdebug.so' > /etc/php/7.2/cli/conf.d/20-xdebug.ini +RUN echo 'zend_extension=/usr/lib/php/20190902/xdebug.so' > /etc/php/7.4/cli/conf.d/20-xdebug.ini RUN apt-get -y autoremove \ && apt-get clean \ diff --git a/composer.json b/composer.json index 21e4f143..d68dd1a7 100644 --- a/composer.json +++ b/composer.json @@ -11,17 +11,16 @@ ], "require": { "ext-json": "*", - "illuminate/support": "^6.0", + "illuminate/support": "^6.0|^7.0", "facade/ignition-contracts": "^1.0", "ramsey/uuid": "^3.7" }, "require-dev": { - "vlucas/phpdotenv": "^3.3", - "laravel/telescope": "^2.0", - "laravel/framework": "^6.0", - "orchestra/testbench-browser-kit": "^4.0", + "vlucas/phpdotenv": "^3.3|^4.0", + "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" + "phpunit/phpcov": "^6.0|^7.0" }, "autoload": { "psr-4": {