View GitHub Repository xe-core

Schedule Inspection
Subscribe

GitHub Access Token became invalid

It seems like the GitHub access token used for retrieving details about this repository from GitHub became invalid. This might prevent certain types of inspections from being run (in particular, everything related to pull requests).
Please ask an admin of your repository to re-new the access token on this website.
Completed
Pull Request — develop (#1959)
by
unknown
13:47
created
Status
Category
Toggle Patches
libs/PEAR.1.9.5/HTTP/Request2/MultipartBody.php 2 patches
Indentation   +211 added lines, -211 removed lines patch added patch discarded remove patch 
@@ -37,232 +37,232 @@
 
 block discarded – undo
37 37 
  */
38 38 
 class HTTP_Request2_MultipartBody
39 39 
 {
40 
-    /**
41 
-     * MIME boundary
42 
-     * @var  string
43 
-     */
44 
-    private $_boundary;
40 
+	/**
41 
+	 * MIME boundary
42 
+	 * @var  string
43 
+	 */
44 
+	private $_boundary;
45 45
46 
-    /**
47 
-     * Form parameters added via {@link HTTP_Request2::addPostParameter()}
48 
-     * @var  array
49 
-     */
50 
-    private $_params = array();
46 
+	/**
47 
+	 * Form parameters added via {@link HTTP_Request2::addPostParameter()}
48 
+	 * @var  array
49 
+	 */
50 
+	private $_params = array();
51 51
52 
-    /**
53 
-     * File uploads added via {@link HTTP_Request2::addUpload()}
54 
-     * @var  array
55 
-     */
56 
-    private $_uploads = array();
52 
+	/**
53 
+	 * File uploads added via {@link HTTP_Request2::addUpload()}
54 
+	 * @var  array
55 
+	 */
56 
+	private $_uploads = array();
57 57
58 
-    /**
59 
-     * Header for parts with parameters
60 
-     * @var  string
61 
-     */
62 
-    private $_headerParam = "--%s\r\nContent-Disposition: form-data; name=\"%s\"\r\n\r\n";
58 
+	/**
59 
+	 * Header for parts with parameters
60 
+	 * @var  string
61 
+	 */
62 
+	private $_headerParam = "--%s\r\nContent-Disposition: form-data; name=\"%s\"\r\n\r\n";
63 63
64 
-    /**
65 
-     * Header for parts with uploads
66 
-     * @var  string
67 
-     */
68 
-    private $_headerUpload = "--%s\r\nContent-Disposition: form-data; name=\"%s\"; filename=\"%s\"\r\nContent-Type: %s\r\n\r\n";
64 
+	/**
65 
+	 * Header for parts with uploads
66 
+	 * @var  string
67 
+	 */
68 
+	private $_headerUpload = "--%s\r\nContent-Disposition: form-data; name=\"%s\"; filename=\"%s\"\r\nContent-Type: %s\r\n\r\n";
69 69
70 
-    /**
71 
-     * Current position in parameter and upload arrays
72 
-     *
73 
-     * First number is index of "current" part, second number is position within
74 
-     * "current" part
75 
-     *
76 
-     * @var  array
77 
-     */
78 
-    private $_pos = array(0, 0);
70 
+	/**
71 
+	 * Current position in parameter and upload arrays
72 
+	 *
73 
+	 * First number is index of "current" part, second number is position within
74 
+	 * "current" part
75 
+	 *
76 
+	 * @var  array
77 
+	 */
78 
+	private $_pos = array(0, 0);
79 79
80 80
81 
-    /**
82 
-     * Constructor. Sets the arrays with POST data.
83 
-     *
84 
-     * @param array $params      values of form fields set via
85 
-     *                           {@link HTTP_Request2::addPostParameter()}
86 
-     * @param array $uploads     file uploads set via
87 
-     *                           {@link HTTP_Request2::addUpload()}
88 
-     * @param bool  $useBrackets whether to append brackets to array variable names
89 
-     */
90 
-    public function __construct(array $params, array $uploads, $useBrackets = true)
91 
-    {
92 
-        $this->_params = self::_flattenArray('', $params, $useBrackets);
93 
-        foreach ($uploads as $fieldName => $f) {
94 
-            if (!is_array($f['fp'])) {
95 
-                $this->_uploads[] = $f + array('name' => $fieldName);
96 
-            } else {
97 
-                for ($i = 0; $i < count($f['fp']); $i++) {
98 
-                    $upload = array(
99 
-                        'name' => ($useBrackets? $fieldName . '[' . $i . ']': $fieldName)
100 
-                    );
101 
-                    foreach (array('fp', 'filename', 'size', 'type') as $key) {
102 
-                        $upload[$key] = $f[$key][$i];
103 
-                    }
104 
-                    $this->_uploads[] = $upload;
105 
-                }
106 
-            }
107 
-        }
108 
-    }
81 
+	/**
82 
+	 * Constructor. Sets the arrays with POST data.
83 
+	 *
84 
+	 * @param array $params      values of form fields set via
85 
+	 *                           {@link HTTP_Request2::addPostParameter()}
86 
+	 * @param array $uploads     file uploads set via
87 
+	 *                           {@link HTTP_Request2::addUpload()}
88 
+	 * @param bool  $useBrackets whether to append brackets to array variable names
89 
+	 */
90 
+	public function __construct(array $params, array $uploads, $useBrackets = true)
91 
+	{
92 
+		$this->_params = self::_flattenArray('', $params, $useBrackets);
93 
+		foreach ($uploads as $fieldName => $f) {
94 
+			if (!is_array($f['fp'])) {
95 
+				$this->_uploads[] = $f + array('name' => $fieldName);
96 
+			} else {
97 
+				for ($i = 0; $i < count($f['fp']); $i++) {
98 
+					$upload = array(
99 
+						'name' => ($useBrackets? $fieldName . '[' . $i . ']': $fieldName)
100 
+					);
101 
+					foreach (array('fp', 'filename', 'size', 'type') as $key) {
102 
+						$upload[$key] = $f[$key][$i];
103 
+					}
104 
+					$this->_uploads[] = $upload;
105 
+				}
106 
+			}
107 
+		}
108 
+	}
109 109
110 
-    /**
111 
-     * Returns the length of the body to use in Content-Length header
112 
-     *
113 
-     * @return   integer
114 
-     */
115 
-    public function getLength()
116 
-    {
117 
-        $boundaryLength     = strlen($this->getBoundary());
118 
-        $headerParamLength  = strlen($this->_headerParam) - 4 + $boundaryLength;
119 
-        $headerUploadLength = strlen($this->_headerUpload) - 8 + $boundaryLength;
120 
-        $length             = $boundaryLength + 6;
121 
-        foreach ($this->_params as $p) {
122 
-            $length += $headerParamLength + strlen($p[0]) + strlen($p[1]) + 2;
123 
-        }
124 
-        foreach ($this->_uploads as $u) {
125 
-            $length += $headerUploadLength + strlen($u['name']) + strlen($u['type']) +
126 
-                       strlen($u['filename']) + $u['size'] + 2;
127 
-        }
128 
-        return $length;
129 
-    }
110 
+	/**
111 
+	 * Returns the length of the body to use in Content-Length header
112 
+	 *
113 
+	 * @return   integer
114 
+	 */
115 
+	public function getLength()
116 
+	{
117 
+		$boundaryLength     = strlen($this->getBoundary());
118 
+		$headerParamLength  = strlen($this->_headerParam) - 4 + $boundaryLength;
119 
+		$headerUploadLength = strlen($this->_headerUpload) - 8 + $boundaryLength;
120 
+		$length             = $boundaryLength + 6;
121 
+		foreach ($this->_params as $p) {
122 
+			$length += $headerParamLength + strlen($p[0]) + strlen($p[1]) + 2;
123 
+		}
124 
+		foreach ($this->_uploads as $u) {
125 
+			$length += $headerUploadLength + strlen($u['name']) + strlen($u['type']) +
126 
+					   strlen($u['filename']) + $u['size'] + 2;
127 
+		}
128 
+		return $length;
129 
+	}
130 130
131 
-    /**
132 
-     * Returns the boundary to use in Content-Type header
133 
-     *
134 
-     * @return   string
135 
-     */
136 
-    public function getBoundary()
137 
-    {
138 
-        if (empty($this->_boundary)) {
139 
-            $this->_boundary = '--' . md5('PEAR-HTTP_Request2-' . microtime());
140 
-        }
141 
-        return $this->_boundary;
142 
-    }
131 
+	/**
132 
+	 * Returns the boundary to use in Content-Type header
133 
+	 *
134 
+	 * @return   string
135 
+	 */
136 
+	public function getBoundary()
137 
+	{
138 
+		if (empty($this->_boundary)) {
139 
+			$this->_boundary = '--' . md5('PEAR-HTTP_Request2-' . microtime());
140 
+		}
141 
+		return $this->_boundary;
142 
+	}
143 143
144 
-    /**
145 
-     * Returns next chunk of request body
146 
-     *
147 
-     * @param integer $length Number of bytes to read
148 
-     *
149 
-     * @return   string  Up to $length bytes of data, empty string if at end
150 
-     * @throws   HTTP_Request2_LogicException
151 
-     */
152 
-    public function read($length)
153 
-    {
154 
-        $ret         = '';
155 
-        $boundary    = $this->getBoundary();
156 
-        $paramCount  = count($this->_params);
157 
-        $uploadCount = count($this->_uploads);
158 
-        while ($length > 0 && $this->_pos[0] <= $paramCount + $uploadCount) {
159 
-            $oldLength = $length;
160 
-            if ($this->_pos[0] < $paramCount) {
161 
-                $param = sprintf(
162 
-                    $this->_headerParam, $boundary, $this->_params[$this->_pos[0]][0]
163 
-                ) . $this->_params[$this->_pos[0]][1] . "\r\n";
164 
-                $ret    .= substr($param, $this->_pos[1], $length);
165 
-                $length -= min(strlen($param) - $this->_pos[1], $length);
144 
+	/**
145 
+	 * Returns next chunk of request body
146 
+	 *
147 
+	 * @param integer $length Number of bytes to read
148 
+	 *
149 
+	 * @return   string  Up to $length bytes of data, empty string if at end
150 
+	 * @throws   HTTP_Request2_LogicException
151 
+	 */
152 
+	public function read($length)
153 
+	{
154 
+		$ret         = '';
155 
+		$boundary    = $this->getBoundary();
156 
+		$paramCount  = count($this->_params);
157 
+		$uploadCount = count($this->_uploads);
158 
+		while ($length > 0 && $this->_pos[0] <= $paramCount + $uploadCount) {
159 
+			$oldLength = $length;
160 
+			if ($this->_pos[0] < $paramCount) {
161 
+				$param = sprintf(
162 
+					$this->_headerParam, $boundary, $this->_params[$this->_pos[0]][0]
163 
+				) . $this->_params[$this->_pos[0]][1] . "\r\n";
164 
+				$ret    .= substr($param, $this->_pos[1], $length);
165 
+				$length -= min(strlen($param) - $this->_pos[1], $length);
166 166
167 
-            } elseif ($this->_pos[0] < $paramCount + $uploadCount) {
168 
-                $pos    = $this->_pos[0] - $paramCount;
169 
-                $header = sprintf(
170 
-                    $this->_headerUpload, $boundary, $this->_uploads[$pos]['name'],
171 
-                    $this->_uploads[$pos]['filename'], $this->_uploads[$pos]['type']
172 
-                );
173 
-                if ($this->_pos[1] < strlen($header)) {
174 
-                    $ret    .= substr($header, $this->_pos[1], $length);
175 
-                    $length -= min(strlen($header) - $this->_pos[1], $length);
176 
-                }
177 
-                $filePos  = max(0, $this->_pos[1] - strlen($header));
178 
-                if ($filePos < $this->_uploads[$pos]['size']) {
179 
-                    while ($length > 0 && !feof($this->_uploads[$pos]['fp'])) {
180 
-                        if (false === ($chunk = fread($this->_uploads[$pos]['fp'], $length))) {
181 
-                            throw new HTTP_Request2_LogicException(
182 
-                                'Failed reading file upload', HTTP_Request2_Exception::READ_ERROR
183 
-                            );
184 
-                        }
185 
-                        $ret    .= $chunk;
186 
-                        $length -= strlen($chunk);
187 
-                    }
188 
-                }
189 
-                if ($length > 0) {
190 
-                    $start   = $this->_pos[1] + ($oldLength - $length) -
191 
-                               strlen($header) - $this->_uploads[$pos]['size'];
192 
-                    $ret    .= substr("\r\n", $start, $length);
193 
-                    $length -= min(2 - $start, $length);
194 
-                }
167 
+			} elseif ($this->_pos[0] < $paramCount + $uploadCount) {
168 
+				$pos    = $this->_pos[0] - $paramCount;
169 
+				$header = sprintf(
170 
+					$this->_headerUpload, $boundary, $this->_uploads[$pos]['name'],
171 
+					$this->_uploads[$pos]['filename'], $this->_uploads[$pos]['type']
172 
+				);
173 
+				if ($this->_pos[1] < strlen($header)) {
174 
+					$ret    .= substr($header, $this->_pos[1], $length);
175 
+					$length -= min(strlen($header) - $this->_pos[1], $length);
176 
+				}
177 
+				$filePos  = max(0, $this->_pos[1] - strlen($header));
178 
+				if ($filePos < $this->_uploads[$pos]['size']) {
179 
+					while ($length > 0 && !feof($this->_uploads[$pos]['fp'])) {
180 
+						if (false === ($chunk = fread($this->_uploads[$pos]['fp'], $length))) {
181 
+							throw new HTTP_Request2_LogicException(
182 
+								'Failed reading file upload', HTTP_Request2_Exception::READ_ERROR
183 
+							);
184 
+						}
185 
+						$ret    .= $chunk;
186 
+						$length -= strlen($chunk);
187 
+					}
188 
+				}
189 
+				if ($length > 0) {
190 
+					$start   = $this->_pos[1] + ($oldLength - $length) -
191 
+							   strlen($header) - $this->_uploads[$pos]['size'];
192 
+					$ret    .= substr("\r\n", $start, $length);
193 
+					$length -= min(2 - $start, $length);
194 
+				}
195 195
196 
-            } else {
197 
-                $closing  = '--' . $boundary . "--\r\n";
198 
-                $ret     .= substr($closing, $this->_pos[1], $length);
199 
-                $length  -= min(strlen($closing) - $this->_pos[1], $length);
200 
-            }
201 
-            if ($length > 0) {
202 
-                $this->_pos     = array($this->_pos[0] + 1, 0);
203 
-            } else {
204 
-                $this->_pos[1] += $oldLength;
205 
-            }
206 
-        }
207 
-        return $ret;
208 
-    }
196 
+			} else {
197 
+				$closing  = '--' . $boundary . "--\r\n";
198 
+				$ret     .= substr($closing, $this->_pos[1], $length);
199 
+				$length  -= min(strlen($closing) - $this->_pos[1], $length);
200 
+			}
201 
+			if ($length > 0) {
202 
+				$this->_pos     = array($this->_pos[0] + 1, 0);
203 
+			} else {
204 
+				$this->_pos[1] += $oldLength;
205 
+			}
206 
+		}
207 
+		return $ret;
208 
+	}
209 209
210 
-    /**
211 
-     * Sets the current position to the start of the body
212 
-     *
213 
-     * This allows reusing the same body in another request
214 
-     */
215 
-    public function rewind()
216 
-    {
217 
-        $this->_pos = array(0, 0);
218 
-        foreach ($this->_uploads as $u) {
219 
-            rewind($u['fp']);
220 
-        }
221 
-    }
210 
+	/**
211 
+	 * Sets the current position to the start of the body
212 
+	 *
213 
+	 * This allows reusing the same body in another request
214 
+	 */
215 
+	public function rewind()
216 
+	{
217 
+		$this->_pos = array(0, 0);
218 
+		foreach ($this->_uploads as $u) {
219 
+			rewind($u['fp']);
220 
+		}
221 
+	}
222 222
223 
-    /**
224 
-     * Returns the body as string
225 
-     *
226 
-     * Note that it reads all file uploads into memory so it is a good idea not
227 
-     * to use this method with large file uploads and rely on read() instead.
228 
-     *
229 
-     * @return   string
230 
-     */
231 
-    public function __toString()
232 
-    {
233 
-        $this->rewind();
234 
-        return $this->read($this->getLength());
235 
-    }
223 
+	/**
224 
+	 * Returns the body as string
225 
+	 *
226 
+	 * Note that it reads all file uploads into memory so it is a good idea not
227 
+	 * to use this method with large file uploads and rely on read() instead.
228 
+	 *
229 
+	 * @return   string
230 
+	 */
231 
+	public function __toString()
232 
+	{
233 
+		$this->rewind();
234 
+		return $this->read($this->getLength());
235 
+	}
236 236
237 237
238 
-    /**
239 
-     * Helper function to change the (probably multidimensional) associative array
240 
-     * into the simple one.
241 
-     *
242 
-     * @param string $name        name for item
243 
-     * @param mixed  $values      item's values
244 
-     * @param bool   $useBrackets whether to append [] to array variables' names
245 
-     *
246 
-     * @return   array   array with the following items: array('item name', 'item value');
247 
-     */
248 
-    private static function _flattenArray($name, $values, $useBrackets)
249 
-    {
250 
-        if (!is_array($values)) {
251 
-            return array(array($name, $values));
252 
-        } else {
253 
-            $ret = array();
254 
-            foreach ($values as $k => $v) {
255 
-                if (empty($name)) {
256 
-                    $newName = $k;
257 
-                } elseif ($useBrackets) {
258 
-                    $newName = $name . '[' . $k . ']';
259 
-                } else {
260 
-                    $newName = $name;
261 
-                }
262 
-                $ret = array_merge($ret, self::_flattenArray($newName, $v, $useBrackets));
263 
-            }
264 
-            return $ret;
265 
-        }
266 
-    }
238 
+	/**
239 
+	 * Helper function to change the (probably multidimensional) associative array
240 
+	 * into the simple one.
241 
+	 *
242 
+	 * @param string $name        name for item
243 
+	 * @param mixed  $values      item's values
244 
+	 * @param bool   $useBrackets whether to append [] to array variables' names
245 
+	 *
246 
+	 * @return   array   array with the following items: array('item name', 'item value');
247 
+	 */
248 
+	private static function _flattenArray($name, $values, $useBrackets)
249 
+	{
250 
+		if (!is_array($values)) {
251 
+			return array(array($name, $values));
252 
+		} else {
253 
+			$ret = array();
254 
+			foreach ($values as $k => $v) {
255 
+				if (empty($name)) {
256 
+					$newName = $k;
257 
+				} elseif ($useBrackets) {
258 
+					$newName = $name . '[' . $k . ']';
259 
+				} else {
260 
+					$newName = $name;
261 
+				}
262 
+				$ret = array_merge($ret, self::_flattenArray($newName, $v, $useBrackets));
263 
+			}
264 
+			return $ret;
265 
+		}
266 
+	}
267 267 
 }
268 268 
 ?>
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch 
@@ -96,7 +96,7 @@  discard block
 
 block discarded – undo
96 96 
             } else {
97 97 
                 for ($i = 0; $i < count($f['fp']); $i++) {
98 98 
                     $upload = array(
99 
-                        'name' => ($useBrackets? $fieldName . '[' . $i . ']': $fieldName)
99 
+                        'name' => ($useBrackets ? $fieldName.'['.$i.']' : $fieldName)
100 100 
                     );
101 101 
                     foreach (array('fp', 'filename', 'size', 'type') as $key) {
102 102 
                         $upload[$key] = $f[$key][$i];

@@ -136,7 +136,7 @@  discard block
 
 block discarded – undo
136 136 
     public function getBoundary()
137 137 
     {
138 138 
         if (empty($this->_boundary)) {
139 
-            $this->_boundary = '--' . md5('PEAR-HTTP_Request2-' . microtime());
139 
+            $this->_boundary = '--'.md5('PEAR-HTTP_Request2-'.microtime());
140 140 
         }
141 141 
         return $this->_boundary;
142 142 
     }

@@ -160,7 +160,7 @@  discard block
 
 block discarded – undo
160 160 
             if ($this->_pos[0] < $paramCount) {
161 161 
                 $param = sprintf(
162 162 
                     $this->_headerParam, $boundary, $this->_params[$this->_pos[0]][0]
163 
-                ) . $this->_params[$this->_pos[0]][1] . "\r\n";
163 
+                ).$this->_params[$this->_pos[0]][1]."\r\n";
164 164 
                 $ret    .= substr($param, $this->_pos[1], $length);
165 165 
                 $length -= min(strlen($param) - $this->_pos[1], $length);
166 166 
 

@@ -174,7 +174,7 @@  discard block
 
 block discarded – undo
174 174 
                     $ret    .= substr($header, $this->_pos[1], $length);
175 175 
                     $length -= min(strlen($header) - $this->_pos[1], $length);
176 176 
                 }
177 
-                $filePos  = max(0, $this->_pos[1] - strlen($header));
177 
+                $filePos = max(0, $this->_pos[1] - strlen($header));
178 178 
                 if ($filePos < $this->_uploads[$pos]['size']) {
179 179 
                     while ($length > 0 && !feof($this->_uploads[$pos]['fp'])) {
180 180 
                         if (false === ($chunk = fread($this->_uploads[$pos]['fp'], $length))) {

@@ -194,7 +194,7 @@  discard block
 
 block discarded – undo
194 194 
                 }
195 195
196 196 
             } else {
197 
-                $closing  = '--' . $boundary . "--\r\n";
197 
+                $closing  = '--'.$boundary."--\r\n";
198 198 
                 $ret     .= substr($closing, $this->_pos[1], $length);
199 199 
                 $length  -= min(strlen($closing) - $this->_pos[1], $length);
200 200 
             }

@@ -255,7 +255,7 @@  discard block
 
 block discarded – undo
255 255 
                 if (empty($name)) {
256 256 
                     $newName = $k;
257 257 
                 } elseif ($useBrackets) {
258 
-                    $newName = $name . '[' . $k . ']';
258 
+                    $newName = $name.'['.$k.']';
259 259 
                 } else {
260 260 
                     $newName = $name;
261 261 
                 }
Please login to merge, or discard this patch.
libs/PEAR.1.9.5/HTTP/Request2/Observer/Log.php 3 patches
Switch Indentation   +30 added lines, -30 removed lines patch added patch discarded remove patch 
@@ -134,36 +134,36 @@
 
 block discarded – undo
134 134 
         }
135 135
136 136 
         switch ($event['name']) {
137 
-        case 'connect':
138 
-            $this->log('* Connected to ' . $event['data']);
139 
-            break;
140 
-        case 'sentHeaders':
141 
-            $headers = explode("\r\n", $event['data']);
142 
-            array_pop($headers);
143 
-            foreach ($headers as $header) {
144 
-                $this->log('> ' . $header);
145 
-            }
146 
-            break;
147 
-        case 'sentBody':
148 
-            $this->log('> ' . $event['data'] . ' byte(s) sent');
149 
-            break;
150 
-        case 'receivedHeaders':
151 
-            $this->log(sprintf(
152 
-                '< HTTP/%s %s %s', $event['data']->getVersion(),
153 
-                $event['data']->getStatus(), $event['data']->getReasonPhrase()
154 
-            ));
155 
-            $headers = $event['data']->getHeader();
156 
-            foreach ($headers as $key => $val) {
157 
-                $this->log('< ' . $key . ': ' . $val);
158 
-            }
159 
-            $this->log('< ');
160 
-            break;
161 
-        case 'receivedBody':
162 
-            $this->log($event['data']->getBody());
163 
-            break;
164 
-        case 'disconnect':
165 
-            $this->log('* Disconnected');
166 
-            break;
137 
+        	case 'connect':
138 
+            	$this->log('* Connected to ' . $event['data']);
139 
+            	break;
140 
+        	case 'sentHeaders':
141 
+            	$headers = explode("\r\n", $event['data']);
142 
+            	array_pop($headers);
143 
+            	foreach ($headers as $header) {
144 
+                	$this->log('> ' . $header);
145 
+            	}
146 
+            	break;
147 
+        	case 'sentBody':
148 
+            	$this->log('> ' . $event['data'] . ' byte(s) sent');
149 
+            	break;
150 
+        	case 'receivedHeaders':
151 
+            	$this->log(sprintf(
152 
+                	'< HTTP/%s %s %s', $event['data']->getVersion(),
153 
+                	$event['data']->getStatus(), $event['data']->getReasonPhrase()
154 
+            	));
155 
+            	$headers = $event['data']->getHeader();
156 
+            	foreach ($headers as $key => $val) {
157 
+                	$this->log('< ' . $key . ': ' . $val);
158 
+            	}
159 
+            	$this->log('< ');
160 
+            	break;
161 
+        	case 'receivedBody':
162 
+            	$this->log($event['data']->getBody());
163 
+            	break;
164 
+        	case 'disconnect':
165 
+            	$this->log('* Disconnected');
166 
+            	break;
167 167 
         }
168 168 
     }
169 169
Please login to merge, or discard this patch.
Indentation   +108 added lines, -108 removed lines patch added patch discarded remove patch 
@@ -69,124 +69,124 @@
 
 block discarded – undo
69 69 
  */
70 70 
 class HTTP_Request2_Observer_Log implements SplObserver
71 71 
 {
72 
-    // properties {{{
72 
+	// properties {{{
73 73
74 
-    /**
75 
-     * The log target, it can be a a resource or a PEAR Log instance.
76 
-     *
77 
-     * @var resource|Log $target
78 
-     */
79 
-    protected $target = null;
74 
+	/**
75 
+	 * The log target, it can be a a resource or a PEAR Log instance.
76 
+	 *
77 
+	 * @var resource|Log $target
78 
+	 */
79 
+	protected $target = null;
80 80
81 
-    /**
82 
-     * The events to log.
83 
-     *
84 
-     * @var array $events
85 
-     */
86 
-    public $events = array(
87 
-        'connect',
88 
-        'sentHeaders',
89 
-        'sentBody',
90 
-        'receivedHeaders',
91 
-        'receivedBody',
92 
-        'disconnect',
93 
-    );
81 
+	/**
82 
+	 * The events to log.
83 
+	 *
84 
+	 * @var array $events
85 
+	 */
86 
+	public $events = array(
87 
+		'connect',
88 
+		'sentHeaders',
89 
+		'sentBody',
90 
+		'receivedHeaders',
91 
+		'receivedBody',
92 
+		'disconnect',
93 
+	);
94 94
95 
-    // }}}
96 
-    // __construct() {{{
95 
+	// }}}
96 
+	// __construct() {{{
97 97
98 
-    /**
99 
-     * Constructor.
100 
-     *
101 
-     * @param mixed $target Can be a file path (default: php://output), a resource,
102 
-     *                      or an instance of the PEAR Log class.
103 
-     * @param array $events Array of events to listen to (default: all events)
104 
-     *
105 
-     * @return void
106 
-     */
107 
-    public function __construct($target = 'php://output', array $events = array())
108 
-    {
109 
-        if (!empty($events)) {
110 
-            $this->events = $events;
111 
-        }
112 
-        if (is_resource($target) || $target instanceof Log) {
113 
-            $this->target = $target;
114 
-        } elseif (false === ($this->target = @fopen($target, 'ab'))) {
115 
-            throw new HTTP_Request2_Exception("Unable to open '{$target}'");
116 
-        }
117 
-    }
98 
+	/**
99 
+	 * Constructor.
100 
+	 *
101 
+	 * @param mixed $target Can be a file path (default: php://output), a resource,
102 
+	 *                      or an instance of the PEAR Log class.
103 
+	 * @param array $events Array of events to listen to (default: all events)
104 
+	 *
105 
+	 * @return void
106 
+	 */
107 
+	public function __construct($target = 'php://output', array $events = array())
108 
+	{
109 
+		if (!empty($events)) {
110 
+			$this->events = $events;
111 
+		}
112 
+		if (is_resource($target) || $target instanceof Log) {
113 
+			$this->target = $target;
114 
+		} elseif (false === ($this->target = @fopen($target, 'ab'))) {
115 
+			throw new HTTP_Request2_Exception("Unable to open '{$target}'");
116 
+		}
117 
+	}
118 118
119 
-    // }}}
120 
-    // update() {{{
119 
+	// }}}
120 
+	// update() {{{
121 121
122 
-    /**
123 
-     * Called when the request notifies us of an event.
124 
-     *
125 
-     * @param HTTP_Request2 $subject The HTTP_Request2 instance
126 
-     *
127 
-     * @return void
128 
-     */
129 
-    public function update(SplSubject $subject)
130 
-    {
131 
-        $event = $subject->getLastEvent();
132 
-        if (!in_array($event['name'], $this->events)) {
133 
-            return;
134 
-        }
122 
+	/**
123 
+	 * Called when the request notifies us of an event.
124 
+	 *
125 
+	 * @param HTTP_Request2 $subject The HTTP_Request2 instance
126 
+	 *
127 
+	 * @return void
128 
+	 */
129 
+	public function update(SplSubject $subject)
130 
+	{
131 
+		$event = $subject->getLastEvent();
132 
+		if (!in_array($event['name'], $this->events)) {
133 
+			return;
134 
+		}
135 135
136 
-        switch ($event['name']) {
137 
-        case 'connect':
138 
-            $this->log('* Connected to ' . $event['data']);
139 
-            break;
140 
-        case 'sentHeaders':
141 
-            $headers = explode("\r\n", $event['data']);
142 
-            array_pop($headers);
143 
-            foreach ($headers as $header) {
144 
-                $this->log('> ' . $header);
145 
-            }
146 
-            break;
147 
-        case 'sentBody':
148 
-            $this->log('> ' . $event['data'] . ' byte(s) sent');
149 
-            break;
150 
-        case 'receivedHeaders':
151 
-            $this->log(sprintf(
152 
-                '< HTTP/%s %s %s', $event['data']->getVersion(),
153 
-                $event['data']->getStatus(), $event['data']->getReasonPhrase()
154 
-            ));
155 
-            $headers = $event['data']->getHeader();
156 
-            foreach ($headers as $key => $val) {
157 
-                $this->log('< ' . $key . ': ' . $val);
158 
-            }
159 
-            $this->log('< ');
160 
-            break;
161 
-        case 'receivedBody':
162 
-            $this->log($event['data']->getBody());
163 
-            break;
164 
-        case 'disconnect':
165 
-            $this->log('* Disconnected');
166 
-            break;
167 
-        }
168 
-    }
136 
+		switch ($event['name']) {
137 
+		case 'connect':
138 
+			$this->log('* Connected to ' . $event['data']);
139 
+			break;
140 
+		case 'sentHeaders':
141 
+			$headers = explode("\r\n", $event['data']);
142 
+			array_pop($headers);
143 
+			foreach ($headers as $header) {
144 
+				$this->log('> ' . $header);
145 
+			}
146 
+			break;
147 
+		case 'sentBody':
148 
+			$this->log('> ' . $event['data'] . ' byte(s) sent');
149 
+			break;
150 
+		case 'receivedHeaders':
151 
+			$this->log(sprintf(
152 
+				'< HTTP/%s %s %s', $event['data']->getVersion(),
153 
+				$event['data']->getStatus(), $event['data']->getReasonPhrase()
154 
+			));
155 
+			$headers = $event['data']->getHeader();
156 
+			foreach ($headers as $key => $val) {
157 
+				$this->log('< ' . $key . ': ' . $val);
158 
+			}
159 
+			$this->log('< ');
160 
+			break;
161 
+		case 'receivedBody':
162 
+			$this->log($event['data']->getBody());
163 
+			break;
164 
+		case 'disconnect':
165 
+			$this->log('* Disconnected');
166 
+			break;
167 
+		}
168 
+	}
169 169
170 
-    // }}}
171 
-    // log() {{{
170 
+	// }}}
171 
+	// log() {{{
172 172
173 
-    /**
174 
-     * Logs the given message to the configured target.
175 
-     *
176 
-     * @param string $message Message to display
177 
-     *
178 
-     * @return void
179 
-     */
180 
-    protected function log($message)
181 
-    {
182 
-        if ($this->target instanceof Log) {
183 
-            $this->target->debug($message);
184 
-        } elseif (is_resource($this->target)) {
185 
-            fwrite($this->target, $message . "\r\n");
186 
-        }
187 
-    }
173 
+	/**
174 
+	 * Logs the given message to the configured target.
175 
+	 *
176 
+	 * @param string $message Message to display
177 
+	 *
178 
+	 * @return void
179 
+	 */
180 
+	protected function log($message)
181 
+	{
182 
+		if ($this->target instanceof Log) {
183 
+			$this->target->debug($message);
184 
+		} elseif (is_resource($this->target)) {
185 
+			fwrite($this->target, $message . "\r\n");
186 
+		}
187 
+	}
188 188
189 
-    // }}}
189 
+	// }}}
190 190 
 }
191 191
192 192 
 ?>
193 193 
\ No newline at end of file
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch 
@@ -135,17 +135,17 @@  discard block
 
 block discarded – undo
135 135
136 136 
         switch ($event['name']) {
137 137 
         case 'connect':
138 
-            $this->log('* Connected to ' . $event['data']);
138 
+            $this->log('* Connected to '.$event['data']);
139 139 
             break;
140 140 
         case 'sentHeaders':
141 141 
             $headers = explode("\r\n", $event['data']);
142 142 
             array_pop($headers);
143 143 
             foreach ($headers as $header) {
144 
-                $this->log('> ' . $header);
144 
+                $this->log('> '.$header);
145 145 
             }
146 146 
             break;
147 147 
         case 'sentBody':
148 
-            $this->log('> ' . $event['data'] . ' byte(s) sent');
148 
+            $this->log('> '.$event['data'].' byte(s) sent');
149 149 
             break;
150 150 
         case 'receivedHeaders':
151 151 
             $this->log(sprintf(

@@ -154,7 +154,7 @@  discard block
 
 block discarded – undo
154 154 
             ));
155 155 
             $headers = $event['data']->getHeader();
156 156 
             foreach ($headers as $key => $val) {
157 
-                $this->log('< ' . $key . ': ' . $val);
157 
+                $this->log('< '.$key.': '.$val);
158 158 
             }
159 159 
             $this->log('< ');
160 160 
             break;

@@ -182,7 +182,7 @@  discard block
 
 block discarded – undo
182 182 
         if ($this->target instanceof Log) {
183 183 
             $this->target->debug($message);
184 184 
         } elseif (is_resource($this->target)) {
185 
-            fwrite($this->target, $message . "\r\n");
185 
+            fwrite($this->target, $message."\r\n");
186 186 
         }
187 187 
     }
188 188
Please login to merge, or discard this patch.
libs/PEAR.1.9.5/HTTP/Request2/Response.php 3 patches
Indentation   +574 added lines, -574 removed lines patch added patch discarded remove patch 
@@ -53,579 +53,579 @@
 
 block discarded – undo
53 53 
  */
54 54 
 class HTTP_Request2_Response
55 55 
 {
56 
-    /**
57 
-     * HTTP protocol version (e.g. 1.0, 1.1)
58 
-     * @var  string
59 
-     */
60 
-    protected $version;
61 
-
62 
-    /**
63 
-     * Status code
64 
-     * @var  integer
65 
-     * @link http://tools.ietf.org/html/rfc2616#section-6.1.1
66 
-     */
67 
-    protected $code;
68 
-
69 
-    /**
70 
-     * Reason phrase
71 
-     * @var  string
72 
-     * @link http://tools.ietf.org/html/rfc2616#section-6.1.1
73 
-     */
74 
-    protected $reasonPhrase;
75 
-
76 
-    /**
77 
-     * Effective URL (may be different from original request URL in case of redirects)
78 
-     * @var  string
79 
-     */
80 
-    protected $effectiveUrl;
81 
-
82 
-    /**
83 
-     * Associative array of response headers
84 
-     * @var  array
85 
-     */
86 
-    protected $headers = array();
87 
-
88 
-    /**
89 
-     * Cookies set in the response
90 
-     * @var  array
91 
-     */
92 
-    protected $cookies = array();
93 
-
94 
-    /**
95 
-     * Name of last header processed by parseHederLine()
96 
-     *
97 
-     * Used to handle the headers that span multiple lines
98 
-     *
99 
-     * @var  string
100 
-     */
101 
-    protected $lastHeader = null;
102 
-
103 
-    /**
104 
-     * Response body
105 
-     * @var  string
106 
-     */
107 
-    protected $body = '';
108 
-
109 
-    /**
110 
-     * Whether the body is still encoded by Content-Encoding
111 
-     *
112 
-     * cURL provides the decoded body to the callback; if we are reading from
113 
-     * socket the body is still gzipped / deflated
114 
-     *
115 
-     * @var  bool
116 
-     */
117 
-    protected $bodyEncoded;
118 
-
119 
-    /**
120 
-     * Associative array of HTTP status code / reason phrase.
121 
-     *
122 
-     * @var  array
123 
-     * @link http://tools.ietf.org/html/rfc2616#section-10
124 
-     */
125 
-    protected static $phrases = array(
126 
-
127 
-        // 1xx: Informational - Request received, continuing process
128 
-        100 => 'Continue',
129 
-        101 => 'Switching Protocols',
130 
-
131 
-        // 2xx: Success - The action was successfully received, understood and
132 
-        // accepted
133 
-        200 => 'OK',
134 
-        201 => 'Created',
135 
-        202 => 'Accepted',
136 
-        203 => 'Non-Authoritative Information',
137 
-        204 => 'No Content',
138 
-        205 => 'Reset Content',
139 
-        206 => 'Partial Content',
140 
-
141 
-        // 3xx: Redirection - Further action must be taken in order to complete
142 
-        // the request
143 
-        300 => 'Multiple Choices',
144 
-        301 => 'Moved Permanently',
145 
-        302 => 'Found',  // 1.1
146 
-        303 => 'See Other',
147 
-        304 => 'Not Modified',
148 
-        305 => 'Use Proxy',
149 
-        307 => 'Temporary Redirect',
150 
-
151 
-        // 4xx: Client Error - The request contains bad syntax or cannot be
152 
-        // fulfilled
153 
-        400 => 'Bad Request',
154 
-        401 => 'Unauthorized',
155 
-        402 => 'Payment Required',
156 
-        403 => 'Forbidden',
157 
-        404 => 'Not Found',
158 
-        405 => 'Method Not Allowed',
159 
-        406 => 'Not Acceptable',
160 
-        407 => 'Proxy Authentication Required',
161 
-        408 => 'Request Timeout',
162 
-        409 => 'Conflict',
163 
-        410 => 'Gone',
164 
-        411 => 'Length Required',
165 
-        412 => 'Precondition Failed',
166 
-        413 => 'Request Entity Too Large',
167 
-        414 => 'Request-URI Too Long',
168 
-        415 => 'Unsupported Media Type',
169 
-        416 => 'Requested Range Not Satisfiable',
170 
-        417 => 'Expectation Failed',
171 
-
172 
-        // 5xx: Server Error - The server failed to fulfill an apparently
173 
-        // valid request
174 
-        500 => 'Internal Server Error',
175 
-        501 => 'Not Implemented',
176 
-        502 => 'Bad Gateway',
177 
-        503 => 'Service Unavailable',
178 
-        504 => 'Gateway Timeout',
179 
-        505 => 'HTTP Version Not Supported',
180 
-        509 => 'Bandwidth Limit Exceeded',
181 
-
182 
-    );
183 
-
184 
-    /**
185 
-     * Returns the default reason phrase for the given code or all reason phrases
186 
-     *
187 
-     * @param int $code Response code
188 
-     *
189 
-     * @return string|array|null Default reason phrase for $code if $code is given
190 
-     *                           (null if no phrase is available), array of all
191 
-     *                           reason phrases if $code is null
192 
-     * @link   http://pear.php.net/bugs/18716
193 
-     */
194 
-    public static function getDefaultReasonPhrase($code = null)
195 
-    {
196 
-        if (null === $code) {
197 
-            return self::$phrases;
198 
-        } else {
199 
-            return isset(self::$phrases[$code]) ? self::$phrases[$code] : null;
200 
-        }
201 
-    }
202 
-
203 
-    /**
204 
-     * Constructor, parses the response status line
205 
-     *
206 
-     * @param string $statusLine   Response status line (e.g. "HTTP/1.1 200 OK")
207 
-     * @param bool   $bodyEncoded  Whether body is still encoded by Content-Encoding
208 
-     * @param string $effectiveUrl Effective URL of the response
209 
-     *
210 
-     * @throws   HTTP_Request2_MessageException if status line is invalid according to spec
211 
-     */
212 
-    public function __construct($statusLine, $bodyEncoded = true, $effectiveUrl = null)
213 
-    {
214 
-        if (!preg_match('!^HTTP/(\d\.\d) (\d{3})(?: (.+))?!', $statusLine, $m)) {
215 
-            throw new HTTP_Request2_MessageException(
216 
-                "Malformed response: {$statusLine}",
217 
-                HTTP_Request2_Exception::MALFORMED_RESPONSE
218 
-            );
219 
-        }
220 
-        $this->version      = $m[1];
221 
-        $this->code         = intval($m[2]);
222 
-        $this->reasonPhrase = !empty($m[3]) ? trim($m[3]) : self::getDefaultReasonPhrase($this->code);
223 
-        $this->bodyEncoded  = (bool)$bodyEncoded;
224 
-        $this->effectiveUrl = (string)$effectiveUrl;
225 
-    }
226 
-
227 
-    /**
228 
-     * Parses the line from HTTP response filling $headers array
229 
-     *
230 
-     * The method should be called after reading the line from socket or receiving
231 
-     * it into cURL callback. Passing an empty string here indicates the end of
232 
-     * response headers and triggers additional processing, so be sure to pass an
233 
-     * empty string in the end.
234 
-     *
235 
-     * @param string $headerLine Line from HTTP response
236 
-     */
237 
-    public function parseHeaderLine($headerLine)
238 
-    {
239 
-        $headerLine = trim($headerLine, "\r\n");
240 
-
241 
-        if ('' == $headerLine) {
242 
-            // empty string signals the end of headers, process the received ones
243 
-            if (!empty($this->headers['set-cookie'])) {
244 
-                $cookies = is_array($this->headers['set-cookie'])?
245 
-                           $this->headers['set-cookie']:
246 
-                           array($this->headers['set-cookie']);
247 
-                foreach ($cookies as $cookieString) {
248 
-                    $this->parseCookie($cookieString);
249 
-                }
250 
-                unset($this->headers['set-cookie']);
251 
-            }
252 
-            foreach (array_keys($this->headers) as $k) {
253 
-                if (is_array($this->headers[$k])) {
254 
-                    $this->headers[$k] = implode(', ', $this->headers[$k]);
255 
-                }
256 
-            }
257 
-
258 
-        } elseif (preg_match('!^([^\x00-\x1f\x7f-\xff()<>@,;:\\\\"/\[\]?={}\s]+):(.+)$!', $headerLine, $m)) {
259 
-            // string of the form header-name: header value
260 
-            $name  = strtolower($m[1]);
261 
-            $value = trim($m[2]);
262 
-            if (empty($this->headers[$name])) {
263 
-                $this->headers[$name] = $value;
264 
-            } else {
265 
-                if (!is_array($this->headers[$name])) {
266 
-                    $this->headers[$name] = array($this->headers[$name]);
267 
-                }
268 
-                $this->headers[$name][] = $value;
269 
-            }
270 
-            $this->lastHeader = $name;
271 
-
272 
-        } elseif (preg_match('!^\s+(.+)$!', $headerLine, $m) && $this->lastHeader) {
273 
-            // continuation of a previous header
274 
-            if (!is_array($this->headers[$this->lastHeader])) {
275 
-                $this->headers[$this->lastHeader] .= ' ' . trim($m[1]);
276 
-            } else {
277 
-                $key = count($this->headers[$this->lastHeader]) - 1;
278 
-                $this->headers[$this->lastHeader][$key] .= ' ' . trim($m[1]);
279 
-            }
280 
-        }
281 
-    }
282 
-
283 
-    /**
284 
-     * Parses a Set-Cookie header to fill $cookies array
285 
-     *
286 
-     * @param string $cookieString value of Set-Cookie header
287 
-     *
288 
-     * @link     http://web.archive.org/web/20080331104521/http://cgi.netscape.com/newsref/std/cookie_spec.html
289 
-     */
290 
-    protected function parseCookie($cookieString)
291 
-    {
292 
-        $cookie = array(
293 
-            'expires' => null,
294 
-            'domain'  => null,
295 
-            'path'    => null,
296 
-            'secure'  => false
297 
-        );
298 
-
299 
-        if (!strpos($cookieString, ';')) {
300 
-            // Only a name=value pair
301 
-            $pos = strpos($cookieString, '=');
302 
-            $cookie['name']  = trim(substr($cookieString, 0, $pos));
303 
-            $cookie['value'] = trim(substr($cookieString, $pos + 1));
304 
-
305 
-        } else {
306 
-            // Some optional parameters are supplied
307 
-            $elements = explode(';', $cookieString);
308 
-            $pos = strpos($elements[0], '=');
309 
-            $cookie['name']  = trim(substr($elements[0], 0, $pos));
310 
-            $cookie['value'] = trim(substr($elements[0], $pos + 1));
311 
-
312 
-            for ($i = 1; $i < count($elements); $i++) {
313 
-                if (false === strpos($elements[$i], '=')) {
314 
-                    $elName  = trim($elements[$i]);
315 
-                    $elValue = null;
316 
-                } else {
317 
-                    list ($elName, $elValue) = array_map('trim', explode('=', $elements[$i]));
318 
-                }
319 
-                $elName = strtolower($elName);
320 
-                if ('secure' == $elName) {
321 
-                    $cookie['secure'] = true;
322 
-                } elseif ('expires' == $elName) {
323 
-                    $cookie['expires'] = str_replace('"', '', $elValue);
324 
-                } elseif ('path' == $elName || 'domain' == $elName) {
325 
-                    $cookie[$elName] = urldecode($elValue);
326 
-                } else {
327 
-                    $cookie[$elName] = $elValue;
328 
-                }
329 
-            }
330 
-        }
331 
-        $this->cookies[] = $cookie;
332 
-    }
333 
-
334 
-    /**
335 
-     * Appends a string to the response body
336 
-     *
337 
-     * @param string $bodyChunk part of response body
338 
-     */
339 
-    public function appendBody($bodyChunk)
340 
-    {
341 
-        $this->body .= $bodyChunk;
342 
-    }
343 
-
344 
-    /**
345 
-     * Returns the effective URL of the response
346 
-     *
347 
-     * This may be different from the request URL if redirects were followed.
348 
-     *
349 
-     * @return string
350 
-     * @link   http://pear.php.net/bugs/bug.php?id=18412
351 
-     */
352 
-    public function getEffectiveUrl()
353 
-    {
354 
-        return $this->effectiveUrl;
355 
-    }
356 
-
357 
-    /**
358 
-     * Returns the status code
359 
-     *
360 
-     * @return   integer
361 
-     */
362 
-    public function getStatus()
363 
-    {
364 
-        return $this->code;
365 
-    }
366 
-
367 
-    /**
368 
-     * Returns the reason phrase
369 
-     *
370 
-     * @return   string
371 
-     */
372 
-    public function getReasonPhrase()
373 
-    {
374 
-        return $this->reasonPhrase;
375 
-    }
376 
-
377 
-    /**
378 
-     * Whether response is a redirect that can be automatically handled by HTTP_Request2
379 
-     *
380 
-     * @return   bool
381 
-     */
382 
-    public function isRedirect()
383 
-    {
384 
-        return in_array($this->code, array(300, 301, 302, 303, 307))
385 
-               && isset($this->headers['location']);
386 
-    }
387 
-
388 
-    /**
389 
-     * Returns either the named header or all response headers
390 
-     *
391 
-     * @param string $headerName Name of header to return
392 
-     *
393 
-     * @return   string|array    Value of $headerName header (null if header is
394 
-     *                           not present), array of all response headers if
395 
-     *                           $headerName is null
396 
-     */
397 
-    public function getHeader($headerName = null)
398 
-    {
399 
-        if (null === $headerName) {
400 
-            return $this->headers;
401 
-        } else {
402 
-            $headerName = strtolower($headerName);
403 
-            return isset($this->headers[$headerName])? $this->headers[$headerName]: null;
404 
-        }
405 
-    }
406 
-
407 
-    /**
408 
-     * Returns cookies set in response
409 
-     *
410 
-     * @return   array
411 
-     */
412 
-    public function getCookies()
413 
-    {
414 
-        return $this->cookies;
415 
-    }
416 
-
417 
-    /**
418 
-     * Returns the body of the response
419 
-     *
420 
-     * @return   string
421 
-     * @throws   HTTP_Request2_Exception if body cannot be decoded
422 
-     */
423 
-    public function getBody()
424 
-    {
425 
-        if (0 == strlen($this->body) || !$this->bodyEncoded
426 
-            || !in_array(strtolower($this->getHeader('content-encoding')), array('gzip', 'deflate'))
427 
-        ) {
428 
-            return $this->body;
429 
-
430 
-        } else {
431 
-            if (extension_loaded('mbstring') && (2 & ini_get('mbstring.func_overload'))) {
432 
-                $oldEncoding = mb_internal_encoding();
433 
-                mb_internal_encoding('8bit');
434 
-            }
435 
-
436 
-            try {
437 
-                switch (strtolower($this->getHeader('content-encoding'))) {
438 
-                case 'gzip':
439 
-                    $decoded = self::decodeGzip($this->body);
440 
-                    break;
441 
-                case 'deflate':
442 
-                    $decoded = self::decodeDeflate($this->body);
443 
-                }
444 
-            } catch (Exception $e) {
445 
-            }
446 
-
447 
-            if (!empty($oldEncoding)) {
448 
-                mb_internal_encoding($oldEncoding);
449 
-            }
450 
-            if (!empty($e)) {
451 
-                throw $e;
452 
-            }
453 
-            return $decoded;
454 
-        }
455 
-    }
456 
-
457 
-    /**
458 
-     * Get the HTTP version of the response
459 
-     *
460 
-     * @return   string
461 
-     */
462 
-    public function getVersion()
463 
-    {
464 
-        return $this->version;
465 
-    }
466 
-
467 
-    /**
468 
-     * Decodes the message-body encoded by gzip
469 
-     *
470 
-     * The real decoding work is done by gzinflate() built-in function, this
471 
-     * method only parses the header and checks data for compliance with
472 
-     * RFC 1952
473 
-     *
474 
-     * @param string $data gzip-encoded data
475 
-     *
476 
-     * @return   string  decoded data
477 
-     * @throws   HTTP_Request2_LogicException
478 
-     * @throws   HTTP_Request2_MessageException
479 
-     * @link     http://tools.ietf.org/html/rfc1952
480 
-     */
481 
-    public static function decodeGzip($data)
482 
-    {
483 
-        $length = strlen($data);
484 
-        // If it doesn't look like gzip-encoded data, don't bother
485 
-        if (18 > $length || strcmp(substr($data, 0, 2), "\x1f\x8b")) {
486 
-            return $data;
487 
-        }
488 
-        if (!function_exists('gzinflate')) {
489 
-            throw new HTTP_Request2_LogicException(
490 
-                'Unable to decode body: gzip extension not available',
491 
-                HTTP_Request2_Exception::MISCONFIGURATION
492 
-            );
493 
-        }
494 
-        $method = ord(substr($data, 2, 1));
495 
-        if (8 != $method) {
496 
-            throw new HTTP_Request2_MessageException(
497 
-                'Error parsing gzip header: unknown compression method',
498 
-                HTTP_Request2_Exception::DECODE_ERROR
499 
-            );
500 
-        }
501 
-        $flags = ord(substr($data, 3, 1));
502 
-        if ($flags & 224) {
503 
-            throw new HTTP_Request2_MessageException(
504 
-                'Error parsing gzip header: reserved bits are set',
505 
-                HTTP_Request2_Exception::DECODE_ERROR
506 
-            );
507 
-        }
508 
-
509 
-        // header is 10 bytes minimum. may be longer, though.
510 
-        $headerLength = 10;
511 
-        // extra fields, need to skip 'em
512 
-        if ($flags & 4) {
513 
-            if ($length - $headerLength - 2 < 8) {
514 
-                throw new HTTP_Request2_MessageException(
515 
-                    'Error parsing gzip header: data too short',
516 
-                    HTTP_Request2_Exception::DECODE_ERROR
517 
-                );
518 
-            }
519 
-            $extraLength = unpack('v', substr($data, 10, 2));
520 
-            if ($length - $headerLength - 2 - $extraLength[1] < 8) {
521 
-                throw new HTTP_Request2_MessageException(
522 
-                    'Error parsing gzip header: data too short',
523 
-                    HTTP_Request2_Exception::DECODE_ERROR
524 
-                );
525 
-            }
526 
-            $headerLength += $extraLength[1] + 2;
527 
-        }
528 
-        // file name, need to skip that
529 
-        if ($flags & 8) {
530 
-            if ($length - $headerLength - 1 < 8) {
531 
-                throw new HTTP_Request2_MessageException(
532 
-                    'Error parsing gzip header: data too short',
533 
-                    HTTP_Request2_Exception::DECODE_ERROR
534 
-                );
535 
-            }
536 
-            $filenameLength = strpos(substr($data, $headerLength), chr(0));
537 
-            if (false === $filenameLength || $length - $headerLength - $filenameLength - 1 < 8) {
538 
-                throw new HTTP_Request2_MessageException(
539 
-                    'Error parsing gzip header: data too short',
540 
-                    HTTP_Request2_Exception::DECODE_ERROR
541 
-                );
542 
-            }
543 
-            $headerLength += $filenameLength + 1;
544 
-        }
545 
-        // comment, need to skip that also
546 
-        if ($flags & 16) {
547 
-            if ($length - $headerLength - 1 < 8) {
548 
-                throw new HTTP_Request2_MessageException(
549 
-                    'Error parsing gzip header: data too short',
550 
-                    HTTP_Request2_Exception::DECODE_ERROR
551 
-                );
552 
-            }
553 
-            $commentLength = strpos(substr($data, $headerLength), chr(0));
554 
-            if (false === $commentLength || $length - $headerLength - $commentLength - 1 < 8) {
555 
-                throw new HTTP_Request2_MessageException(
556 
-                    'Error parsing gzip header: data too short',
557 
-                    HTTP_Request2_Exception::DECODE_ERROR
558 
-                );
559 
-            }
560 
-            $headerLength += $commentLength + 1;
561 
-        }
562 
-        // have a CRC for header. let's check
563 
-        if ($flags & 2) {
564 
-            if ($length - $headerLength - 2 < 8) {
565 
-                throw new HTTP_Request2_MessageException(
566 
-                    'Error parsing gzip header: data too short',
567 
-                    HTTP_Request2_Exception::DECODE_ERROR
568 
-                );
569 
-            }
570 
-            $crcReal   = 0xffff & crc32(substr($data, 0, $headerLength));
571 
-            $crcStored = unpack('v', substr($data, $headerLength, 2));
572 
-            if ($crcReal != $crcStored[1]) {
573 
-                throw new HTTP_Request2_MessageException(
574 
-                    'Header CRC check failed',
575 
-                    HTTP_Request2_Exception::DECODE_ERROR
576 
-                );
577 
-            }
578 
-            $headerLength += 2;
579 
-        }
580 
-        // unpacked data CRC and size at the end of encoded data
581 
-        $tmp = unpack('V2', substr($data, -8));
582 
-        $dataCrc  = $tmp[1];
583 
-        $dataSize = $tmp[2];
584 
-
585 
-        // finally, call the gzinflate() function
586 
-        // don't pass $dataSize to gzinflate, see bugs #13135, #14370
587 
-        $unpacked = gzinflate(substr($data, $headerLength, -8));
588 
-        if (false === $unpacked) {
589 
-            throw new HTTP_Request2_MessageException(
590 
-                'gzinflate() call failed',
591 
-                HTTP_Request2_Exception::DECODE_ERROR
592 
-            );
593 
-        } elseif ($dataSize != strlen($unpacked)) {
594 
-            throw new HTTP_Request2_MessageException(
595 
-                'Data size check failed',
596 
-                HTTP_Request2_Exception::DECODE_ERROR
597 
-            );
598 
-        } elseif ((0xffffffff & $dataCrc) != (0xffffffff & crc32($unpacked))) {
599 
-            throw new HTTP_Request2_Exception(
600 
-                'Data CRC check failed',
601 
-                HTTP_Request2_Exception::DECODE_ERROR
602 
-            );
603 
-        }
604 
-        return $unpacked;
605 
-    }
606 
-
607 
-    /**
608 
-     * Decodes the message-body encoded by deflate
609 
-     *
610 
-     * @param string $data deflate-encoded data
611 
-     *
612 
-     * @return   string  decoded data
613 
-     * @throws   HTTP_Request2_LogicException
614 
-     */
615 
-    public static function decodeDeflate($data)
616 
-    {
617 
-        if (!function_exists('gzuncompress')) {
618 
-            throw new HTTP_Request2_LogicException(
619 
-                'Unable to decode body: gzip extension not available',
620 
-                HTTP_Request2_Exception::MISCONFIGURATION
621 
-            );
622 
-        }
623 
-        // RFC 2616 defines 'deflate' encoding as zlib format from RFC 1950,
624 
-        // while many applications send raw deflate stream from RFC 1951.
625 
-        // We should check for presence of zlib header and use gzuncompress() or
626 
-        // gzinflate() as needed. See bug #15305
627 
-        $header = unpack('n', substr($data, 0, 2));
628 
-        return (0 == $header[1] % 31)? gzuncompress($data): gzinflate($data);
629 
-    }
56 
+	/**
57 
+	 * HTTP protocol version (e.g. 1.0, 1.1)
58 
+	 * @var  string
59 
+	 */
60 
+	protected $version;
61 
+
62 
+	/**
63 
+	 * Status code
64 
+	 * @var  integer
65 
+	 * @link http://tools.ietf.org/html/rfc2616#section-6.1.1
66 
+	 */
67 
+	protected $code;
68 
+
69 
+	/**
70 
+	 * Reason phrase
71 
+	 * @var  string
72 
+	 * @link http://tools.ietf.org/html/rfc2616#section-6.1.1
73 
+	 */
74 
+	protected $reasonPhrase;
75 
+
76 
+	/**
77 
+	 * Effective URL (may be different from original request URL in case of redirects)
78 
+	 * @var  string
79 
+	 */
80 
+	protected $effectiveUrl;
81 
+
82 
+	/**
83 
+	 * Associative array of response headers
84 
+	 * @var  array
85 
+	 */
86 
+	protected $headers = array();
87 
+
88 
+	/**
89 
+	 * Cookies set in the response
90 
+	 * @var  array
91 
+	 */
92 
+	protected $cookies = array();
93 
+
94 
+	/**
95 
+	 * Name of last header processed by parseHederLine()
96 
+	 *
97 
+	 * Used to handle the headers that span multiple lines
98 
+	 *
99 
+	 * @var  string
100 
+	 */
101 
+	protected $lastHeader = null;
102 
+
103 
+	/**
104 
+	 * Response body
105 
+	 * @var  string
106 
+	 */
107 
+	protected $body = '';
108 
+
109 
+	/**
110 
+	 * Whether the body is still encoded by Content-Encoding
111 
+	 *
112 
+	 * cURL provides the decoded body to the callback; if we are reading from
113 
+	 * socket the body is still gzipped / deflated
114 
+	 *
115 
+	 * @var  bool
116 
+	 */
117 
+	protected $bodyEncoded;
118 
+
119 
+	/**
120 
+	 * Associative array of HTTP status code / reason phrase.
121 
+	 *
122 
+	 * @var  array
123 
+	 * @link http://tools.ietf.org/html/rfc2616#section-10
124 
+	 */
125 
+	protected static $phrases = array(
126 
+
127 
+		// 1xx: Informational - Request received, continuing process
128 
+		100 => 'Continue',
129 
+		101 => 'Switching Protocols',
130 
+
131 
+		// 2xx: Success - The action was successfully received, understood and
132 
+		// accepted
133 
+		200 => 'OK',
134 
+		201 => 'Created',
135 
+		202 => 'Accepted',
136 
+		203 => 'Non-Authoritative Information',
137 
+		204 => 'No Content',
138 
+		205 => 'Reset Content',
139 
+		206 => 'Partial Content',
140 
+
141 
+		// 3xx: Redirection - Further action must be taken in order to complete
142 
+		// the request
143 
+		300 => 'Multiple Choices',
144 
+		301 => 'Moved Permanently',
145 
+		302 => 'Found',  // 1.1
146 
+		303 => 'See Other',
147 
+		304 => 'Not Modified',
148 
+		305 => 'Use Proxy',
149 
+		307 => 'Temporary Redirect',
150 
+
151 
+		// 4xx: Client Error - The request contains bad syntax or cannot be
152 
+		// fulfilled
153 
+		400 => 'Bad Request',
154 
+		401 => 'Unauthorized',
155 
+		402 => 'Payment Required',
156 
+		403 => 'Forbidden',
157 
+		404 => 'Not Found',
158 
+		405 => 'Method Not Allowed',
159 
+		406 => 'Not Acceptable',
160 
+		407 => 'Proxy Authentication Required',
161 
+		408 => 'Request Timeout',
162 
+		409 => 'Conflict',
163 
+		410 => 'Gone',
164 
+		411 => 'Length Required',
165 
+		412 => 'Precondition Failed',
166 
+		413 => 'Request Entity Too Large',
167 
+		414 => 'Request-URI Too Long',
168 
+		415 => 'Unsupported Media Type',
169 
+		416 => 'Requested Range Not Satisfiable',
170 
+		417 => 'Expectation Failed',
171 
+
172 
+		// 5xx: Server Error - The server failed to fulfill an apparently
173 
+		// valid request
174 
+		500 => 'Internal Server Error',
175 
+		501 => 'Not Implemented',
176 
+		502 => 'Bad Gateway',
177 
+		503 => 'Service Unavailable',
178 
+		504 => 'Gateway Timeout',
179 
+		505 => 'HTTP Version Not Supported',
180 
+		509 => 'Bandwidth Limit Exceeded',
181 
+
182 
+	);
183 
+
184 
+	/**
185 
+	 * Returns the default reason phrase for the given code or all reason phrases
186 
+	 *
187 
+	 * @param int $code Response code
188 
+	 *
189 
+	 * @return string|array|null Default reason phrase for $code if $code is given
190 
+	 *                           (null if no phrase is available), array of all
191 
+	 *                           reason phrases if $code is null
192 
+	 * @link   http://pear.php.net/bugs/18716
193 
+	 */
194 
+	public static function getDefaultReasonPhrase($code = null)
195 
+	{
196 
+		if (null === $code) {
197 
+			return self::$phrases;
198 
+		} else {
199 
+			return isset(self::$phrases[$code]) ? self::$phrases[$code] : null;
200 
+		}
201 
+	}
202 
+
203 
+	/**
204 
+	 * Constructor, parses the response status line
205 
+	 *
206 
+	 * @param string $statusLine   Response status line (e.g. "HTTP/1.1 200 OK")
207 
+	 * @param bool   $bodyEncoded  Whether body is still encoded by Content-Encoding
208 
+	 * @param string $effectiveUrl Effective URL of the response
209 
+	 *
210 
+	 * @throws   HTTP_Request2_MessageException if status line is invalid according to spec
211 
+	 */
212 
+	public function __construct($statusLine, $bodyEncoded = true, $effectiveUrl = null)
213 
+	{
214 
+		if (!preg_match('!^HTTP/(\d\.\d) (\d{3})(?: (.+))?!', $statusLine, $m)) {
215 
+			throw new HTTP_Request2_MessageException(
216 
+				"Malformed response: {$statusLine}",
217 
+				HTTP_Request2_Exception::MALFORMED_RESPONSE
218 
+			);
219 
+		}
220 
+		$this->version      = $m[1];
221 
+		$this->code         = intval($m[2]);
222 
+		$this->reasonPhrase = !empty($m[3]) ? trim($m[3]) : self::getDefaultReasonPhrase($this->code);
223 
+		$this->bodyEncoded  = (bool)$bodyEncoded;
224 
+		$this->effectiveUrl = (string)$effectiveUrl;
225 
+	}
226 
+
227 
+	/**
228 
+	 * Parses the line from HTTP response filling $headers array
229 
+	 *
230 
+	 * The method should be called after reading the line from socket or receiving
231 
+	 * it into cURL callback. Passing an empty string here indicates the end of
232 
+	 * response headers and triggers additional processing, so be sure to pass an
233 
+	 * empty string in the end.
234 
+	 *
235 
+	 * @param string $headerLine Line from HTTP response
236 
+	 */
237 
+	public function parseHeaderLine($headerLine)
238 
+	{
239 
+		$headerLine = trim($headerLine, "\r\n");
240 
+
241 
+		if ('' == $headerLine) {
242 
+			// empty string signals the end of headers, process the received ones
243 
+			if (!empty($this->headers['set-cookie'])) {
244 
+				$cookies = is_array($this->headers['set-cookie'])?
245 
+						   $this->headers['set-cookie']:
246 
+						   array($this->headers['set-cookie']);
247 
+				foreach ($cookies as $cookieString) {
248 
+					$this->parseCookie($cookieString);
249 
+				}
250 
+				unset($this->headers['set-cookie']);
251 
+			}
252 
+			foreach (array_keys($this->headers) as $k) {
253 
+				if (is_array($this->headers[$k])) {
254 
+					$this->headers[$k] = implode(', ', $this->headers[$k]);
255 
+				}
256 
+			}
257 
+
258 
+		} elseif (preg_match('!^([^\x00-\x1f\x7f-\xff()<>@,;:\\\\"/\[\]?={}\s]+):(.+)$!', $headerLine, $m)) {
259 
+			// string of the form header-name: header value
260 
+			$name  = strtolower($m[1]);
261 
+			$value = trim($m[2]);
262 
+			if (empty($this->headers[$name])) {
263 
+				$this->headers[$name] = $value;
264 
+			} else {
265 
+				if (!is_array($this->headers[$name])) {
266 
+					$this->headers[$name] = array($this->headers[$name]);
267 
+				}
268 
+				$this->headers[$name][] = $value;
269 
+			}
270 
+			$this->lastHeader = $name;
271 
+
272 
+		} elseif (preg_match('!^\s+(.+)$!', $headerLine, $m) && $this->lastHeader) {
273 
+			// continuation of a previous header
274 
+			if (!is_array($this->headers[$this->lastHeader])) {
275 
+				$this->headers[$this->lastHeader] .= ' ' . trim($m[1]);
276 
+			} else {
277 
+				$key = count($this->headers[$this->lastHeader]) - 1;
278 
+				$this->headers[$this->lastHeader][$key] .= ' ' . trim($m[1]);
279 
+			}
280 
+		}
281 
+	}
282 
+
283 
+	/**
284 
+	 * Parses a Set-Cookie header to fill $cookies array
285 
+	 *
286 
+	 * @param string $cookieString value of Set-Cookie header
287 
+	 *
288 
+	 * @link     http://web.archive.org/web/20080331104521/http://cgi.netscape.com/newsref/std/cookie_spec.html
289 
+	 */
290 
+	protected function parseCookie($cookieString)
291 
+	{
292 
+		$cookie = array(
293 
+			'expires' => null,
294 
+			'domain'  => null,
295 
+			'path'    => null,
296 
+			'secure'  => false
297 
+		);
298 
+
299 
+		if (!strpos($cookieString, ';')) {
300 
+			// Only a name=value pair
301 
+			$pos = strpos($cookieString, '=');
302 
+			$cookie['name']  = trim(substr($cookieString, 0, $pos));
303 
+			$cookie['value'] = trim(substr($cookieString, $pos + 1));
304 
+
305 
+		} else {
306 
+			// Some optional parameters are supplied
307 
+			$elements = explode(';', $cookieString);
308 
+			$pos = strpos($elements[0], '=');
309 
+			$cookie['name']  = trim(substr($elements[0], 0, $pos));
310 
+			$cookie['value'] = trim(substr($elements[0], $pos + 1));
311 
+
312 
+			for ($i = 1; $i < count($elements); $i++) {
313 
+				if (false === strpos($elements[$i], '=')) {
314 
+					$elName  = trim($elements[$i]);
315 
+					$elValue = null;
316 
+				} else {
317 
+					list ($elName, $elValue) = array_map('trim', explode('=', $elements[$i]));
318 
+				}
319 
+				$elName = strtolower($elName);
320 
+				if ('secure' == $elName) {
321 
+					$cookie['secure'] = true;
322 
+				} elseif ('expires' == $elName) {
323 
+					$cookie['expires'] = str_replace('"', '', $elValue);
324 
+				} elseif ('path' == $elName || 'domain' == $elName) {
325 
+					$cookie[$elName] = urldecode($elValue);
326 
+				} else {
327 
+					$cookie[$elName] = $elValue;
328 
+				}
329 
+			}
330 
+		}
331 
+		$this->cookies[] = $cookie;
332 
+	}
333 
+
334 
+	/**
335 
+	 * Appends a string to the response body
336 
+	 *
337 
+	 * @param string $bodyChunk part of response body
338 
+	 */
339 
+	public function appendBody($bodyChunk)
340 
+	{
341 
+		$this->body .= $bodyChunk;
342 
+	}
343 
+
344 
+	/**
345 
+	 * Returns the effective URL of the response
346 
+	 *
347 
+	 * This may be different from the request URL if redirects were followed.
348 
+	 *
349 
+	 * @return string
350 
+	 * @link   http://pear.php.net/bugs/bug.php?id=18412
351 
+	 */
352 
+	public function getEffectiveUrl()
353 
+	{
354 
+		return $this->effectiveUrl;
355 
+	}
356 
+
357 
+	/**
358 
+	 * Returns the status code
359 
+	 *
360 
+	 * @return   integer
361 
+	 */
362 
+	public function getStatus()
363 
+	{
364 
+		return $this->code;
365 
+	}
366 
+
367 
+	/**
368 
+	 * Returns the reason phrase
369 
+	 *
370 
+	 * @return   string
371 
+	 */
372 
+	public function getReasonPhrase()
373 
+	{
374 
+		return $this->reasonPhrase;
375 
+	}
376 
+
377 
+	/**
378 
+	 * Whether response is a redirect that can be automatically handled by HTTP_Request2
379 
+	 *
380 
+	 * @return   bool
381 
+	 */
382 
+	public function isRedirect()
383 
+	{
384 
+		return in_array($this->code, array(300, 301, 302, 303, 307))
385 
+			   && isset($this->headers['location']);
386 
+	}
387 
+
388 
+	/**
389 
+	 * Returns either the named header or all response headers
390 
+	 *
391 
+	 * @param string $headerName Name of header to return
392 
+	 *
393 
+	 * @return   string|array    Value of $headerName header (null if header is
394 
+	 *                           not present), array of all response headers if
395 
+	 *                           $headerName is null
396 
+	 */
397 
+	public function getHeader($headerName = null)
398 
+	{
399 
+		if (null === $headerName) {
400 
+			return $this->headers;
401 
+		} else {
402 
+			$headerName = strtolower($headerName);
403 
+			return isset($this->headers[$headerName])? $this->headers[$headerName]: null;
404 
+		}
405 
+	}
406 
+
407 
+	/**
408 
+	 * Returns cookies set in response
409 
+	 *
410 
+	 * @return   array
411 
+	 */
412 
+	public function getCookies()
413 
+	{
414 
+		return $this->cookies;
415 
+	}
416 
+
417 
+	/**
418 
+	 * Returns the body of the response
419 
+	 *
420 
+	 * @return   string
421 
+	 * @throws   HTTP_Request2_Exception if body cannot be decoded
422 
+	 */
423 
+	public function getBody()
424 
+	{
425 
+		if (0 == strlen($this->body) || !$this->bodyEncoded
426 
+			|| !in_array(strtolower($this->getHeader('content-encoding')), array('gzip', 'deflate'))
427 
+		) {
428 
+			return $this->body;
429 
+
430 
+		} else {
431 
+			if (extension_loaded('mbstring') && (2 & ini_get('mbstring.func_overload'))) {
432 
+				$oldEncoding = mb_internal_encoding();
433 
+				mb_internal_encoding('8bit');
434 
+			}
435 
+
436 
+			try {
437 
+				switch (strtolower($this->getHeader('content-encoding'))) {
438 
+				case 'gzip':
439 
+					$decoded = self::decodeGzip($this->body);
440 
+					break;
441 
+				case 'deflate':
442 
+					$decoded = self::decodeDeflate($this->body);
443 
+				}
444 
+			} catch (Exception $e) {
445 
+			}
446 
+
447 
+			if (!empty($oldEncoding)) {
448 
+				mb_internal_encoding($oldEncoding);
449 
+			}
450 
+			if (!empty($e)) {
451 
+				throw $e;
452 
+			}
453 
+			return $decoded;
454 
+		}
455 
+	}
456 
+
457 
+	/**
458 
+	 * Get the HTTP version of the response
459 
+	 *
460 
+	 * @return   string
461 
+	 */
462 
+	public function getVersion()
463 
+	{
464 
+		return $this->version;
465 
+	}
466 
+
467 
+	/**
468 
+	 * Decodes the message-body encoded by gzip
469 
+	 *
470 
+	 * The real decoding work is done by gzinflate() built-in function, this
471 
+	 * method only parses the header and checks data for compliance with
472 
+	 * RFC 1952
473 
+	 *
474 
+	 * @param string $data gzip-encoded data
475 
+	 *
476 
+	 * @return   string  decoded data
477 
+	 * @throws   HTTP_Request2_LogicException
478 
+	 * @throws   HTTP_Request2_MessageException
479 
+	 * @link     http://tools.ietf.org/html/rfc1952
480 
+	 */
481 
+	public static function decodeGzip($data)
482 
+	{
483 
+		$length = strlen($data);
484 
+		// If it doesn't look like gzip-encoded data, don't bother
485 
+		if (18 > $length || strcmp(substr($data, 0, 2), "\x1f\x8b")) {
486 
+			return $data;
487 
+		}
488 
+		if (!function_exists('gzinflate')) {
489 
+			throw new HTTP_Request2_LogicException(
490 
+				'Unable to decode body: gzip extension not available',
491 
+				HTTP_Request2_Exception::MISCONFIGURATION
492 
+			);
493 
+		}
494 
+		$method = ord(substr($data, 2, 1));
495 
+		if (8 != $method) {
496 
+			throw new HTTP_Request2_MessageException(
497 
+				'Error parsing gzip header: unknown compression method',
498 
+				HTTP_Request2_Exception::DECODE_ERROR
499 
+			);
500 
+		}
501 
+		$flags = ord(substr($data, 3, 1));
502 
+		if ($flags & 224) {
503 
+			throw new HTTP_Request2_MessageException(
504 
+				'Error parsing gzip header: reserved bits are set',
505 
+				HTTP_Request2_Exception::DECODE_ERROR
506 
+			);
507 
+		}
508 
+
509 
+		// header is 10 bytes minimum. may be longer, though.
510 
+		$headerLength = 10;
511 
+		// extra fields, need to skip 'em
512 
+		if ($flags & 4) {
513 
+			if ($length - $headerLength - 2 < 8) {
514 
+				throw new HTTP_Request2_MessageException(
515 
+					'Error parsing gzip header: data too short',
516 
+					HTTP_Request2_Exception::DECODE_ERROR
517 
+				);
518 
+			}
519 
+			$extraLength = unpack('v', substr($data, 10, 2));
520 
+			if ($length - $headerLength - 2 - $extraLength[1] < 8) {
521 
+				throw new HTTP_Request2_MessageException(
522 
+					'Error parsing gzip header: data too short',
523 
+					HTTP_Request2_Exception::DECODE_ERROR
524 
+				);
525 
+			}
526 
+			$headerLength += $extraLength[1] + 2;
527 
+		}
528 
+		// file name, need to skip that
529 
+		if ($flags & 8) {
530 
+			if ($length - $headerLength - 1 < 8) {
531 
+				throw new HTTP_Request2_MessageException(
532 
+					'Error parsing gzip header: data too short',
533 
+					HTTP_Request2_Exception::DECODE_ERROR
534 
+				);
535 
+			}
536 
+			$filenameLength = strpos(substr($data, $headerLength), chr(0));
537 
+			if (false === $filenameLength || $length - $headerLength - $filenameLength - 1 < 8) {
538 
+				throw new HTTP_Request2_MessageException(
539 
+					'Error parsing gzip header: data too short',
540 
+					HTTP_Request2_Exception::DECODE_ERROR
541 
+				);
542 
+			}
543 
+			$headerLength += $filenameLength + 1;
544 
+		}
545 
+		// comment, need to skip that also
546 
+		if ($flags & 16) {
547 
+			if ($length - $headerLength - 1 < 8) {
548 
+				throw new HTTP_Request2_MessageException(
549 
+					'Error parsing gzip header: data too short',
550 
+					HTTP_Request2_Exception::DECODE_ERROR
551 
+				);
552 
+			}
553 
+			$commentLength = strpos(substr($data, $headerLength), chr(0));
554 
+			if (false === $commentLength || $length - $headerLength - $commentLength - 1 < 8) {
555 
+				throw new HTTP_Request2_MessageException(
556 
+					'Error parsing gzip header: data too short',
557 
+					HTTP_Request2_Exception::DECODE_ERROR
558 
+				);
559 
+			}
560 
+			$headerLength += $commentLength + 1;
561 
+		}
562 
+		// have a CRC for header. let's check
563 
+		if ($flags & 2) {
564 
+			if ($length - $headerLength - 2 < 8) {
565 
+				throw new HTTP_Request2_MessageException(
566 
+					'Error parsing gzip header: data too short',
567 
+					HTTP_Request2_Exception::DECODE_ERROR
568 
+				);
569 
+			}
570 
+			$crcReal   = 0xffff & crc32(substr($data, 0, $headerLength));
571 
+			$crcStored = unpack('v', substr($data, $headerLength, 2));
572 
+			if ($crcReal != $crcStored[1]) {
573 
+				throw new HTTP_Request2_MessageException(
574 
+					'Header CRC check failed',
575 
+					HTTP_Request2_Exception::DECODE_ERROR
576 
+				);
577 
+			}
578 
+			$headerLength += 2;
579 
+		}
580 
+		// unpacked data CRC and size at the end of encoded data
581 
+		$tmp = unpack('V2', substr($data, -8));
582 
+		$dataCrc  = $tmp[1];
583 
+		$dataSize = $tmp[2];
584 
+
585 
+		// finally, call the gzinflate() function
586 
+		// don't pass $dataSize to gzinflate, see bugs #13135, #14370
587 
+		$unpacked = gzinflate(substr($data, $headerLength, -8));
588 
+		if (false === $unpacked) {
589 
+			throw new HTTP_Request2_MessageException(
590 
+				'gzinflate() call failed',
591 
+				HTTP_Request2_Exception::DECODE_ERROR
592 
+			);
593 
+		} elseif ($dataSize != strlen($unpacked)) {
594 
+			throw new HTTP_Request2_MessageException(
595 
+				'Data size check failed',
596 
+				HTTP_Request2_Exception::DECODE_ERROR
597 
+			);
598 
+		} elseif ((0xffffffff & $dataCrc) != (0xffffffff & crc32($unpacked))) {
599 
+			throw new HTTP_Request2_Exception(
600 
+				'Data CRC check failed',
601 
+				HTTP_Request2_Exception::DECODE_ERROR
602 
+			);
603 
+		}
604 
+		return $unpacked;
605 
+	}
606 
+
607 
+	/**
608 
+	 * Decodes the message-body encoded by deflate
609 
+	 *
610 
+	 * @param string $data deflate-encoded data
611 
+	 *
612 
+	 * @return   string  decoded data
613 
+	 * @throws   HTTP_Request2_LogicException
614 
+	 */
615 
+	public static function decodeDeflate($data)
616 
+	{
617 
+		if (!function_exists('gzuncompress')) {
618 
+			throw new HTTP_Request2_LogicException(
619 
+				'Unable to decode body: gzip extension not available',
620 
+				HTTP_Request2_Exception::MISCONFIGURATION
621 
+			);
622 
+		}
623 
+		// RFC 2616 defines 'deflate' encoding as zlib format from RFC 1950,
624 
+		// while many applications send raw deflate stream from RFC 1951.
625 
+		// We should check for presence of zlib header and use gzuncompress() or
626 
+		// gzinflate() as needed. See bug #15305
627 
+		$header = unpack('n', substr($data, 0, 2));
628 
+		return (0 == $header[1] % 31)? gzuncompress($data): gzinflate($data);
629 
+	}
630 630 
 }
631 631 
 ?>
632 632 
\ No newline at end of file
Please login to merge, or discard this patch.
Switch Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch 
@@ -435,11 +435,11 @@
 
 block discarded – undo
435 435
436 436 
             try {
437 437 
                 switch (strtolower($this->getHeader('content-encoding'))) {
438 
-                case 'gzip':
439 
-                    $decoded = self::decodeGzip($this->body);
440 
-                    break;
441 
-                case 'deflate':
442 
-                    $decoded = self::decodeDeflate($this->body);
438 
+                	case 'gzip':
439 
+                    	$decoded = self::decodeGzip($this->body);
440 
+                    	break;
441 
+                	case 'deflate':
442 
+                    	$decoded = self::decodeDeflate($this->body);
443 443 
                 }
444 444 
             } catch (Exception $e) {
445 445 
             }
Please login to merge, or discard this patch.
Spacing   +9 added lines, -10 removed lines patch added patch discarded remove patch 
@@ -142,7 +142,7 @@  discard block
 
 block discarded – undo
142 142 
         // the request
143 143 
         300 => 'Multiple Choices',
144 144 
         301 => 'Moved Permanently',
145 
-        302 => 'Found',  // 1.1
145 
+        302 => 'Found', // 1.1
146 146 
         303 => 'See Other',
147 147 
         304 => 'Not Modified',
148 148 
         305 => 'Use Proxy',

@@ -220,8 +220,8 @@  discard block
 
 block discarded – undo
220 220 
         $this->version      = $m[1];
221 221 
         $this->code         = intval($m[2]);
222 222 
         $this->reasonPhrase = !empty($m[3]) ? trim($m[3]) : self::getDefaultReasonPhrase($this->code);
223 
-        $this->bodyEncoded  = (bool)$bodyEncoded;
224 
-        $this->effectiveUrl = (string)$effectiveUrl;
223 
+        $this->bodyEncoded  = (bool) $bodyEncoded;
224 
+        $this->effectiveUrl = (string) $effectiveUrl;
225 225 
     }
226 226
227 227 
     /**

@@ -241,9 +241,8 @@  discard block
 
 block discarded – undo
241 241 
         if ('' == $headerLine) {
242 242 
             // empty string signals the end of headers, process the received ones
243 243 
             if (!empty($this->headers['set-cookie'])) {
244 
-                $cookies = is_array($this->headers['set-cookie'])?
245 
-                           $this->headers['set-cookie']:
246 
-                           array($this->headers['set-cookie']);
244 
+                $cookies = is_array($this->headers['set-cookie']) ?
245 
+                           $this->headers['set-cookie'] : array($this->headers['set-cookie']);
247 246 
                 foreach ($cookies as $cookieString) {
248 247 
                     $this->parseCookie($cookieString);
249 248 
                 }

@@ -272,10 +271,10 @@  discard block
 
 block discarded – undo
272 271 
         } elseif (preg_match('!^\s+(.+)$!', $headerLine, $m) && $this->lastHeader) {
273 272 
             // continuation of a previous header
274 273 
             if (!is_array($this->headers[$this->lastHeader])) {
275 
-                $this->headers[$this->lastHeader] .= ' ' . trim($m[1]);
274 
+                $this->headers[$this->lastHeader] .= ' '.trim($m[1]);
276 275 
             } else {
277 276 
                 $key = count($this->headers[$this->lastHeader]) - 1;
278 
-                $this->headers[$this->lastHeader][$key] .= ' ' . trim($m[1]);
277 
+                $this->headers[$this->lastHeader][$key] .= ' '.trim($m[1]);
279 278 
             }
280 279 
         }
281 280 
     }

@@ -400,7 +399,7 @@  discard block
 
 block discarded – undo
400 399 
             return $this->headers;
401 400 
         } else {
402 401 
             $headerName = strtolower($headerName);
403 
-            return isset($this->headers[$headerName])? $this->headers[$headerName]: null;
402 
+            return isset($this->headers[$headerName]) ? $this->headers[$headerName] : null;
404 403 
         }
405 404 
     }
406 405 
 

@@ -625,7 +624,7 @@  discard block
 
 block discarded – undo
625 624 
         // We should check for presence of zlib header and use gzuncompress() or
626 625 
         // gzinflate() as needed. See bug #15305
627 626 
         $header = unpack('n', substr($data, 0, 2));
628 
-        return (0 == $header[1] % 31)? gzuncompress($data): gzinflate($data);
627 
+        return (0 == $header[1] % 31) ? gzuncompress($data) : gzinflate($data);
629 628 
     }
630 629 
 }
631 630 
 ?>
632 631 
\ No newline at end of file
Please login to merge, or discard this patch.
libs/PEAR.1.9.5/HTTP/Request2/SOCKS5.php 3 patches
Switch Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch 
@@ -68,14 +68,14 @@
 
 block discarded – undo
68 68 
             );
69 69 
         }
70 70 
         switch ($response['method']) {
71 
-        case 2:
72 
-            $this->performAuthentication($username, $password);
73 
-        case 0:
74 
-            break;
75 
-        default:
76 
-            throw new HTTP_Request2_ConnectionException(
77 
-                "Connection rejected by proxy due to unsupported auth method"
78 
-            );
71 
+        	case 2:
72 
+            	$this->performAuthentication($username, $password);
73 
+        	case 0:
74 
+            	break;
75 
+        	default:
76 
+            	throw new HTTP_Request2_ConnectionException(
77 
+                	"Connection rejected by proxy due to unsupported auth method"
78 
+            	);
79 79 
         }
80 80 
     }
81 81
Please login to merge, or discard this patch.
Indentation   +91 added lines, -91 removed lines patch added patch discarded remove patch 
@@ -35,101 +35,101 @@
 
 block discarded – undo
35 35 
  */
36 36 
 class HTTP_Request2_SOCKS5 extends HTTP_Request2_SocketWrapper
37 37 
 {
38 
-    /**
39 
-     * Constructor, tries to connect and authenticate to a SOCKS5 proxy
40 
-     *
41 
-     * @param string $address        Proxy address, e.g. 'tcp://localhost:1080'
42 
-     * @param int    $timeout        Connection timeout (seconds)
43 
-     * @param array  $contextOptions Stream context options
44 
-     * @param string $username       Proxy user name
45 
-     * @param string $password       Proxy password
46 
-     *
47 
-     * @throws HTTP_Request2_LogicException
48 
-     * @throws HTTP_Request2_ConnectionException
49 
-     * @throws HTTP_Request2_MessageException
50 
-     */
51 
-    public function __construct(
52 
-        $address, $timeout = 10, array $contextOptions = array(),
53 
-        $username = null, $password = null
54 
-    ) {
55 
-        parent::__construct($address, $timeout, $contextOptions);
38 
+	/**
39 
+	 * Constructor, tries to connect and authenticate to a SOCKS5 proxy
40 
+	 *
41 
+	 * @param string $address        Proxy address, e.g. 'tcp://localhost:1080'
42 
+	 * @param int    $timeout        Connection timeout (seconds)
43 
+	 * @param array  $contextOptions Stream context options
44 
+	 * @param string $username       Proxy user name
45 
+	 * @param string $password       Proxy password
46 
+	 *
47 
+	 * @throws HTTP_Request2_LogicException
48 
+	 * @throws HTTP_Request2_ConnectionException
49 
+	 * @throws HTTP_Request2_MessageException
50 
+	 */
51 
+	public function __construct(
52 
+		$address, $timeout = 10, array $contextOptions = array(),
53 
+		$username = null, $password = null
54 
+	) {
55 
+		parent::__construct($address, $timeout, $contextOptions);
56 56
57 
-        if (strlen($username)) {
58 
-            $request = pack('C4', 5, 2, 0, 2);
59 
-        } else {
60 
-            $request = pack('C3', 5, 1, 0);
61 
-        }
62 
-        $this->write($request);
63 
-        $response = unpack('Cversion/Cmethod', $this->read(3));
64 
-        if (5 != $response['version']) {
65 
-            throw new HTTP_Request2_MessageException(
66 
-                'Invalid version received from SOCKS5 proxy: ' . $response['version'],
67 
-                HTTP_Request2_Exception::MALFORMED_RESPONSE
68 
-            );
69 
-        }
70 
-        switch ($response['method']) {
71 
-        case 2:
72 
-            $this->performAuthentication($username, $password);
73 
-        case 0:
74 
-            break;
75 
-        default:
76 
-            throw new HTTP_Request2_ConnectionException(
77 
-                "Connection rejected by proxy due to unsupported auth method"
78 
-            );
79 
-        }
80 
-    }
57 
+		if (strlen($username)) {
58 
+			$request = pack('C4', 5, 2, 0, 2);
59 
+		} else {
60 
+			$request = pack('C3', 5, 1, 0);
61 
+		}
62 
+		$this->write($request);
63 
+		$response = unpack('Cversion/Cmethod', $this->read(3));
64 
+		if (5 != $response['version']) {
65 
+			throw new HTTP_Request2_MessageException(
66 
+				'Invalid version received from SOCKS5 proxy: ' . $response['version'],
67 
+				HTTP_Request2_Exception::MALFORMED_RESPONSE
68 
+			);
69 
+		}
70 
+		switch ($response['method']) {
71 
+		case 2:
72 
+			$this->performAuthentication($username, $password);
73 
+		case 0:
74 
+			break;
75 
+		default:
76 
+			throw new HTTP_Request2_ConnectionException(
77 
+				"Connection rejected by proxy due to unsupported auth method"
78 
+			);
79 
+		}
80 
+	}
81 81
82 
-    /**
83 
-     * Performs username/password authentication for SOCKS5
84 
-     *
85 
-     * @param string $username Proxy user name
86 
-     * @param string $password Proxy password
87 
-     *
88 
-     * @throws HTTP_Request2_ConnectionException
89 
-     * @throws HTTP_Request2_MessageException
90 
-     * @link http://tools.ietf.org/html/rfc1929
91 
-     */
92 
-    protected function performAuthentication($username, $password)
93 
-    {
94 
-        $request  = pack('C2', 1, strlen($username)) . $username
95 
-                    . pack('C', strlen($password)) . $password;
82 
+	/**
83 
+	 * Performs username/password authentication for SOCKS5
84 
+	 *
85 
+	 * @param string $username Proxy user name
86 
+	 * @param string $password Proxy password
87 
+	 *
88 
+	 * @throws HTTP_Request2_ConnectionException
89 
+	 * @throws HTTP_Request2_MessageException
90 
+	 * @link http://tools.ietf.org/html/rfc1929
91 
+	 */
92 
+	protected function performAuthentication($username, $password)
93 
+	{
94 
+		$request  = pack('C2', 1, strlen($username)) . $username
95 
+					. pack('C', strlen($password)) . $password;
96 96
97 
-        $this->write($request);
98 
-        $response = unpack('Cvn/Cstatus', $this->read(3));
99 
-        if (1 != $response['vn'] || 0 != $response['status']) {
100 
-            throw new HTTP_Request2_ConnectionException(
101 
-                'Connection rejected by proxy due to invalid username and/or password'
102 
-            );
103 
-        }
104 
-    }
97 
+		$this->write($request);
98 
+		$response = unpack('Cvn/Cstatus', $this->read(3));
99 
+		if (1 != $response['vn'] || 0 != $response['status']) {
100 
+			throw new HTTP_Request2_ConnectionException(
101 
+				'Connection rejected by proxy due to invalid username and/or password'
102 
+			);
103 
+		}
104 
+	}
105 105
106 
-    /**
107 
-     * Connects to a remote host via proxy
108 
-     *
109 
-     * @param string $remoteHost Remote host
110 
-     * @param int    $remotePort Remote port
111 
-     *
112 
-     * @throws HTTP_Request2_ConnectionException
113 
-     * @throws HTTP_Request2_MessageException
114 
-     */
115 
-    public function connect($remoteHost, $remotePort)
116 
-    {
117 
-        $request = pack('C5', 0x05, 0x01, 0x00, 0x03, strlen($remoteHost))
118 
-                   . $remoteHost . pack('n', $remotePort);
106 
+	/**
107 
+	 * Connects to a remote host via proxy
108 
+	 *
109 
+	 * @param string $remoteHost Remote host
110 
+	 * @param int    $remotePort Remote port
111 
+	 *
112 
+	 * @throws HTTP_Request2_ConnectionException
113 
+	 * @throws HTTP_Request2_MessageException
114 
+	 */
115 
+	public function connect($remoteHost, $remotePort)
116 
+	{
117 
+		$request = pack('C5', 0x05, 0x01, 0x00, 0x03, strlen($remoteHost))
118 
+				   . $remoteHost . pack('n', $remotePort);
119 119
120 
-        $this->write($request);
121 
-        $response = unpack('Cversion/Creply/Creserved', $this->read(1024));
122 
-        if (5 != $response['version'] || 0 != $response['reserved']) {
123 
-            throw new HTTP_Request2_MessageException(
124 
-                'Invalid response received from SOCKS5 proxy',
125 
-                HTTP_Request2_Exception::MALFORMED_RESPONSE
126 
-            );
127 
-        } elseif (0 != $response['reply']) {
128 
-            throw new HTTP_Request2_ConnectionException(
129 
-                "Unable to connect to {$remoteHost}:{$remotePort} through SOCKS5 proxy",
130 
-                0, $response['reply']
131 
-            );
132 
-        }
133 
-    }
120 
+		$this->write($request);
121 
+		$response = unpack('Cversion/Creply/Creserved', $this->read(1024));
122 
+		if (5 != $response['version'] || 0 != $response['reserved']) {
123 
+			throw new HTTP_Request2_MessageException(
124 
+				'Invalid response received from SOCKS5 proxy',
125 
+				HTTP_Request2_Exception::MALFORMED_RESPONSE
126 
+			);
127 
+		} elseif (0 != $response['reply']) {
128 
+			throw new HTTP_Request2_ConnectionException(
129 
+				"Unable to connect to {$remoteHost}:{$remotePort} through SOCKS5 proxy",
130 
+				0, $response['reply']
131 
+			);
132 
+		}
133 
+	}
134 134 
 }
135 135 
 ?>
136 136 
\ No newline at end of file
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch 
@@ -63,7 +63,7 @@  discard block
 
 block discarded – undo
63 63 
         $response = unpack('Cversion/Cmethod', $this->read(3));
64 64 
         if (5 != $response['version']) {
65 65 
             throw new HTTP_Request2_MessageException(
66 
-                'Invalid version received from SOCKS5 proxy: ' . $response['version'],
66 
+                'Invalid version received from SOCKS5 proxy: '.$response['version'],
67 67 
                 HTTP_Request2_Exception::MALFORMED_RESPONSE
68 68 
             );
69 69 
         }

@@ -91,8 +91,8 @@  discard block
 
 block discarded – undo
91 91 
      */
92 92 
     protected function performAuthentication($username, $password)
93 93 
     {
94 
-        $request  = pack('C2', 1, strlen($username)) . $username
95 
-                    . pack('C', strlen($password)) . $password;
94 
+        $request = pack('C2', 1, strlen($username)).$username
95 
+                    . pack('C', strlen($password)).$password;
96 96
97 97 
         $this->write($request);
98 98 
         $response = unpack('Cvn/Cstatus', $this->read(3));

@@ -115,7 +115,7 @@  discard block
 
 block discarded – undo
115 115 
     public function connect($remoteHost, $remotePort)
116 116 
     {
117 117 
         $request = pack('C5', 0x05, 0x01, 0x00, 0x03, strlen($remoteHost))
118 
-                   . $remoteHost . pack('n', $remotePort);
118 
+                   . $remoteHost.pack('n', $remotePort);
119 119
120 120 
         $this->write($request);
121 121 
         $response = unpack('Cversion/Creply/Creserved', $this->read(1024));
Please login to merge, or discard this patch.
libs/PEAR.1.9.5/HTTP/Request2/SocketWrapper.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -170,7 +170,7 @@
 
 block discarded – undo
170 170 
                 // reset socket timeout if we don't have request timeout specified,
171 171 
                 // prevents further calls failing with a bogus Exception
172 172 
                 if (!$this->deadline) {
173 
-                    $default = (int)@ini_get('default_socket_timeout');
173 
+                    $default = (int) @ini_get('default_socket_timeout');
174 174 
                     stream_set_timeout($this->socket, $default > 0 ? $default : PHP_INT_MAX);
175 175 
                 }
176 176 
                 if ($info['timed_out']) {
Please login to merge, or discard this patch.
Indentation   +238 added lines, -238 removed lines patch added patch discarded remove patch 
@@ -38,260 +38,260 @@
 
 block discarded – undo
38 38 
  */
39 39 
 class HTTP_Request2_SocketWrapper
40 40 
 {
41 
-    /**
42 
-     * PHP warning messages raised during stream_socket_client() call
43 
-     * @var array
44 
-     */
45 
-    protected $connectionWarnings = array();
41 
+	/**
42 
+	 * PHP warning messages raised during stream_socket_client() call
43 
+	 * @var array
44 
+	 */
45 
+	protected $connectionWarnings = array();
46 46
47 
-    /**
48 
-     * Connected socket
49 
-     * @var resource
50 
-     */
51 
-    protected $socket;
47 
+	/**
48 
+	 * Connected socket
49 
+	 * @var resource
50 
+	 */
51 
+	protected $socket;
52 52
53 
-    /**
54 
-     * Sum of start time and global timeout, exception will be thrown if request continues past this time
55 
-     * @var  integer
56 
-     */
57 
-    protected $deadline;
53 
+	/**
54 
+	 * Sum of start time and global timeout, exception will be thrown if request continues past this time
55 
+	 * @var  integer
56 
+	 */
57 
+	protected $deadline;
58 58
59 
-    /**
60 
-     * Global timeout value, mostly for exception messages
61 
-     * @var integer
62 
-     */
63 
-    protected $timeout;
59 
+	/**
60 
+	 * Global timeout value, mostly for exception messages
61 
+	 * @var integer
62 
+	 */
63 
+	protected $timeout;
64 64
65 
-    /**
66 
-     * Class constructor, tries to establish connection
67 
-     *
68 
-     * @param string $address        Address for stream_socket_client() call,
69 
-     *                               e.g. 'tcp://localhost:80'
70 
-     * @param int    $timeout        Connection timeout (seconds)
71 
-     * @param array  $contextOptions Context options
72 
-     *
73 
-     * @throws HTTP_Request2_LogicException
74 
-     * @throws HTTP_Request2_ConnectionException
75 
-     */
76 
-    public function __construct($address, $timeout, array $contextOptions = array())
77 
-    {
78 
-        if (!empty($contextOptions)
79 
-            && !isset($contextOptions['socket']) && !isset($contextOptions['ssl'])
80 
-        ) {
81 
-            // Backwards compatibility with 2.1.0 and 2.1.1 releases
82 
-            $contextOptions = array('ssl' => $contextOptions);
83 
-        }
84 
-        $context = stream_context_create();
85 
-        foreach ($contextOptions as $wrapper => $options) {
86 
-            foreach ($options as $name => $value) {
87 
-                if (!stream_context_set_option($context, $wrapper, $name, $value)) {
88 
-                    throw new HTTP_Request2_LogicException(
89 
-                        "Error setting '{$wrapper}' wrapper context option '{$name}'"
90 
-                    );
91 
-                }
92 
-            }
93 
-        }
94 
-        set_error_handler(array($this, 'connectionWarningsHandler'));
95 
-        $this->socket = stream_socket_client(
96 
-            $address, $errno, $errstr, $timeout, STREAM_CLIENT_CONNECT, $context
97 
-        );
98 
-        restore_error_handler();
99 
-        // if we fail to bind to a specified local address (see request #19515),
100 
-        // connection still succeeds, albeit with a warning. Throw an Exception
101 
-        // with the warning text in this case as that connection is unlikely
102 
-        // to be what user wants and as Curl throws an error in similar case.
103 
-        if ($this->connectionWarnings) {
104 
-            if ($this->socket) {
105 
-                fclose($this->socket);
106 
-            }
107 
-            $error = $errstr ? $errstr : implode("\n", $this->connectionWarnings);
108 
-            throw new HTTP_Request2_ConnectionException(
109 
-                "Unable to connect to {$address}. Error: {$error}", 0, $errno
110 
-            );
111 
-        }
112 
-    }
65 
+	/**
66 
+	 * Class constructor, tries to establish connection
67 
+	 *
68 
+	 * @param string $address        Address for stream_socket_client() call,
69 
+	 *                               e.g. 'tcp://localhost:80'
70 
+	 * @param int    $timeout        Connection timeout (seconds)
71 
+	 * @param array  $contextOptions Context options
72 
+	 *
73 
+	 * @throws HTTP_Request2_LogicException
74 
+	 * @throws HTTP_Request2_ConnectionException
75 
+	 */
76 
+	public function __construct($address, $timeout, array $contextOptions = array())
77 
+	{
78 
+		if (!empty($contextOptions)
79 
+			&& !isset($contextOptions['socket']) && !isset($contextOptions['ssl'])
80 
+		) {
81 
+			// Backwards compatibility with 2.1.0 and 2.1.1 releases
82 
+			$contextOptions = array('ssl' => $contextOptions);
83 
+		}
84 
+		$context = stream_context_create();
85 
+		foreach ($contextOptions as $wrapper => $options) {
86 
+			foreach ($options as $name => $value) {
87 
+				if (!stream_context_set_option($context, $wrapper, $name, $value)) {
88 
+					throw new HTTP_Request2_LogicException(
89 
+						"Error setting '{$wrapper}' wrapper context option '{$name}'"
90 
+					);
91 
+				}
92 
+			}
93 
+		}
94 
+		set_error_handler(array($this, 'connectionWarningsHandler'));
95 
+		$this->socket = stream_socket_client(
96 
+			$address, $errno, $errstr, $timeout, STREAM_CLIENT_CONNECT, $context
97 
+		);
98 
+		restore_error_handler();
99 
+		// if we fail to bind to a specified local address (see request #19515),
100 
+		// connection still succeeds, albeit with a warning. Throw an Exception
101 
+		// with the warning text in this case as that connection is unlikely
102 
+		// to be what user wants and as Curl throws an error in similar case.
103 
+		if ($this->connectionWarnings) {
104 
+			if ($this->socket) {
105 
+				fclose($this->socket);
106 
+			}
107 
+			$error = $errstr ? $errstr : implode("\n", $this->connectionWarnings);
108 
+			throw new HTTP_Request2_ConnectionException(
109 
+				"Unable to connect to {$address}. Error: {$error}", 0, $errno
110 
+			);
111 
+		}
112 
+	}
113 113
114 
-    /**
115 
-     * Destructor, disconnects socket
116 
-     */
117 
-    public function __destruct()
118 
-    {
119 
-        fclose($this->socket);
120 
-    }
114 
+	/**
115 
+	 * Destructor, disconnects socket
116 
+	 */
117 
+	public function __destruct()
118 
+	{
119 
+		fclose($this->socket);
120 
+	}
121 121
122 
-    /**
123 
-     * Wrapper around fread(), handles global request timeout
124 
-     *
125 
-     * @param int $length Reads up to this number of bytes
126 
-     *
127 
-     * @return   string Data read from socket
128 
-     * @throws   HTTP_Request2_MessageException     In case of timeout
129 
-     */
130 
-    public function read($length)
131 
-    {
132 
-        if ($this->deadline) {
133 
-            stream_set_timeout($this->socket, max($this->deadline - time(), 1));
134 
-        }
135 
-        $data = fread($this->socket, $length);
136 
-        $this->checkTimeout();
137 
-        return $data;
138 
-    }
122 
+	/**
123 
+	 * Wrapper around fread(), handles global request timeout
124 
+	 *
125 
+	 * @param int $length Reads up to this number of bytes
126 
+	 *
127 
+	 * @return   string Data read from socket
128 
+	 * @throws   HTTP_Request2_MessageException     In case of timeout
129 
+	 */
130 
+	public function read($length)
131 
+	{
132 
+		if ($this->deadline) {
133 
+			stream_set_timeout($this->socket, max($this->deadline - time(), 1));
134 
+		}
135 
+		$data = fread($this->socket, $length);
136 
+		$this->checkTimeout();
137 
+		return $data;
138 
+	}
139 139
140 
-    /**
141 
-     * Reads until either the end of the socket or a newline, whichever comes first
142 
-     *
143 
-     * Strips the trailing newline from the returned data, handles global
144 
-     * request timeout. Method idea borrowed from Net_Socket PEAR package.
145 
-     *
146 
-     * @param int $bufferSize   buffer size to use for reading
147 
-     * @param int $localTimeout timeout value to use just for this call
148 
-     *                          (used when waiting for "100 Continue" response)
149 
-     *
150 
-     * @return   string Available data up to the newline (not including newline)
151 
-     * @throws   HTTP_Request2_MessageException     In case of timeout
152 
-     */
153 
-    public function readLine($bufferSize, $localTimeout = null)
154 
-    {
155 
-        $line = '';
156 
-        while (!feof($this->socket)) {
157 
-            if (null !== $localTimeout) {
158 
-                stream_set_timeout($this->socket, $localTimeout);
159 
-            } elseif ($this->deadline) {
160 
-                stream_set_timeout($this->socket, max($this->deadline - time(), 1));
161 
-            }
140 
+	/**
141 
+	 * Reads until either the end of the socket or a newline, whichever comes first
142 
+	 *
143 
+	 * Strips the trailing newline from the returned data, handles global
144 
+	 * request timeout. Method idea borrowed from Net_Socket PEAR package.
145 
+	 *
146 
+	 * @param int $bufferSize   buffer size to use for reading
147 
+	 * @param int $localTimeout timeout value to use just for this call
148 
+	 *                          (used when waiting for "100 Continue" response)
149 
+	 *
150 
+	 * @return   string Available data up to the newline (not including newline)
151 
+	 * @throws   HTTP_Request2_MessageException     In case of timeout
152 
+	 */
153 
+	public function readLine($bufferSize, $localTimeout = null)
154 
+	{
155 
+		$line = '';
156 
+		while (!feof($this->socket)) {
157 
+			if (null !== $localTimeout) {
158 
+				stream_set_timeout($this->socket, $localTimeout);
159 
+			} elseif ($this->deadline) {
160 
+				stream_set_timeout($this->socket, max($this->deadline - time(), 1));
161 
+			}
162 162
163 
-            $line .= @fgets($this->socket, $bufferSize);
163 
+			$line .= @fgets($this->socket, $bufferSize);
164 164
165 
-            if (null === $localTimeout) {
166 
-                $this->checkTimeout();
165 
+			if (null === $localTimeout) {
166 
+				$this->checkTimeout();
167 167
168 
-            } else {
169 
-                $info = stream_get_meta_data($this->socket);
170 
-                // reset socket timeout if we don't have request timeout specified,
171 
-                // prevents further calls failing with a bogus Exception
172 
-                if (!$this->deadline) {
173 
-                    $default = (int)@ini_get('default_socket_timeout');
174 
-                    stream_set_timeout($this->socket, $default > 0 ? $default : PHP_INT_MAX);
175 
-                }
176 
-                if ($info['timed_out']) {
177 
-                    throw new HTTP_Request2_MessageException(
178 
-                        "readLine() call timed out", HTTP_Request2_Exception::TIMEOUT
179 
-                    );
180 
-                }
181 
-            }
182 
-            if (substr($line, -1) == "\n") {
183 
-                return rtrim($line, "\r\n");
184 
-            }
185 
-        }
186 
-        return $line;
187 
-    }
168 
+			} else {
169 
+				$info = stream_get_meta_data($this->socket);
170 
+				// reset socket timeout if we don't have request timeout specified,
171 
+				// prevents further calls failing with a bogus Exception
172 
+				if (!$this->deadline) {
173 
+					$default = (int)@ini_get('default_socket_timeout');
174 
+					stream_set_timeout($this->socket, $default > 0 ? $default : PHP_INT_MAX);
175 
+				}
176 
+				if ($info['timed_out']) {
177 
+					throw new HTTP_Request2_MessageException(
178 
+						"readLine() call timed out", HTTP_Request2_Exception::TIMEOUT
179 
+					);
180 
+				}
181 
+			}
182 
+			if (substr($line, -1) == "\n") {
183 
+				return rtrim($line, "\r\n");
184 
+			}
185 
+		}
186 
+		return $line;
187 
+	}
188 188
189 
-    /**
190 
-     * Wrapper around fwrite(), handles global request timeout
191 
-     *
192 
-     * @param string $data String to be written
193 
-     *
194 
-     * @return int
195 
-     * @throws HTTP_Request2_MessageException
196 
-     */
197 
-    public function write($data)
198 
-    {
199 
-        if ($this->deadline) {
200 
-            stream_set_timeout($this->socket, max($this->deadline - time(), 1));
201 
-        }
202 
-        $written = fwrite($this->socket, $data);
203 
-        $this->checkTimeout();
204 
-        // http://www.php.net/manual/en/function.fwrite.php#96951
205 
-        if ($written < strlen($data)) {
206 
-            throw new HTTP_Request2_MessageException('Error writing request');
207 
-        }
208 
-        return $written;
209 
-    }
189 
+	/**
190 
+	 * Wrapper around fwrite(), handles global request timeout
191 
+	 *
192 
+	 * @param string $data String to be written
193 
+	 *
194 
+	 * @return int
195 
+	 * @throws HTTP_Request2_MessageException
196 
+	 */
197 
+	public function write($data)
198 
+	{
199 
+		if ($this->deadline) {
200 
+			stream_set_timeout($this->socket, max($this->deadline - time(), 1));
201 
+		}
202 
+		$written = fwrite($this->socket, $data);
203 
+		$this->checkTimeout();
204 
+		// http://www.php.net/manual/en/function.fwrite.php#96951
205 
+		if ($written < strlen($data)) {
206 
+			throw new HTTP_Request2_MessageException('Error writing request');
207 
+		}
208 
+		return $written;
209 
+	}
210 210
211 
-    /**
212 
-     * Tests for end-of-file on a socket
213 
-     *
214 
-     * @return bool
215 
-     */
216 
-    public function eof()
217 
-    {
218 
-        return feof($this->socket);
219 
-    }
211 
+	/**
212 
+	 * Tests for end-of-file on a socket
213 
+	 *
214 
+	 * @return bool
215 
+	 */
216 
+	public function eof()
217 
+	{
218 
+		return feof($this->socket);
219 
+	}
220 220
221 
-    /**
222 
-     * Sets request deadline
223 
-     *
224 
-     * @param int $deadline Exception will be thrown if request continues
225 
-     *                      past this time
226 
-     * @param int $timeout  Original request timeout value, to use in
227 
-     *                      Exception message
228 
-     */
229 
-    public function setDeadline($deadline, $timeout)
230 
-    {
231 
-        $this->deadline = $deadline;
232 
-        $this->timeout  = $timeout;
233 
-    }
221 
+	/**
222 
+	 * Sets request deadline
223 
+	 *
224 
+	 * @param int $deadline Exception will be thrown if request continues
225 
+	 *                      past this time
226 
+	 * @param int $timeout  Original request timeout value, to use in
227 
+	 *                      Exception message
228 
+	 */
229 
+	public function setDeadline($deadline, $timeout)
230 
+	{
231 
+		$this->deadline = $deadline;
232 
+		$this->timeout  = $timeout;
233 
+	}
234 234
235 
-    /**
236 
-     * Turns on encryption on a socket
237 
-     *
238 
-     * @throws HTTP_Request2_ConnectionException
239 
-     */
240 
-    public function enableCrypto()
241 
-    {
242 
-        $modes = array(
243 
-            STREAM_CRYPTO_METHOD_TLS_CLIENT,
244 
-            STREAM_CRYPTO_METHOD_SSLv3_CLIENT,
245 
-            STREAM_CRYPTO_METHOD_SSLv23_CLIENT,
246 
-            STREAM_CRYPTO_METHOD_SSLv2_CLIENT
247 
-        );
235 
+	/**
236 
+	 * Turns on encryption on a socket
237 
+	 *
238 
+	 * @throws HTTP_Request2_ConnectionException
239 
+	 */
240 
+	public function enableCrypto()
241 
+	{
242 
+		$modes = array(
243 
+			STREAM_CRYPTO_METHOD_TLS_CLIENT,
244 
+			STREAM_CRYPTO_METHOD_SSLv3_CLIENT,
245 
+			STREAM_CRYPTO_METHOD_SSLv23_CLIENT,
246 
+			STREAM_CRYPTO_METHOD_SSLv2_CLIENT
247 
+		);
248 248
249 
-        foreach ($modes as $mode) {
250 
-            if (stream_socket_enable_crypto($this->socket, true, $mode)) {
251 
-                return;
252 
-            }
253 
-        }
254 
-        throw new HTTP_Request2_ConnectionException(
255 
-            'Failed to enable secure connection when connecting through proxy'
256 
-        );
257 
-    }
249 
+		foreach ($modes as $mode) {
250 
+			if (stream_socket_enable_crypto($this->socket, true, $mode)) {
251 
+				return;
252 
+			}
253 
+		}
254 
+		throw new HTTP_Request2_ConnectionException(
255 
+			'Failed to enable secure connection when connecting through proxy'
256 
+		);
257 
+	}
258 258
259 
-    /**
260 
-     * Throws an Exception if stream timed out
261 
-     *
262 
-     * @throws HTTP_Request2_MessageException
263 
-     */
264 
-    protected function checkTimeout()
265 
-    {
266 
-        $info = stream_get_meta_data($this->socket);
267 
-        if ($info['timed_out'] || $this->deadline && time() > $this->deadline) {
268 
-            $reason = $this->deadline
269 
-                ? "after {$this->timeout} second(s)"
270 
-                : 'due to default_socket_timeout php.ini setting';
271 
-            throw new HTTP_Request2_MessageException(
272 
-                "Request timed out {$reason}", HTTP_Request2_Exception::TIMEOUT
273 
-            );
274 
-        }
275 
-    }
259 
+	/**
260 
+	 * Throws an Exception if stream timed out
261 
+	 *
262 
+	 * @throws HTTP_Request2_MessageException
263 
+	 */
264 
+	protected function checkTimeout()
265 
+	{
266 
+		$info = stream_get_meta_data($this->socket);
267 
+		if ($info['timed_out'] || $this->deadline && time() > $this->deadline) {
268 
+			$reason = $this->deadline
269 
+				? "after {$this->timeout} second(s)"
270 
+				: 'due to default_socket_timeout php.ini setting';
271 
+			throw new HTTP_Request2_MessageException(
272 
+				"Request timed out {$reason}", HTTP_Request2_Exception::TIMEOUT
273 
+			);
274 
+		}
275 
+	}
276 276
277 
-    /**
278 
-     * Error handler to use during stream_socket_client() call
279 
-     *
280 
-     * One stream_socket_client() call may produce *multiple* PHP warnings
281 
-     * (especially OpenSSL-related), we keep them in an array to later use for
282 
-     * the message of HTTP_Request2_ConnectionException
283 
-     *
284 
-     * @param int    $errno  error level
285 
-     * @param string $errstr error message
286 
-     *
287 
-     * @return bool
288 
-     */
289 
-    protected function connectionWarningsHandler($errno, $errstr)
290 
-    {
291 
-        if ($errno & E_WARNING) {
292 
-            array_unshift($this->connectionWarnings, $errstr);
293 
-        }
294 
-        return true;
295 
-    }
277 
+	/**
278 
+	 * Error handler to use during stream_socket_client() call
279 
+	 *
280 
+	 * One stream_socket_client() call may produce *multiple* PHP warnings
281 
+	 * (especially OpenSSL-related), we keep them in an array to later use for
282 
+	 * the message of HTTP_Request2_ConnectionException
283 
+	 *
284 
+	 * @param int    $errno  error level
285 
+	 * @param string $errstr error message
286 
+	 *
287 
+	 * @return bool
288 
+	 */
289 
+	protected function connectionWarningsHandler($errno, $errstr)
290 
+	{
291 
+		if ($errno & E_WARNING) {
292 
+			array_unshift($this->connectionWarnings, $errstr);
293 
+		}
294 
+		return true;
295 
+	}
296 296 
 }
297 297 
 ?>
Please login to merge, or discard this patch.
libs/PEAR.1.9.5/PEAR/Exception.php 4 patches
Indentation   +275 added lines, -275 removed lines patch added patch discarded remove patch 
@@ -96,294 +96,294 @@
 
 block discarded – undo
96 96 
  */
97 97 
 class PEAR_Exception extends Exception
98 98 
 {
99 
-    const OBSERVER_PRINT = -2;
100 
-    const OBSERVER_TRIGGER = -4;
101 
-    const OBSERVER_DIE = -8;
102 
-    protected $cause;
103 
-    private static $_observers = array();
104 
-    private static $_uniqueid = 0;
105 
-    private $_trace;
99 
+	const OBSERVER_PRINT = -2;
100 
+	const OBSERVER_TRIGGER = -4;
101 
+	const OBSERVER_DIE = -8;
102 
+	protected $cause;
103 
+	private static $_observers = array();
104 
+	private static $_uniqueid = 0;
105 
+	private $_trace;
106 106
107 
-    /**
108 
-     * Supported signatures:
109 
-     *  - PEAR_Exception(string $message);
110 
-     *  - PEAR_Exception(string $message, int $code);
111 
-     *  - PEAR_Exception(string $message, Exception $cause);
112 
-     *  - PEAR_Exception(string $message, Exception $cause, int $code);
113 
-     *  - PEAR_Exception(string $message, PEAR_Error $cause);
114 
-     *  - PEAR_Exception(string $message, PEAR_Error $cause, int $code);
115 
-     *  - PEAR_Exception(string $message, array $causes);
116 
-     *  - PEAR_Exception(string $message, array $causes, int $code);
117 
-     * @param string exception message
118 
-     * @param int|Exception|PEAR_Error|array|null exception cause
119 
-     * @param int|null exception code or null
120 
-     */
121 
-    public function __construct($message, $p2 = null, $p3 = null)
122 
-    {
123 
-        if (is_int($p2)) {
124 
-            $code = $p2;
125 
-            $this->cause = null;
126 
-        } elseif (is_object($p2) || is_array($p2)) {
127 
-            // using is_object allows both Exception and PEAR_Error
128 
-            if (is_object($p2) && !($p2 instanceof Exception)) {
129 
-                if (!class_exists('PEAR_Error') || !($p2 instanceof PEAR_Error)) {
130 
-                    throw new PEAR_Exception('exception cause must be Exception, ' .
131 
-                        'array, or PEAR_Error');
132 
-                }
133 
-            }
134 
-            $code = $p3;
135 
-            if (is_array($p2) && isset($p2['message'])) {
136 
-                // fix potential problem of passing in a single warning
137 
-                $p2 = array($p2);
138 
-            }
139 
-            $this->cause = $p2;
140 
-        } else {
141 
-            $code = null;
142 
-            $this->cause = null;
143 
-        }
144 
-        parent::__construct($message, $code);
145 
-        $this->signal();
146 
-    }
107 
+	/**
108 
+	 * Supported signatures:
109 
+	 *  - PEAR_Exception(string $message);
110 
+	 *  - PEAR_Exception(string $message, int $code);
111 
+	 *  - PEAR_Exception(string $message, Exception $cause);
112 
+	 *  - PEAR_Exception(string $message, Exception $cause, int $code);
113 
+	 *  - PEAR_Exception(string $message, PEAR_Error $cause);
114 
+	 *  - PEAR_Exception(string $message, PEAR_Error $cause, int $code);
115 
+	 *  - PEAR_Exception(string $message, array $causes);
116 
+	 *  - PEAR_Exception(string $message, array $causes, int $code);
117 
+	 * @param string exception message
118 
+	 * @param int|Exception|PEAR_Error|array|null exception cause
119 
+	 * @param int|null exception code or null
120 
+	 */
121 
+	public function __construct($message, $p2 = null, $p3 = null)
122 
+	{
123 
+		if (is_int($p2)) {
124 
+			$code = $p2;
125 
+			$this->cause = null;
126 
+		} elseif (is_object($p2) || is_array($p2)) {
127 
+			// using is_object allows both Exception and PEAR_Error
128 
+			if (is_object($p2) && !($p2 instanceof Exception)) {
129 
+				if (!class_exists('PEAR_Error') || !($p2 instanceof PEAR_Error)) {
130 
+					throw new PEAR_Exception('exception cause must be Exception, ' .
131 
+						'array, or PEAR_Error');
132 
+				}
133 
+			}
134 
+			$code = $p3;
135 
+			if (is_array($p2) && isset($p2['message'])) {
136 
+				// fix potential problem of passing in a single warning
137 
+				$p2 = array($p2);
138 
+			}
139 
+			$this->cause = $p2;
140 
+		} else {
141 
+			$code = null;
142 
+			$this->cause = null;
143 
+		}
144 
+		parent::__construct($message, $code);
145 
+		$this->signal();
146 
+	}
147 147
148 
-    /**
149 
-     * @param mixed $callback  - A valid php callback, see php func is_callable()
150 
-     *                         - A PEAR_Exception::OBSERVER_* constant
151 
-     *                         - An array(const PEAR_Exception::OBSERVER_*,
152 
-     *                           mixed $options)
153 
-     * @param string $label    The name of the observer. Use this if you want
154 
-     *                         to remove it later with removeObserver()
155 
-     */
156 
-    public static function addObserver($callback, $label = 'default')
157 
-    {
158 
-        self::$_observers[$label] = $callback;
159 
-    }
148 
+	/**
149 
+	 * @param mixed $callback  - A valid php callback, see php func is_callable()
150 
+	 *                         - A PEAR_Exception::OBSERVER_* constant
151 
+	 *                         - An array(const PEAR_Exception::OBSERVER_*,
152 
+	 *                           mixed $options)
153 
+	 * @param string $label    The name of the observer. Use this if you want
154 
+	 *                         to remove it later with removeObserver()
155 
+	 */
156 
+	public static function addObserver($callback, $label = 'default')
157 
+	{
158 
+		self::$_observers[$label] = $callback;
159 
+	}
160 160
161 
-    public static function removeObserver($label = 'default')
162 
-    {
163 
-        unset(self::$_observers[$label]);
164 
-    }
161 
+	public static function removeObserver($label = 'default')
162 
+	{
163 
+		unset(self::$_observers[$label]);
164 
+	}
165 165
166 
-    /**
167 
-     * @return int unique identifier for an observer
168 
-     */
169 
-    public static function getUniqueId()
170 
-    {
171 
-        return self::$_uniqueid++;
172 
-    }
166 
+	/**
167 
+	 * @return int unique identifier for an observer
168 
+	 */
169 
+	public static function getUniqueId()
170 
+	{
171 
+		return self::$_uniqueid++;
172 
+	}
173 173
174 
-    private function signal()
175 
-    {
176 
-        foreach (self::$_observers as $func) {
177 
-            if (is_callable($func)) {
178 
-                call_user_func($func, $this);
179 
-                continue;
180 
-            }
181 
-            settype($func, 'array');
182 
-            switch ($func[0]) {
183 
-                case self::OBSERVER_PRINT :
184 
-                    $f = (isset($func[1])) ? $func[1] : '%s';
185 
-                    printf($f, $this->getMessage());
186 
-                    break;
187 
-                case self::OBSERVER_TRIGGER :
188 
-                    $f = (isset($func[1])) ? $func[1] : E_USER_NOTICE;
189 
-                    trigger_error($this->getMessage(), $f);
190 
-                    break;
191 
-                case self::OBSERVER_DIE :
192 
-                    $f = (isset($func[1])) ? $func[1] : '%s';
193 
-                    die(printf($f, $this->getMessage()));
194 
-                    break;
195 
-                default:
196 
-                    trigger_error('invalid observer type', E_USER_WARNING);
197 
-            }
198 
-        }
199 
-    }
174 
+	private function signal()
175 
+	{
176 
+		foreach (self::$_observers as $func) {
177 
+			if (is_callable($func)) {
178 
+				call_user_func($func, $this);
179 
+				continue;
180 
+			}
181 
+			settype($func, 'array');
182 
+			switch ($func[0]) {
183 
+				case self::OBSERVER_PRINT :
184 
+					$f = (isset($func[1])) ? $func[1] : '%s';
185 
+					printf($f, $this->getMessage());
186 
+					break;
187 
+				case self::OBSERVER_TRIGGER :
188 
+					$f = (isset($func[1])) ? $func[1] : E_USER_NOTICE;
189 
+					trigger_error($this->getMessage(), $f);
190 
+					break;
191 
+				case self::OBSERVER_DIE :
192 
+					$f = (isset($func[1])) ? $func[1] : '%s';
193 
+					die(printf($f, $this->getMessage()));
194 
+					break;
195 
+				default:
196 
+					trigger_error('invalid observer type', E_USER_WARNING);
197 
+			}
198 
+		}
199 
+	}
200 200
201 
-    /**
202 
-     * Return specific error information that can be used for more detailed
203 
-     * error messages or translation.
204 
-     *
205 
-     * This method may be overridden in child exception classes in order
206 
-     * to add functionality not present in PEAR_Exception and is a placeholder
207 
-     * to define API
208 
-     *
209 
-     * The returned array must be an associative array of parameter => value like so:
210 
-     * <pre>
211 
-     * array('name' => $name, 'context' => array(...))
212 
-     * </pre>
213 
-     * @return array
214 
-     */
215 
-    public function getErrorData()
216 
-    {
217 
-        return array();
218 
-    }
201 
+	/**
202 
+	 * Return specific error information that can be used for more detailed
203 
+	 * error messages or translation.
204 
+	 *
205 
+	 * This method may be overridden in child exception classes in order
206 
+	 * to add functionality not present in PEAR_Exception and is a placeholder
207 
+	 * to define API
208 
+	 *
209 
+	 * The returned array must be an associative array of parameter => value like so:
210 
+	 * <pre>
211 
+	 * array('name' => $name, 'context' => array(...))
212 
+	 * </pre>
213 
+	 * @return array
214 
+	 */
215 
+	public function getErrorData()
216 
+	{
217 
+		return array();
218 
+	}
219 219
220 
-    /**
221 
-     * Returns the exception that caused this exception to be thrown
222 
-     * @access public
223 
-     * @return Exception|array The context of the exception
224 
-     */
225 
-    public function getCause()
226 
-    {
227 
-        return $this->cause;
228 
-    }
220 
+	/**
221 
+	 * Returns the exception that caused this exception to be thrown
222 
+	 * @access public
223 
+	 * @return Exception|array The context of the exception
224 
+	 */
225 
+	public function getCause()
226 
+	{
227 
+		return $this->cause;
228 
+	}
229 229
230 
-    /**
231 
-     * Function must be public to call on caused exceptions
232 
-     * @param array
233 
-     */
234 
-    public function getCauseMessage(&$causes)
235 
-    {
236 
-        $trace = $this->getTraceSafe();
237 
-        $cause = array('class'   => get_class($this),
238 
-                       'message' => $this->message,
239 
-                       'file' => 'unknown',
240 
-                       'line' => 'unknown');
241 
-        if (isset($trace[0])) {
242 
-            if (isset($trace[0]['file'])) {
243 
-                $cause['file'] = $trace[0]['file'];
244 
-                $cause['line'] = $trace[0]['line'];
245 
-            }
246 
-        }
247 
-        $causes[] = $cause;
248 
-        if ($this->cause instanceof PEAR_Exception) {
249 
-            $this->cause->getCauseMessage($causes);
250 
-        } elseif ($this->cause instanceof Exception) {
251 
-            $causes[] = array('class'   => get_class($this->cause),
252 
-                              'message' => $this->cause->getMessage(),
253 
-                              'file' => $this->cause->getFile(),
254 
-                              'line' => $this->cause->getLine());
255 
-        } elseif (class_exists('PEAR_Error') && $this->cause instanceof PEAR_Error) {
256 
-            $causes[] = array('class' => get_class($this->cause),
257 
-                              'message' => $this->cause->getMessage(),
258 
-                              'file' => 'unknown',
259 
-                              'line' => 'unknown');
260 
-        } elseif (is_array($this->cause)) {
261 
-            foreach ($this->cause as $cause) {
262 
-                if ($cause instanceof PEAR_Exception) {
263 
-                    $cause->getCauseMessage($causes);
264 
-                } elseif ($cause instanceof Exception) {
265 
-                    $causes[] = array('class'   => get_class($cause),
266 
-                                   'message' => $cause->getMessage(),
267 
-                                   'file' => $cause->getFile(),
268 
-                                   'line' => $cause->getLine());
269 
-                } elseif (class_exists('PEAR_Error') && $cause instanceof PEAR_Error) {
270 
-                    $causes[] = array('class' => get_class($cause),
271 
-                                      'message' => $cause->getMessage(),
272 
-                                      'file' => 'unknown',
273 
-                                      'line' => 'unknown');
274 
-                } elseif (is_array($cause) && isset($cause['message'])) {
275 
-                    // PEAR_ErrorStack warning
276 
-                    $causes[] = array(
277 
-                        'class' => $cause['package'],
278 
-                        'message' => $cause['message'],
279 
-                        'file' => isset($cause['context']['file']) ?
280 
-                                            $cause['context']['file'] :
281 
-                                            'unknown',
282 
-                        'line' => isset($cause['context']['line']) ?
283 
-                                            $cause['context']['line'] :
284 
-                                            'unknown',
285 
-                    );
286 
-                }
287 
-            }
288 
-        }
289 
-    }
230 
+	/**
231 
+	 * Function must be public to call on caused exceptions
232 
+	 * @param array
233 
+	 */
234 
+	public function getCauseMessage(&$causes)
235 
+	{
236 
+		$trace = $this->getTraceSafe();
237 
+		$cause = array('class'   => get_class($this),
238 
+					   'message' => $this->message,
239 
+					   'file' => 'unknown',
240 
+					   'line' => 'unknown');
241 
+		if (isset($trace[0])) {
242 
+			if (isset($trace[0]['file'])) {
243 
+				$cause['file'] = $trace[0]['file'];
244 
+				$cause['line'] = $trace[0]['line'];
245 
+			}
246 
+		}
247 
+		$causes[] = $cause;
248 
+		if ($this->cause instanceof PEAR_Exception) {
249 
+			$this->cause->getCauseMessage($causes);
250 
+		} elseif ($this->cause instanceof Exception) {
251 
+			$causes[] = array('class'   => get_class($this->cause),
252 
+							  'message' => $this->cause->getMessage(),
253 
+							  'file' => $this->cause->getFile(),
254 
+							  'line' => $this->cause->getLine());
255 
+		} elseif (class_exists('PEAR_Error') && $this->cause instanceof PEAR_Error) {
256 
+			$causes[] = array('class' => get_class($this->cause),
257 
+							  'message' => $this->cause->getMessage(),
258 
+							  'file' => 'unknown',
259 
+							  'line' => 'unknown');
260 
+		} elseif (is_array($this->cause)) {
261 
+			foreach ($this->cause as $cause) {
262 
+				if ($cause instanceof PEAR_Exception) {
263 
+					$cause->getCauseMessage($causes);
264 
+				} elseif ($cause instanceof Exception) {
265 
+					$causes[] = array('class'   => get_class($cause),
266 
+								   'message' => $cause->getMessage(),
267 
+								   'file' => $cause->getFile(),
268 
+								   'line' => $cause->getLine());
269 
+				} elseif (class_exists('PEAR_Error') && $cause instanceof PEAR_Error) {
270 
+					$causes[] = array('class' => get_class($cause),
271 
+									  'message' => $cause->getMessage(),
272 
+									  'file' => 'unknown',
273 
+									  'line' => 'unknown');
274 
+				} elseif (is_array($cause) && isset($cause['message'])) {
275 
+					// PEAR_ErrorStack warning
276 
+					$causes[] = array(
277 
+						'class' => $cause['package'],
278 
+						'message' => $cause['message'],
279 
+						'file' => isset($cause['context']['file']) ?
280 
+											$cause['context']['file'] :
281 
+											'unknown',
282 
+						'line' => isset($cause['context']['line']) ?
283 
+											$cause['context']['line'] :
284 
+											'unknown',
285 
+					);
286 
+				}
287 
+			}
288 
+		}
289 
+	}
290 290
291 
-    public function getTraceSafe()
292 
-    {
293 
-        if (!isset($this->_trace)) {
294 
-            $this->_trace = $this->getTrace();
295 
-            if (empty($this->_trace)) {
296 
-                $backtrace = debug_backtrace();
297 
-                $this->_trace = array($backtrace[count($backtrace)-1]);
298 
-            }
299 
-        }
300 
-        return $this->_trace;
301 
-    }
291 
+	public function getTraceSafe()
292 
+	{
293 
+		if (!isset($this->_trace)) {
294 
+			$this->_trace = $this->getTrace();
295 
+			if (empty($this->_trace)) {
296 
+				$backtrace = debug_backtrace();
297 
+				$this->_trace = array($backtrace[count($backtrace)-1]);
298 
+			}
299 
+		}
300 
+		return $this->_trace;
301 
+	}
302 302
303 
-    public function getErrorClass()
304 
-    {
305 
-        $trace = $this->getTraceSafe();
306 
-        return $trace[0]['class'];
307 
-    }
303 
+	public function getErrorClass()
304 
+	{
305 
+		$trace = $this->getTraceSafe();
306 
+		return $trace[0]['class'];
307 
+	}
308 308
309 
-    public function getErrorMethod()
310 
-    {
311 
-        $trace = $this->getTraceSafe();
312 
-        return $trace[0]['function'];
313 
-    }
309 
+	public function getErrorMethod()
310 
+	{
311 
+		$trace = $this->getTraceSafe();
312 
+		return $trace[0]['function'];
313 
+	}
314 314
315 
-    public function __toString()
316 
-    {
317 
-        if (isset($_SERVER['REQUEST_URI'])) {
318 
-            return $this->toHtml();
319 
-        }
320 
-        return $this->toText();
321 
-    }
315 
+	public function __toString()
316 
+	{
317 
+		if (isset($_SERVER['REQUEST_URI'])) {
318 
+			return $this->toHtml();
319 
+		}
320 
+		return $this->toText();
321 
+	}
322 322
323 
-    public function toHtml()
324 
-    {
325 
-        $trace = $this->getTraceSafe();
326 
-        $causes = array();
327 
-        $this->getCauseMessage($causes);
328 
-        $html =  '<table style="border: 1px" cellspacing="0">' . "\n";
329 
-        foreach ($causes as $i => $cause) {
330 
-            $html .= '<tr><td colspan="3" style="background: #ff9999">'
331 
-               . str_repeat('-', $i) . ' <b>' . $cause['class'] . '</b>: '
332 
-               . htmlspecialchars($cause['message']) . ' in <b>' . $cause['file'] . '</b> '
333 
-               . 'on line <b>' . $cause['line'] . '</b>'
334 
-               . "</td></tr>\n";
335 
-        }
336 
-        $html .= '<tr><td colspan="3" style="background-color: #aaaaaa; text-align: center; font-weight: bold;">Exception trace</td></tr>' . "\n"
337 
-               . '<tr><td style="text-align: center; background: #cccccc; width:20px; font-weight: bold;">#</td>'
338 
-               . '<td style="text-align: center; background: #cccccc; font-weight: bold;">Function</td>'
339 
-               . '<td style="text-align: center; background: #cccccc; font-weight: bold;">Location</td></tr>' . "\n";
323 
+	public function toHtml()
324 
+	{
325 
+		$trace = $this->getTraceSafe();
326 
+		$causes = array();
327 
+		$this->getCauseMessage($causes);
328 
+		$html =  '<table style="border: 1px" cellspacing="0">' . "\n";
329 
+		foreach ($causes as $i => $cause) {
330 
+			$html .= '<tr><td colspan="3" style="background: #ff9999">'
331 
+			   . str_repeat('-', $i) . ' <b>' . $cause['class'] . '</b>: '
332 
+			   . htmlspecialchars($cause['message']) . ' in <b>' . $cause['file'] . '</b> '
333 
+			   . 'on line <b>' . $cause['line'] . '</b>'
334 
+			   . "</td></tr>\n";
335 
+		}
336 
+		$html .= '<tr><td colspan="3" style="background-color: #aaaaaa; text-align: center; font-weight: bold;">Exception trace</td></tr>' . "\n"
337 
+			   . '<tr><td style="text-align: center; background: #cccccc; width:20px; font-weight: bold;">#</td>'
338 
+			   . '<td style="text-align: center; background: #cccccc; font-weight: bold;">Function</td>'
339 
+			   . '<td style="text-align: center; background: #cccccc; font-weight: bold;">Location</td></tr>' . "\n";
340 340
341 
-        foreach ($trace as $k => $v) {
342 
-            $html .= '<tr><td style="text-align: center;">' . $k . '</td>'
343 
-                   . '<td>';
344 
-            if (!empty($v['class'])) {
345 
-                $html .= $v['class'] . $v['type'];
346 
-            }
347 
-            $html .= $v['function'];
348 
-            $args = array();
349 
-            if (!empty($v['args'])) {
350 
-                foreach ($v['args'] as $arg) {
351 
-                    if (is_null($arg)) $args[] = 'null';
352 
-                    elseif (is_array($arg)) $args[] = 'Array';
353 
-                    elseif (is_object($arg)) $args[] = 'Object('.get_class($arg).')';
354 
-                    elseif (is_bool($arg)) $args[] = $arg ? 'true' : 'false';
355 
-                    elseif (is_int($arg) || is_double($arg)) $args[] = $arg;
356 
-                    else {
357 
-                        $arg = (string)$arg;
358 
-                        $str = htmlspecialchars(substr($arg, 0, 16));
359 
-                        if (strlen($arg) > 16) $str .= '&hellip;';
360 
-                        $args[] = "'" . $str . "'";
361 
-                    }
362 
-                }
363 
-            }
364 
-            $html .= '(' . implode(', ',$args) . ')'
365 
-                   . '</td>'
366 
-                   . '<td>' . (isset($v['file']) ? $v['file'] : 'unknown')
367 
-                   . ':' . (isset($v['line']) ? $v['line'] : 'unknown')
368 
-                   . '</td></tr>' . "\n";
369 
-        }
370 
-        $html .= '<tr><td style="text-align: center;">' . ($k+1) . '</td>'
371 
-               . '<td>{main}</td>'
372 
-               . '<td>&nbsp;</td></tr>' . "\n"
373 
-               . '</table>';
374 
-        return $html;
375 
-    }
341 
+		foreach ($trace as $k => $v) {
342 
+			$html .= '<tr><td style="text-align: center;">' . $k . '</td>'
343 
+				   . '<td>';
344 
+			if (!empty($v['class'])) {
345 
+				$html .= $v['class'] . $v['type'];
346 
+			}
347 
+			$html .= $v['function'];
348 
+			$args = array();
349 
+			if (!empty($v['args'])) {
350 
+				foreach ($v['args'] as $arg) {
351 
+					if (is_null($arg)) $args[] = 'null';
352 
+					elseif (is_array($arg)) $args[] = 'Array';
353 
+					elseif (is_object($arg)) $args[] = 'Object('.get_class($arg).')';
354 
+					elseif (is_bool($arg)) $args[] = $arg ? 'true' : 'false';
355 
+					elseif (is_int($arg) || is_double($arg)) $args[] = $arg;
356 
+					else {
357 
+						$arg = (string)$arg;
358 
+						$str = htmlspecialchars(substr($arg, 0, 16));
359 
+						if (strlen($arg) > 16) $str .= '&hellip;';
360 
+						$args[] = "'" . $str . "'";
361 
+					}
362 
+				}
363 
+			}
364 
+			$html .= '(' . implode(', ',$args) . ')'
365 
+				   . '</td>'
366 
+				   . '<td>' . (isset($v['file']) ? $v['file'] : 'unknown')
367 
+				   . ':' . (isset($v['line']) ? $v['line'] : 'unknown')
368 
+				   . '</td></tr>' . "\n";
369 
+		}
370 
+		$html .= '<tr><td style="text-align: center;">' . ($k+1) . '</td>'
371 
+			   . '<td>{main}</td>'
372 
+			   . '<td>&nbsp;</td></tr>' . "\n"
373 
+			   . '</table>';
374 
+		return $html;
375 
+	}
376 376
377 
-    public function toText()
378 
-    {
379 
-        $causes = array();
380 
-        $this->getCauseMessage($causes);
381 
-        $causeMsg = '';
382 
-        foreach ($causes as $i => $cause) {
383 
-            $causeMsg .= str_repeat(' ', $i) . $cause['class'] . ': '
384 
-                   . $cause['message'] . ' in ' . $cause['file']
385 
-                   . ' on line ' . $cause['line'] . "\n";
386 
-        }
387 
-        return $causeMsg . $this->getTraceAsString();
388 
-    }
377 
+	public function toText()
378 
+	{
379 
+		$causes = array();
380 
+		$this->getCauseMessage($causes);
381 
+		$causeMsg = '';
382 
+		foreach ($causes as $i => $cause) {
383 
+			$causeMsg .= str_repeat(' ', $i) . $cause['class'] . ': '
384 
+				   . $cause['message'] . ' in ' . $cause['file']
385 
+				   . ' on line ' . $cause['line'] . "\n";
386 
+		}
387 
+		return $causeMsg . $this->getTraceAsString();
388 
+	}
389 389 
 }
390 390 
\ No newline at end of file
Please login to merge, or discard this patch.
Doc Comments   +2 added lines patch added patch discarded remove patch 
@@ -117,6 +117,8 @@
 
 block discarded – undo
117 117 
      * @param string exception message
118 118 
      * @param int|Exception|PEAR_Error|array|null exception cause
119 119 
      * @param int|null exception code or null
120 
+     * @param string|null $message
121 
+     * @param integer $p2
120 122 
      */
121 123 
     public function __construct($message, $p2 = null, $p3 = null)
122 124 
     {
Please login to merge, or discard this patch.
Braces   +14 added lines, -7 removed lines patch added patch discarded remove patch 
@@ -348,15 +348,22 @@
 
 block discarded – undo
348 348 
             $args = array();
349 349 
             if (!empty($v['args'])) {
350 350 
                 foreach ($v['args'] as $arg) {
351 
-                    if (is_null($arg)) $args[] = 'null';
352 
-                    elseif (is_array($arg)) $args[] = 'Array';
353 
-                    elseif (is_object($arg)) $args[] = 'Object('.get_class($arg).')';
354 
-                    elseif (is_bool($arg)) $args[] = $arg ? 'true' : 'false';
355 
-                    elseif (is_int($arg) || is_double($arg)) $args[] = $arg;
356 
-                    else {
351 
+                    if (is_null($arg)) {
352 
+                    	$args[] = 'null';
353 
+                    } elseif (is_array($arg)) {
354 
+                    	$args[] = 'Array';
355 
+                    } elseif (is_object($arg)) {
356 
+                    	$args[] = 'Object('.get_class($arg).')';
357 
+                    } elseif (is_bool($arg)) {
358 
+                    	$args[] = $arg ? 'true' : 'false';
359 
+                    } elseif (is_int($arg) || is_double($arg)) {
360 
+                    	$args[] = $arg;
361 
+                    } else {
357 362 
                         $arg = (string)$arg;
358 363 
                         $str = htmlspecialchars(substr($arg, 0, 16), ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
359 
-                        if (strlen($arg) > 16) $str .= '&hellip;';
364 
+                        if (strlen($arg) > 16) {
365 
+                        	$str .= '&hellip;';
366 
+                        }
360 367 
                         $args[] = "'" . $str . "'";
361 368 
                     }
362 369 
                 }
Please login to merge, or discard this patch.
Spacing   +24 added lines, -26 removed lines patch added patch discarded remove patch 
@@ -127,7 +127,7 @@  discard block
 
 block discarded – undo
127 127 
             // using is_object allows both Exception and PEAR_Error
128 128 
             if (is_object($p2) && !($p2 instanceof Exception)) {
129 129 
                 if (!class_exists('PEAR_Error') || !($p2 instanceof PEAR_Error)) {
130 
-                    throw new PEAR_Exception('exception cause must be Exception, ' .
130 
+                    throw new PEAR_Exception('exception cause must be Exception, '.
131 131 
                         'array, or PEAR_Error');
132 132 
                 }
133 133 
             }
 
@@ -277,11 +277,9 @@  discard block
 
 block discarded – undo
277 277 
                         'class' => $cause['package'],
278 278 
                         'message' => $cause['message'],
279 279 
                         'file' => isset($cause['context']['file']) ?
280 
-                                            $cause['context']['file'] :
281 
-                                            'unknown',
280 
+                                            $cause['context']['file'] : 'unknown',
282 281 
                         'line' => isset($cause['context']['line']) ?
283 
-                                            $cause['context']['line'] :
284 
-                                            'unknown',
282 
+                                            $cause['context']['line'] : 'unknown',
285 283 
                     );
286 284 
                 }
287 285 
             }
 
@@ -294,7 +292,7 @@  discard block
 
 block discarded – undo
294 292 
             $this->_trace = $this->getTrace();
295 293 
             if (empty($this->_trace)) {
296 294 
                 $backtrace = debug_backtrace();
297 
-                $this->_trace = array($backtrace[count($backtrace)-1]);
295 
+                $this->_trace = array($backtrace[count($backtrace) - 1]);
298 296 
             }
299 297 
         }
300 298 
         return $this->_trace;
 
@@ -325,24 +323,24 @@  discard block
 
 block discarded – undo
325 323 
         $trace = $this->getTraceSafe();
326 324 
         $causes = array();
327 325 
         $this->getCauseMessage($causes);
328 
-        $html =  '<table style="border: 1px" cellspacing="0">' . "\n";
326 
+        $html = '<table style="border: 1px" cellspacing="0">'."\n";
329 327 
         foreach ($causes as $i => $cause) {
330 328 
             $html .= '<tr><td colspan="3" style="background: #ff9999">'
331 
-               . str_repeat('-', $i) . ' <b>' . $cause['class'] . '</b>: '
332 
-               . htmlspecialchars($cause['message']) . ' in <b>' . $cause['file'] . '</b> '
333 
-               . 'on line <b>' . $cause['line'] . '</b>'
329 
+               . str_repeat('-', $i).' <b>'.$cause['class'].'</b>: '
330 
+               . htmlspecialchars($cause['message']).' in <b>'.$cause['file'].'</b> '
331 
+               . 'on line <b>'.$cause['line'].'</b>'
334 332 
                . "</td></tr>\n";
335 333 
         }
336 
-        $html .= '<tr><td colspan="3" style="background-color: #aaaaaa; text-align: center; font-weight: bold;">Exception trace</td></tr>' . "\n"
334 
+        $html .= '<tr><td colspan="3" style="background-color: #aaaaaa; text-align: center; font-weight: bold;">Exception trace</td></tr>'."\n"
337 335 
                . '<tr><td style="text-align: center; background: #cccccc; width:20px; font-weight: bold;">#</td>'
338 336 
                . '<td style="text-align: center; background: #cccccc; font-weight: bold;">Function</td>'
339 
-               . '<td style="text-align: center; background: #cccccc; font-weight: bold;">Location</td></tr>' . "\n";
337 
+               . '<td style="text-align: center; background: #cccccc; font-weight: bold;">Location</td></tr>'."\n";
340 338
341 339 
         foreach ($trace as $k => $v) {
342 
-            $html .= '<tr><td style="text-align: center;">' . $k . '</td>'
340 
+            $html .= '<tr><td style="text-align: center;">'.$k.'</td>'
343 341 
                    . '<td>';
344 342 
             if (!empty($v['class'])) {
345 
-                $html .= $v['class'] . $v['type'];
343 
+                $html .= $v['class'].$v['type'];
346 344 
             }
347 345 
             $html .= $v['function'];
348 346 
             $args = array();
 
@@ -354,22 +352,22 @@  discard block
 
 block discarded – undo
354 352 
                     elseif (is_bool($arg)) $args[] = $arg ? 'true' : 'false';
355 353 
                     elseif (is_int($arg) || is_double($arg)) $args[] = $arg;
356 354 
                     else {
357 
-                        $arg = (string)$arg;
355 
+                        $arg = (string) $arg;
358 356 
                         $str = htmlspecialchars(substr($arg, 0, 16));
359 357 
                         if (strlen($arg) > 16) $str .= '&hellip;';
360 
-                        $args[] = "'" . $str . "'";
358 
+                        $args[] = "'".$str."'";
361 359 
                     }
362 360 
                 }
363 361 
             }
364 
-            $html .= '(' . implode(', ',$args) . ')'
362 
+            $html .= '('.implode(', ', $args).')'
365 363 
                    . '</td>'
366 
-                   . '<td>' . (isset($v['file']) ? $v['file'] : 'unknown')
367 
-                   . ':' . (isset($v['line']) ? $v['line'] : 'unknown')
368 
-                   . '</td></tr>' . "\n";
364 
+                   . '<td>'.(isset($v['file']) ? $v['file'] : 'unknown')
365 
+                   . ':'.(isset($v['line']) ? $v['line'] : 'unknown')
366 
+                   . '</td></tr>'."\n";
369 367 
         }
370 
-        $html .= '<tr><td style="text-align: center;">' . ($k+1) . '</td>'
368 
+        $html .= '<tr><td style="text-align: center;">'.($k + 1).'</td>'
371 369 
                . '<td>{main}</td>'
372 
-               . '<td>&nbsp;</td></tr>' . "\n"
370 
+               . '<td>&nbsp;</td></tr>'."\n"
373 371 
                . '</table>';
374 372 
         return $html;
375 373 
     }
 
@@ -380,10 +378,10 @@  discard block
 
 block discarded – undo
380 378 
         $this->getCauseMessage($causes);
381 379 
         $causeMsg = '';
382 380 
         foreach ($causes as $i => $cause) {
383 
-            $causeMsg .= str_repeat(' ', $i) . $cause['class'] . ': '
384 
-                   . $cause['message'] . ' in ' . $cause['file']
385 
-                   . ' on line ' . $cause['line'] . "\n";
381 
+            $causeMsg .= str_repeat(' ', $i).$cause['class'].': '
382 
+                   . $cause['message'].' in '.$cause['file']
383 
+                   . ' on line '.$cause['line']."\n";
386 384 
         }
387 
-        return $causeMsg . $this->getTraceAsString();
385 
+        return $causeMsg.$this->getTraceAsString();
388 386 
     }
389 387 
 }
390 388 
\ No newline at end of file
Please login to merge, or discard this patch.
libs/PEAR.1.9/HTTP/Request.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch 
@@ -18,28 +18,28 @@
 
 block discarded – undo
18 18 
 	}
19 19
20 20 
 	public function getResponseCode() {
21 
-		if($this->response)
21 
+		if ($this->response)
22 22 
 		{
23 23 
 			return $this->response->getStatus();
24 24 
 		}
25 25 
 	}
26 26
27 27 
 	public function getResponseHeader() {
28 
-		if($this->response)
28 
+		if ($this->response)
29 29 
 		{
30 30 
 			return $this->response->getHeader();
31 31 
 		}
32 32 
 	}
33 33
34 34 
 	public function getResponseBody() {
35 
-		if($this->response)
35 
+		if ($this->response)
36 36 
 		{
37 37 
 			return $this->response->getBody();
38 38 
 		}
39 39 
 	}
40 40
41 41 
 	public function getResponseCookies() {
42 
-		if($this->response)
42 
+		if ($this->response)
43 43 
 		{
44 44 
 			return $this->response->getCookies();
45 45 
 		}
Please login to merge, or discard this patch.
libs/PEAR.1.9/HTTP/Request2/MultipartBody.php 2 patches
Indentation   +126 added lines, -126 removed lines patch added patch discarded remove patch 
@@ -59,31 +59,31 @@  discard block
 
 block discarded – undo
59 59 
     * MIME boundary
60 60 
     * @var  string
61 61 
     */
62 
-    private $_boundary;
62 
+	private $_boundary;
63 63
64 64 
    /**
65 65 
     * Form parameters added via {@link HTTP_Request2::addPostParameter()}
66 66 
     * @var  array
67 67 
     */
68 
-    private $_params = array();
68 
+	private $_params = array();
69 69
70 70 
    /**
71 71 
     * File uploads added via {@link HTTP_Request2::addUpload()}
72 72 
     * @var  array
73 73 
     */
74 
-    private $_uploads = array();
74 
+	private $_uploads = array();
75 75
76 76 
    /**
77 77 
     * Header for parts with parameters
78 78 
     * @var  string
79 79 
     */
80 
-    private $_headerParam = "--%s\r\nContent-Disposition: form-data; name=\"%s\"\r\n\r\n";
80 
+	private $_headerParam = "--%s\r\nContent-Disposition: form-data; name=\"%s\"\r\n\r\n";
81 81
82 82 
    /**
83 83 
     * Header for parts with uploads
84 84 
     * @var  string
85 85 
     */
86 
-    private $_headerUpload = "--%s\r\nContent-Disposition: form-data; name=\"%s\"; filename=\"%s\"\r\nContent-Type: %s\r\n\r\n";
86 
+	private $_headerUpload = "--%s\r\nContent-Disposition: form-data; name=\"%s\"; filename=\"%s\"\r\nContent-Type: %s\r\n\r\n";
87 87
88 88 
    /**
89 89 
     * Current position in parameter and upload arrays
 
@@ -93,7 +93,7 @@  discard block
 
 block discarded – undo
93 93 
     *
94 94 
     * @var  array
95 95 
     */
96 
-    private $_pos = array(0, 0);
96 
+	private $_pos = array(0, 0);
97 97
98 98
99 99 
    /**
 
@@ -103,59 +103,59 @@  discard block
 
 block discarded – undo
103 103 
     * @param    array   file uploads set via {@link HTTP_Request2::addUpload()}
104 104 
     * @param    bool    whether to append brackets to array variable names
105 105 
     */
106 
-    public function __construct(array $params, array $uploads, $useBrackets = true)
107 
-    {
108 
-        $this->_params = self::_flattenArray('', $params, $useBrackets);
109 
-        foreach ($uploads as $fieldName => $f) {
110 
-            if (!is_array($f['fp'])) {
111 
-                $this->_uploads[] = $f + array('name' => $fieldName);
112 
-            } else {
113 
-                for ($i = 0; $i < count($f['fp']); $i++) {
114 
-                    $upload = array(
115 
-                        'name' => ($useBrackets? $fieldName . '[' . $i . ']': $fieldName)
116 
-                    );
117 
-                    foreach (array('fp', 'filename', 'size', 'type') as $key) {
118 
-                        $upload[$key] = $f[$key][$i];
119 
-                    }
120 
-                    $this->_uploads[] = $upload;
121 
-                }
122 
-            }
123 
-        }
124 
-    }
106 
+	public function __construct(array $params, array $uploads, $useBrackets = true)
107 
+	{
108 
+		$this->_params = self::_flattenArray('', $params, $useBrackets);
109 
+		foreach ($uploads as $fieldName => $f) {
110 
+			if (!is_array($f['fp'])) {
111 
+				$this->_uploads[] = $f + array('name' => $fieldName);
112 
+			} else {
113 
+				for ($i = 0; $i < count($f['fp']); $i++) {
114 
+					$upload = array(
115 
+						'name' => ($useBrackets? $fieldName . '[' . $i . ']': $fieldName)
116 
+					);
117 
+					foreach (array('fp', 'filename', 'size', 'type') as $key) {
118 
+						$upload[$key] = $f[$key][$i];
119 
+					}
120 
+					$this->_uploads[] = $upload;
121 
+				}
122 
+			}
123 
+		}
124 
+	}
125 125
126 126 
    /**
127 127 
     * Returns the length of the body to use in Content-Length header
128 128 
     *
129 129 
     * @return   integer
130 130 
     */
131 
-    public function getLength()
132 
-    {
133 
-        $boundaryLength     = strlen($this->getBoundary());
134 
-        $headerParamLength  = strlen($this->_headerParam) - 4 + $boundaryLength;
135 
-        $headerUploadLength = strlen($this->_headerUpload) - 8 + $boundaryLength;
136 
-        $length             = $boundaryLength + 6;
137 
-        foreach ($this->_params as $p) {
138 
-            $length += $headerParamLength + strlen($p[0]) + strlen($p[1]) + 2;
139 
-        }
140 
-        foreach ($this->_uploads as $u) {
141 
-            $length += $headerUploadLength + strlen($u['name']) + strlen($u['type']) +
142 
-                       strlen($u['filename']) + $u['size'] + 2;
143 
-        }
144 
-        return $length;
145 
-    }
131 
+	public function getLength()
132 
+	{
133 
+		$boundaryLength     = strlen($this->getBoundary());
134 
+		$headerParamLength  = strlen($this->_headerParam) - 4 + $boundaryLength;
135 
+		$headerUploadLength = strlen($this->_headerUpload) - 8 + $boundaryLength;
136 
+		$length             = $boundaryLength + 6;
137 
+		foreach ($this->_params as $p) {
138 
+			$length += $headerParamLength + strlen($p[0]) + strlen($p[1]) + 2;
139 
+		}
140 
+		foreach ($this->_uploads as $u) {
141 
+			$length += $headerUploadLength + strlen($u['name']) + strlen($u['type']) +
142 
+					   strlen($u['filename']) + $u['size'] + 2;
143 
+		}
144 
+		return $length;
145 
+	}
146 146
147 147 
    /**
148 148 
     * Returns the boundary to use in Content-Type header
149 149 
     *
150 150 
     * @return   string
151 151 
     */
152 
-    public function getBoundary()
153 
-    {
154 
-        if (empty($this->_boundary)) {
155 
-            $this->_boundary = '--' . md5('PEAR-HTTP_Request2-' . microtime());
156 
-        }
157 
-        return $this->_boundary;
158 
-    }
152 
+	public function getBoundary()
153 
+	{
154 
+		if (empty($this->_boundary)) {
155 
+			$this->_boundary = '--' . md5('PEAR-HTTP_Request2-' . microtime());
156 
+		}
157 
+		return $this->_boundary;
158 
+	}
159 159
160 160 
    /**
161 161 
     * Returns next chunk of request body
 
@@ -163,69 +163,69 @@  discard block
 
 block discarded – undo
163 163 
     * @param    integer Amount of bytes to read
164 164 
     * @return   string  Up to $length bytes of data, empty string if at end
165 165 
     */
166 
-    public function read($length)
167 
-    {
168 
-        $ret         = '';
169 
-        $boundary    = $this->getBoundary();
170 
-        $paramCount  = count($this->_params);
171 
-        $uploadCount = count($this->_uploads);
172 
-        while ($length > 0 && $this->_pos[0] <= $paramCount + $uploadCount) {
173 
-            $oldLength = $length;
174 
-            if ($this->_pos[0] < $paramCount) {
175 
-                $param = sprintf($this->_headerParam, $boundary,
176 
-                                 $this->_params[$this->_pos[0]][0]) .
177 
-                         $this->_params[$this->_pos[0]][1] . "\r\n";
178 
-                $ret    .= substr($param, $this->_pos[1], $length);
179 
-                $length -= min(strlen($param) - $this->_pos[1], $length);
166 
+	public function read($length)
167 
+	{
168 
+		$ret         = '';
169 
+		$boundary    = $this->getBoundary();
170 
+		$paramCount  = count($this->_params);
171 
+		$uploadCount = count($this->_uploads);
172 
+		while ($length > 0 && $this->_pos[0] <= $paramCount + $uploadCount) {
173 
+			$oldLength = $length;
174 
+			if ($this->_pos[0] < $paramCount) {
175 
+				$param = sprintf($this->_headerParam, $boundary,
176 
+								 $this->_params[$this->_pos[0]][0]) .
177 
+						 $this->_params[$this->_pos[0]][1] . "\r\n";
178 
+				$ret    .= substr($param, $this->_pos[1], $length);
179 
+				$length -= min(strlen($param) - $this->_pos[1], $length);
180 180
181 
-            } elseif ($this->_pos[0] < $paramCount + $uploadCount) {
182 
-                $pos    = $this->_pos[0] - $paramCount;
183 
-                $header = sprintf($this->_headerUpload, $boundary,
184 
-                                  $this->_uploads[$pos]['name'],
185 
-                                  $this->_uploads[$pos]['filename'],
186 
-                                  $this->_uploads[$pos]['type']);
187 
-                if ($this->_pos[1] < strlen($header)) {
188 
-                    $ret    .= substr($header, $this->_pos[1], $length);
189 
-                    $length -= min(strlen($header) - $this->_pos[1], $length);
190 
-                }
191 
-                $filePos  = max(0, $this->_pos[1] - strlen($header));
192 
-                if ($length > 0 && $filePos < $this->_uploads[$pos]['size']) {
193 
-                    $ret     .= fread($this->_uploads[$pos]['fp'], $length);
194 
-                    $length  -= min($length, $this->_uploads[$pos]['size'] - $filePos);
195 
-                }
196 
-                if ($length > 0) {
197 
-                    $start   = $this->_pos[1] + ($oldLength - $length) -
198 
-                               strlen($header) - $this->_uploads[$pos]['size'];
199 
-                    $ret    .= substr("\r\n", $start, $length);
200 
-                    $length -= min(2 - $start, $length);
201 
-                }
181 
+			} elseif ($this->_pos[0] < $paramCount + $uploadCount) {
182 
+				$pos    = $this->_pos[0] - $paramCount;
183 
+				$header = sprintf($this->_headerUpload, $boundary,
184 
+								  $this->_uploads[$pos]['name'],
185 
+								  $this->_uploads[$pos]['filename'],
186 
+								  $this->_uploads[$pos]['type']);
187 
+				if ($this->_pos[1] < strlen($header)) {
188 
+					$ret    .= substr($header, $this->_pos[1], $length);
189 
+					$length -= min(strlen($header) - $this->_pos[1], $length);
190 
+				}
191 
+				$filePos  = max(0, $this->_pos[1] - strlen($header));
192 
+				if ($length > 0 && $filePos < $this->_uploads[$pos]['size']) {
193 
+					$ret     .= fread($this->_uploads[$pos]['fp'], $length);
194 
+					$length  -= min($length, $this->_uploads[$pos]['size'] - $filePos);
195 
+				}
196 
+				if ($length > 0) {
197 
+					$start   = $this->_pos[1] + ($oldLength - $length) -
198 
+							   strlen($header) - $this->_uploads[$pos]['size'];
199 
+					$ret    .= substr("\r\n", $start, $length);
200 
+					$length -= min(2 - $start, $length);
201 
+				}
202 202
203 
-            } else {
204 
-                $closing  = '--' . $boundary . "--\r\n";
205 
-                $ret     .= substr($closing, $this->_pos[1], $length);
206 
-                $length  -= min(strlen($closing) - $this->_pos[1], $length);
207 
-            }
208 
-            if ($length > 0) {
209 
-                $this->_pos     = array($this->_pos[0] + 1, 0);
210 
-            } else {
211 
-                $this->_pos[1] += $oldLength;
212 
-            }
213 
-        }
214 
-        return $ret;
215 
-    }
203 
+			} else {
204 
+				$closing  = '--' . $boundary . "--\r\n";
205 
+				$ret     .= substr($closing, $this->_pos[1], $length);
206 
+				$length  -= min(strlen($closing) - $this->_pos[1], $length);
207 
+			}
208 
+			if ($length > 0) {
209 
+				$this->_pos     = array($this->_pos[0] + 1, 0);
210 
+			} else {
211 
+				$this->_pos[1] += $oldLength;
212 
+			}
213 
+		}
214 
+		return $ret;
215 
+	}
216 216
217 217 
    /**
218 218 
     * Sets the current position to the start of the body
219 219 
     *
220 220 
     * This allows reusing the same body in another request
221 221 
     */
222 
-    public function rewind()
223 
-    {
224 
-        $this->_pos = array(0, 0);
225 
-        foreach ($this->_uploads as $u) {
226 
-            rewind($u['fp']);
227 
-        }
228 
-    }
222 
+	public function rewind()
223 
+	{
224 
+		$this->_pos = array(0, 0);
225 
+		foreach ($this->_uploads as $u) {
226 
+			rewind($u['fp']);
227 
+		}
228 
+	}
229 229
230 230 
    /**
231 231 
     * Returns the body as string
 
@@ -235,11 +235,11 @@  discard block
 
 block discarded – undo
235 235 
     *
236 236 
     * @return   string
237 237 
     */
238 
-    public function __toString()
239 
-    {
240 
-        $this->rewind();
241 
-        return $this->read($this->getLength());
242 
-    }
238 
+	public function __toString()
239 
+	{
240 
+		$this->rewind();
241 
+		return $this->read($this->getLength());
242 
+	}
243 243
244 244
245 245 
    /**
 
@@ -251,24 +251,24 @@  discard block
 
 block discarded – undo
251 251 
     * @param    bool    whether to append [] to array variables' names
252 252 
     * @return   array   array with the following items: array('item name', 'item value');
253 253 
     */
254 
-    private static function _flattenArray($name, $values, $useBrackets)
255 
-    {
256 
-        if (!is_array($values)) {
257 
-            return array(array($name, $values));
258 
-        } else {
259 
-            $ret = array();
260 
-            foreach ($values as $k => $v) {
261 
-                if (empty($name)) {
262 
-                    $newName = $k;
263 
-                } elseif ($useBrackets) {
264 
-                    $newName = $name . '[' . $k . ']';
265 
-                } else {
266 
-                    $newName = $name;
267 
-                }
268 
-                $ret = array_merge($ret, self::_flattenArray($newName, $v, $useBrackets));
269 
-            }
270 
-            return $ret;
271 
-        }
272 
-    }
254 
+	private static function _flattenArray($name, $values, $useBrackets)
255 
+	{
256 
+		if (!is_array($values)) {
257 
+			return array(array($name, $values));
258 
+		} else {
259 
+			$ret = array();
260 
+			foreach ($values as $k => $v) {
261 
+				if (empty($name)) {
262 
+					$newName = $k;
263 
+				} elseif ($useBrackets) {
264 
+					$newName = $name . '[' . $k . ']';
265 
+				} else {
266 
+					$newName = $name;
267 
+				}
268 
+				$ret = array_merge($ret, self::_flattenArray($newName, $v, $useBrackets));
269 
+			}
270 
+			return $ret;
271 
+		}
272 
+	}
273 273 
 }
274 274 
 ?>
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch 
@@ -112,7 +112,7 @@  discard block
 
 block discarded – undo
112 112 
             } else {
113 113 
                 for ($i = 0; $i < count($f['fp']); $i++) {
114 114 
                     $upload = array(
115 
-                        'name' => ($useBrackets? $fieldName . '[' . $i . ']': $fieldName)
115 
+                        'name' => ($useBrackets ? $fieldName.'['.$i.']' : $fieldName)
116 116 
                     );
117 117 
                     foreach (array('fp', 'filename', 'size', 'type') as $key) {
118 118 
                         $upload[$key] = $f[$key][$i];
 
@@ -152,7 +152,7 @@  discard block
 
 block discarded – undo
152 152 
     public function getBoundary()
153 153 
     {
154 154 
         if (empty($this->_boundary)) {
155 
-            $this->_boundary = '--' . md5('PEAR-HTTP_Request2-' . microtime());
155 
+            $this->_boundary = '--'.md5('PEAR-HTTP_Request2-'.microtime());
156 156 
         }
157 157 
         return $this->_boundary;
158 158 
     }
 
@@ -173,8 +173,8 @@  discard block
 
 block discarded – undo
173 173 
             $oldLength = $length;
174 174 
             if ($this->_pos[0] < $paramCount) {
175 175 
                 $param = sprintf($this->_headerParam, $boundary,
176 
-                                 $this->_params[$this->_pos[0]][0]) .
177 
-                         $this->_params[$this->_pos[0]][1] . "\r\n";
176 
+                                 $this->_params[$this->_pos[0]][0]).
177 
+                         $this->_params[$this->_pos[0]][1]."\r\n";
178 178 
                 $ret    .= substr($param, $this->_pos[1], $length);
179 179 
                 $length -= min(strlen($param) - $this->_pos[1], $length);
180 180 
 
@@ -188,7 +188,7 @@  discard block
 
 block discarded – undo
188 188 
                     $ret    .= substr($header, $this->_pos[1], $length);
189 189 
                     $length -= min(strlen($header) - $this->_pos[1], $length);
190 190 
                 }
191 
-                $filePos  = max(0, $this->_pos[1] - strlen($header));
191 
+                $filePos = max(0, $this->_pos[1] - strlen($header));
192 192 
                 if ($length > 0 && $filePos < $this->_uploads[$pos]['size']) {
193 193 
                     $ret     .= fread($this->_uploads[$pos]['fp'], $length);
194 194 
                     $length  -= min($length, $this->_uploads[$pos]['size'] - $filePos);
 
@@ -201,7 +201,7 @@  discard block
 
 block discarded – undo
201 201 
                 }
202 202
203 203 
             } else {
204 
-                $closing  = '--' . $boundary . "--\r\n";
204 
+                $closing  = '--'.$boundary."--\r\n";
205 205 
                 $ret     .= substr($closing, $this->_pos[1], $length);
206 206 
                 $length  -= min(strlen($closing) - $this->_pos[1], $length);
207 207 
             }
 
@@ -261,7 +261,7 @@  discard block
 
 block discarded – undo
261 261 
                 if (empty($name)) {
262 262 
                     $newName = $k;
263 263 
                 } elseif ($useBrackets) {
264 
-                    $newName = $name . '[' . $k . ']';
264 
+                    $newName = $name.'['.$k.']';
265 265 
                 } else {
266 266 
                     $newName = $name;
267 267 
                 }
Please login to merge, or discard this patch.
libs/PEAR.1.9/HTTP/Request2/Observer/Log.php 3 patches
Switch Indentation   +30 added lines, -30 removed lines patch added patch discarded remove patch 
@@ -157,36 +157,36 @@
 
 block discarded – undo
157 157 
         }
158 158
159 159 
         switch ($event['name']) {
160 
-        case 'connect':
161 
-            $this->log('* Connected to ' . $event['data']);
162 
-            break;
163 
-        case 'sentHeaders':
164 
-            $headers = explode("\r\n", $event['data']);
165 
-            array_pop($headers);
166 
-            foreach ($headers as $header) {
167 
-                $this->log('> ' . $header);
168 
-            }
169 
-            break;
170 
-        case 'sentBodyPart':
171 
-            $this->log('> ' . $event['data'] . ' byte(s) sent');
172 
-            break;
173 
-        case 'receivedHeaders':
174 
-            $this->log(sprintf('< HTTP/%s %s %s',
175 
-                $event['data']->getVersion(),
176 
-                $event['data']->getStatus(),
177 
-                $event['data']->getReasonPhrase()));
178 
-            $headers = $event['data']->getHeader();
179 
-            foreach ($headers as $key => $val) {
180 
-                $this->log('< ' . $key . ': ' . $val);
181 
-            }
182 
-            $this->log('< ');
183 
-            break;
184 
-        case 'receivedBody':
185 
-            $this->log($event['data']->getBody());
186 
-            break;
187 
-        case 'disconnect':
188 
-            $this->log('* Disconnected');
189 
-            break;
160 
+        	case 'connect':
161 
+            	$this->log('* Connected to ' . $event['data']);
162 
+            	break;
163 
+        	case 'sentHeaders':
164 
+            	$headers = explode("\r\n", $event['data']);
165 
+            	array_pop($headers);
166 
+            	foreach ($headers as $header) {
167 
+                	$this->log('> ' . $header);
168 
+            	}
169 
+            	break;
170 
+        	case 'sentBodyPart':
171 
+            	$this->log('> ' . $event['data'] . ' byte(s) sent');
172 
+            	break;
173 
+        	case 'receivedHeaders':
174 
+            	$this->log(sprintf('< HTTP/%s %s %s',
175 
+                	$event['data']->getVersion(),
176 
+                	$event['data']->getStatus(),
177 
+                	$event['data']->getReasonPhrase()));
178 
+            	$headers = $event['data']->getHeader();
179 
+            	foreach ($headers as $key => $val) {
180 
+                	$this->log('< ' . $key . ': ' . $val);
181 
+            	}
182 
+            	$this->log('< ');
183 
+            	break;
184 
+        	case 'receivedBody':
185 
+            	$this->log($event['data']->getBody());
186 
+            	break;
187 
+        	case 'disconnect':
188 
+            	$this->log('* Disconnected');
189 
+            	break;
190 190 
         }
191 191 
     }
192 192
Please login to merge, or discard this patch.
Indentation   +108 added lines, -108 removed lines patch added patch discarded remove patch 
@@ -92,124 +92,124 @@
 
 block discarded – undo
92 92 
  */
93 93 
 class HTTP_Request2_Observer_Log implements SplObserver
94 94 
 {
95 
-    // properties {{{
95 
+	// properties {{{
96 96
97 
-    /**
98 
-     * The log target, it can be a a resource or a PEAR Log instance.
99 
-     *
100 
-     * @var resource|Log $target
101 
-     */
102 
-    protected $target = null;
97 
+	/**
98 
+	 * The log target, it can be a a resource or a PEAR Log instance.
99 
+	 *
100 
+	 * @var resource|Log $target
101 
+	 */
102 
+	protected $target = null;
103 103
104 
-    /**
105 
-     * The events to log.
106 
-     *
107 
-     * @var array $events
108 
-     */
109 
-    public $events = array(
110 
-        'connect',
111 
-        'sentHeaders',
112 
-        'sentBodyPart',
113 
-        'receivedHeaders',
114 
-        'receivedBody',
115 
-        'disconnect',
116 
-    );
104 
+	/**
105 
+	 * The events to log.
106 
+	 *
107 
+	 * @var array $events
108 
+	 */
109 
+	public $events = array(
110 
+		'connect',
111 
+		'sentHeaders',
112 
+		'sentBodyPart',
113 
+		'receivedHeaders',
114 
+		'receivedBody',
115 
+		'disconnect',
116 
+	);
117 117
118 
-    // }}}
119 
-    // __construct() {{{
118 
+	// }}}
119 
+	// __construct() {{{
120 120
121 
-    /**
122 
-     * Constructor.
123 
-     *
124 
-     * @param mixed $target Can be a file path (default: php://output), a resource,
125 
-     *                      or an instance of the PEAR Log class.
126 
-     * @param array $events Array of events to listen to (default: all events)
127 
-     *
128 
-     * @return void
129 
-     */
130 
-    public function __construct($target = 'php://output', array $events = array())
131 
-    {
132 
-        if (!empty($events)) {
133 
-            $this->events = $events;
134 
-        }
135 
-        if (is_resource($target) || $target instanceof Log) {
136 
-            $this->target = $target;
137 
-        } elseif (false === ($this->target = @fopen($target, 'ab'))) {
138 
-            throw new HTTP_Request2_Exception("Unable to open '{$target}'");
139 
-        }
140 
-    }
121 
+	/**
122 
+	 * Constructor.
123 
+	 *
124 
+	 * @param mixed $target Can be a file path (default: php://output), a resource,
125 
+	 *                      or an instance of the PEAR Log class.
126 
+	 * @param array $events Array of events to listen to (default: all events)
127 
+	 *
128 
+	 * @return void
129 
+	 */
130 
+	public function __construct($target = 'php://output', array $events = array())
131 
+	{
132 
+		if (!empty($events)) {
133 
+			$this->events = $events;
134 
+		}
135 
+		if (is_resource($target) || $target instanceof Log) {
136 
+			$this->target = $target;
137 
+		} elseif (false === ($this->target = @fopen($target, 'ab'))) {
138 
+			throw new HTTP_Request2_Exception("Unable to open '{$target}'");
139 
+		}
140 
+	}
141 141
142 
-    // }}}
143 
-    // update() {{{
142 
+	// }}}
143 
+	// update() {{{
144 144
145 
-    /**
146 
-     * Called when the request notifies us of an event.
147 
-     *
148 
-     * @param HTTP_Request2 $subject The HTTP_Request2 instance
149 
-     *
150 
-     * @return void
151 
-     */
152 
-    public function update(SplSubject $subject)
153 
-    {
154 
-        $event = $subject->getLastEvent();
155 
-        if (!in_array($event['name'], $this->events)) {
156 
-            return;
157 
-        }
145 
+	/**
146 
+	 * Called when the request notifies us of an event.
147 
+	 *
148 
+	 * @param HTTP_Request2 $subject The HTTP_Request2 instance
149 
+	 *
150 
+	 * @return void
151 
+	 */
152 
+	public function update(SplSubject $subject)
153 
+	{
154 
+		$event = $subject->getLastEvent();
155 
+		if (!in_array($event['name'], $this->events)) {
156 
+			return;
157 
+		}
158 158
159 
-        switch ($event['name']) {
160 
-        case 'connect':
161 
-            $this->log('* Connected to ' . $event['data']);
162 
-            break;
163 
-        case 'sentHeaders':
164 
-            $headers = explode("\r\n", $event['data']);
165 
-            array_pop($headers);
166 
-            foreach ($headers as $header) {
167 
-                $this->log('> ' . $header);
168 
-            }
169 
-            break;
170 
-        case 'sentBodyPart':
171 
-            $this->log('> ' . $event['data'] . ' byte(s) sent');
172 
-            break;
173 
-        case 'receivedHeaders':
174 
-            $this->log(sprintf('< HTTP/%s %s %s',
175 
-                $event['data']->getVersion(),
176 
-                $event['data']->getStatus(),
177 
-                $event['data']->getReasonPhrase()));
178 
-            $headers = $event['data']->getHeader();
179 
-            foreach ($headers as $key => $val) {
180 
-                $this->log('< ' . $key . ': ' . $val);
181 
-            }
182 
-            $this->log('< ');
183 
-            break;
184 
-        case 'receivedBody':
185 
-            $this->log($event['data']->getBody());
186 
-            break;
187 
-        case 'disconnect':
188 
-            $this->log('* Disconnected');
189 
-            break;
190 
-        }
191 
-    }
159 
+		switch ($event['name']) {
160 
+		case 'connect':
161 
+			$this->log('* Connected to ' . $event['data']);
162 
+			break;
163 
+		case 'sentHeaders':
164 
+			$headers = explode("\r\n", $event['data']);
165 
+			array_pop($headers);
166 
+			foreach ($headers as $header) {
167 
+				$this->log('> ' . $header);
168 
+			}
169 
+			break;
170 
+		case 'sentBodyPart':
171 
+			$this->log('> ' . $event['data'] . ' byte(s) sent');
172 
+			break;
173 
+		case 'receivedHeaders':
174 
+			$this->log(sprintf('< HTTP/%s %s %s',
175 
+				$event['data']->getVersion(),
176 
+				$event['data']->getStatus(),
177 
+				$event['data']->getReasonPhrase()));
178 
+			$headers = $event['data']->getHeader();
179 
+			foreach ($headers as $key => $val) {
180 
+				$this->log('< ' . $key . ': ' . $val);
181 
+			}
182 
+			$this->log('< ');
183 
+			break;
184 
+		case 'receivedBody':
185 
+			$this->log($event['data']->getBody());
186 
+			break;
187 
+		case 'disconnect':
188 
+			$this->log('* Disconnected');
189 
+			break;
190 
+		}
191 
+	}
192 192
193 
-    // }}}
194 
-    // log() {{{
193 
+	// }}}
194 
+	// log() {{{
195 195
196 
-    /**
197 
-     * Logs the given message to the configured target.
198 
-     *
199 
-     * @param string $message Message to display
200 
-     *
201 
-     * @return void
202 
-     */
203 
-    protected function log($message)
204 
-    {
205 
-        if ($this->target instanceof Log) {
206 
-            $this->target->debug($message);
207 
-        } elseif (is_resource($this->target)) {
208 
-            fwrite($this->target, $message . "\r\n");
209 
-        }
210 
-    }
196 
+	/**
197 
+	 * Logs the given message to the configured target.
198 
+	 *
199 
+	 * @param string $message Message to display
200 
+	 *
201 
+	 * @return void
202 
+	 */
203 
+	protected function log($message)
204 
+	{
205 
+		if ($this->target instanceof Log) {
206 
+			$this->target->debug($message);
207 
+		} elseif (is_resource($this->target)) {
208 
+			fwrite($this->target, $message . "\r\n");
209 
+		}
210 
+	}
211 211
212 
-    // }}}
212 
+	// }}}
213 213 
 }
214 214
215 215 
 ?>
216 216 
\ No newline at end of file
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch 
@@ -158,17 +158,17 @@  discard block
 
 block discarded – undo
158 158
159 159 
         switch ($event['name']) {
160 160 
         case 'connect':
161 
-            $this->log('* Connected to ' . $event['data']);
161 
+            $this->log('* Connected to '.$event['data']);
162 162 
             break;
163 163 
         case 'sentHeaders':
164 164 
             $headers = explode("\r\n", $event['data']);
165 165 
             array_pop($headers);
166 166 
             foreach ($headers as $header) {
167 
-                $this->log('> ' . $header);
167 
+                $this->log('> '.$header);
168 168 
             }
169 169 
             break;
170 170 
         case 'sentBodyPart':
171 
-            $this->log('> ' . $event['data'] . ' byte(s) sent');
171 
+            $this->log('> '.$event['data'].' byte(s) sent');
172 172 
             break;
173 173 
         case 'receivedHeaders':
174 174 
             $this->log(sprintf('< HTTP/%s %s %s',
 
@@ -177,7 +177,7 @@  discard block
 
 block discarded – undo
177 177 
                 $event['data']->getReasonPhrase()));
178 178 
             $headers = $event['data']->getHeader();
179 179 
             foreach ($headers as $key => $val) {
180 
-                $this->log('< ' . $key . ': ' . $val);
180 
+                $this->log('< '.$key.': '.$val);
181 181 
             }
182 182 
             $this->log('< ');
183 183 
             break;
 
@@ -205,7 +205,7 @@  discard block
 
 block discarded – undo
205 205 
         if ($this->target instanceof Log) {
206 206 
             $this->target->debug($message);
207 207 
         } elseif (is_resource($this->target)) {
208 
-            fwrite($this->target, $message . "\r\n");
208 
+            fwrite($this->target, $message."\r\n");
209 209 
         }
210 210 
     }
211 211
Please login to merge, or discard this patch.