Add post_file_path_upload.php

Author: amouhzi

src/Curl/Curl.php

@@ -4,6 +4,15 @@
 
 class Curl {
 
+	// The HTTP authentication method(s) to use.
+
+	const AUTH_BASIC = CURLAUTH_BASIC;
+	const AUTH_DIGEST = CURLAUTH_DIGEST;
+	const AUTH_GSSNEGOTIATE = CURLAUTH_GSSNEGOTIATE;
+	const AUTH_NTLM = CURLAUTH_NTLM;
+	const AUTH_ANY = CURLAUTH_ANY;
+	const AUTH_ANYSAFE = CURLAUTH_ANYSAFE;
+
 	const USER_AGENT = 'PHP Curl/1.1 (+https://github.com/mod-php/curl)';
 
 	private $_cookies = array();
@@ -28,7 +37,7 @@ class Curl {
 	public $response = NULL;
 
 	public function __construct() {
-		
+
 		if (!extension_loaded('curl')) {
 			throw new ErrorException('cURL library is not loaded');
 		}
@@ -73,9 +82,13 @@ public function delete($url, $data=array()) {
 	}
 
 	public function setBasicAuthentication($username, $password) {
-		$this->setopt(CURLOPT_HTTPAUTH, CURLAUTH_BASIC);
+		$this->setHttpAuth(self::AUTH_BASIC);
 		$this->setopt(CURLOPT_USERPWD, $username . ':' . $password);
 	}
+	
+	protected function setHttpAuth($httpauth) {
+		$this->setOpt(CURLOPT_HTTPAUTH, $httpauth);
+	}
 
 	public function setHeader($key, $value) {
 		$this->_headers[$key] = $key . ': ' . $value;

tests/CurlTest.php

@@ -84,11 +84,20 @@ public function testPostMultidimensionalData() {
 	public function testPostFilePathUpload() {
 		$file_path = $this->get_png();
 
-		$this->assertEquals('image/png', $this->server('POST', array(
-				'test' => 'post_file_path_upload',
+		$data = array(
 				'key' => 'image',
 				'image' => '@' . $file_path,
-		)));
+		);
+
+		$this->curl->post($this->test_url . 'post_file_path_upload.php', $data);
+
+		$this->assertEquals(
+				array(
+						'request_method' => 'POST',
+						'key' => 'image',
+						'mime_content_type' => 'image/png'
+				),
+				json_decode($this->curl->response));
 
 		unlink($file_path);
 	}
@@ -144,10 +153,9 @@ public function testBasicHttpAuth() {
 
 		$username = 'myusername';
 		$password = 'mypassword';
+
 		$this->curl->setBasicAuthentication($username, $password);
-		$this->server('GET', array(
-				'test' => 'http_basic_auth',
-		));
+
 		$json = json_decode($this->curl->response);
 		$this->assertTrue($json->username === $username);
 		$this->assertTrue($json->password === $password);

tests/server.php

@@ -4,11 +4,7 @@
 $test = isset($data_values['test']) ? $data_values['test'] : '';
 $key = isset($data_values['key']) ? $data_values['key'] : '';
 
-if ($test === 'post_file_path_upload') {
-    echo mime_content_type($_FILES[$key]['tmp_name']);
-    exit;
-}
-else if ($test === 'put_file_handle') {
+if ($test === 'put_file_handle') {
     $tmp_filename = tempnam('/tmp', 'php-curl-class.');
     file_put_contents($tmp_filename, file_get_contents('php://input'));
     echo mime_content_type($tmp_filename);

tests/server/post_file_path_upload.php

@@ -0,0 +1,19 @@
+<?php
+
+$request_method = isset($_SERVER['REQUEST_METHOD']) ? $_SERVER['REQUEST_METHOD'] : '';
+$data_values = $request_method === 'POST' ? $_POST : $_GET;
+
+$key = isset($data_values['key']) ? $data_values['key'] : '';
+
+$response = array();
+
+$response['request_method'] = $request_method;
+$response['key'] = $key;
+
+if(isset($_FILES[$key])) {
+	$response['mime_content_type'] = mime_content_type($_FILES[$key]['tmp_name']);
+} else {
+	$response['mime_content_type'] = 'ERROR';
+}
+
+echo json_encode($response);