nextsms · alphaolomi · Jun 28, 2024 · Jun 28, 2024 · Jun 28, 2024
diff --git a/.gitattributes b/.gitattributes
@@ -2,14 +2,14 @@
 # https://www.kernel.org/pub/software/scm/git/docs/gitattributes.html
 
 # Ignore all test and documentation with "export-ignore".
-/.github                 export-ignore
-/.gitattributes          export-ignore
-/.gitignore              export-ignore
-/phpunit.xml.dist        export-ignore
-/psalm.xml.dist          export-ignore
-/tests                   export-ignore
-/.editorconfig           export-ignore
-/.php-cs-fixer.dist.php  export-ignore
-/art                     export-ignore
-/docs                    export-ignore
-/UPGRADING.md            export-ignore
+/.github export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/phpunit.xml.dist export-ignore
+/psalm.xml.dist export-ignore
+/tests export-ignore
+/.editorconfig export-ignore
+/.php-cs-fixer.dist.php export-ignore
+/art export-ignore
+/docs export-ignore
+/UPGRADING.md export-ignore
diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
@@ -0,0 +1,58 @@
+name: Bug Report
+description: Report an Issue or Bug with the Package
+title: "[Bug]: "
+labels: ["bug"]
+body:
+    - type: markdown
+      attributes:
+          value: |
+              We're sorry to hear you have a problem. Can you help us solve it by providing the following details.
+    - type: textarea
+      id: what-happened
+      attributes:
+          label: What happened?
+          description: What did you expect to happen?
+          placeholder: I cannot currently do X thing because when I do, it breaks X thing.
+      validations:
+          required: true
+    - type: textarea
+      id: how-to-reproduce
+      attributes:
+          label: How to reproduce the bug
+          description: How did this occur, please add any config values used and provide a set of reliable steps if possible.
+          placeholder: When I do X I see Y.
+      validations:
+          required: true
+    - type: input
+      id: package-version
+      attributes:
+          label: Package Version
+          description: What version of our Package are you running? Please be as specific as possible
+          placeholder: 2.0.0
+      validations:
+          required: true
+    - type: input
+      id: php-version
+      attributes:
+          label: PHP Version
+          description: What version of PHP are you running? Please be as specific as possible
+          placeholder: 8.2.0
+      validations:
+          required: true
+    - type: dropdown
+      id: operating-systems
+      attributes:
+        label: Which operating systems does with happen with?
+        description: You may select more than one.
+        multiple: true
+        options:
+        - macOS
+        - Windows
+        - Linux
+    - type: textarea
+      id: notes
+      attributes:
+          label: Notes
+          description: Use this field to provide any other notes that you feel might be relevant to the issue.
+      validations:
+          required: false
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,14 +1,14 @@
 blank_issues_enabled: false
 contact_links:
-    - name: Ask a question
-      url: https://github.com/nextsms/php-client/discussions/new?category=q-a
-      about: Ask the community for help
-    - name: Request a feature
-      url: https://github.com/nextsms/php-client/discussions/new?category=ideas
-      about: Share ideas for new features
-    - name: Report a security issue
-      url: https://github.com/nextsms/php-client/security/policy
-      about: Learn how to notify us for sensitive bugs
-    - name: Report a bug
-      url: https://github.com/nextsms/php-client/issues/new
-      about: Report a reproducible bug
+  - name: Ask a question
+    url: https://github.com/nextsms/php-client/discussions/new?category=q-a
+    about: Ask the community for help
+  - name: Request a feature
+    url: https://github.com/nextsms/php-client/discussions/new?category=ideas
+    about: Share ideas for new features
+  - name: Report a security issue
+    url: https://github.com/nextsms/php-client/security/policy
+    about: Learn how to notify us for sensitive bugs
+  - name: Report a bug
+    url: https://github.com/nextsms/php-client/issues/new
+    about: Report a reproducible bug
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -9,4 +9,11 @@ updates:
     schedule:
       interval: "weekly"
     labels:
-      - "dependencies"
+      - "dependencies"
+
+  - package-ecosystem: "composer"
+    directory: "/"
+    schedule:
+      interval: "monthly"
+    labels:
+      - "dependencies"
diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml
@@ -8,22 +8,23 @@ permissions:
 jobs:
   dependabot:
     runs-on: ubuntu-latest
+    timeout-minutes: 5
     if: ${{ github.actor == 'dependabot[bot]' }}
     steps:
-    
+
       - name: Dependabot metadata
         id: metadata
         uses: dependabot/fetch-metadata@v1.6.0
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
-          
+
       - name: Auto-merge Dependabot PRs for semver-minor updates
         if: ${{steps.metadata.outputs.update-type == 'version-update:semver-minor'}}
         run: gh pr merge --auto --merge "$PR_URL"
         env:
           PR_URL: ${{github.event.pull_request.html_url}}
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
-          
+
       - name: Auto-merge Dependabot PRs for semver-patch updates
         if: ${{steps.metadata.outputs.update-type == 'version-update:semver-patch'}}
         run: gh pr merge --auto --merge "$PR_URL"

diff --git a/.github/workflows/fix-php-code-style-issues.yml b/.github/workflows/fix-php-code-style-issues.yml
@@ -5,9 +5,13 @@ on:
     paths:
       - '**.php'
 
+permissions:
+  contents: write
+
 jobs:
   php-code-styling:
     runs-on: ubuntu-latest
+    timeout-minutes: 5
 
     steps:
       - name: Checkout code

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -1,15 +1,23 @@
 name: Tests
 
-on: [push, pull_request]
+on:
+  push:
+    paths:
+      - '**.php'
+      - '.github/workflows/run-tests.yml'
+      - 'phpunit.xml.dist'
+      - 'composer.json'
+      - 'composer.lock'
 
 jobs:
   test:
     runs-on: ${{ matrix.os }}
+    timeout-minutes: 5
     strategy:
       fail-fast: true
       matrix:
         os: [ubuntu-latest, windows-latest]
-        php: [8.1]
+        php: [8.3, 8.2, 8.1]
         stability: [prefer-lowest, prefer-stable]
 
     name: P${{ matrix.php }} - ${{ matrix.stability }} - ${{ matrix.os }}
@@ -33,5 +41,8 @@ jobs:
       - name: Install dependencies
         run: composer update --${{ matrix.stability }} --prefer-dist --no-interaction
 
+      - name: List Installed Dependencies
+        run: composer show -D
+
       - name: Execute tests
-        run: vendor/bin/pest
+        run: vendor/bin/pest --ci
diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml
@@ -4,9 +4,13 @@ on:
   release:
     types: [released]
 
+permissions:
+  contents: write
+
 jobs:
   update:
     runs-on: ubuntu-latest
+    timeout-minutes: 5
 
     steps:
       - name: Checkout code

diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,7 @@
 .idea
 .php_cs
 .php_cs.cache
-.phpunit.result.cache
+.phpunit.cache
 build
 composer.lock
 coverage

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 All notable changes to `nextsms/php-client` will be documented in this file
 
+
+## 1.0.0 - 2024-06-28
+
+### Added
+
+-   Added support for PHP 8.3
+-   Added support for Laravel 10+
+
 ## 0.0.2 - 2021-05-11
 
 ### Changed

diff --git a/LICENSE.md b/LICENSE.md
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) Alpha Olomi <alphaolomi@gmail.com>
+Copyright (c) Alpha Olomi <hello@alphaolomi.dev>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -1,17 +1,13 @@
 # Nextsms for PHP
 
-[![Latest Version on Packagist](https://img.shields.io/packagist/v/nextsms/php-client.svg?style=flat-square)](https://packagist.org/packages/nextsms/php-client) [![Tests](https://github.com/nextsms/php-client/actions/workflows/run-tests.yml/badge.svg?branch=main)](https://github.com/nextsms/php-client/actions/workflows/run-tests.yml) [![Total Downloads](https://img.shields.io/packagist/dt/nextsms/php-client.svg?style=flat-square)](https://packagist.org/packages/nextsms/php-client) [![Check & fix styling](https://github.com/nextsms/php-client/actions/workflows/php-cs-fixer.yml/badge.svg)](https://github.com/nextsms/php-client/actions/workflows/php-cs-fixer.yml)
-
+[![Latest Version on Packagist](https://img.shields.io/packagist/v/nextsms/php-client.svg?style=flat-square)](https://packagist.org/packages/nextsms/php-client)
+[![Tests](https://img.shields.io/github/actions/workflow/status/nextsms/php-client/run-tests.yml?branch=main&label=tests&style=flat-square)](https://github.com/nextsms/php-client/actions/workflows/run-tests.yml)
+[![Total Downloads](https://img.shields.io/packagist/dt/nextsms/php-client.svg?style=flat-square)](https://packagist.org/packages/nextsms/php-client)
 The `Nextsms for PHP` makes it easy for developers to access Nextsms services in their PHP code, and build robust applications and software using services like Bulk SMS delivery, Sub customers, and more.
 
-> **V2:** You are currently viewing the documentation for the NextSMS PHP SDK V2. If you are looking for the documentation for the V1 SDK, you can find it [here](#).
-
-
 ## Installation
 
-> **Requirement:** PHP 8.0 or higher is required.
-
-You can install the package via Composer:
+You can install the package via composer:
 
 ```bash
 composer require nextsms/php-client
@@ -95,6 +91,7 @@ $recharge = $client->customers()->recharge($customer, 1000);
 
 // Deduct
 $deduct = $client->customers()->deduct($customer, 1100);
+
 ```
 
 ## Testing

diff --git a/composer.json b/composer.json
@@ -19,8 +19,8 @@
         "guzzlehttp/guzzle": "^7.5"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^3.0",
-        "pestphp/pest": "^1.20"
+        "pestphp/pest": "^2.20",
+        "laravel/pint": "^1.0"
     },
     "autoload": {
         "psr-4": {
@@ -35,12 +35,13 @@
     "scripts": {
         "test": "vendor/bin/pest",
         "test-coverage": "vendor/bin/pest --coverage",
-        "format": "vendor/bin/php-cs-fixer fix --allow-risky=yes"
+        "format": "vendor/bin/pint"
     },
     "config": {
         "sort-packages": true,
         "allow-plugins": {
-            "pestphp/pest-plugin": true
+            "pestphp/pest-plugin": true,
+            "phpstan/extension-installer": true
         }
     },
     "minimum-stability": "dev",

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,32 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.3/phpunit.xsd"
     backupGlobals="false"
-    backupStaticAttributes="false"
     bootstrap="vendor/autoload.php"
     colors="true"
-    convertErrorsToExceptions="true"
-    convertNoticesToExceptions="true"
-    convertWarningsToExceptions="true"
     processIsolation="false"
     stopOnFailure="false"
     executionOrder="random"
     failOnWarning="true"
     failOnRisky="true"
     failOnEmptyTestSuite="true"
     beStrictAboutOutputDuringTests="true"
-    verbose="true"
+    cacheDirectory=".phpunit.cache"
+    backupStaticProperties="false"
 >
     <testsuites>
         <testsuite name="Nextsms Test Suite">
             <directory>tests</directory>
         </testsuite>
     </testsuites>
     <coverage>
-        <include>
-            <directory suffix=".php">./src</directory>
-        </include>
         <report>
             <html outputDirectory="build/coverage"/>
             <text outputFile="build/coverage.txt"/>
@@ -36,4 +30,9 @@
     <logging>
         <junit outputFile="build/report.junit.xml"/>
     </logging>
+    <source>
+        <include>
+            <directory suffix=".php">./src</directory>
+        </include>
+    </source>
 </phpunit>
diff --git a/src/Services/Messages.php b/src/Services/Messages.php
@@ -256,8 +256,8 @@ public function sendLater(array|Message $data, string|\DateTime $date)
      */
     public function getSent(
         array $data,
-        string|\DateTime $sentSince = null,
-        string|\DateTime $sentUntill = null,
+        string|\DateTime|null $sentSince = null,
+        string|\DateTime|null $sentUntill = null,
     ) {
         // todo: implement this
         foreach (['from', 'to'] as $key) {

diff --git a/src/ValueObjects/Customer.php b/src/ValueObjects/Customer.php
@@ -23,9 +23,7 @@ class Customer
 
     public ?string $smsPrice = null;
 
-    public function __construct()
-    {
-    }
+    public function __construct() {}
 
     public static function make(array $data): Customer
     {

diff --git a/src/ValueObjects/Message.php b/src/ValueObjects/Message.php
@@ -27,9 +27,7 @@ class Message
 
     protected ?Status $status = null;
 
-    public function __construct()
-    {
-    }
+    public function __construct() {}
 
     public static function make(string|array $text): self
     {

diff --git a/src/ValueObjects/Status.php b/src/ValueObjects/Status.php
@@ -21,9 +21,7 @@ class Status
 
     protected ?string $description;
 
-    public function __construct()
-    {
-    }
+    public function __construct() {}
 
     public static function make(array $data): self
     {