Merge branch 'develop' into testing3/http

codeigniter4 · Oct 10, 2018 · 38a0905 · 38a0905
2 parents b3ae918 + c1e2d88
commit 38a0905
Show file tree

Hide file tree

Showing 10 changed files with 970 additions and 31 deletions.
diff --git a/system/HTTP/CLIRequest.php b/system/HTTP/CLIRequest.php
@@ -124,6 +124,18 @@ public function getOptions(): array
 
 	//--------------------------------------------------------------------
 
+	/**
+	 * Returns the path segments.
+	 *
+	 * @return array
+	 */
+	public function getSegments(): array
+	{
+		return $this->segments;
+	}
+
+	//--------------------------------------------------------------------
+
 	/**
 	 * Returns the value for a single CLI option that was passed in.
 	 *
@@ -178,7 +190,7 @@ public function getOptionString(): string
 			$out .= "-{$name} $value ";
 		}
 
-		return $out;
+		return trim($out);
 	}
 
 	//--------------------------------------------------------------------

diff --git a/system/HTTP/CURLRequest.php b/system/HTTP/CURLRequest.php
@@ -1,4 +1,6 @@
-<?php namespace CodeIgniter\HTTP;
+<?php
+
+namespace CodeIgniter\HTTP;
 
 /**
  * CodeIgniter
@@ -71,10 +73,10 @@ class CURLRequest extends Request
 	 * @var array
 	 */
 	protected $config = [
-		'timeout'			 => 0.0,
-		'connect_timeout'	 => 150,
-		'debug'				 => false,
-		'verify'			 => true
+		'timeout' => 0.0,
+		'connect_timeout' => 150,
+		'debug' => false,
+		'verify' => true
 	];
 
 	/**
@@ -84,9 +86,9 @@ class CURLRequest extends Request
 	 * @var array
 	 */
 	protected $redirectDefaults = [
-		'max'		 => 5,
-		'strict'	 => true,
-		'protocols'	 => ['http', 'https'],
+		'max' => 5,
+		'strict' => true,
+		'protocols' => ['http', 'https'],
 	];
 
 	/**
@@ -114,7 +116,10 @@ public function __construct(App $config, URI $uri, ResponseInterface $response =
 	{
 		if ( ! function_exists('curl_version'))
 		{
+			// we won't see this during travis-CI
+			// @codeCoverageIgnoreStart
 			throw HTTPException::forMissingCurl();
+			// @codeCoverageIgnoreEnd
 		}
 
 		parent::__construct($config);
@@ -571,7 +576,7 @@ protected function setCURLOptions(array $curl_options = [], array $config = [])
 				$cert = $cert[0];
 			}
 
-			if (! file_exists($cert))
+			if ( ! file_exists($cert))
 			{
 				throw HTTPException::forSSLCertNotFound($cert);
 			}
@@ -586,7 +591,7 @@ protected function setCURLOptions(array $curl_options = [], array $config = [])
 			{
 				$file = realpath($config['ssl_key']);
 
-				if (! $file)
+				if ( ! $file)
 				{
 					throw HTTPException::forInvalidSSLKey($config['ssl_key']);
 				}
@@ -723,6 +728,8 @@ protected function setCURLOptions(array $curl_options = [], array $config = [])
 	 * Does the actual work of initializing cURL, setting the options,
 	 * and grabbing the output.
 	 *
+	 * @codeCoverageIgnore
+	 *
 	 * @param array $curl_options
 	 *
 	 * @return string

diff --git a/system/HTTP/Exceptions/HTTPException.php b/system/HTTP/Exceptions/HTTPException.php
@@ -11,6 +11,9 @@ class HTTPException extends FrameworkException implements ExceptionInterface
 	 * For CurlRequest
 	 *
 	 * @return \CodeIgniter\HTTP\Exceptions\HTTPException
+	 * 
+	 * Not testable with travis-ci
+	 * @codeCoverageIgnore		
 	 */
 	public static function forMissingCurl()
 	{
@@ -48,6 +51,9 @@ public static function forInvalidSSLKey(string $key)
 	 * @param string $error
 	 *
 	 * @return \CodeIgniter\HTTP\Exceptions\HTTPException
+	 * 
+	 * Not testable with travis-ci; we over-ride the method which triggers it
+	 * @codeCoverageIgnore		
 	 */
 	public static function forCurlError(string $errorNum, string $error)
 	{

diff --git a/tests/_support/HTTP/Files/CookiesHolder.txt b/tests/_support/HTTP/Files/CookiesHolder.txt
@@ -0,0 +1 @@
+
diff --git a/tests/_support/HTTP/MockCURLRequest.php b/tests/_support/HTTP/MockCURLRequest.php
@@ -1,4 +1,6 @@
-<?php namespace Tests\Support\HTTP;
+<?php
+
+namespace Tests\Support\HTTP;
 
 use CodeIgniter\HTTP\CURLRequest;
 
@@ -11,8 +13,8 @@
  */
 class MockCURLRequest extends CURLRequest
 {
-	public $curl_options;
 
+	public $curl_options;
 	protected $output = '';
 
 	//--------------------------------------------------------------------
@@ -35,5 +37,16 @@ protected function sendRequest(array $curl_options = []): string
 	}
 
 	//--------------------------------------------------------------------
+	// for testing purposes only
+	public function getBaseURI()
+	{
+		return $this->baseURI;
+	}
+
+	// for testing purposes only
+	public function getDelay()
+	{
+		return $this->delay;
+	}
 
 }