Merge pull request zendframework/zendframework#2210 from weierophinney/hotfix/remove-suppression-operator

Get rid of error suppression

Author: Maks3w

src/Client.php

@@ -14,6 +14,7 @@
 use Traversable;
 use Zend\Stdlib;
 use Zend\Stdlib\ArrayUtils;
+use Zend\Stdlib\ErrorHandler;
 use Zend\Uri\Http;
 
 /**
@@ -598,11 +599,14 @@ protected function openTempStream()
             );
         }
 
-        if (false === ($fp = @fopen($this->streamName, "w+b"))) {
+        ErrorHandler::start();
+        $fp    = fopen($this->streamName, "w+b");
+        $error = ErrorHandler::stop();
+        if (false === $fp) {
             if ($this->adapter instanceof Client\Adapter\AdapterInterface) {
                 $this->adapter->close();
             }
-            throw new Exception\RuntimeException("Could not open temp file {$this->streamName}");
+            throw new Exception\RuntimeException("Could not open temp file {$this->streamName}", 0, $error);
         }
 
         return $fp;
@@ -926,8 +930,11 @@ public function send(Request $request = null)
     public function setFileUpload($filename, $formname, $data = null, $ctype = null)
     {
         if ($data === null) {
-            if (($data = @file_get_contents($filename)) === false) {
-                throw new Exception\RuntimeException("Unable to read file '{$filename}' for upload");
+            ErrorHandler::start();
+            $data  = file_get_contents($filename);
+            $error = ErrorHandler::stop();
+            if ($data === false) {
+                throw new Exception\RuntimeException("Unable to read file '{$filename}' for upload", 0, $error);
             }
             if (!$ctype) {
                 $ctype = $this->detectFileMimeType($filename);
@@ -1156,7 +1163,9 @@ protected function detectFileMimeType($file)
         // First try with fileinfo functions
         if (function_exists('finfo_open')) {
             if (self::$fileInfoDb === null) {
-                self::$fileInfoDb = @finfo_open(FILEINFO_MIME);
+                ErrorHandler::start();
+                self::$fileInfoDb = finfo_open(FILEINFO_MIME);
+                ErrorHandler::stop();
             }
 
             if (self::$fileInfoDb) {

src/Client/Adapter/Proxy.php

@@ -12,6 +12,8 @@
 
 use Zend\Http\Client;
 use Zend\Http\Client\Adapter\Exception as AdapterException;
+use Zend\Http\Response;
+use Zend\Stdlib\ErrorHandler;
 
 /**
  * HTTP Proxy-supporting Zend_Http_Client adapter class, based on the default
@@ -154,8 +156,11 @@ public function write($method, $uri, $http_ver = '1.1', $headers = array(), $bod
         }
 
         // Send the request
-        if (! @fwrite($this->socket, $request)) {
-            throw new AdapterException\RuntimeException("Error writing request to proxy server");
+        ErrorHandler::start();
+        $test  = fwrite($this->socket, $request);
+        $error = ErrorHandler::stop();
+        if (!$test) {
+            throw new AdapterException\RuntimeException("Error writing request to proxy server", 0, $error);
         }
 
         if (is_resource($body)) {
@@ -195,23 +200,28 @@ protected function connectHandshake($host, $port = 443, $http_ver = '1.1', array
         $request .= "\r\n";
 
         // Send the request
-        if (! @fwrite($this->socket, $request)) {
-            throw new AdapterException\RuntimeException("Error writing request to proxy server");
+        ErrorHandler::start();
+        $test  = fwrite($this->socket, $request);
+        $error = ErrorHandler::stop();
+        if (!$test) {
+            throw new AdapterException\RuntimeException("Error writing request to proxy server", 0, $error);
         }
 
         // Read response headers only
         $response = '';
         $gotStatus = false;
-        while ($line = @fgets($this->socket)) {
+        ErrorHandler::start();
+        while ($line = fgets($this->socket)) {
             $gotStatus = $gotStatus || (strpos($line, 'HTTP') !== false);
             if ($gotStatus) {
                 $response .= $line;
                 if (!rtrim($line)) break;
             }
         }
+        ErrorHandler::stop();
 
         // Check that the response from the proxy is 200
-        if (\Zend\Http\Response::extractCode($response) != 200) {
+        if (Response::extractCode($response) != 200) {
             throw new AdapterException\RuntimeException("Unable to connect to HTTPS proxy. Server response: " . $response);
         }
 

src/Client/Adapter/Socket.php

@@ -15,6 +15,7 @@
 use Zend\Http\Client\Adapter\Exception as AdapterException;
 use Zend\Http\Response;
 use Zend\Stdlib\ArrayUtils;
+use Zend\Stdlib\ErrorHandler;
 
 /**
  * A sockets based (stream\socket\client) adapter class for Zend\Http\Client. Can be used
@@ -218,19 +219,25 @@ public function connect($host, $port = 80, $secure = false)
             $flags = STREAM_CLIENT_CONNECT;
             if ($this->config['persistent']) $flags |= STREAM_CLIENT_PERSISTENT;
 
-            $errno = null;
-            $errstr = '';
-            $this->socket = @stream_socket_client($host . ':' . $port,
-                                                  $errno,
-                                                  $errstr,
-                                                  (int) $this->config['timeout'],
-                                                  $flags,
-                                                  $context);
+            ErrorHandler::start();
+            $this->socket = stream_socket_client(
+                $host . ':' . $port,
+                $errno,
+                $errstr,
+                (int) $this->config['timeout'],
+                $flags,
+                $context
+            );
+            $error = ErrorHandler::stop();
 
             if (! $this->socket) {
                 $this->close();
-                throw new AdapterException\RuntimeException(
-                    'Unable to Connect to ' . $host . ':' . $port . '. Error #' . $errno . ': ' . $errstr);
+                throw new AdapterException\RuntimeException(sprintf(
+                    'Unable to connect to %s:%d%s',
+                    $host,
+                    $port
+                    ($error ? '. Error #' . $error->getCode() . ': ' . $error->getMessage() : '')
+                ), 0, $error);
             }
 
             // Set the stream timeout
@@ -287,8 +294,11 @@ public function write($method, $uri, $http_ver = '1.1', $headers = array(), $bod
         }
 
         // Send the request
-        if (! @fwrite($this->socket, $request)) {
-            throw new AdapterException\RuntimeException('Error writing request to server');
+        ErrorHandler::start();
+        $test  = fwrite($this->socket, $request);
+        $error = ErrorHandler::stop();
+        if (!test) {
+            throw new AdapterException\RuntimeException('Error writing request to server', 0, $error);
         }
 
         if (is_resource($body)) {
@@ -392,7 +402,9 @@ public function read()
                         }
                     } while (! feof($this->socket));
 
-                    $chunk .= @fgets($this->socket);
+                    ErrorHandler::start();
+                    $chunk .= fgets($this->socket);
+                    ErrorHandler::stop();
                     $this->_checkSocketReadTimeout();
 
                     if (!$this->out_stream) {
@@ -485,7 +497,11 @@ public function read()
      */
     public function close()
     {
-        if (is_resource($this->socket)) @fclose($this->socket);
+        if (is_resource($this->socket)) {
+            ErrorHandler::start();
+            fclose($this->socket);
+            ErrorHandler::stop();
+        }
         $this->socket = null;
         $this->connected_to = array(null, null);
     }