Fix scrutinizer and codecov tags

Author: yoanm

.github/workflows/CI.yml

@@ -98,14 +98,14 @@ jobs:
         with:
           file: "build/coverage-phpunit/clover-unit.xml"
           name: "unit-tests-${{ matrix.php-version }}-${{ matrix.symfony-version }}"
-          flags: "unit-tests,php-${{ matrix.php-version }},sf-${{ matrix.symfony-version }}+"
+          flags: "unit-tests,php-${{ matrix.php-version }},sf-${{ matrix.symfony-version }}"
           fail_ci_if_error: true
           move_coverage_to_trash: true
       - name: Upload functional tests coverage to codecov
         uses: codecov/codecov-action@v2
         with:
           name: "functional-tests-${{ matrix.php-version }}-${{ matrix.symfony-version }}"
-          flags: "functional-tests,php-${{ matrix.php-version }},sf-${{ matrix.symfony-version }}+"
+          flags: "functional-tests,php-${{ matrix.php-version }},sf-${{ matrix.symfony-version }}"
           fail_ci_if_error: true
 
   nightly-tests:
@@ -171,7 +171,7 @@ jobs:
         with:
           file: "build/coverage-phpunit/clover-unit.xml"
           name: "unit-tests-${{ matrix.php-version }}-${{ matrix.symfony-version }}"
-          flags: "nightly,unit-tests,php-${{ matrix.php-version }},sf-${{ matrix.symfony-version }}+"
+          flags: "nightly,unit-tests,php-${{ matrix.php-version }},sf-${{ matrix.symfony-version }}"
           fail_ci_if_error: false
           move_coverage_to_trash: true
       - name: Upload functional tests coverage to codecov
@@ -180,5 +180,5 @@ jobs:
         with:
           file: "build/coverage-phpunit/clover-functional.xml,build/coverage-behat/clover.xml"
           name: "functional-tests-${{ matrix.php-version }}-${{ matrix.symfony-version }}"
-          flags: "nightly,functional-tests,php-${{ matrix.php-version }},sf-${{ matrix.symfony-version }}+"
+          flags: "nightly,functional-tests,php-${{ matrix.php-version }},sf-${{ matrix.symfony-version }}"
           fail_ci_if_error: false

.scrutinizer.yml

@@ -22,8 +22,13 @@ build:
       - command: make scrutinizer-phpunit
         idle_timeout: 1200
         coverage:
-          file: 'build/coverage/clover.xml'
+          file: 'build/coverage-phpunit/scrutinizer.xml'
           format: 'php-clover'
+      - command: make scrutinizer-behat
+          idle_timeout: 1200
+          coverage:
+            file: 'build/coverage-behat/clover.xml'
+            format: 'php-clover'
       - command: php-scrutinizer-run --enable-security-analysis
         title: Scrutinizer checks
 

Makefile

@@ -99,10 +99,10 @@ codestyle: create-build-directories
 	./vendor/bin/phpcs ${PHPCS_DISABLE_WARNING_OPTION} --standard=phpcs.xml.dist ${PHPCS_COLOR_OPTION} ${PHPCS_REPORT_FILE_OPTION} --report=${PHPCS_REPORT_STYLE}
 
 scrutinizer-phpunit:
-	./vendor/bin/phpunit ${PHPUNIT_COLOR_OPTION} ${PHPUNIT_OUTPUT_STYLE_OPTION} ${PHPUNIT_COVERAGE_OPTION}
+	XDEBUG_MODE=coverage ./vendor/bin/phpunit ${PHPUNIT_COLOR_OPTION} ${PHPUNIT_OUTPUT_STYLE_OPTION} --coverage-clover build/coverage-phpunit/scrutinizer.xml
 
 scrutinizer-behat:
-	./vendor/bin/behat ${BEHAT_COLOR_OPTION} ${BEHAT_OUTPUT_STYLE_OPTION} ${BEHAT_COVERAGE_OPTION} --no-snippets
+	XDEBUG_MODE=coverage ./vendor/bin/behat ${BEHAT_COLOR_OPTION} ${BEHAT_OUTPUT_STYLE_OPTION} --profile coverage-clover --no-snippets
 
 
 # Internal commands