Merge branch '6.0' into 6.1

javiereguiluz · javiereguiluz · commit 95349df972bc · 2022-07-22T12:04:25.000+02:00
* 6.0:
  [DI] add missing linter exception
  [ci] allow flex to run in CI
diff --git a/.doctor-rst.yaml b/.doctor-rst.yaml
@@ -91,6 +91,7 @@ whitelist:
         - '.. versionadded:: 1.8' # MakerBundle
         - '.. versionadded:: 1.18' # Flex in setup/upgrade_minor.rst
         - '.. versionadded:: 1.0.0' # Encore
+        - '.. versionadded:: 5.1' # Private Services
         - '0 => 123' # assertion for var_dumper - components/var_dumper.rst
         - '1 => "foo"' # assertion for var_dumper - components/var_dumper.rst
         - '123,' # assertion for var_dumper - components/var_dumper.rst
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -116,6 +116,11 @@ jobs:
             if: ${{ steps.find-files.outputs.files }}
             run: composer create-project symfony-tools/code-block-checker:@dev _checker
 
+          - name: Allow Flex
+            if: ${{ steps.find-files.outputs.files }}
+            run: |
+              composer config --no-plugins allow-plugins.symfony/flex true
+
           - name: Install test application
             if: ${{ steps.find-files.outputs.files }}
             run: |
