Merge pull request #7 from mbardelmeijer/master

Require PHP 7, cleanup code, add support for Laravel 5.4 and 5.5

Author: mbardelmeijer

.travis.yml

@@ -1,10 +1,11 @@
 language: php
 
 php:
-  - 5.6
   - 7.0
   - 7.1
 
+sudo: false
+
 env:
   matrix:
     - COMPOSER_FLAGS="--prefer-lowest"

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to `CMSMS` will be documented in this file
 
+## [1.0.0] - 2016-09-29
+#### Changed
+- Added support for Laravel 5.4 and 5.5
+- Dropped support for PHP 5.6
+- Added support for Laravel 5.5 package autoloader
+
 ## [0.0.5] - 2016-09-29
 #### Fixed
 - Allow an empty `tariff` to be set.

README.md

@@ -38,7 +38,7 @@ You can install the package via composer:
 composer require laravel-notification-channels/cmsms
 ```
 
-You must install the service provider:
+You must install the service provider for Laravel 5.4 and below:
 
 ```php
 // config/app.php
@@ -48,6 +48,8 @@ You must install the service provider:
 ],
 ```
 
+Laravel 5.5 uses Package Auto-Discovery, so doesn't require you to manually add the ServiceProvider.
+
 ## Setting up your CMSMS account
 
 Add your CMSMS Product Token and default originator (name or number of sender) to your `config/services.php`:

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "laravel-notification-channels/cmsms",
-    "description": "Cmsms notification channel for Laravel 5.3",
+    "description": "Cmsms notification channel for Laravel 5",
     "homepage": "https://github.com/laravel-notification-channels/cmsms",
     "license": "MIT",
     "authors": [
@@ -12,15 +12,15 @@
         }
     ],
     "require": {
-        "php": ">=5.6.4",
-        "illuminate/notifications": "^5.3",
-        "illuminate/support": "^5.1|^5.2|^5.3",
+        "php": "^7.0",
+        "illuminate/notifications": "~5.3",
+        "illuminate/support": "~5.3",
         "guzzlehttp/guzzle": "^6.2"
     },
     "require-dev": {
-        "mockery/mockery": "^0.9.5",
-        "phpunit/phpunit": "4.*",
-        "orchestra/testbench": "^3.3"
+        "mockery/mockery": "~0.9.9",
+        "phpunit/phpunit": "^6.1",
+        "orchestra/testbench": "~3.4.6"
     },
     "autoload": {
         "psr-4": {
@@ -37,5 +37,12 @@
     },
     "config": {
         "sort-packages": true
+    },
+    "extra": {
+        "laravel": {
+            "providers": [
+                "NotificationChannels\\Cmsms\\CmsmsServiceProvider"
+            ]
+        }
     }
 }

src/CmsmsChannel.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace NotificationChannels\Cmsms;
 
 use Illuminate\Notifications\Notification;

src/CmsmsClient.php

@@ -1,11 +1,13 @@
 <?php
 
+declare(strict_types=1);
+
 namespace NotificationChannels\Cmsms;
 
-use GuzzleHttp\Client as GuzzleClient;
+use SimpleXMLElement;
 use Illuminate\Support\Arr;
+use GuzzleHttp\Client as GuzzleClient;
 use NotificationChannels\Cmsms\Exceptions\CouldNotSendNotification;
-use SimpleXMLElement;
 
 class CmsmsClient
 {
@@ -21,7 +23,7 @@ class CmsmsClient
      * @param GuzzleClient $client
      * @param string $productToken
      */
-    public function __construct(GuzzleClient $client, $productToken)
+    public function __construct(GuzzleClient $client, string $productToken)
     {
         $this->client = $client;
         $this->productToken = $productToken;
@@ -32,7 +34,7 @@ public function __construct(GuzzleClient $client, $productToken)
      * @param string $recipient
      * @throws CouldNotSendNotification
      */
-    public function send(CmsmsMessage $message, $recipient)
+    public function send(CmsmsMessage $message, string $recipient)
     {
         if (is_null(Arr::get($message->toXmlArray(), 'FROM'))) {
             $message->originator(config('services.cmsms.originator'));
@@ -58,20 +60,20 @@ public function send(CmsmsMessage $message, $recipient)
      * @param string $recipient
      * @return string
      */
-    public function buildMessageXml(CmsmsMessage $message, $recipient)
+    public function buildMessageXml(CmsmsMessage $message, string $recipient): string
     {
         $xml = new SimpleXMLElement('<MESSAGES/>');
 
         $xml->addChild('AUTHENTICATION')
             ->addChild('PRODUCTTOKEN', $this->productToken);
 
         if ($tariff = $message->getTariff()) {
-            $xml->addChild('TARIFF', $tariff);
+            $xml->addChild('TARIFF', (string) $tariff);
         }
 
         $msg = $xml->addChild('MSG');
         foreach ($message->toXmlArray() as $name => $value) {
-            $msg->addChild($name, $value);
+            $msg->addChild($name, (string) $value);
         }
         $msg->addChild('TO', $recipient);
 

src/CmsmsMessage.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace NotificationChannels\Cmsms;
 
 use NotificationChannels\Cmsms\Exceptions\InvalidMessage;
@@ -27,7 +29,7 @@ class CmsmsMessage
     /**
      * @param string $body
      */
-    public function __construct($body = '')
+    public function __construct(string $body = '')
     {
         $this->body($body);
     }
@@ -36,7 +38,7 @@ public function __construct($body = '')
      * @param string $body
      * @return $this
      */
-    public function body($body)
+    public function body(string $body)
     {
         $this->body = trim($body);
 
@@ -64,7 +66,7 @@ public function originator($originator)
      * @return $this
      * @throws InvalidMessage
      */
-    public function reference($reference)
+    public function reference(string $reference)
     {
         if (empty($reference) || strlen($reference) > 32 || ! ctype_alnum($reference)) {
             throw InvalidMessage::invalidReference($reference);
@@ -80,12 +82,8 @@ public function reference($reference)
      * @return $this
      * @throws InvalidMessage
      */
-    public function tariff($tariff)
+    public function tariff(int $tariff)
     {
-        if (! is_int($tariff)) {
-            throw InvalidMessage::invalidTariff($tariff);
-        }
-
         $this->tariff = $tariff;
 
         return $this;
@@ -94,7 +92,7 @@ public function tariff($tariff)
     /**
      * @return int
      */
-    public function getTariff()
+    public function getTariff(): int
     {
         return $this->tariff;
     }
@@ -105,9 +103,9 @@ public function getTariff()
      * @return $this
      * @throws InvalidMessage
      */
-    public function multipart($minimum, $maximum)
+    public function multipart(int $minimum, int $maximum)
     {
-        if (! is_int($minimum) || ! is_int($maximum) || $maximum > 8 || $minimum >= $maximum) {
+        if ($maximum > 8 || $minimum >= $maximum) {
             throw InvalidMessage::invalidMultipart($minimum, $maximum);
         }
 
@@ -120,7 +118,7 @@ public function multipart($minimum, $maximum)
     /**
      * @return array
      */
-    public function toXmlArray()
+    public function toXmlArray(): array
     {
         return array_filter([
             'BODY' => $this->body,

src/CmsmsServiceProvider.php

@@ -1,28 +1,25 @@
 <?php
 
+declare(strict_types=1);
+
 namespace NotificationChannels\Cmsms;
 
-use Illuminate\Support\ServiceProvider;
 use GuzzleHttp\Client as GuzzleClient;
+use Illuminate\Support\ServiceProvider;
 use NotificationChannels\Cmsms\Exceptions\InvalidConfiguration;
 
 class CmsmsServiceProvider extends ServiceProvider
 {
-    /**
-     * Bootstrap the application services.
-     */
     public function boot()
     {
         $this->app->when(CmsmsChannel::class)
             ->needs(CmsmsClient::class)
             ->give(function () {
-                $config = config('services.cmsms');
-
-                if (is_null($config)) {
+                if (is_null($productToken = config('services.cmsms.product_token'))) {
                     throw InvalidConfiguration::configurationNotSet();
                 }
 
-                return new CmsmsClient(new GuzzleClient(), $config['product_token']);
+                return new CmsmsClient(new GuzzleClient, $productToken);
             });
     }
 }

src/Exceptions/CouldNotSendNotification.php

@@ -10,7 +10,7 @@ class CouldNotSendNotification extends Exception
      * @param string $error
      * @return static
      */
-    public static function serviceRespondedWithAnError($error)
+    public static function serviceRespondedWithAnError(string $error)
     {
         return new static("CMSMS service responded with an error: {$error}'");
     }

src/Exceptions/InvalidMessage.php

@@ -10,7 +10,7 @@ class InvalidMessage extends Exception
      * @param string $reference
      * @return static
      */
-    public static function invalidReference($reference)
+    public static function invalidReference(string $reference)
     {
         return new static("The reference on the CMSMS message may only contain 1 - 32 alphanumeric characters. Was given '{$reference}'");
     }
@@ -19,26 +19,17 @@ public static function invalidReference($reference)
      * @param string $originator
      * @return static
      */
-    public static function invalidOriginator($originator)
+    public static function invalidOriginator(string $originator)
     {
         return new static("The originator on the CMSMS message may only contain 1 - 11 characters. Was given '{$originator}'");
     }
 
-    /**
-     * @param int $tariff
-     * @return static
-     */
-    public static function invalidTariff($tariff)
-    {
-        return new static("The tarrif on the CMSMS message may only contain a nonzero integer. Was given '{$tariff}'");
-    }
-
     /**
      * @param int $minimum
      * @param int $maximum
      * @return static
      */
-    public static function invalidMultipart($minimum, $maximum)
+    public static function invalidMultipart(int $minimum, int $maximum)
     {
         return new static("The number of message parts for sending a multipart message on the CMSMS message may only contain a integer range from 0 to 8. Was given a minimum of '{$minimum}' and maximum of '{$maximum}'");
     }

tests/CmsmsChannelTest.php

@@ -2,16 +2,16 @@
 
 namespace NotificationChannels\Cmsms\Test;
 
+use Mockery;
 use GuzzleHttp\Client;
+use PHPUnit\Framework\TestCase;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Notifications\Notification;
-use Mockery;
-use NotificationChannels\Cmsms\CmsmsChannel;
 use NotificationChannels\Cmsms\CmsmsClient;
+use NotificationChannels\Cmsms\CmsmsChannel;
 use NotificationChannels\Cmsms\CmsmsMessage;
-use PHPUnit_Framework_TestCase;
 
-class CmsmsChannelTest extends PHPUnit_Framework_TestCase
+class CmsmsChannelTest extends TestCase
 {
     public function setUp()
     {
@@ -35,7 +35,10 @@ public function it_can_be_instantiated()
         $this->assertInstanceOf(CmsmsChannel::class, $this->channel);
     }
 
-    /** @test */
+    /**
+     * @test
+     * @doesNotPerformAssertions
+     */
     public function it_shares_message()
     {
         $this->client->shouldReceive('send')->once();

tests/CmsmsClientTest.php

@@ -2,13 +2,13 @@
 
 namespace NotificationChannels\Cmsms\Test;
 
+use Mockery;
 use GuzzleHttp\Client;
 use GuzzleHttp\Psr7\Response;
-use Mockery;
+use Orchestra\Testbench\TestCase;
 use NotificationChannels\Cmsms\CmsmsClient;
 use NotificationChannels\Cmsms\CmsmsMessage;
 use NotificationChannels\Cmsms\Exceptions\CouldNotSendNotification;
-use Orchestra\Testbench\TestCase;
 
 class CmsmsClientTest extends TestCase
 {
@@ -34,7 +34,10 @@ public function it_can_be_instantiated()
         $this->assertInstanceOf(CmsmsMessage::class, $this->message);
     }
 
-    /** @test */
+    /**
+     * @test
+     * @doesNotPerformAssertions
+     */
     public function it_can_send_message()
     {
         $this->guzzle
@@ -45,7 +48,10 @@ public function it_can_send_message()
         $this->client->send($this->message, '00301234');
     }
 
-    /** @test */
+    /**
+     * @test
+     * @doesNotPerformAssertions
+     */
     public function it_sets_a_default_originator_if_none_is_set()
     {
         $message = Mockery::mock(new CmsmsMessage('Message body'));
@@ -64,7 +70,7 @@ public function it_sets_a_default_originator_if_none_is_set()
     /** @test */
     public function it_throws_exception_on_error_response()
     {
-        $this->setExpectedException(CouldNotSendNotification::class);
+        $this->expectException(CouldNotSendNotification::class);
 
         $this->guzzle
             ->shouldReceive('request')