From 650f9fe1fedd7e0c4dab5ae80eb1f7333ad232ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?p=C3=A9c=C3=A9?= Date: Mon, 11 Jul 2022 23:22:26 +0200 Subject: [PATCH] Min PHP version: 7.4, min Symfony version: 5.3, allows Symfony 6 --- .travis.yml | 12 +++++------ composer.json | 42 +++++++++++++++++++-------------------- docker-compose.yml.dist | 2 +- docker/phpunit/Dockerfile | 2 +- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/.travis.yml b/.travis.yml index a3c21eb..8d9064d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,14 +16,14 @@ env: matrix: fast_finish: true include: - - php: 7.1 + - php: 7.4 env: CHECK_PHP_SYNTAX="true" COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_DEPRECATIONS_HELPER=weak - TWIG_VERSION="^2.4" + TWIG_VERSION="^3.3" - - php: 7.3 + - php: 8.1 env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_DEPRECATIONS_HELPER=weak - TWIG_VERSION="^2.4" + TWIG_VERSION="^3.3" ENABLE_CODE_COVERAGE="true" # Latest commit to master @@ -36,12 +36,12 @@ matrix: before_install: - phpenv config-rm xdebug.ini || true - if [[ "$CHECK_PHP_SYNTAX" == "true" ]]; then wget https://cs.symfony.com/download/php-cs-fixer-v2.phar -O php-cs-fixer; fi - - phpenv global 7.3; composer global require --prefer-dist --no-progress --no-scripts --no-plugins symfony/flex dev-master; phpenv global $TRAVIS_PHP_VERSION + - phpenv global 7.4; composer global require --prefer-dist --no-progress --no-scripts --no-plugins symfony/flex dev-master; phpenv global $TRAVIS_PHP_VERSION - if [[ "$ENABLE_CODE_COVERAGE" != "true" && "$TRAVIS_EVENT_TYPE" != "cron" ]]; then rm -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini; fi; install: - composer update $COMPOSER_FLAGS --no-interaction - - phpenv global 7.3; ./vendor/bin/simple-phpunit install; phpenv global $TRAVIS_PHP_VERSION + - phpenv global 7.4; ./vendor/bin/simple-phpunit install; phpenv global $TRAVIS_PHP_VERSION - if [[ "$ENABLE_CODE_COVERAGE" == "true" ]]; then composer require --dev php-coveralls/php-coveralls; fi script: diff --git a/composer.json b/composer.json index 0501567..4cdb9ae 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ } ], "require": { - "php": "^7.1.3|^8.0", + "php": "^7.4|^8.0", "doctrine/collections": "^1.5", "doctrine/common": "^2.11|^3.0", "doctrine/dbal": "^2.10|^3.0", @@ -20,35 +20,35 @@ "doctrine/orm": "^2.7", "doctrine/persistence": "^1.3|^2", "easycorp/easyadmin-bundle": "^2.3.4", - "symfony/config": "^4.4|^5.0", - "symfony/dependency-injection": "^4.4|^5.0", - "symfony/event-dispatcher": "^4.4|^5.0", - "symfony/form": "^4.4|^5.0", - "symfony/framework-bundle": "^4.4|^5.0", - "symfony/http-foundation": "^4.4|^5.0.7", - "symfony/http-kernel": "^4.4|^5.0", - "symfony/property-access": "^4.4|^5.0", - "symfony/validator": "^4.4|^5.0", - "twig/twig": "^2.11.3|^3.0" + "symfony/config": "^5.3|^6.0", + "symfony/dependency-injection": "^5.3|^6.0", + "symfony/event-dispatcher": "^5.3|^6.0", + "symfony/form": "^5.3|^6.0", + "symfony/framework-bundle": "^5.3|^6.0", + "symfony/http-foundation": "^5.3|^6.0.7", + "symfony/http-kernel": "^5.3|^6.0", + "symfony/property-access": "^5.3|^6.0", + "symfony/validator": "^5.3|^6.0", + "twig/twig": "^3.3.8" }, "require-dev": { "doctrine/data-fixtures": "^1.3", "doctrine/doctrine-fixtures-bundle": "^3.0", "friendsofphp/php-cs-fixer": "^2.11", "php-coveralls/php-coveralls": "^2.0", - "phpstan/phpstan": "^0.12", + "phpstan/phpstan": "^1.0", "psr/log": "~1.0", - "symfony/browser-kit": "^4.4|^5.0", - "symfony/console": "^4.4|^5.0", - "symfony/css-selector": "^4.4|^5.0", - "symfony/dom-crawler": "^4.4|^5.0", + "symfony/browser-kit": "^5.3|^6.0", + "symfony/console": "^5.3|^6.0", + "symfony/css-selector": "^5.3|^6.0", + "symfony/dom-crawler": "^5.3|^6.0", "symfony/phpunit-bridge": "^4.3.5|^5.0", "symfony/polyfill-mbstring": "^1.7", - "symfony/security-bundle": "^4.4|^5.0", + "symfony/security-bundle": "^5.3|^6.0", "symfony/thanks": "^1.2.10", - "symfony/twig-bundle": "^4.4|^5.0", - "symfony/var-dumper": "^4.4|^5.0", - "symfony/yaml": "^4.4|^5.0" + "symfony/twig-bundle": "^5.3|^6.0", + "symfony/var-dumper": "^5.3|^6.0", + "symfony/yaml": "^5.3|^6.0" }, "conflict": { "easycorp/easyadmin-bundle": "<2.2.2" @@ -72,7 +72,7 @@ }, "extra": { "branch-alias": { - "dev-master": "3.0.x-dev" + "dev-master": "3.2.x-dev" } } } diff --git a/docker-compose.yml.dist b/docker-compose.yml.dist index f7e6fab..13a2904 100644 --- a/docker-compose.yml.dist +++ b/docker-compose.yml.dist @@ -1,4 +1,4 @@ -version: '3.2' +version: '3.9' services: diff --git a/docker/phpunit/Dockerfile b/docker/phpunit/Dockerfile index 2913a9f..6b9c6aa 100644 --- a/docker/phpunit/Dockerfile +++ b/docker/phpunit/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.1 +FROM php:7.4 RUN apt-get update && \ apt-get install -y --no-install-recommends git zip