Merge branch 'master' of git://github.com/zendframework/zf2 into ZF2-377

zendframework · Jul 17, 2012 · 845333c · 845333c
5 parents 5ef6a39 + 65e3b0b + 459f1f9 + e0c8424 + 58fd018
commit 845333c
Show file tree

Hide file tree

Showing 26 changed files with 1,026 additions and 184 deletions.
diff --git a/src/Client.php b/src/Client.php
@@ -123,7 +123,7 @@ class Client implements Stdlib\DispatchableInterface
      *
      * @var resource
      */
-    static protected $_fileInfoDb = null;
+    protected static $_fileInfoDb = null;
 
     /**
      * Constructor

diff --git a/src/Client/Adapter/Curl.php b/src/Client/Adapter/Curl.php
@@ -357,9 +357,9 @@ public function write($method, $uri, $httpVersion = 1.1, $headers = array(), $bo
 
         // Treating basic auth headers in a special way
         if (array_key_exists('Authorization', $headers) && 'Basic' == substr($headers['Authorization'], 0, 5)) {
-        	curl_setopt($this->curl, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);
-        	curl_setopt($this->curl, CURLOPT_USERPWD, base64_decode(substr($headers['Authorization'], 6)));
-        	unset($headers['Authorization']);
+            curl_setopt($this->curl, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);
+            curl_setopt($this->curl, CURLOPT_USERPWD, base64_decode(substr($headers['Authorization'], 6)));
+            unset($headers['Authorization']);
         }
 
         // set additional headers
@@ -389,6 +389,8 @@ public function write($method, $uri, $httpVersion = 1.1, $headers = array(), $bo
         } elseif ($method == 'PUT') {
             // This is a PUT by a setRawData string, not by file-handle
             curl_setopt($this->curl, CURLOPT_POSTFIELDS, $body);
+        } elseif ($method == 'PATCH') {
+            curl_setopt($this->curl, CURLOPT_POSTFIELDS, $body);
         }
 
         // set additional curl options

diff --git a/src/Client/Adapter/Socket.php b/src/Client/Adapter/Socket.php
@@ -292,7 +292,7 @@ public function read()
         $response = '';
         $gotStatus = false;
 
-        while (($line = @fgets($this->socket)) !== false) {
+        while (($line = fgets($this->socket)) !== false) {
             $gotStatus = $gotStatus || (strpos($line, 'HTTP') !== false);
             if ($gotStatus) {
                 $response .= $line;
@@ -335,7 +335,7 @@ public function read()
             if (strtolower($transfer_encoding->getFieldValue()) == 'chunked') {
 
                 do {
-                    $line  = @fgets($this->socket);
+                    $line  = fgets($this->socket);
                     $this->_checkSocketReadTimeout();
 
                     $chunk = $line;
@@ -364,7 +364,7 @@ public function read()
                               break;
                              }
                         } else {
-                            $line = @fread($this->socket, $read_to - $current_pos);
+                            $line = fread($this->socket, $read_to - $current_pos);
                             if ($line === false || strlen($line) === 0) {
                                 $this->_checkSocketReadTimeout();
                                 break;
@@ -409,12 +409,12 @@ public function read()
                  $current_pos = ftell($this->socket)) {
 
                  if ($this->out_stream) {
-                     if (@stream_copy_to_stream($this->socket, $this->out_stream, $read_to - $current_pos) == 0) {
+                     if (stream_copy_to_stream($this->socket, $this->out_stream, $read_to - $current_pos) == 0) {
                           $this->_checkSocketReadTimeout();
                           break;
                      }
                  } else {
-                    $chunk = @fread($this->socket, $read_to - $current_pos);
+                    $chunk = fread($this->socket, $read_to - $current_pos);
                     if ($chunk === false || strlen($chunk) === 0) {
                         $this->_checkSocketReadTimeout();
                         break;
@@ -432,12 +432,12 @@ public function read()
 
             do {
                 if ($this->out_stream) {
-                    if (@stream_copy_to_stream($this->socket, $this->out_stream) == 0) {
+                    if (stream_copy_to_stream($this->socket, $this->out_stream) == 0) {
                           $this->_checkSocketReadTimeout();
                           break;
                      }
                 } else {
-                    $buff = @fread($this->socket, 8192);
+                    $buff = fread($this->socket, 8192);
                     if ($buff === false || strlen($buff) === 0) {
                         $this->_checkSocketReadTimeout();
                         break;

diff --git a/src/Client/Adapter/StreamInterface.php b/src/Client/Adapter/StreamInterface.php
@@ -29,5 +29,5 @@ interface StreamInterface
      * @param resource $stream Stream to write the output to
      *
      */
-    function setOutputStream($stream);
+    public function setOutputStream($stream);
 }