merge revision 25266 to release-1.12

git-svn-id: http://framework.zend.com/svn/framework/standard/branches/release-1.12@25267 44c647ce-9c0f-0410-b52a-842ac1e357ba

library/Zend/Service/Twitter.php

@@ -130,7 +130,7 @@ class Zend_Service_Twitter extends Zend_Rest_Client
      */
     public function __construct($options = null, Zend_Oauth_Consumer $consumer = null)
     {
-        $this->setUri('http://api.twitter.com');
+        $this->setUri('https://api.twitter.com');
         if ($options instanceof Zend_Config) {
             $options = $options->toArray();
         }

tests/Zend/Service/Twitter/TwitterTest.php

@@ -85,7 +85,7 @@ class Zend_Service_Twitter_TwitterTest extends PHPUnit_Framework_TestCase
         $client->expects($this->any())->method('resetParameters')
             ->will($this->returnValue($client));
         $client->expects($this->once())->method('setUri')
-            ->with('http://api.twitter.com/1/' . $path);
+            ->with('https://api.twitter.com/1/' . $path);
         $response = $this->getMock('Zend_Http_Response', array(), array(), '', false);
         if (!is_null($params)) {
             $setter = 'setParameter' . ucfirst(strtolower($method));