Merge pull request #71 from swagindustries/feat/php-82-upgrade

swagindustries · Sep 3, 2023 · d06c76b · d06c76b
2 parents e3319bb + f45fb0e
commit d06c76b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,14 +18,14 @@ jobs:
             -   name: Setup PHP
                 uses: shivammathur/setup-php@v2
                 with:
-                    php-version: 8.0
+                    php-version: 8.2
 
             -   uses: actions/cache@v2
                 id: cache-composer
                 with:
                     path: ~/.composer/cache
-                    key: composer-php-8.0-${{ github.sha }}
-                    restore-keys: composer-php-8.0-
+                    key: composer-php-8.2-${{ github.sha }}
+                    restore-keys: composer-php-8.2-
 
             -   name: Install dependencies
                 run: composer update --prefer-dist --no-progress --no-suggest
@@ -37,7 +37,7 @@ jobs:
         name: Unit tests
         strategy:
             matrix:
-                php: [ 8.0, 8.1 ]
+                php: [ 8.0, 8.1, 8.2 ]
                 os: [ ubuntu-latest ]
                 include:
                     -   os: [ ubuntu-latest ]
@@ -63,7 +63,7 @@ jobs:
                 run: make test.composer
 
             -   name: Install dependencies
-                run: composer update --prefer-dist --no-progress --no-suggest ${{ matrix.composer-flag }}
+                run: composer update --prefer-dist --no-progress --no-suggest --no-plugins ${{ matrix.composer-flag }}
 
             -   name: Run PHPUnit tests
                 run: make test.phpunit
@@ -72,7 +72,7 @@ jobs:
         name: Functionnal tests
         strategy:
             matrix:
-                php: [ 8.0, 8.1 ]
+                php: [ 8.0, 8.1, 8.2 ]
                 os: [ ubuntu-latest ]
                 include:
                     -   os: [ ubuntu-latest ]
@@ -97,7 +97,7 @@ jobs:
 
 
             -   name: Install dependencies
-                run: composer update --prefer-dist --no-progress --no-suggest ${{ matrix.composer-flag }}
+                run: composer update --prefer-dist --no-progress --no-suggest --no-plugins ${{ matrix.composer-flag }}
 
             -   name: Run Behat tests
                 run: make test.behat
diff --git a/composer.json b/composer.json
@@ -29,7 +29,9 @@
         "doctrine/doctrine-bundle": "^2.1",
         "behat/behat": "3.10.0",
         "friends-of-behat/symfony-extension": "^2.3.0",
-        "fakerphp/faker": "^1.12.1"
+        "fakerphp/faker": "^1.12.1",
+        "monolog/monolog": "^3.4 || ^2.9",
+        "masterminds/html5": "^2.8"
     },
     "autoload": {
         "psr-4": {

diff --git a/tests/Behat/Context/BasicsContext.php b/tests/Behat/Context/BasicsContext.php
@@ -16,7 +16,7 @@ class BasicsContext extends AbstractContext
      */
     public function iMakeARequestOn($uri, $verb = 'GET', PyStringNode $content = null)
     {
-        $this->request($uri, $verb, $content);
+        $this->request($uri, $verb, (string) $content);
     }
 
     /**