Merge branch 'master' into hotfix/ZF-3821

Conflicts: tests/Zend/InfoCard/XmlParsingTest.php
zendframework · Aug 26, 2011 · 986898b · 986898b
commit 986898b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/test/PubSubHubbub/Model/SubscriptionTest.php b/test/PubSubHubbub/Model/SubscriptionTest.php
@@ -48,7 +48,7 @@ public function testAllOperations()
 
         $this->assertTrue($subscription->hasSubscription($id));
         $dataSubscription = $subscription->getSubscription($id);
-        $this->assertType('array', $dataSubscription);
+        $this->assertInternalType('array', $dataSubscription);
         $keys = array('id', 'topic_url', 'hub_url',
                       'created_time', 'lease_seconds',
                       'verify_token', 'secret',