test

.github/workflows/analyse.yml

@@ -0,0 +1,20 @@
+name: "Static Analysis"
+
+on: [pull_request]
+jobs:
+  analyse:
+    name: Analyse
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+      with:
+        fetch-depth: 2
+
+    - run: git checkout HEAD^2
+
+    - name: Run Static Analysis
+      run: |
+        docker run --rm -v $PWD:/app composer sh -c \
+        "composer install --profile --ignore-platform-reqs && composer analyse"

.github/workflows/linter.yml → .github/workflows/lint.yml

@@ -11,7 +11,9 @@ jobs:
       uses: actions/checkout@v3
       with:
         fetch-depth: 2
+
     - run: git checkout HEAD^2
+
     - name: Run Linter
       run: |
         docker run --rm -v $PWD:/app composer sh -c \

.github/workflows/test.yml

@@ -0,0 +1,48 @@
+name: "Tests"
+
+on: [pull_request]
+jobs:
+  tests:
+    name: Unit & E2E
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 2
+    - run: git checkout HEAD^2
+    - name: Run Tests 
+      env:
+        MAILGUN_API_KEY: ${{ secrets.MAILGUN_API_KEY }}
+        MAILGUN_DOMAIN: ${{ secrets.MAILGUN_DOMAIN }}
+        SENDGRID_API_KEY: ${{ secrets.SENDGRID_API_KEY }}
+        FCM_SERVER_KEY: ${{ secrets.FCM_SERVER_KEY }}
+        FCM_SERVER_TO: ${{ secrets.FCM_SERVER_TO }}
+        TWILIO_ACCOUNT_SID: ${{ secrets.TWILIO_ACCOUNT_SID }}
+        TWILIO_AUTH_TOKEN: ${{ secrets.TWILIO_AUTH_TOKEN }}
+        TWILIO_TO: ${{ secrets.TWILIO_TO }}
+        TWILIO_FROM: ${{ secrets.TWILIO_FROM }}
+        TELNYX_API_KEY: ${{ secrets.TELNYX_API_KEY }}
+        TELNYX_PUBLIC_KEY: ${{ secrets.TELNYX_PUBLIC_KEY }}
+        APNS_AUTHKEY_8KVVCLA3HL: ${{ secrets.APNS_AUTHKEY_8KVVCLA3HL }}
+        APNS_AUTH_ID: ${{ secrets.APNS_AUTH_ID }}
+        APNS_TEAM_ID: ${{ secrets.APNS_TEAM_ID }}
+        APNS_BUNDLE_ID: ${{ secrets.APNS_BUNDLE_ID }}
+        APNS_TO: ${{ secrets.APNS_TO }}
+        MSG_91_SENDER_ID: ${{ secrets.MSG_91_SENDER_ID }}
+        MSG_91_AUTH_KEY: ${{ secrets.MSG_91_AUTH_KEY }}
+        MSG_91_TO: ${{ secrets.MSG_91_TO }}
+        MSG_91_FROM: ${{ secrets.MSG_91_FROM }}
+        TEST_EMAIL: ${{ secrets.TEST_EMAIL }}
+        TEST_FROM_EMAIL: ${{ secrets.TEST_FROM_EMAIL }}
+        VONAGE_API_KEY: ${{ secrets.VONAGE_API_KEY }}
+        VONAGE_API_SECRET: ${{ secrets.VONAGE_API_SECRET }}
+        VONAGE_TO: ${{ secrets.VONAGE_TO }}
+        VONAGE_FROM: ${{ secrets.VONAGE_FROM }}
+        DISCORD_WEBHOOK_ID: ${{ secrets.DISCORD_WEBHOOK_ID }}
+        DISCORD_WEBHOOK_TOKEN: ${{ secrets.DISCORD_WEBHOOK_TOKEN }}
+      run: |
+        docker compose up -d --build
+        sleep 5
+        docker compose exec tests vendor/bin/phpunit

.gitignore

@@ -1,3 +1,97 @@
 .idea
 vendor
+Makefile
+.envrc
+.env
+*.p8
+
+### Linux ###
+*~
+
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*
+
+### macOS ###
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+### macOS Patch ###
+# iCloud generated files
+*.icloud
+
+### PHPUnit ###
+# Covers PHPUnit
+# Reference: https://phpunit.de/
+
+# Generated files
 .phpunit.result.cache
+.phpunit.cache
+
+# PHPUnit
+/app/phpunit.xml
+/phpunit.xml
+
+# Build data
+/build/
+
+### Windows ###
+# Windows thumbnail cache files
+Thumbs.db
+Thumbs.db:encryptable
+ehthumbs.db
+ehthumbs_vista.db
+
+# Dump file
+*.stackdump
+
+# Folder config file
+[Dd]esktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+# End of https://www.toptal.com/developers/gitignore/api/macos,linux,windows,phpunit

README.md

@@ -15,14 +15,14 @@ Install using composer:
 composer require utopia-php/messaging
 ```
 
-## Email
+## Email 
 
 ```php
 <?php
 
 use \Utopia\Messaging\Messages\Email;
-use \Utopia\Messaging\Adapters\Email\SendGrid;
-use \Utopia\Messaging\Adapters\Email\Mailgun;
+use \Utopia\Messaging\Adapter\Email\SendGrid;
+use \Utopia\Messaging\Adapter\Email\Mailgun;
 
 $message = new Email(
     to: ['team@appwrite.io'],
@@ -43,8 +43,8 @@ $messaging->send($message);
 <?php
 
 use \Utopia\Messaging\Messages\SMS;
-use \Utopia\Messaging\Adapters\SMS\Twilio;
-use \Utopia\Messaging\Adapters\SMS\Telesign;
+use \Utopia\Messaging\Adapter\SMS\Twilio;
+use \Utopia\Messaging\Adapter\SMS\Telesign;
 
 $message = new SMS(
     to: ['+12025550139'],
@@ -64,7 +64,7 @@ $messaging->send($message);
 <?php
 
 use \Utopia\Messaging\Messages\Push;
-use \Utopia\Messaging\Adapters\Push\FCM;
+use \Utopia\Messaging\Adapter\Push\FCM;
 
 $message = new Push(
     to: ['eyJhGc...ssw5c'],
@@ -98,12 +98,12 @@ $messaging->send($message);
 - [x] [TextMagic](https://www.textmagic.com/)
 - [x] [Msg91](https://msg91.com/)
 - [x] [Vonage](https://www.vonage.com/)
-- [ ] [Plivo](https://www.plivo.com/)
-- [ ] [Infobip](https://www.infobip.com/)
-- [ ] [Clickatell](https://www.clickatell.com/)
+- [x] [Plivo](https://www.plivo.com/)
+- [x] [Infobip](https://www.infobip.com/)
+- [x] [Clickatell](https://www.clickatell.com/)
 - [ ] [AfricasTalking](https://africastalking.com/)
-- [ ] [Sinch](https://www.sinch.com/)
-- [ ] [Sms77](https://www.sms77.io/)
+- [x] [Sinch](https://www.sinch.com/)
+- [x] [Seven](https://www.seven.io/)
 - [ ] [SmsGlobal](https://www.smsglobal.com/)
 
 ### Push
@@ -135,13 +135,6 @@ To run static code analysis, use the following Psalm command:
 composer lint
 ```
 
-## Authors
-
-**Jake Barnby**
-
-+ [https://github.com/abnegate](https://github.com/abnegate)
-+ [https://nz.linkedin.com/in/jakebarnby](https://nz.linkedin.com/in/jakebarnby)
-
 ## Copyright and license
 
 The MIT License (MIT) [http://www.opensource.org/licenses/mit-license.php](http://www.opensource.org/licenses/mit-license.php)

composer.json

@@ -6,35 +6,31 @@
   "license": "MIT",
   "minimum-stability": "stable",
   "scripts": {
-    "test": "vendor/bin/phpunit",
-    "lint": "vendor/bin/phpcs",
-    "format": "vendor/bin/phpcbf"
+    "test": "./vendor/bin/phpunit",
+    "lint": "./vendor/bin/pint --test",
+    "format": "./vendor/bin/pint",
+    "analyse": "./vendor/bin/phpstan analyse --memory-limit=2G --level=6 src tests"
   },
-  "authors": [
-    {
-      "name": "Jake Barnby",
-      "email": "jake@appwrite.io"
-    }
-  ],
   "autoload": {
     "psr-4": {
       "Utopia\\Messaging\\": "src/Utopia/Messaging"
     }
   },
   "autoload-dev": {
     "psr-4": {
-      "Tests\\E2E\\": "tests/e2e",
-      "Tests\\Unit\\": "tests/unit"
+      "Utopia\\Tests\\": "tests/Messaging"
     }
   },
   "require": {
     "php": ">=8.0.0",
     "ext-curl": "*"
   },
   "require-dev": {
-    "phpunit/phpunit": "9.5.*",
-    "phpmailer/phpmailer": "6.6.*",
-    "squizlabs/php_codesniffer": "^3.6"
+    "ext-openssl": "*",
+    "phpunit/phpunit": "9.6.10",
+    "phpmailer/phpmailer": "6.8.*",
+    "laravel/pint": "1.13.*",
+    "phpstan/phpstan": "1.10.*"
   },
   "config": {
     "platform": {