fix: support psr/log:^3.0

GregoireHebert · Sep 26, 2022 · b6f0e01 · b6f0e01
1 parent 1d3ed65
commit b6f0e01
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 23 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,42 +12,33 @@ on:
 
 jobs:
   tests:
-    name: Tests PHP ${{ matrix.php }} ${{ matrix.dependency }} (Symfony ${{ matrix.symfony }})
+    name: Tests PHP ${{ matrix.php }} (Symfony ${{ matrix.symfony }})
     runs-on: ubuntu-latest
     strategy:
       matrix:
         php:
-          - '7.3'
           - '7.4'
           - '8.0'
           - '8.1'
         symfony:
           - '4.4.*'
           - '5.4.*'
-          - '6.0.*'
-        dependency:
-          - ''
-          - '--prefer-lowest'
-        exclude:
-          - symfony: '6.0.*'
-            php: '7.3'
-          - symfony: '6.0.*'
-            php: '7.4'
-          - symfony: '5.4.*'
-            dependency: '--prefer-lowest'
-          - symfony: '6.0.*'
-            dependency: '--prefer-lowest'
+          - '6.1.*'
         include:
           - php: '7.4'
-            dependency: ''
             symfony: '5.4.*'
             bootable: true
           - php: '8.1'
-            dependency: ''
-            symfony: '6.0.*'
+            symfony: '6.1.*'
             coverage: '--coverage-clover build/logs/phpunit/clover.xml'
             bootable: true
             quality: true
+        exclude:
+          # Symfony 6.1 requires PHP 8.1
+          - php: '7.4'
+            symfony: '6.1.*'
+          - php: '8.0'
+            symfony: '6.1.*'
       fail-fast: false
     steps:
       - name: Checkout
@@ -80,7 +71,7 @@ jobs:
         run: composer config extra.symfony.require "${{ matrix.symfony }}"
 
       - name: Update project dependencies
-        run: composer update --no-progress --ansi --prefer-stable ${{ matrix.dependency }}
+        run: composer update --no-progress --ansi --prefer-stable
 
       - name: Bundle is bootable
         if: matrix.bootable && github.event_name == 'push'
@@ -133,9 +124,7 @@ jobs:
           DOCUSIGN_DEFAULT_SIGNER_EMAIL: ${{ secrets.DOCUSIGN_DEFAULT_SIGNER_EMAIL }}
           DOCUSIGN_EMAIL: ${{ secrets.DOCUSIGN_EMAIL }}
           DOCUSIGN_PASSWORD: ${{ secrets.DOCUSIGN_PASSWORD }}
-        run: |
-          composer require --dev nyholm/symfony-bundle-test:dev-master
-          vendor/bin/simple-phpunit --group bootable
+        run: vendor/bin/simple-phpunit --group bootable
 
       - name: Upload coverage artifacts
         if: matrix.coverage != ''

diff --git a/composer.json b/composer.json
@@ -28,7 +28,7 @@
         "docusign/esign-client": "^5.0 || ^6.0",
         "lcobucci/jwt": "^3.3.1 || ^4.0",
         "league/flysystem": "^1.1 || ^2.3",
-        "psr/log": "^1.1 || ^2.0",
+        "psr/log": "^1.1 || ^2.0 || ^3.0",
         "symfony/config": "^4.4 || ^5.0 || ^6.0",
         "symfony/dependency-injection": "^4.4 || ^5.0 || ^6.0",
         "symfony/event-dispatcher-contracts": "^1.0 || ^2.0 || ^3.0",
@@ -46,6 +46,7 @@
         "dbrekelmans/bdi": "^1.0",
         "doctrine/annotations": "^1.11",
         "league/flysystem-bundle": "^1.2 || ^2.0",
+        "nyholm/symfony-bundle-test": "^2.0",
         "phpspec/prophecy": "^1.12",
         "phpstan/phpstan": "^1.0",
         "psr/event-dispatcher": "^1.0",

diff --git a/tests/ClickwrapTest.php b/tests/ClickwrapTest.php
@@ -17,6 +17,8 @@
 
 /**
  * @author Vincent Chalamon <vincentchalamon@gmail.com>
+ *
+ * @group functional
  */
 final class ClickwrapTest extends PantherTestCase
 {

diff --git a/tests/EmbeddedAuthCodeTest.php b/tests/EmbeddedAuthCodeTest.php
@@ -17,6 +17,8 @@
 
 /**
  * @author Vincent Chalamon <vincentchalamon@gmail.com>
+ *
+ * @group functional
  */
 final class EmbeddedAuthCodeTest extends PantherTestCase
 {

diff --git a/tests/EmbeddedTest.php b/tests/EmbeddedTest.php
@@ -17,6 +17,8 @@
 
 /**
  * @author Vincent Chalamon <vincentchalamon@gmail.com>
+ *
+ * @group functional
  */
 final class EmbeddedTest extends PantherTestCase
 {

diff --git a/tests/HomepageTest.php b/tests/HomepageTest.php
@@ -17,6 +17,8 @@
 
 /**
  * @author Vincent Chalamon <vincentchalamon@gmail.com>
+ *
+ * @group functional
  */
 final class HomepageTest extends PantherTestCase
 {

diff --git a/tests/RemoteAuthCodeTest.php b/tests/RemoteAuthCodeTest.php
@@ -17,6 +17,8 @@
 
 /**
  * @author Vincent Chalamon <vincentchalamon@gmail.com>
+ *
+ * @group functional
  */
 final class RemoteAuthCodeTest extends PantherTestCase
 {

diff --git a/tests/RemoteTest.php b/tests/RemoteTest.php
@@ -17,6 +17,8 @@
 
 /**
  * @author Vincent Chalamon <vincentchalamon@gmail.com>
+ *
+ * @group functional
  */
 final class RemoteTest extends PantherTestCase
 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,6 +17,8 @@ @@
     /**
      * @author Vincent Chalamon <vincentchalamon@gmail.com>
+     *
+     * @group functional
      */
     final class ClickwrapTest extends PantherTestCase
     {
@@ Expand Down @@