change way to set the max phpunit version

massiveart · Jan 16, 2024 · c259b2c · c259b2c
1 parent dff10c6
commit c259b2c
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 2 deletions.
diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml
@@ -16,6 +16,7 @@ jobs:
             SYMFONY_DEPRECATIONS_HELPER: weak
             COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
             ELASTICSEARCH_VERSION: ${{ matrix.elasticsearch-version }}
+            SYMFONY_MAX_PHPUNIT_VERSION: ${{ matrix.max-phpunit-version }}
 
         strategy:
             fail-fast: false
@@ -28,6 +29,7 @@ jobs:
                       dependency-versions: 'lowest'
                       tools: 'composer:v1'
                       php-cs-fixer: false
+                      matrix.max-phpunit-version: '7'
 
                     - php-version: '7.3'
                       elasticsearch-version: '2.4.6'
@@ -36,6 +38,7 @@ jobs:
                       dependency-versions: 'highest'
                       tools: 'composer:v2'
                       php-cs-fixer: false
+                      matrix.max-phpunit-version: '7'
 
                     - php-version: '7.4'
                       elasticsearch-version: '2.4.6'
@@ -44,6 +47,7 @@ jobs:
                       dependency-versions: 'highest'
                       tools: 'composer:v2'
                       php-cs-fixer: true
+                      matrix.max-phpunit-version: '7'
 
                     - php-version: '8.0'
                       elasticsearch-version: '7.11.1'
@@ -52,6 +56,7 @@ jobs:
                       dependency-versions: 'highest'
                       tools: 'composer:v2'
                       php-cs-fixer: false
+                      matrix.max-phpunit-version: '7'
 
                     - php-version: '8.1'
                       elasticsearch-version: '7.11.1'
@@ -60,6 +65,7 @@ jobs:
                       dependency-versions: 'highest'
                       tools: 'composer:v2'
                       php-cs-fixer: false
+                      matrix.max-phpunit-version: '8'
 
                     - php-version: '8.1'
                       elasticsearch-version: '7.11.1'
@@ -68,6 +74,7 @@ jobs:
                       dependency-versions: 'highest'
                       tools: 'composer:v2'
                       php-cs-fixer: false
+                      matrix.max-phpunit-version: '8'
 
         services:
             elasticsearch:

diff --git a/Tests/ProphecyTrait.php b/Tests/ProphecyTrait.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the MassiveSearchBundle
+ *
+ * (c) MASSIVE ART WebServices GmbH
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
 namespace Prophecy\PhpUnit;
 
 trait ProphecyTrait

diff --git a/Tests/Unit/Command/ReindexCommandTest.php b/Tests/Unit/Command/ReindexCommandTest.php
@@ -99,7 +99,7 @@ public function testCheckpointAsk()
             Argument::type(OutputInterface::class),
             Argument::type(ConfirmationQuestion::class),
             true
-        )->shouldBeCalled();
+        )->shouldBeCalled()->willReturn(true);
         $this->execute('prod', []);
     }
 

diff --git a/Tests/bootstrap.php b/Tests/bootstrap.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the MassiveSearchBundle
+ *
+ * (c) MASSIVE ART WebServices GmbH
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
 require_once __DIR__ . '/../vendor/symfony-cmf/testing/bootstrap/bootstrap.php';
 
 if (!\trait_exists('Prophecy\PhpUnit\ProphecyTrait')) {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -22,7 +22,6 @@
     </coverage>
 
     <php>
-        <env name="SYMFONY_MAX_PHPUNIT_VERSION" value="7"/>
         <env name="SYMFONY_PHPUNIT_REMOVE_RETURN_TYPEHINT" value="1"/>
         <env name="SYMFONY_PHPUNIT_REMOVE" value="symfony/yaml"/>
         <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak"/>