From b0ec13fa139483133ccad7a64556914c5c21be4a Mon Sep 17 00:00:00 2001
From: James Brooks <james@bluebaytravel.co.uk>
Date: Mon, 14 Sep 2015 08:37:24 +0100
Subject: [PATCH] Fixes adding of subscribers. Closes #944

---
 .../SubscriberHasSubscribedEvent.php          |  2 +
 .../SubscriberHasUnsubscribedEvent.php        |  2 +
 ...SendSubscriberVerificationEmailHandler.php | 62 -------------------
 ...SendSubscriberVerificationEmailHandler.php |  4 +-
 app/Providers/EventServiceProvider.php        |  2 +-
 5 files changed, 7 insertions(+), 65 deletions(-)
 delete mode 100644 app/Handlers/Events/SendSubscriberVerificationEmailHandler.php

diff --git a/app/Events/Subscriber/SubscriberHasSubscribedEvent.php b/app/Events/Subscriber/SubscriberHasSubscribedEvent.php
index b1c8297f..5808ae4a 100644
--- a/app/Events/Subscriber/SubscriberHasSubscribedEvent.php
+++ b/app/Events/Subscriber/SubscriberHasSubscribedEvent.php
@@ -24,6 +24,8 @@ class SubscriberHasSubscribedEvent
 
     /**
      * Create a new subscriber has subscribed event instance.
+     *
+     * @return void
      */
     public function __construct(Subscriber $subscriber)
     {
diff --git a/app/Events/Subscriber/SubscriberHasUnsubscribedEvent.php b/app/Events/Subscriber/SubscriberHasUnsubscribedEvent.php
index cbd1ec83..e7738f46 100644
--- a/app/Events/Subscriber/SubscriberHasUnsubscribedEvent.php
+++ b/app/Events/Subscriber/SubscriberHasUnsubscribedEvent.php
@@ -24,6 +24,8 @@ class SubscriberHasUnsubscribedEvent
 
     /**
      * Create a new subscriber has unsubscribed event instance.
+     *
+     * @return void
      */
     public function __construct(Subscriber $subscriber)
     {
diff --git a/app/Handlers/Events/SendSubscriberVerificationEmailHandler.php b/app/Handlers/Events/SendSubscriberVerificationEmailHandler.php
deleted file mode 100644
index 1de26a31..00000000
--- a/app/Handlers/Events/SendSubscriberVerificationEmailHandler.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/*
- * This file is part of Cachet.
- *
- * (c) Alt Three Services Limited
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace CachetHQ\Cachet\Handlers\Events;
-
-use CachetHQ\Cachet\Events\SubscriberHasSubscribedEvent;
-use Illuminate\Contracts\Mail\MailQueue;
-use Illuminate\Mail\Message;
-
-class SendSubscriberVerificationEmailHandler
-{
-    /**
-     * The mailer instance.
-     *
-     * @var \Illuminate\Contracts\Mail\MailQueue
-     */
-    protected $mailer;
-
-    /**
-     * Create a new send subscriber verification email handler.
-     *
-     * @param \Illuminate\Contracts\Mail\Mailer $mailer
-     *
-     * @return void
-     */
-    public function __construct(MailQueue $mailer)
-    {
-        $this->mailer = $mailer;
-    }
-
-    /**
-     * Handle the event.
-     *
-     * @param \CachetHQ\Cachet\Events\CustomerHasSubscribedEvent $event
-     *
-     * @return void
-     */
-    public function handle(SubscriberHasSubscribedEvent $event)
-    {
-        $mail = [
-            'email'    => $event->subscriber->email,
-            'subject'  => 'Confirm your subscription.',
-            'link'     => route('subscribe.verify', ['code' => $event->subscriber->verify_code]),
-            'app_url'  => env('APP_URL'),
-        ];
-
-        $this->mailer->queue([
-            'html' => 'emails.subscribers.verify-html',
-            'text' => 'emails.subscribers.verify-text',
-        ], $mail, function (Message $message) use ($mail) {
-            $message->to($mail['email'])->subject($mail['subject']);
-        });
-    }
-}
diff --git a/app/Handlers/Events/Subscriber/SendSubscriberVerificationEmailHandler.php b/app/Handlers/Events/Subscriber/SendSubscriberVerificationEmailHandler.php
index 593734f9..d0d667fa 100644
--- a/app/Handlers/Events/Subscriber/SendSubscriberVerificationEmailHandler.php
+++ b/app/Handlers/Events/Subscriber/SendSubscriberVerificationEmailHandler.php
@@ -11,7 +11,7 @@
 
 namespace CachetHQ\Cachet\Handlers\Events\Subscriber;
 
-use CachetHQ\Cachet\Events\SubscriberHasSubscribedEvent;
+use CachetHQ\Cachet\Events\Subscriber\SubscriberHasSubscribedEvent;
 use Illuminate\Contracts\Mail\MailQueue;
 use Illuminate\Mail\Message;
 
@@ -39,7 +39,7 @@ class SendSubscriberVerificationEmailHandler
     /**
      * Handle the event.
      *
-     * @param \CachetHQ\Cachet\Events\CustomerHasSubscribedEvent $event
+     * @param \CachetHQ\Cachet\Events\SubscriberHasSubscribedEvent $event
      *
      * @return void
      */
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index 7646ad66..841031bc 100644
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -22,7 +22,7 @@ class EventServiceProvider extends ServiceProvider
      */
     protected $listen = [
         'CachetHQ\Cachet\Events\Subscriber\SubscriberHasSubscribedEvent' => [
-            'CachetHQ\Cachet\Handlers\Events\SendSubscriberVerificationEmailHandler',
+            'CachetHQ\Cachet\Handlers\Events\Subscriber\SendSubscriberVerificationEmailHandler',
         ],
         'CachetHQ\Cachet\Events\Incident\IncidentWasReportedEvent' => [
             'CachetHQ\Cachet\Handlers\Events\Incident\SendIncidentEmailNotificationHandler',