Merge pull request #8 from kbond/sf-5.4

Adjust CI matrix
zenstruck · Sep 30, 2021 · 23c7876 · 23c7876
2 parents 4b13884 + 8264478
commit 23c7876
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 18 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,14 +14,11 @@ jobs:
       matrix:
         php: [7.4, 8.0]
         stability: [hightest]
-        symfony: [4.4.*, 5.2.*, 5.3.*]
+        symfony: [4.4.*, 5.3.*, 5.4.*]
         include:
           - php: 7.4
             stability: lowest
             symfony: '*'
-          - php: 8.0
-            stability: highest
-            symfony: '5.4.*@dev'
     steps:
       - name: Checkout code
         uses: actions/checkout@v2.3.3
@@ -31,13 +28,7 @@ jobs:
         with:
           php-version: ${{ matrix.php }}
           coverage: none
-
-      - name: Install Symfony Flex
-        run: composer global require --no-progress --no-scripts --no-plugins symfony/flex dev-main
-
-      - name: Set minimum-stability to dev
-        run: composer config minimum-stability dev
-        if: ${{ contains(matrix.symfony, '@dev') }}
+          tools: flex
 
       - name: Install dependencies
         uses: ramsey/composer-install@v1

diff --git a/composer.json b/composer.json
@@ -33,5 +33,7 @@
     },
     "autoload-dev": {
         "psr-4": { "Zenstruck\\Mailer\\Test\\Tests\\": "tests/" }
-    }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }
diff --git a/tests/InteractsWithMailerTest.php b/tests/InteractsWithMailerTest.php
@@ -173,10 +173,10 @@ public function mailer_must_be_enabled(): void
     /**
      * @test
      */
-    public function profiler_must_be_enabled_after_5_2(): void
+    public function profiler_must_be_enabled_in_symfony_5_2(): void
     {
-        if (Kernel::VERSION_ID < 50200) {
-            // profile needs to be enabled in 5.2+
+        if ('52' !== Kernel::MAJOR_VERSION.Kernel::MINOR_VERSION) {
+            // profile needs to be enabled in 5.2 only
             $this->markTestSkipped();
         }
 
@@ -191,10 +191,10 @@ public function profiler_must_be_enabled_after_5_2(): void
     /**
      * @test
      */
-    public function profiler_does_not_need_to_enabled_prior_to_5_2(): void
+    public function profiler_does_not_need_to_enabled(): void
     {
-        if (Kernel::VERSION_ID >= 50200) {
-            // profile does not need to be enabled in <5.2
+        if ('52' === Kernel::MAJOR_VERSION.Kernel::MINOR_VERSION) {
+            // profile does not need to be enabled in versions other than 52
             $this->markTestSkipped();
         }