Upgrade PHP requirement to ~8.1, upgrade all packages, switch CI/CD f…

…rom Travis to GitHub actions (#19)

.github/workflows/test.yaml

@@ -0,0 +1,42 @@
+name: Tests
+
+on:
+  push:
+    branches: ["1.0"]
+  pull_request:
+    branches: ["1.0"]
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup PHP with tools
+        uses: shivammathur/setup-php@v2
+        if: ${{ env.ACT }}
+        with:
+          php-version: "8.2"
+          tools: phpunit
+
+      - name: Validate composer.json and composer.lock
+        run: composer validate --strict
+
+      - name: Cache Composer packages
+        id: composer-cache
+        uses: actions/cache@v3
+        with:
+          path: vendor
+          key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-php-
+
+      - name: Install dependencies
+        run: composer install --prefer-dist --no-progress
+
+      - name: Run test suite
+        run: composer run-script test

composer.json

@@ -1,34 +1,38 @@
 {
-    "name": "descom/sms-php",
-    "description": "Build your SMS application with PHP, easy SMS sending and worldwide coverage",
-    "type": "library",
-    "license": "MIT",
-    "keywords": ["sms", "php", "descom"],
-    "homepage": "https://www.descomsms.com",
-    "authors": [
-        {
-            "name": "Descom Soporte",
-            "email": "soporte@descom.es"
-        }
-    ],
-    "require": {
-        "php": "^5.6|^7.0",
-        "guzzlehttp/guzzle": "~6.0|~5.3.1"
-    },
-    "autoload": {
-        "psr-4": {
-            "Descom\\Sms\\": "src/"
-        }
-    },
-    "require-dev": {
-        "phpunit/phpunit": "^5.7|^7.0"
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Descom\\Sms\\Test\\": "tests"
-        }
-    },
-    "scripts": {
-        "test": "vendor/bin/phpunit"
+  "name": "descom/sms-php",
+  "description": "Build your SMS application with PHP, easy SMS sending and worldwide coverage",
+  "type": "library",
+  "license": "MIT",
+  "keywords": [
+    "sms",
+    "php",
+    "descom"
+  ],
+  "homepage": "https://www.descomsms.com",
+  "authors": [
+    {
+      "name": "Descom Soporte",
+      "email": "soporte@descom.es"
     }
+  ],
+  "require": {
+    "php": "~8.1",
+    "guzzlehttp/guzzle": "^7.0"
+  },
+  "autoload": {
+    "psr-4": {
+      "Descom\\Sms\\": "src/"
+    }
+  },
+  "require-dev": {
+    "phpunit/phpunit": "^10.3"
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "Descom\\Sms\\Test\\": "tests"
+    }
+  },
+  "scripts": {
+    "test": "vendor/bin/phpunit"
+  }
 }

phpunit.xml.dist

@@ -1,28 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit bootstrap="vendor/autoload.php"
          backupGlobals="false"
-         backupStaticAttributes="false"
          colors="true"
-         verbose="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false">
     <testsuites>
         <testsuite name="League Test Suite">
             <directory>tests</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src/</directory>
-        </whitelist>
-    </filter>
-    <logging>
-        <log type="junit" target="build/report.junit.xml"/>
-        <log type="coverage-html" target="build/coverage" charset="UTF-8" yui="true" highlight="true"/>
-        <log type="coverage-text" target="build/coverage.txt"/>
-        <log type="coverage-clover" target="build/logs/clover.xml"/>
-    </logging>
 </phpunit>

src/Http/Http.php

@@ -2,7 +2,9 @@
 
 namespace Descom\Sms\Http;
 
-use GuzzleHttp\ClientInterface;
+use GuzzleHttp\Client;
+use GuzzleHttp\Exception\ClientException;
+use GuzzleHttp\Exception\RequestException;
 
 class Http
 {
@@ -20,16 +22,30 @@ class Http
      */
     public function sendHttp($verb, $path, array $headers, array $data = [])
     {
-        $version = (string) ClientInterface::VERSION;
+        $client = new Client(['base_uri' => 'https://api.descomsms.com/api/']);
+        $response = new Response();
 
-        if ($version[0] === '6') {
-            $sms = new GuzzleV6();
+        $httpData = [
+            'headers'   => $headers,
+            'debug'     => $this->debug,
+        ];
 
-            return $sms->sendHttp($verb, $path, $headers, $data);
-        } elseif ($version[0] === '5') {
-            $sms = new GuzzleV5();
+        if (count($data) > 0) {
+            $httpData['json'] = $data;
+        }
 
-            return $sms->sendHttp($verb, $path, $headers, $data);
+        try {
+            $result = $client->request($verb, $path, $httpData);
+            $response->status = $result->getStatusCode();
+            $response->message = $result->getBody()->getContents();
+        } catch (ClientException $e) {
+            $response->status = $e->getResponse()->getStatusCode();
+            $response->message = $e->getResponse()->getBody(true);
+        } catch (RequestException $e) {
+            $response->status = 500;
+            $response->message = $e->getMessage();
         }
+
+        return $response;
     }
 }