Merge aabde6d into 0740ee1

sonata-project · Aug 27, 2020 · 38d295e · 38d295e
2 parents 0740ee1 + aabde6d
commit 38d295e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -11,7 +11,7 @@ on:
       - 3.x
 
   pull_request:
-    paths: ['**.php', '**.yml', '**.yaml', '**.xml', '**.twig', '**.js', '**.css', '**.json']
+    paths: ['**.php', '**.yml', '**.yaml', '**.xml', '**.xml.dist', '**.twig', '**.js', '**.css', '**.json']
 
 jobs:
   test:
@@ -27,27 +27,35 @@ jobs:
           - '7.2'
           - '7.3'
           - '7.4'
+        phpunit-version: ['8.5']
         dependencies: [highest]
         allowed_to_fail: [false]
         variant: [normal]
         include:
           - php-version: '7.2'
+            phpunit-version: '8.5'
             dependencies: lowest
             allowed_to_fail: false
             variant: normal
           - php-version: '8.0'
+            phpunit-version: '9.3'
             dependencies: highest
             allowed_to_fail: true
             variant: normal
           - php-version: '7.3'
+            phpunit-version: '8.5'
             dependencies: highest
             allowed_to_fail: false
             variant: 'symfony/symfony:"4.4.*"'
           - php-version: '7.3'
+            phpunit-version: '8.5'
             dependencies: highest
             allowed_to_fail: false
             variant: 'sonata-project/block-bundle:"3.*"'
 
+    env:
+      SYMFONY_PHPUNIT_VERSION: ${{ matrix.phpunit-version }}
+
     steps:
       - name: Checkout
         uses: actions/checkout@v2

diff --git a/composer.json b/composer.json
@@ -72,6 +72,7 @@
         "jms/translation-bundle": "^1.4",
         "matthiasnoback/symfony-dependency-injection-test": "^4.1",
         "phpdocumentor/reflection-docblock": "^5.2",
+        "phpspec/prophecy": "^1.11.1",
         "phpstan/phpstan": "^0.12.29",
         "psalm/plugin-symfony": "^1.4",
         "psr/event-dispatcher": "^1.0",

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -31,7 +31,6 @@ It's auto-generated by sonata-project/dev-kit package.
     <php>
         <ini name="precision" value="8" />
         <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0" />
-        <env name="SYMFONY_PHPUNIT_REMOVE" value="symfony/yaml" />
         <env name="SYMFONY_PHPUNIT_VERSION" value="8.5" />
     </php>