[zendframework/zendframework#3295] Fixed tests and logic flow

- Fixed the unit tests for the unsubscribe functionality. The table
  gateway was expecting the "delete" method now (not "update"), with
  only the "id" member in the array argument; additionally, we needed to
  test the return value, so I added a "will" clause.
- Altered the workflow of Callback to use a switch() statement for the
  "hub_mode"; this will make adding additional cases in the future
  easier, and allows us to raise an exception on an invalid mode.

src/PubSubHubbub/Subscriber/Callback.php

@@ -11,6 +11,7 @@
 namespace Zend\Feed\PubSubHubbub\Subscriber;
 
 use Zend\Feed\PubSubHubbub;
+use Zend\Feed\PubSubHubbub\Exception;
 use Zend\Uri;
 
 /**
@@ -95,23 +96,32 @@ public function handle(array $httpGetData = null, $sendResponseNow = false)
         } elseif ($this->isValidHubVerification($httpGetData)) {
             $this->getHttpResponse()->setContent($httpGetData['hub_challenge']);
 
-            if ($httpGetData['hub_mode'] == 'subscribe') {
-            	$data = $this->currentSubscriptionData;
-                $data['subscription_state'] = PubSubHubbub\PubSubHubbub::SUBSCRIPTION_VERIFIED;
-                if (isset($httpGetData['hub_lease_seconds'])) {
-                    $data['lease_seconds'] = $httpGetData['hub_lease_seconds'];
-                }
-                $this->getStorage()->setSubscription($data);
-            } else {
-                $verifyTokenKey = $this->_detectVerifyTokenKey($httpGetData);
-                $this->getStorage()->deleteSubscription($verifyTokenKey);
+            switch (strtolower($httpGetData['hub_mode'])) {
+                case 'subscribe':
+                    $data = $this->currentSubscriptionData;
+                    $data['subscription_state'] = PubSubHubbub\PubSubHubbub::SUBSCRIPTION_VERIFIED;
+                    if (isset($httpGetData['hub_lease_seconds'])) {
+                        $data['lease_seconds'] = $httpGetData['hub_lease_seconds'];
+                    }
+                    $this->getStorage()->setSubscription($data);
+                    break;
+                case 'unsubscribe':
+                    $verifyTokenKey = $this->_detectVerifyTokenKey($httpGetData);
+                    $this->getStorage()->deleteSubscription($verifyTokenKey);
+                    break;
+                default:
+                    throw new Exception\RuntimeException(sprintf(
+                        'Invalid hub_mode ("%s") provided',
+                        $httpGetData['hub_mode']
+                    ));
             }
         /**
          * Hey, C'mon! We tried everything else!
          */
         } else {
             $this->getHttpResponse()->setStatusCode(404);
         }
+
         if ($sendResponseNow) {
             $this->sendResponse();
         }

test/PubSubHubbub/Subscriber/CallbackTest.php

@@ -280,21 +280,12 @@ public function testRespondsToValidConfirmationWith200Response()
             ->will($this->returnValue(1));
 
         $this->_tableGateway->expects($this->once())
-            ->method('update')
-            ->with(
-            $this->equalTo(array('id'                => 'verifytokenkey',
-                                 'verify_token'      => hash('sha256', 'cba'),
-                                 'created_time'      => $t->getTimestamp(),
-                                 'lease_seconds'     => 1234567,
-                                 'subscription_state'=> 'to_delete',
-                                 'expiration_time'   => $t->add(new DateInterval('PT1234567S'))
-                                     ->format('Y-m-d H:i:s'))),
-            $this->equalTo(array('id' => 'verifytokenkey'))
-        );
+            ->method('delete')
+            ->with($this->equalTo(array('id' => 'verifytokenkey')))
+            ->will($this->returnValue(true));
 
         $this->_callback->handle($this->_get);
         $this->assertTrue($this->_callback->getHttpResponse()->getStatusCode() == 200);
-        $this->assertTrue($this->_callback->getStorage()->hasSubscription('verifytokenkey') == false);
     }
 
     public function testRespondsToValidConfirmationWithBodyContainingHubChallenge()