composer.json angepasst

Die Package Information so gesetzt, dass sie auf das neue Repository verweisen
psr-4 autoload
2024-02-08 13:56:28 +01:00 · 2021-06-02 14:50:16 +02:00 · 2021-06-02 14:29:41 +02:00 · 2021-06-02 14:15:36 +02:00 · 2021-06-02 13:41:15 +02:00 · 2017-02-24 09:06:01 -08:00
5 changed files with 48 additions and 27 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,9 @@
 .DS_Store
+.idea
 build
 composer.lock
 composer.phar
 coverage
 vendor
+
+composer
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ To install unirest-php with Composer, just add the following to your `composer.j
 ```json
 {
    "require-dev": {
-        "mashape/unirest-php": "2.*"
+        "mashape/unirest-php": "3.*"
    }
 }
 ```
--- a/composer.json
+++ b/composer.json
@@ -1,9 +1,9 @@
 {
-  "name": "mashape/unirest-php",
+  "name": "bitmotor/unirest-php",
  "description": "Unirest PHP",
  "keywords": ["rest", "curl", "http", "https", "client"],
  "type": "library",
-  "homepage": "https://github.com/Mashape/unirest-php",
+  "homepage": "https://git.steeeg.de/bitmotor/unirest-php",
  "license": "MIT",
  "author": "Mashape <opensource@mashape.com> (https://www.mashape.com)",
  "require": {
@@ -18,9 +18,7 @@
    "codeclimate/php-test-reporter": "0.1.*"
  },
  "autoload": {
-    "psr-0": {
-      "Unirest": "src"
-    }
+    "psr-4": { "Unirest\\": "src/Unirest" }
  },
  "support": {
    "email": "opensource@mashape.com"
--- a/src/Unirest/Request.php
+++ b/src/Unirest/Request.php
@@ -2,10 +2,6 @@

 namespace Unirest;

-use Unirest\Method as Method;
-use Unirest\Response as Response;
-use Unirest\Exception as Exception;
-
 class Request
 {
    private static $cookie = null;
@@ -86,6 +82,7 @@ class Request
     * Set default headers to send on every request
     *
     * @param array $headers headers array
+     * @return array
     */
    public static function defaultHeaders($headers)
    {
@@ -159,7 +156,7 @@ class Request
    }

    /**
-     * Set a coockie string for enabling coockie handling
+     * Set a cookie string for enabling cookie handling
     *
     * @param string $cookie
     */
@@ -169,7 +166,7 @@ class Request
    }

    /**
-     * Set a coockie file path for enabling coockie handling
+     * Set a cookie file path for enabling cookie handling
     *
     * $cookieFile must be a correct path with write permission
     *
@@ -232,7 +229,7 @@ class Request
     * @param mixed $parameters parameters to send in the querystring
     * @param string $username Authentication username (deprecated)
     * @param string $password Authentication password (deprecated)
-     * @return Unirest\Response
+     * @return Response
     */
    public static function get($url, $headers = array(), $parameters = null, $username = null, $password = null)
    {
@@ -246,7 +243,7 @@ class Request
     * @param mixed $parameters parameters to send in the querystring
     * @param string $username Basic Authentication username (deprecated)
     * @param string $password Basic Authentication password (deprecated)
-     * @return Unirest\Response
+     * @return Response
     */
    public static function head($url, $headers = array(), $parameters = null, $username = null, $password = null)
    {
@@ -260,7 +257,7 @@ class Request
     * @param mixed $parameters parameters to send in the querystring
     * @param string $username Basic Authentication username
     * @param string $password Basic Authentication password
-     * @return Unirest\Response
+     * @return Response
     */
    public static function options($url, $headers = array(), $parameters = null, $username = null, $password = null)
    {
@@ -274,7 +271,7 @@ class Request
     * @param mixed $parameters parameters to send in the querystring
     * @param string $username Basic Authentication username (deprecated)
     * @param string $password Basic Authentication password (deprecated)
-     * @return Unirest\Response
+     * @return Response
     */
    public static function connect($url, $headers = array(), $parameters = null, $username = null, $password = null)
    {
@@ -288,7 +285,7 @@ class Request
     * @param mixed $body POST body data
     * @param string $username Basic Authentication username (deprecated)
     * @param string $password Basic Authentication password (deprecated)
-     * @return Unirest\Response response
+     * @return Response response
     */
    public static function post($url, $headers = array(), $body = null, $username = null, $password = null)
    {
@@ -302,7 +299,7 @@ class Request
     * @param mixed $body DELETE body data
     * @param string $username Basic Authentication username (deprecated)
     * @param string $password Basic Authentication password (deprecated)
-     * @return Unirest\Response
+     * @return Response
     */
    public static function delete($url, $headers = array(), $body = null, $username = null, $password = null)
    {
@@ -316,7 +313,7 @@ class Request
     * @param mixed $body PUT body data
     * @param string $username Basic Authentication username (deprecated)
     * @param string $password Basic Authentication password (deprecated)
-     * @return Unirest\Response
+     * @return Response
     */
    public static function put($url, $headers = array(), $body = null, $username = null, $password = null)
    {
@@ -330,7 +327,7 @@ class Request
     * @param mixed $body PATCH body data
     * @param string $username Basic Authentication username (deprecated)
     * @param string $password Basic Authentication password (deprecated)
-     * @return Unirest\Response
+     * @return Response
     */
    public static function patch($url, $headers = array(), $body = null, $username = null, $password = null)
    {
@@ -344,7 +341,7 @@ class Request
     * @param mixed $body TRACE body data
     * @param string $username Basic Authentication username (deprecated)
     * @param string $password Basic Authentication password (deprecated)
-     * @return Unirest\Response
+     * @return Response
     */
    public static function trace($url, $headers = array(), $body = null, $username = null, $password = null)
    {
@@ -385,21 +382,28 @@ class Request

    /**
     * Send a cURL request
-     * @param Unirest\Method|string $method HTTP method to use
+     * @param \Unirest\Method|string $method HTTP method to use
     * @param string $url URL to send the request to
     * @param mixed $body request body
     * @param array $headers additional headers to send
     * @param string $username Authentication username (deprecated)
     * @param string $password Authentication password (deprecated)
-     * @throws Unirest\Exception if a cURL error occurs
-     * @return Unirest\Response
+     * @throws \Unirest\Exception if a cURL error occurs
+     * @return Response
     */
    public static function send($method, $url, $body = null, $headers = array(), $username = null, $password = null)
    {
        self::$handle = curl_init();

        if ($method !== Method::GET) {
-            curl_setopt(self::$handle, CURLOPT_CUSTOMREQUEST, $method);
+			if ($method === Method::POST) {
+				curl_setopt(self::$handle, CURLOPT_POST, true);
+			} else {
+                 if ($method === Method::HEAD) {
+                    curl_setopt(self::$handle, CURLOPT_NOBODY, true);
+                 }
+				curl_setopt(self::$handle, CURLOPT_CUSTOMREQUEST, $method);
+			}

            curl_setopt(self::$handle, CURLOPT_POSTFIELDS, $body);
        } elseif (is_array($body)) {
@@ -504,7 +508,7 @@ class Request
    {
        $formattedHeaders = array();

-        $combinedHeaders = array_change_key_case(array_merge((array) $headers, self::$defaultHeaders));
+        $combinedHeaders = array_change_key_case(array_merge(self::$defaultHeaders, (array) $headers));

        foreach ($combinedHeaders as $key => $val) {
            $formattedHeaders[] = self::getHeaderString($key, $val);
@@ -551,7 +555,7 @@ class Request
            $query = '?' . http_build_query(self::getArrayFromQuerystring($query));
        }

-        if ($port && $port[0] !== ':') {
+        if ($port && (!is_array($port) || $port[0] !== ':')) {
            $port = ':' . $port;
        }

--- a/tests/Unirest/RequestTest.php
+++ b/tests/Unirest/RequestTest.php
@@ -48,6 +48,12 @@ class UnirestRequestTest extends \PHPUnit_Framework_TestCase
        $this->assertObjectHasAttribute('header2', $response->body->headers);
        $this->assertEquals('world', $response->body->headers->header2);

+        $response = Request::get('http://mockbin.com/request', ['header1' => 'Custom value']);
+
+        $this->assertEquals(200, $response->code);
+        $this->assertObjectHasAttribute('header1', $response->body->headers);
+        $this->assertEquals('Custom value', $response->body->headers->header1);
+
        Request::clearDefaultHeaders();

        $response = Request::get('http://mockbin.com/request');
@@ -245,6 +251,16 @@ class UnirestRequestTest extends \PHPUnit_Framework_TestCase
        $this->assertEquals('John', $response->body->queryString->name[1]);
    }

+    // HEAD
+    public function testHead()
+    {
+        $response = Request::head('http://mockbin.com/request?name=Mark', array(
+          'Accept' => 'application/json'
+        ));
+
+        $this->assertEquals(200, $response->code);
+    }
+
    // POST
    public function testPost()
    {
Author	SHA1	Message	Date
Grischa Brockhaus	b46a35cf6a	composer.json angepasst Die Package Information so gesetzt, dass sie auf das neue Repository verweisen	2024-02-08 13:56:28 +01:00
Grischa Brockhaus	87642e3e05	psr-4 autoload	2021-06-02 14:50:16 +02:00
Grischa Brockhaus	3ba32276cc	ignore composer installation	2021-06-02 14:29:41 +02:00
Grischa Brockhaus	e65aef7c8f	Renaming	2021-06-02 14:15:36 +02:00
Grischa Brockhaus	655607d739	parse_url does not return port as array, but it is used as array in Request.php So I added a check, wether this is an array actually, else I use the port as intended as int. I would assume, that that array check is needless altogether but maybe old PHP versions needed that?	2021-06-02 13:41:15 +02:00
thenetexperts	14aa9aa691	feat(HEAD): CURLOPT_NOBODY option for HEAD requests * When using HEAD requests set the appropriate curl header to not wait for a response body. See http://www.php.net/manual/en/function.curl-setopt.php on CURLOPT_NOBODY. * Add simple test for HEAD request.	2017-02-24 09:06:01 -08:00
Kieran O'Reilly	842c0f242d	Fix composer package (#100 ) * Update composer.json * Remove trailing comma	2016-08-11 13:49:21 -04:00
İrfan Evrens	5d304c6f6c	improved syntax and some codes. (#108 ) * improved syntax and some codes. * back to original for Body.php	2016-05-31 12:59:14 -04:00
Ahmad Nassri	53656bf519	Merge pull request #105 from voodoodrul/patch-2 Don't use CURLOPT_CUSTOMREQUEST for POSTs	2016-04-29 19:54:44 -04:00
Ahmad Nassri	889ca14f5f	Merge pull request #106 from Lozzano/master Fixing current version in README.	2016-04-25 10:03:29 -04:00
André Valentin	45274fd536	Fixing current version in README. The current version wasn't showed as the one people should add in their composer files. Updated from 2.* to 3.*.	2016-04-25 15:02:42 +02:00
Jesse Skrivseth	a3446f6d99	Update Request.php Remove curl_setopt(self::$handle, CURLOPT_POSTREDIR, 3); in favor of the caller being well-behaved and setting this option as needed	2016-04-19 23:05:11 -06:00
Jesse Skrivseth	e9ea4dbee2	Don't use CURLOPT_CUSTOMREQUEST for POSTs I think the current usage of CURLOPT_CUSTOMREQUEST is wrong. As far as I can tell CURLOPT_CUSTOMREQUEST = Method::POST is not the same thing as CURLOPT_POST = true. I struggled for hours with POSTed data not being accepted by IIS. First IIS threw an HTTP 411 due to curl not sending a Content-Length header. That is solved by replacing CURLOPT_CUSTOMREQUEST with CURLOPT_POST in the case of actual POSTs. Also, IIS in my case returns an HTTP 301 redirect, which I need Unirest to follow, so I set the CURLOPT_POSTREDIR = 3 in order to let the POST follow on redirect via 301 or 302. Notice this: https://curl.haxx.se/libcurl/c/CURLOPT_CUSTOMREQUEST.html - "Many people have wrongly used this option to replace the entire request with their own, including multiple headers and POST contents. While that might work in many cases, it will cause libcurl to send invalid requests and it could possibly confuse the remote server badly. Use CURLOPT_POST and CURLOPT_POSTFIELDS to set POST data. Use CURLOPT_HTTPHEADER to replace or extend the set of headers sent by libcurl. Use CURLOPT_HTTP_VERSION to change HTTP version." In any case, I know that the CURLOPT_POSTREDIR option probably shouldn't go here and should be client configurable, but I can't find a good place for it. It would be nice to have one-shot $curlOpts passed in with the send method, or curlOpts() that otherwise live for only one curl_exec().	2016-04-19 22:49:27 -06:00
Colin Hutchinson	d71cd15d4a	Merge pull request #102 from xcopy/master Typofix	2016-04-14 08:33:01 -04:00
Kairat Jenishev	2d0cd4c8d9	Typofix	2016-04-14 17:01:32 +06:00
Ahmad Nassri	c01f685e3b	Merge pull request #98 from RusinovIG/master Issue with priority of headers	2016-03-23 00:18:08 -04:00
Igor Rusinov	28080c975c	Fixedissue with priority of headers	2016-03-20 20:53:52 +03:00