Commit d46bfbd3 authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

Merge branch 'fix/preinstalled-xdebug' into 'master' 

fix: support preinstalled xdebug

Closes #24

See merge request to-be-continuous/php!61
parents 20066df8 bc2a03a8

templates/gitlab-ci-php.yml

+12 −4
Original line number Diff line number Diff line
@@ -467,6 +467,17 @@ stages: 
    log_info "xdebug.mode=coverage set in \\e[33;1m${phpini_path}/conf.d/xdebug_coverage.ini\\e[0m"

  }



  function enable_xdebug() {

    if docker-php-ext-enable xdebug 2> /dev/null

    then

      log_info "xdebug already installed"

    else

      pecl install xdebug

      docker-php-ext-enable xdebug

    fi

    set_xdebug_mode

  }



  # locates and executes phpunit (./vendor/bin/phpunit is default location; ./bin/phpunit alternate location)

  function dophpunit() {

    if [[ -f "./vendor/bin/phpunit" ]]
@@ -512,10 +523,7 @@ php-unit: 
  extends: .php-base

  stage: build

  script:

    # install Xdebug

    - pecl install xdebug

    - docker-php-ext-enable xdebug

    - set_xdebug_mode

    - enable_xdebug

    # run PHPUnit (no color is important for the coverage regex)

    - dophpunit ${TRACE+--debug} --coverage-text --log-junit=reports/php-test.xunit.xml --coverage-cobertura=reports/php-coverage.cobertura.xml --coverage-clover=reports/php-coverage.clover.xml --colors=never $PHP_UNIT_ARGS

  # code coverage RegEx