diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..cd8eb86e --- /dev/null +++ b/.editorconfig @@ -0,0 +1,15 @@ +; This file is for unifying the coding style for different editors and IDEs. +; More information at http://editorconfig.org + +root = true + +[*] +charset = utf-8 +indent_size = 4 +indent_style = space +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true + +[*.md] +trim_trailing_whitespace = false diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..b2638710 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,10 @@ +# Path-based git attributes +# https://www.kernel.org/pub/software/scm/git/docs/gitattributes.html + +# Ignore all test and documentation with "export-ignore". +/.gitattributes export-ignore +/.gitignore export-ignore +/.travis.yml export-ignore +/phpunit.xml.dist export-ignore +/.scrutinizer.yml export-ignore +/tests export-ignore diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml new file mode 100644 index 00000000..99d4daf7 --- /dev/null +++ b/.github/workflows/tests.yml @@ -0,0 +1,32 @@ +name: PHPUnit tests + +on: + - push + - pull_request + +jobs: + tests: + runs-on: ubuntu-latest + strategy: + fail-fast: true + matrix: + php: [8.1, 8.2, 8.3] + + name: Tests on PHP ${{ matrix.php }} - ${{ matrix.stability }} + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php }} + tools: composer:v2 + coverage: pcov + + - name: Install dependencies + run: composer update --prefer-source --no-interaction --no-progress + + - name: Execute tests + run: vendor/bin/phpunit diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..0044b968 --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +/.phpunit.cache +/build +/vendor +composer.phar +composer.lock +.DS_Store diff --git a/.scrutinizer.yml b/.scrutinizer.yml new file mode 100644 index 00000000..fc4b6f4f --- /dev/null +++ b/.scrutinizer.yml @@ -0,0 +1,18 @@ +checks: + php: + remove_extra_empty_lines: true + remove_php_closing_tag: true + remove_trailing_whitespace: true + fix_use_statements: + remove_unused: true + preserve_multiple: false + preserve_blanklines: true + order_alphabetically: true + fix_php_opening_tag: true + fix_linefeed: true + fix_line_ending: true + fix_identation_4spaces: true + fix_doc_comments: true + +tools: + external_code_coverage: true diff --git a/.styleci.yml b/.styleci.yml new file mode 100644 index 00000000..0285f179 --- /dev/null +++ b/.styleci.yml @@ -0,0 +1 @@ +preset: laravel diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100755 index 00000000..d6053f0b --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,7 @@ +# Changelog + +All notable changes to Spryng will be documented in this file + +## 1.0.0 - 201X-XX-XX + +- initial release diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100755 index 00000000..4da74e3f --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,55 @@ +# Contributing + +Contributions are **welcome** and will be fully **credited**. + +Please read and understand the contribution guide before creating an issue or pull request. + +## Etiquette + +This project is open source, and as such, the maintainers give their free time to build and maintain the source code +held within. They make the code freely available in the hope that it will be of use to other developers. It would be +extremely unfair for them to suffer abuse or anger for their hard work. + +Please be considerate towards maintainers when raising issues or presenting pull requests. Let's show the +world that developers are civilized and selfless people. + +It's the duty of the maintainer to ensure that all submissions to the project are of sufficient +quality to benefit the project. Many developers have different skillsets, strengths, and weaknesses. Respect the maintainer's decision, and do not be upset or abusive if your submission is not used. + +## Viability + +When requesting or submitting new features, first consider whether it might be useful to others. Open +source projects are used by many developers, who may have entirely different needs to your own. Think about +whether or not your feature is likely to be used by other users of the project. + +## Procedure + +Before filing an issue: + +- Attempt to replicate the problem, to ensure that it wasn't a coincidental incident. +- Check to make sure your feature suggestion isn't already present within the project. +- Check the pull requests tab to ensure that the bug doesn't have a fix in progress. +- Check the pull requests tab to ensure that the feature isn't already in progress. + +Before submitting a pull request: + +- Check the codebase to ensure that your feature doesn't already exist. +- Check the pull requests to ensure that another person hasn't already submitted the feature or fix. + +## Requirements + +If the project maintainer has any additional requirements, you will find them listed here. + +- **[PSR-2 Coding Standard](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md)** - The easiest way to apply the conventions is to install [PHP Code Sniffer](http://pear.php.net/package/PHP_CodeSniffer). + +- **Add tests!** - Your patch won't be accepted if it doesn't have tests. + +- **Document any change in behaviour** - Make sure the `README.md` and any other relevant documentation are kept up-to-date. + +- **Consider our release cycle** - We try to follow [SemVer v2.0.0](http://semver.org/). Randomly breaking public APIs is not an option. + +- **One pull request per feature** - If you want to do more than one thing, send multiple pull requests. + +- **Send coherent history** - Make sure each individual commit in your pull request is meaningful. If you had to make multiple intermediate commits while developing, please [squash them](http://www.git-scm.com/book/en/v2/Git-Tools-Rewriting-History#Changing-Multiple-Commit-Messages) before submitting. + +**Happy coding**! diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 00000000..aa0c11bb --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,21 @@ +# The MIT License (MIT) + +Copyright (c) :Bas van Dinther <:hello@baspa.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 +> in the Software without restriction, including without limitation the rights +> to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +> copies of the Software, and to permit persons to whom the Software is +> furnished to do so, subject to the following conditions: +> +> The above copyright notice and this permission notice shall be included in +> all copies or substantial portions of the Software. +> +> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +> THE SOFTWARE. diff --git a/README.md b/README.md index fa8362b7..68f9a94b 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,108 @@ -# New Notification Channels +# Spryng Notification Channel -### Suggesting a new channel -Have a suggestion or working on a new channel? Please create a new issue for that service. +[![Latest Version on Packagist](https://img.shields.io/packagist/v/laravel-notification-channels/spryng.svg?style=flat-square)](https://packagist.org/packages/laravel-notification-channels/spryng) +[![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE.md) +[![Build Status](https://img.shields.io/travis/laravel-notification-channels/spryng/master.svg?style=flat-square)](https://travis-ci.org/laravel-notification-channels/spryng) +[![StyleCI](https://styleci.io/repos/:style_ci_id/shield)](https://styleci.io/repos/:style_ci_id) +[![SensioLabsInsight](https://img.shields.io/sensiolabs/i/:sensio_labs_id.svg?style=flat-square)](https://insight.sensiolabs.com/projects/:sensio_labs_id) +[![Quality Score](https://img.shields.io/scrutinizer/g/laravel-notification-channels/spryng.svg?style=flat-square)](https://scrutinizer-ci.com/g/laravel-notification-channels/spryng) +[![Code Coverage](https://img.shields.io/scrutinizer/coverage/g/laravel-notification-channels/spryng/master.svg?style=flat-square)](https://scrutinizer-ci.com/g/laravel-notification-channels/spryng/?branch=master) +[![Total Downloads](https://img.shields.io/packagist/dt/laravel-notification-channels/spryng.svg?style=flat-square)](https://packagist.org/packages/laravel-notification-channels/spryng) -### I'm working on a new channel -Please create an issue for it if it does not already exist, then PR you code for review. +📲 [Spryng](https://www.spryng.nl/en/) Notifications Channel for Laravel -## Workflow for new channels +## Contents -1) Head over to the [skeleton repo](https://github.com/laravel-notification-channels/skeleton) download a ZIP copy. This is important, to ensure you start from a fresh commit history. -2) Use find/replace to replace all of the placeholders with the correct values (package name, author name, email, etc). -3) Implement to logic for the channel & add tests. -4) Fork this repo, add it as a remote and push your new channel to a branch. -5) Submit a new PR against this repo for review. +- [Installation](#installation) + - [Setting up the Spryng service](#setting-up-the-Spryng-service) +- [Usage](#usage) + - [Available Message methods](#available-message-methods) +- [Changelog](#changelog) +- [Testing](#testing) +- [Security](#security) +- [Contributing](#contributing) +- [Credits](#credits) +- [License](#license) -Take a look at our [FAQ](http://laravel-notification-channels.com/) to see our small list of rules, to provide top-notch notification channels. + +## Installation + +```bash +composer require laravel-notification-channels/spryng +``` + +Add the configuration to your `services.php` config file: + +```php +'spryng' => [ + 'key' => env('SPRYNG_API_KEY'), +] +``` + +### Setting up the Spryng service + +You'll need a Spryng account. Head over to their [website](https://www.spryng.nl/en/) and create or login to your account. + +Head to your `Profile` and then `Security` in the sidebar to generate a set of API keys. + +## Usage + +You can use the channel in your `via()` method inside the notification: + +```php +use Illuminate\Notifications\Notification; +use \NotificationChannels\Spryng\SpryngMessage; +use \NotificationChannels\Spryng\SpryngChannel; + +class AccountApproved extends Notification +{ + public function via($notifiable) + { + return [SpryngChannel::class]; + } + + public function toSpryng($notifiable) + { + return (new SpryngMessage) + ->setBody("Task #{$notifiable->id} is complete!") + ->setRecipients($notifiable->phone_number) + ->setOriginator(config('app.name')); + } +} +``` + +Make sure your Notifiable model has a `phone_number` attribute, which will be used to send the SMS. Also make sure it's a valid phone number. + +### Available Message methods + +- `setBody('')`: Accepts a string value for the message body. +- `setRecipients('')`: Accepts a string or array value for the recipient(s) phone number. +- `setOriginator('')`: Accepts a string value for the sender name. + +## Changelog + +Please see [CHANGELOG](CHANGELOG.md) for more information what has changed recently. + +## Testing + +``` bash +$ composer test +``` + +## Security + +If you discover any security related issues, please email hello@baspa.dev instead of using the issue tracker. + +## Contributing + +Please see [CONTRIBUTING](CONTRIBUTING.md) for details. + +## Credits + +- [Bas van Dinther](https://github.com/Baspa) +- [Spryng](https://www.spryng.nl/en/) +- [All Contributors](../../contributors) + +## License + +The MIT License (MIT). Please see [License File](LICENSE.md) for more information. diff --git a/composer.json b/composer.json new file mode 100644 index 00000000..ddb930b4 --- /dev/null +++ b/composer.json @@ -0,0 +1,41 @@ +{ + "name": "laravel-notification-channels/spryng", + "description": "Spryng Notification Channel For Laravel", + "homepage": "https://github.com/laravel-notification-channels/spryng", + "license": "MIT", + "authors": [ + { + "name": "Bas van Dinther", + "email": "hello@baspa.dev", + "homepage": "https://baspa.dev", + "role": "Developer" + } + ], + "require": { + "php": ">=8.1", + "illuminate/notifications": "~10.0 || ~11.0", + "illuminate/support": "~10.0 || ~11.0", + "spryng/rest-api-php": "^1.1" + }, + "require-dev": { + "mockery/mockery": "^1.0", + "phpunit/phpunit": "^10.0" + }, + "autoload": { + "psr-4": { + "NotificationChannels\\Spryng\\": "src" + } + }, + "autoload-dev": { + "psr-4": { + "NotificationChannels\\Spryng\\Test\\": "tests" + } + }, + "scripts": { + "test": "phpunit", + "test:coverage": "phpunit --coverage-text --coverage-clover=coverage.clover" + }, + "config": { + "sort-packages": true + } +} diff --git a/phpunit.xml.dist b/phpunit.xml.dist new file mode 100644 index 00000000..06e56cde --- /dev/null +++ b/phpunit.xml.dist @@ -0,0 +1,23 @@ + + + + + + + + + + + + tests + + + + + + + + src/ + + + diff --git a/src/Exceptions/CouldNotSendNotification.php b/src/Exceptions/CouldNotSendNotification.php new file mode 100644 index 00000000..6420abec --- /dev/null +++ b/src/Exceptions/CouldNotSendNotification.php @@ -0,0 +1,7 @@ +spryng = $spryng; + } + + /** + * Send the given notification. + * + * @param mixed $notifiable + * @param \Illuminate\Notifications\Notification $notification + * + * @throws \NotificationChannels\Spryng\Exceptions\CouldNotSendNotification + */ + public function send($notifiable, Notification $notification) + { + $to = $notifiable->phone; + + if (! $to) { + return; + } + + $message = $notification->toSpryng($notifiable); + + $message = $this->createMessage($message); + + $response = $this->spryng->message->create($message); + + if (! $response || $response->serverError()) { + throw new CouldNotSendNotification( + message: 'Message could not be send because of a server error...', + code: $response->getResponseCode() + ); + } + } + + private function createMessage(SpryngMessage $message): Message + { + $spryngMessage = new Message(); + + $spryngMessage->setBody($message->body); + $spryngMessage->setRecipients($message->recipients); + $spryngMessage->setOriginator($message->originator); + + return $spryngMessage; + } +} diff --git a/src/SpryngMessage.php b/src/SpryngMessage.php new file mode 100644 index 00000000..539d2aff --- /dev/null +++ b/src/SpryngMessage.php @@ -0,0 +1,43 @@ +body = $body; + $this->originator = $originator; + $this->recipients = $recipients; + } + + public function setBody(string $body): self + { + $this->body = $body; + + return $this; + } + + public function setOriginator(string $originator): self + { + $this->originator = $originator; + + return $this; + } + + public function setRecipients(array|string $recipients): self + { + $this->recipients = is_array($recipients) ? $recipients : [$recipients]; + + return $this; + } +} diff --git a/src/SpryngServiceProvider.php b/src/SpryngServiceProvider.php new file mode 100644 index 00000000..18f295db --- /dev/null +++ b/src/SpryngServiceProvider.php @@ -0,0 +1,34 @@ +app->when(SpryngChannel::class) + ->needs(Spryng::class) + ->give(function ($app) { + if ( + empty($app['config']['services.spryng.key']) + ) { + throw new \InvalidArgumentException('Missing Spryng config in services'); + } + + return new Spryng( + $app['config']['services.spryng.key'] + ); + }); + } + + public function provides(): array + { + return [Spryng::class]; + } +}