Use JHttp

Author: Michael Babker

administrator/components/com_patchtester/helpers/curl/curl.php

@@ -14,6 +14,31 @@
  */
 class PatchtesterModelPull extends JModelLegacy
 {
+	/**
+	 * @var  JHttp
+	 */
+	protected $transport;
+
+	/**
+	 * Constructor
+	 *
+	 * @param   array  $config  An array of configuration options (name, state, dbo, table_path, ignore_request).
+	 *
+	 * @since   12.2
+	 * @throws  Exception
+	 */
+	public function __construct($config = array())
+	{
+		parent::__construct($config);
+
+		// Set up the JHttp object
+		$options = new JRegistry;
+		$options->set('userAgent', 'JPatchTester/1.0');
+		$options->set('timeout', 120);
+
+		$this->transport = JHttpFactory::getHttp($options, 'curl');
+	}
+
 	/**
 	 * Method to auto-populate the model state.
 	 *
@@ -104,8 +129,7 @@ public function apply($id)
 			throw new Exception(JText::_('COM_PATCHTESTER_REPO_IS_GONE'));
 		}
 
-		$patch = PTCurl::getAdapter($pull->diff_url)
-			->fetch()->body;
+		$patch = $this->transport->get($pull->diff_url)->body;
 
 		$files = $this->parsePatch($patch);
 
@@ -132,8 +156,7 @@ public function apply($id)
 				$url = 'https://raw.github.com/' . $pull->head->user->login . '/' . $pull->head->repo->name . '/' .
 					$pull->head->ref . '/' . $file->new;
 
-				$file->body = PTCurl::getAdapter($url)
-					->fetch()->body;
+				$file->body = $this->transport->get($url)->body;
 			}
 		}