Преглед изворни кода

[ZF-10182] Zend_Oauth:

- fixed type hinting in Zend_Oauth_Client:>__construct(). 

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@22650 44c647ce-9c0f-0410-b52a-842ac1e357ba
ramon пре 15 година
родитељ
комит
e09f60f103
2 измењених фајлова са 38 додато и 4 уклоњено
  1. 3 3
      library/Zend/Oauth/Client.php
  2. 35 1
      tests/Zend/Oauth/OauthTest.php

+ 3 - 3
library/Zend/Oauth/Client.php

@@ -74,7 +74,7 @@ class Zend_Oauth_Client extends Zend_Http_Client
      * @param  array|Zend_Config $config
      * @return void
      */
-    public function __construct(array $oauthOptions, $uri = null, $config = null)
+    public function __construct($oauthOptions, $uri = null, $config = null)
     {
         parent::__construct($uri, $config);
         $this->_config = new Zend_Oauth_Config;
@@ -95,7 +95,7 @@ class Zend_Oauth_Client extends Zend_Http_Client
     {
         return $this->adapter;
     }
-    
+
    /**
      * Load the connection adapter
      *
@@ -269,7 +269,7 @@ class Zend_Oauth_Client extends Zend_Http_Client
                 $queryParts = explode('&', $this->getUri()->getQuery());
                 foreach ($queryParts as $queryPart) {
                     $kvTuple = explode('=', $queryPart);
-                    $params[$kvTuple[0]] = 
+                    $params[$kvTuple[0]] =
                         (array_key_exists(1, $kvTuple) ? $kvTuple[1] : NULL);
                 }
             }

+ 35 - 1
tests/Zend/Oauth/OauthTest.php

@@ -1,4 +1,5 @@
 <?php
+require_once dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'TestHelper.php';
 
 require_once 'PHPUnit/Framework/TestCase.php';
 require_once 'Zend/Oauth.php';
@@ -38,4 +39,37 @@ class Zend_OauthTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(null, $resetClient->getHeader('Authorization'));
     }
 
-}
+    /**
+     * @group ZF-10182
+     */
+    public function testOauthClientPassingObjectConfigInConstructor()
+    {
+        $options = array(
+            'requestMethod' => 'GET',
+            'siteUrl'       => 'http://www.example.com'
+        );
+
+        require_once 'Zend/Config.php';
+        require_once 'Zend/Oauth/Client.php';
+        $config = new Zend_Config($options);
+        $client = new Zend_Oauth_Client($config);
+        $this->assertEquals('GET', $client->getRequestMethod());
+        $this->assertEquals('http://www.example.com', $client->getSiteUrl());
+    }
+
+    /**
+     * @group ZF-10182
+     */
+    public function testOauthClientPassingArrayInConstructor()
+    {
+        $options = array(
+            'requestMethod' => 'GET',
+            'siteUrl'       => 'http://www.example.com'
+        );
+
+        require_once 'Zend/Oauth/Client.php';
+        $client = new Zend_Oauth_Client($options);
+        $this->assertEquals('GET', $client->getRequestMethod());
+        $this->assertEquals('http://www.example.com', $client->getSiteUrl());
+    }
+}