Merge branch '2.1'

orchestral · Dec 30, 2013 · 704aeb3 · 704aeb3
2 parents 6c1ef04 + 4ce9cec
commit 704aeb3
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 21 deletions.
diff --git a/src/Orchestra/Notifier/LaravelNotifier.php b/src/Orchestra/Notifier/LaravelNotifier.php
@@ -25,13 +25,13 @@ public function __construct(IlluminateMailer $mailer)
     /**
      * Send notification via API.
      *
-     * @param  NotifiableInterface $user
-     * @param  string              $subject
-     * @param  string|array        $view
-     * @param  array               $data
+     * @param  UserProviderInterface   $user
+     * @param  string                  $subject
+     * @param  string|array            $view
+     * @param  array                   $data
      * @return boolean
      */
-    public function send(NotifiableInterface $user, $subject, $view, array $data = array())
+    public function send(UserProviderInterface $user, $subject, $view, array $data = array())
     {
         $sent = $this->mailer->send($view, $data, function ($mail) use ($user, $subject) {
             $mail->to($user->getNotifierEmail(), $user->getNotifierName());

diff --git a/src/Orchestra/Notifier/NotifierInterface.php b/src/Orchestra/Notifier/NotifierInterface.php
@@ -6,11 +6,11 @@ interface NotifierInterface
     /**
      * Send notification via API.
      *
-     * @param  NotifiableInterface $user
-     * @param  string              $subject
-     * @param  string|array        $view
-     * @param  array               $data
+     * @param  UserProviderInterface   $user
+     * @param  string                  $subject
+     * @param  string|array            $view
+     * @param  array                   $data
      * @return boolean
      */
-    public function send(NotifiableInterface $user, $subject, $view, array $data = array());
+    public function send(UserProviderInterface $user, $subject, $view, array $data = array());
 }
diff --git a/src/Orchestra/Notifier/OrchestraNotifier.php b/src/Orchestra/Notifier/OrchestraNotifier.php
@@ -25,13 +25,13 @@ public function __construct(Mailer $mailer)
     /**
      * Send notification via API.
      *
-     * @param  NotifiableInterface $user
-     * @param  string              $subject
-     * @param  string|array        $view
-     * @param  array               $data
+     * @param  UserProviderInterface   $user
+     * @param  string                  $subject
+     * @param  string|array            $view
+     * @param  array                   $data
      * @return boolean
      */
-    public function send(NotifiableInterface $user, $subject, $view, array $data = array())
+    public function send(UserProviderInterface $user, $subject, $view, array $data = array())
     {
         $sent = $this->mailer->push($view, $data, function ($message) use ($user, $subject) {
             $message->to($user->getNotifierEmail(), $user->getNotifierName());

diff --git a/...rchestra/Notifier/NotifiableInterface.php → ...hestra/Notifier/UserProviderInterface.php b/...rchestra/Notifier/NotifiableInterface.php → ...hestra/Notifier/UserProviderInterface.php
@@ -1,6 +1,6 @@
 <?php namespace Orchestra\Notifier;
 
-interface NotifiableInterface
+interface UserProviderInterface
 {
     /**
      * Get the e-mail address where notification are sent.

diff --git a/tests/LaravelNotifierTest.php b/tests/LaravelNotifierTest.php
@@ -22,7 +22,7 @@ public function tearDown()
     public function testSendMethodSucceed()
     {
         $mailer = m::mock('\Illuminate\Mail\Mailer[send]');
-        $user = m::mock('\Orchestra\Notifier\NotifiableInterface');
+        $user = m::mock('\Orchestra\Notifier\UserProviderInterface');
         $subject = 'foobar';
         $view = 'foo.bar';
         $data = array();
@@ -52,7 +52,7 @@ public function testSendMethodSucceed()
     public function testSendMethodFailed()
     {
         $mailer = m::mock('\Illuminate\Mail\Mailer[send]');
-        $user = m::mock('\Orchestra\Notifier\NotifiableInterface');
+        $user = m::mock('\Orchestra\Notifier\UserProviderInterface');
         $subject = 'foobar';
         $view = 'foo.bar';
         $data = array();

diff --git a/tests/OrchestraNotifierTest.php b/tests/OrchestraNotifierTest.php
@@ -22,7 +22,7 @@ public function tearDown()
     public function testSendMethodWithoutQueue()
     {
         $mailer = m::mock('\Orchestra\Notifier\Mailer[push]');
-        $user = m::mock('\Orchestra\Notifier\NotifiableInterface');
+        $user = m::mock('\Orchestra\Notifier\UserProviderInterface');
         $subject = 'foobar';
         $view = 'foo.bar';
         $data = array();
@@ -54,7 +54,7 @@ public function testSendMethodUsingQueue()
     {
         $mailer = m::mock('\Orchestra\Notifier\Mailer[push]');
         $memory = m::mock('\Orchestra\Memory\Provider[get]');
-        $user = m::mock('\Orchestra\Notifier\NotifiableInterface');
+        $user = m::mock('\Orchestra\Notifier\UserProviderInterface');
         $subject = 'foobar';
         $view = 'foo.bar';
         $data = array();
@@ -86,7 +86,7 @@ public function testSendMethodUsingQueue()
     public function testSendMethodFailed()
     {
         $mailer = m::mock('\Orchestra\Notifier\Mailer[push]');
-        $user = m::mock('\Orchestra\Notifier\NotifiableInterface');
+        $user = m::mock('\Orchestra\Notifier\UserProviderInterface');
         $subject = 'foobar';
         $view = 'foo.bar';
         $data = array();