Update PHP and firebase/php-jwt version requirements

.github/workflows/psalm.yml

@@ -1,19 +1,23 @@
 name: Psalm
 
-# Controls when the action will run. 
 on: [push, pull_request]
 
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  # This workflow contains a single job called "build"
-  build:
-    # The type of runner that the job will run on
+  psalm:
     runs-on: ubuntu-latest
 
-    # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v3
 
-      - name: Psalm – Static Analysis for PHP
-        uses: docker://vimeo/psalm-github-actions:4.18.1
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.0'
+          extensions: curl, json
+          tools: composer:v2
+
+      - name: Install dependencies
+        run: composer install --no-progress
+
+      - name: Run Psalm
+        run: vendor/bin/psalm --no-progress

.github/workflows/tests.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
+        php: [ '8.0', '8.1', '8.2', '8.3', '8.4' ]
         stability: [ prefer-stable ]
 
     name: PHP ${{ matrix.php }} - ${{ matrix.stability }}

README.md

@@ -11,7 +11,7 @@ Requirements
 
 - [Sign up](https://www.messagebird.com/en/signup) for a free MessageBird account
 - Create a new access_key in the developers sections
-- MessageBird API client for PHP requires PHP >= 7.3.
+- MessageBird API client for PHP requires PHP >= 8.0.
 
 Installation
 -----

composer.json

@@ -16,10 +16,10 @@
         "source": "https://github.com/messagebird/php-rest-api"
     },
     "require": {
-        "php": ">=7.3|~8.0.0|~8.1.0|~8.2.0",
+        "php": ">=8.0",
         "ext-curl": "*",
         "ext-json": "*",
-        "firebase/php-jwt": "^5.5.1|^6.2"
+        "firebase/php-jwt": "^7.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5.14",

psalm.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <psalm
     errorLevel="7"
+    phpVersion="8.0"
     resolveFromConfigFile="true"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"

src/MessageBird/Common/HttpClient.php

@@ -199,8 +199,6 @@ public function performHttpRequest(string $method, ?string $resourceName, $query
         $isThreePartResponse = (strpos($parts[0], "\n") === false && strpos($parts[0], 'HTTP/1.') === 0);
         [$responseHeader, $responseBody] = $isThreePartResponse ? [$parts[1], $parts[2]] : [$parts[0], $parts[1]];
 
-        curl_close($curl);
-
         return [$responseStatus, $responseHeader, $responseBody];
     }