Templating broken with unset

.gitignore

@@ -3,3 +3,6 @@ composer.lock
 vendor
 downloads
 .idea/*
+tests/.phpunit.result.cache
+/rector.php
+/.vs

.travis.yml

@@ -1,17 +1,12 @@
 language: php
 
 php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - hhvm
-
+  - 7.2
+  - 7.3
+  - 7.4
+
 matrix:
   fast_finish: true
-  allow_failures:
-    - php: 7.0
-
+
 script:
   - phpunit -c ./tests/phpunit.xml

README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://secure.travis-ci.org/nategood/httpful.png?branch=master)](http://travis-ci.org/nategood/httpful) [![Total Downloads](https://poser.pugx.org/nategood/httpful/downloads.png)](https://packagist.org/packages/nategood/httpful)
 
-[Httpful](http://phphttpclient.com) is a simple Http Client library for PHP 5.3+.  There is an emphasis of readability, simplicity, and flexibility – basically provide the features and flexibility to get the job done and make those features really easy to use.
+Httpful is a simple Http Client library for PHP 7.2+.  There is an emphasis of readability, simplicity, and flexibility – basically provide the features and flexibility to get the job done and make those features really easy to use.
 
 Features
 
@@ -34,16 +34,6 @@ echo "{$response->body->name} joined GitHub on " .
 
 # Installation
 
-## Phar
-
-A [PHP Archive](http://php.net/manual/en/book.phar.php) (or .phar) file is available for [downloading](http://phphttpclient.com/httpful.phar).  Simply [download](http://phphttpclient.com/httpful.phar) the .phar, drop it into your project, and include it like you would any other php file.  _This method is ideal for smaller projects, one off scripts, and quick API hacking_.
-
-```php
-include('httpful.phar');
-$r = \Httpful\Request::get($uri)->sendIt();
-...
-```
-
 ## Composer
 
 Httpful is PSR-0 compliant and can be installed using [composer](http://getcomposer.org/).  Simply add `nategood/httpful` to your composer.json file.  _Composer is the sane alternative to PEAR.  It is excellent for managing dependencies in larger projects_.
@@ -62,11 +52,7 @@ Because Httpful is PSR-0 compliant, you can also just clone the Httpful reposito
 
 If you want the build your own [Phar Archive](http://php.net/manual/en/book.phar.php) you can use the `build` script included.
 Make sure that your `php.ini` has the *Off* or 0 value for the `phar.readonly` setting.
-Also you need to create ad empty `downloads` directory in the project root.
-
-# Show Me More!
-
-You can checkout the [Httpful Landing Page](http://phphttpclient.com) for more info including many examples and  [documentation](http://phphttpclient.com/docs).
+Also you need to create an empty `downloads` directory in the project root.
 
 # Contributing
 
@@ -81,6 +67,18 @@ Httpful highly encourages sending in pull requests.  When submitting a pull requ
 
 # Changelog
 
+## 0.3.2
+
+ - REFACTOR [PR #276](https://github.com/nategood/httpful/pull/276) Add properly subclassed, more descriptive Exceptions for JSON parse errors
+
+## 0.3.1
+
+ - FIX [PR #286](https://github.com/nategood/httpful/pull/286) Fixed header case sensitivity
+
+## 0.3.0
+
+ - REFACTOR Dropped support for dead versions of PHP. Updated the PHPUnit tests.
+
 ## 0.2.20
 
  - MINOR Move Response building logic into separate function [PR #193](https://github.com/nategood/httpful/pull/193)

composer.json

@@ -4,7 +4,7 @@
     "homepage": "http://github.com/nategood/httpful",
     "license": "MIT",
     "keywords": ["http", "curl", "rest", "restful", "api", "requests"],
-    "version": "0.2.20",
+    "version": "0.3.2",
     "authors": [
         {
             "name": "Nate Good",
@@ -13,7 +13,7 @@
         }
     ],
     "require": {
-        "php": ">=5.3",
+        "php": ">=7.2",
         "ext-curl": "*"
     },
     "autoload": {

src/Httpful/Bootstrap.php

@@ -11,8 +11,8 @@
 class Bootstrap
 {
 
-    const DIR_GLUE = DIRECTORY_SEPARATOR;
-    const NS_GLUE = '\\';
+    public const DIR_GLUE = DIRECTORY_SEPARATOR;
+    public const NS_GLUE = '\\';
 
     public static $registered = false;
 
@@ -21,7 +21,7 @@ class Bootstrap
      */
     public static function init()
     {
-        spl_autoload_register(array('\Httpful\Bootstrap', 'autoload'));
+        spl_autoload_register(['\\' . \Httpful\Bootstrap::class, 'autoload']);
         self::registerHandlers();
     }
 
@@ -32,15 +32,15 @@ public static function init()
      */
     public static function autoload($classname)
     {
-        self::_autoload(dirname(dirname(__FILE__)), $classname);
+        self::_autoload(dirname(__FILE__,2), $classname);
     }
 
     /**
      * Register the autoloader and any other setup needed
      */
     public static function pharInit()
     {
-        spl_autoload_register(array('\Httpful\Bootstrap', 'pharAutoload'));
+        spl_autoload_register(['\\' . \Httpful\Bootstrap::class, 'pharAutoload']);
         self::registerHandlers();
     }
 
@@ -78,12 +78,12 @@ public static function registerHandlers()
 
         // @todo check a conf file to load from that instead of
         // hardcoding into the library?
-        $handlers = array(
+        $handlers = [
             \Httpful\Mime::JSON => new \Httpful\Handlers\JsonHandler(),
             \Httpful\Mime::XML  => new \Httpful\Handlers\XmlHandler(),
             \Httpful\Mime::FORM => new \Httpful\Handlers\FormHandler(),
             \Httpful\Mime::CSV  => new \Httpful\Handlers\CsvHandler(),
-        );
+        ];
 
         foreach ($handlers as $mime => $handler) {
             // Don't overwrite if the handler has already been registered

src/Httpful/Exception/ConnectionErrorException.php

@@ -1,7 +1,54 @@
-<?php 
+<?php
 
 namespace Httpful\Exception;
 
-class ConnectionErrorException extends \Exception 
-{
+
+class ConnectionErrorException extends \Exception {
+
+
+	/**
+	 * @var string
+	 */
+	private $curlErrorNumber;
+
+	/**
+	 * @var string
+	 */
+	private $curlErrorString;
+
+	/**
+	 * @return string
+	 */
+	public function getCurlErrorNumber() {
+		return $this->curlErrorNumber;
+	}
+
+	/**
+	 * @param string $curlErrorNumber
+	 * @return $this
+	 */
+	public function setCurlErrorNumber($curlErrorNumber) {
+		$this->curlErrorNumber = $curlErrorNumber;
+
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getCurlErrorString() {
+		return $this->curlErrorString;
+	}
+
+	/**
+	 * @param string $curlErrorString
+	 * @return $this
+	 */
+	public function setCurlErrorString($curlErrorString) {
+		$this->curlErrorString = $curlErrorString;
+
+		return $this;
+	}
+
+
 }

src/Httpful/Handlers/CsvHandler.php

@@ -18,13 +18,13 @@ public function parse($body)
         if (empty($body))
             return null;
 
-        $parsed = array();
+        $parsed = [];
         $fp = fopen('data://text/plain;base64,' . base64_encode($body), 'r');
         while (($r = fgetcsv($fp)) !== FALSE) {
             $parsed[] = $r;
         }
 
-        if (empty($parsed))
+        if ($parsed === [])
             throw new \Exception("Unable to parse response as CSV");
         return $parsed;
     }
@@ -33,7 +33,7 @@ public function parse($body)
      * @param mixed $payload
      * @return string
      */
-    public function serialize($payload)
+    public function serialize($payload): string
     {
         $fp = fopen('php://temp/maxmemory:'. (6*1024*1024), 'r+');
         $i = 0;

src/Httpful/Handlers/FormHandler.php

@@ -14,7 +14,7 @@ class FormHandler extends MimeHandlerAdapter
      */
     public function parse($body)
     {
-        $parsed = array();
+        $parsed = [];
         parse_str($body, $parsed);
         return $parsed;
     }
@@ -23,7 +23,7 @@ public function parse($body)
      * @param mixed $payload
      * @return string
      */
-    public function serialize($payload)
+    public function serialize($payload): string
     {
         return http_build_query($payload, null, '&');
     }

src/Httpful/Handlers/JsonHandler.php

@@ -14,7 +14,7 @@ class JsonHandler extends MimeHandlerAdapter
 
     public function init(array $args)
     {
-        $this->decode_as_array = !!(array_key_exists('decode_as_array', $args) ? $args['decode_as_array'] : false);
+        $this->decode_as_array = (bool) ($args['decode_as_array'] ?? false);
     }
 
     /**
@@ -37,7 +37,7 @@ public function parse($body)
      * @param mixed $payload
      * @return string
      */
-    public function serialize($payload)
+    public function serialize($payload): string
     {
         return json_encode($payload);
     }

src/Httpful/Handlers/MimeHandlerAdapter.php

@@ -10,7 +10,7 @@
 
 class MimeHandlerAdapter
 {
-    public function __construct(array $args = array())
+    public function __construct(array $args = [])
     {
         $this->init($args);
     }
@@ -36,18 +36,18 @@ public function parse($body)
      * @param mixed $payload
      * @return string
      */
-    function serialize($payload)
+    function serialize($payload): string
     {
         return (string) $payload;
     }
 
-    protected function stripBom($body)
+    protected function stripBom($body): string
     {
         if ( substr($body,0,3) === "\xef\xbb\xbf" )  // UTF-8
             $body = substr($body,3);
-        else if ( substr($body,0,4) === "\xff\xfe\x00\x00" || substr($body,0,4) === "\x00\x00\xfe\xff" )  // UTF-32
+        elseif ( substr($body,0,4) === "\xff\xfe\x00\x00" || substr($body,0,4) === "\x00\x00\xfe\xff" )  // UTF-32
             $body = substr($body,4);
-        else if ( substr($body,0,2) === "\xff\xfe" || substr($body,0,2) === "\xfe\xff" )  // UTF-16
+        elseif ( substr($body,0,2) === "\xff\xfe" || substr($body,0,2) === "\xfe\xff" )  // UTF-16
             $body = substr($body,2);
         return $body;
     }