Merge branch '2.3' into 2.4

.travis.yml

@@ -13,7 +13,4 @@ before_install:
 
 install: travis_retry composer install --no-interaction --no-suggest
 
-notifications:
-  email: false
-
 script: vendor/bin/paratest -p 4 --max-batch-size 256

app/Bus/Handlers/Commands/Subscriber/UnsubscribeSubscriberCommandHandler.php

@@ -13,7 +13,6 @@ namespace CachetHQ\Cachet\Bus\Handlers\Commands\Subscriber;
 
 use CachetHQ\Cachet\Bus\Commands\Subscriber\UnsubscribeSubscriberCommand;
 use CachetHQ\Cachet\Bus\Events\Subscriber\SubscriberHasUnsubscribedEvent;
-use CachetHQ\Cachet\Models\Subscriber;
 
 /**
  * This is the unsubscribe subscriber command class.

composer.json

@@ -35,7 +35,7 @@
         "alt-three/twitter": "^1.0",
         "alt-three/validator": "^2.0",
         "aws/aws-sdk-php": "^3.7",
-        "backup-manager/laravel": "^1.1",
+        "backup-manager/laravel": "dev-master#df53f9c9d8c6be5d7a2638f45d54b8fb7bc51e2b",
         "barryvdh/laravel-cors": "^0.8",
         "doctrine/dbal": "^2.5",
         "fideloper/proxy": "^3.1",
@@ -61,7 +61,7 @@
         "fzaninotto/faker": "^1.6",
         "graham-campbell/testbench-core": "^1.1",
         "laravel/browser-kit-testing": "^2.0",
-        "mockery/mockery": "0.9.5",
+        "mockery/mockery": "0.9.9",
         "nikic/php-parser": "^3.0",
         "phpunit/phpunit": "5.7.20",
         "symfony/css-selector": "^3.1",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "24ddfebd513bb6f48357ccd4ccf065c3",
+    "content-hash": "c54768ae2bf05cf41daedaeecdef7b63",
     "packages": [
         {
             "name": "alt-three/badger",
@@ -595,16 +595,16 @@
         },
         {
             "name": "backup-manager/laravel",
-            "version": "1.1.2",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "https://github.com/backup-manager/laravel.git",
-                "reference": "a94b98cd3033c8e5c5958dc3640bf05b0f2df636"
+                "reference": "df53f9c9d8c6be5d7a2638f45d54b8fb7bc51e2b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/backup-manager/laravel/zipball/a94b98cd3033c8e5c5958dc3640bf05b0f2df636",
-                "reference": "a94b98cd3033c8e5c5958dc3640bf05b0f2df636",
+                "url": "https://api.github.com/repos/backup-manager/laravel/zipball/df53f9c9d8c6be5d7a2638f45d54b8fb7bc51e2b",
+                "reference": "df53f9c9d8c6be5d7a2638f45d54b8fb7bc51e2b",
                 "shasum": ""
             },
             "require": {
@@ -647,7 +647,7 @@
                 }
             ],
             "description": "Database backup manager seamlessly integrated with Laravel 4 or 5 with user-definable procedures and support for S3, Dropbox, FTP, SFTP, and more.",
-            "time": "2016-11-15T11:11:05+00:00"
+            "time": "2017-05-15T13:05:54+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",
@@ -4748,16 +4748,16 @@
         },
         {
             "name": "mockery/mockery",
-            "version": "0.9.5",
+            "version": "0.9.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mockery/mockery.git",
-                "reference": "4db079511a283e5aba1b3c2fb19037c645e70fc2"
+                "reference": "6fdb61243844dc924071d3404bb23994ea0b6856"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mockery/mockery/zipball/4db079511a283e5aba1b3c2fb19037c645e70fc2",
-                "reference": "4db079511a283e5aba1b3c2fb19037c645e70fc2",
+                "url": "https://api.github.com/repos/mockery/mockery/zipball/6fdb61243844dc924071d3404bb23994ea0b6856",
+                "reference": "6fdb61243844dc924071d3404bb23994ea0b6856",
                 "shasum": ""
             },
             "require": {
@@ -4809,7 +4809,7 @@
                 "test double",
                 "testing"
             ],
-            "time": "2016-05-22T21:52:33+00:00"
+            "time": "2017-02-28T12:52:32+00:00"
         },
         {
             "name": "myclabs/deep-copy",
@@ -6223,6 +6223,7 @@
     "aliases": [],
     "minimum-stability": "dev",
     "stability-flags": {
+        "backup-manager/laravel": 20,
         "nexmo/client": 10
     },
     "prefer-stable": true,

tests/Api/SubscriberTest.php

@@ -81,9 +81,8 @@ class SubscriberTest extends AbstractApiTestCase
         $this->post('/api/v1/subscribers', [
             'email'         => 'support@alt-three.com',
             'verify'        => true,
-            'subscriptions' => [
+            'components'    => [
                 1,
-                2,
                 3,
             ],
         ]);
@@ -91,6 +90,11 @@ class SubscriberTest extends AbstractApiTestCase
         $this->seeHeader('Content-Type', 'application/json');
         $this->seeJsonContains(['email' => 'support@alt-three.com']);
         $this->seeJsonStructure(['data' => ['subscriptions' => []]]);
+
+        $data = $this->decodeResponseJson();
+        $this->assertCount(2, $data['data']['subscriptions']);
+        $this->assertEquals(1, $data['data']['subscriptions'][0]['component_id']);
+        $this->assertEquals(3, $data['data']['subscriptions'][1]['component_id']);
     }
 
     public function testDeleteSubscriber()