This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Fixing up style errors and line endings in JMediawiki

  • Loading branch information...
1 parent 7466fcc commit 71f3311698a0febdab9c30bf0bbc57b98fa23432 @dongilbert dongilbert committed Mar 17, 2013

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -1,92 +1,94 @@
-<?php
-/**
- * @package Joomla.Platform
- * @subpackage MediaWiki
- *
- * @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
- * @license GNU General Public License version 2 or later; see LICENSE
- */
-
-defined('JPATH_PLATFORM') or die;
-
-/**
- * HTTP client class for connecting to a MediaWiki instance.
- *
- * @package Joomla.Platform
- * @subpackage MediaWiki
- * @since 12.3
- */
-class JMediawikiHttp extends JHttp
-{
- /**
- * Constructor.
- *
- * @param JRegistry $options Client options object.
- * @param JHttpTransport $transport The HTTP transport object.
- *
- * @since 12.3
- */
- public function __construct(JRegistry $options = null, JHttpTransport $transport = null)
- {
- // Override the JHttp contructor to use JHttpTransportStream.
- $this->options = isset($options) ? $options : new JRegistry;
- $this->transport = isset($transport) ? $transport : new JHttpTransportStream($this->options);
-
- // Make sure the user agent string is defined.
- $this->options->def('api.useragent', 'JMediawiki/1.0');
-
- // Set the default timeout to 120 seconds.
- $this->options->def('api.timeout', 120);
- }
-
- /**
- * Method to send the GET command to the server.
- *
- * @param string $url Path to the resource.
- * @param array $headers An array of name-value pairs to include in the header of the request.
- *
- * @return JHttpResponse
- *
- * @since 12.3
- */
- public function get($url, array $headers = null)
- {
- // Look for headers set in the options.
- $temp = (array) $this->options->get('headers');
- foreach ($temp as $key => $val)
- {
- if (!isset($headers[$key]))
- {
- $headers[$key] = $val;
- }
- }
-
- return $this->transport->request('GET', new JUri($url), null, $headers, $this->options->get('api.timeout'), $this->options->get('api.useragent'));
- }
-
- /**
- * Method to send the POST command to the server.
- *
- * @param string $url Path to the resource.
- * @param mixed $data Either an associative array or a string to be sent with the request.
- * @param array $headers An array of name-value pairs to include in the header of the request.
- *
- * @return JHttpResponse
- *
- * @since 12.3
- */
- public function post($url, $data, array $headers = null)
- {
- // Look for headers set in the options.
- $temp = (array) $this->options->get('headers');
- foreach ($temp as $key => $val)
- {
- if (!isset($headers[$key]))
- {
- $headers[$key] = $val;
- }
- }
-
- return $this->transport->request('POST', new JUri($url), $data, $headers, $this->options->get('api.timeout'), $this->options->get('api.useragent'));
- }
-}
+<?php
+/**
+ * @package Joomla.Platform
+ * @subpackage MediaWiki
+ *
+ * @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
+ * @license GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * HTTP client class for connecting to a MediaWiki instance.
+ *
+ * @package Joomla.Platform
+ * @subpackage MediaWiki
+ * @since 12.3
+ */
+class JMediawikiHttp extends JHttp
+{
+ /**
+ * Constructor.
+ *
+ * @param JRegistry $options Client options object.
+ * @param JHttpTransport $transport The HTTP transport object.
+ *
+ * @since 12.3
+ */
+ public function __construct(JRegistry $options = null, JHttpTransport $transport = null)
+ {
+ // Override the JHttp contructor to use JHttpTransportStream.
+ $this->options = isset($options) ? $options : new JRegistry;
+ $this->transport = isset($transport) ? $transport : new JHttpTransportStream($this->options);
+
+ // Make sure the user agent string is defined.
+ $this->options->def('api.useragent', 'JMediawiki/1.0');
+
+ // Set the default timeout to 120 seconds.
+ $this->options->def('api.timeout', 120);
+ }
+
+ /**
+ * Method to send the GET command to the server.
+ *
+ * @param string $url Path to the resource.
+ * @param array $headers An array of name-value pairs to include in the header of the request.
+ *
+ * @return JHttpResponse
+ *
+ * @since 12.3
+ */
+ public function get($url, array $headers = null)
+ {
+ // Look for headers set in the options.
+ $temp = (array) $this->options->get('headers');
+
+ foreach ($temp as $key => $val)
+ {
+ if (!isset($headers[$key]))
+ {
+ $headers[$key] = $val;
+ }
+ }
+
+ return $this->transport->request('GET', new JUri($url), null, $headers, $this->options->get('api.timeout'), $this->options->get('api.useragent'));
+ }
+
+ /**
+ * Method to send the POST command to the server.
+ *
+ * @param string $url Path to the resource.
+ * @param mixed $data Either an associative array or a string to be sent with the request.
+ * @param array $headers An array of name-value pairs to include in the header of the request.
+ *
+ * @return JHttpResponse
+ *
+ * @since 12.3
+ */
+ public function post($url, $data, array $headers = null)
+ {
+ // Look for headers set in the options.
+ $temp = (array) $this->options->get('headers');
+
+ foreach ($temp as $key => $val)
+ {
+ if (!isset($headers[$key]))
+ {
+ $headers[$key] = $val;
+ }
+ }
+
+ return $this->transport->request('POST', new JUri($url), $data, $headers, $this->options->get('api.timeout'), $this->options->get('api.useragent'));
+ }
+}
Oops, something went wrong.

0 comments on commit 71f3311

Please sign in to comment.