diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 40bdde8..dc6a985 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -48,8 +48,6 @@ jobs: run: | export WITH_COVERAGE=$(if [[ ("${{ matrix.php }}" = "8.0") && ("${{ matrix.stability }}" = "--prefer-stable") ]]; then echo "true"; else echo "false"; fi) echo "WITH_COVERAGE=${WITH_COVERAGE}" >> $GITHUB_ENV - export XDEBUG_VERSION=$(if [[ ("${{ matrix.php }}" = "7.2") then echo "2.9.3"; else echo "3.0.4"; fi) - echo "XDEBUG_VERSION=${XDEBUG_VERSION}" >> $GITHUB_ENV make vendor make tests diff --git a/Makefile b/Makefile index aa46103..de5a99e 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,6 @@ DOCKER_COMPOSE ?= docker-compose EXEC_PHP = $(DOCKER_COMPOSE) run --rm -T php PHP_VERSION ?= 8.0 -XDEBUG_VERSION ?= 3.0.4 DEPS_STRATEGY ?= --prefer-stable COMPOSER = $(EXEC_PHP) composer WITH_COVERAGE ?= "FALSE" diff --git a/docker-compose.yml b/docker-compose.yml index 6d58cf2..95ee4b8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,7 +7,6 @@ services: context: docker/php args: PHP_VERSION: ${PHP_VERSION:-8.0} - XDEBUG_VERSION: ${XDEBUG_VERSION:-3.0.4} volumes: - .:/usr/src/myapp - ./cache:/root/composer/cache diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile index c074128..4920781 100644 --- a/docker/php/Dockerfile +++ b/docker/php/Dockerfile @@ -6,7 +6,7 @@ ENV XDEBUG_MODE=coverage RUN echo "memory_limit=-1" > "$PHP_INI_DIR/conf.d/memory-limit.ini" \ && echo "date.timezone=${PHP_TIMEZONE:-UTC}" > "$PHP_INI_DIR/conf.d/date_timezone.ini" -ARG XDEBUG_VERSION +ARG XDEBUG_VERSION=3.0.4 RUN apt-get update \ && apt install -y \