Merge branch 'master' of git://github.com/zendframework/zf2 into useStatementFixes

Author: marc-mabe

src/Response.php

@@ -327,8 +327,9 @@ public function getReasonPhrase()
     /**
      * Set HTTP status code and (optionally) message
      *
-     * @param numeric $code
-     * @return Response
+     * @param integer $code
+     * @throws Exception\InvalidArgumentException
+     * @return \Zend\Http\Response
      */
     public function setStatusCode($code)
     {

test/Client/StaticTest.php

@@ -342,6 +342,9 @@ public function testGetLastRawResponseWhenNotStoring()
      */
     public function testInvalidPostContentType()
     {
+        if (!constant('TESTS_ZEND_HTTP_CLIENT_ONLINE')) {
+            $this->markTestSkipped('Zend\Http\Client online tests are not enabled');
+        }
         $this->setExpectedException(
             'Zend\Http\Exception\RuntimeException',
             'Cannot handle content type \'x-foo/something-fake\' automatically');
@@ -359,6 +362,9 @@ public function testInvalidPostContentType()
      */
     public function testSocketErrorException()
     {
+        if (!constant('TESTS_ZEND_HTTP_CLIENT_ONLINE')) {
+            $this->markTestSkipped('Zend\Http\Client online tests are not enabled');
+        }
         $this->setExpectedException(
             'Zend\Http\Client\Adapter\Exception\RuntimeException',
             'Unable to Connect to tcp://255.255.255.255:80');
@@ -395,6 +401,9 @@ public function testSettingInvalidMethodThrowsException($method)
      */
     public function testFormDataEncodingWithMultiArrayZF7038()
     {
+        if (!constant('TESTS_ZEND_HTTP_CLIENT_ONLINE')) {
+            $this->markTestSkipped('Zend\Http\Client online tests are not enabled');
+        }
         $this->_client->setAdapter('Zend\Http\Client\Adapter\Test');
         $this->_client->setUri('http://example.com');
         $this->_client->setEncType(HTTPClient::ENC_FORMDATA);
@@ -439,6 +448,9 @@ public function testFormDataEncodingWithMultiArrayZF7038()
      */
     public function testMultibyteRawPostDataZF2098()
     {
+        if (!constant('TESTS_ZEND_HTTP_CLIENT_ONLINE')) {
+            $this->markTestSkipped('Zend\Http\Client online tests are not enabled');
+        }
         $this->_client->setAdapter('Zend\Http\Client\Adapter\Test');
         $this->_client->setUri('http://example.com');
 
@@ -464,6 +476,9 @@ public function testMultibyteRawPostDataZF2098()
      */
     public function testOpenTempStreamWithValidFileDoesntThrowsException()
     {
+        if (!constant('TESTS_ZEND_HTTP_CLIENT_ONLINE')) {
+            $this->markTestSkipped('Zend\Http\Client online tests are not enabled');
+        }
         $url = 'http://www.example.com/';
         $config = array (
             'outputstream' => realpath(__DIR__ . '/_files/zend_http_client_stream.file'),
@@ -486,6 +501,9 @@ public function testOpenTempStreamWithValidFileDoesntThrowsException()
      */
     public function testOpenTempStreamWithBogusFileClosesTheConnection()
     {
+        if (!constant('TESTS_ZEND_HTTP_CLIENT_ONLINE')) {
+            $this->markTestSkipped('Zend\Http\Client online tests are not enabled');
+        }
         $this->setExpectedException(
             'Zend\Http\Exception\RuntimeException',
             'Could not open temp file /path/to/bogus/file.ext');
@@ -506,6 +524,9 @@ public function testOpenTempStreamWithBogusFileClosesTheConnection()
      */
     public function testEncodedCookiesInRequestHeaders()
     {
+        if (!constant('TESTS_ZEND_HTTP_CLIENT_ONLINE')) {
+            $this->markTestSkipped('Zend\Http\Client online tests are not enabled');
+        }
         $this->_client->addCookie('foo', 'bar=baz');
         $this->_client->send();
         $cookieValue = 'Cookie: foo='.urlencode('bar=baz');
@@ -520,6 +541,9 @@ public function testEncodedCookiesInRequestHeaders()
      */
     public function testRawCookiesInRequestHeaders()
     {
+        if (!constant('TESTS_ZEND_HTTP_CLIENT_ONLINE')) {
+            $this->markTestSkipped('Zend\Http\Client online tests are not enabled');
+        }
         $this->_client->setOptions(array('encodecookies' => false));
         $this->_client->addCookie('foo', 'bar=baz');
         $this->_client->send();

test/Client/UseCaseTest.php

@@ -26,7 +26,7 @@ class UseCaseTest extends \PHPUnit_Framework_TestCase
      *
      * @var string
      */
-    protected $baseuri = 'http://www.google.com/';
+    protected $baseuri;
 
     /**
      * Common HTTP client
@@ -56,7 +56,15 @@ class UseCaseTest extends \PHPUnit_Framework_TestCase
      */
     protected function setUp()
     {
-        $this->client= new HTTPClient($this->baseuri);
+        if (defined('TESTS_ZEND_HTTP_CLIENT_BASEURI')
+            && (TESTS_ZEND_HTTP_CLIENT_BASEURI != false)
+        ) {
+            $this->baseuri = TESTS_ZEND_HTTP_CLIENT_BASEURI;
+            $this->client  = new HTTPClient($this->baseuri);
+        } else {
+            // Skip tests
+            $this->markTestSkipped("Zend_Http_Client dynamic tests are not enabled in TestConfiguration.php");
+        }
     }
 
     /**
@@ -67,20 +75,20 @@ protected function tearDown()
     {
         $this->client = null;
     }
-    
+
     public function testHttpGet()
     {
         $this->client->setMethod(Request::METHOD_GET);
         $response= $this->client->send();
         $this->assertTrue($response->isSuccess());
     }
-    
+
     public function testStaticHttpGet()
     {
 //        $response= HTTPClient::get($this->baseuri);
 //        $this->assertTrue($response->isSuccess());
     }
-    
+
     public function testRequestHttpGet()
     {
         $client= new HTTPClient();
@@ -90,5 +98,5 @@ public function testRequestHttpGet()
         $response= $client->send($request);
         $this->assertTrue($response->isSuccess());
     }
-    
+
 }