Merging Master from upstream

commit 2bd4b09
Author: Will <[email protected]>
Date:   Tue Mar 22 23:59:29 2016 +0000

    Adding php7 compatibility and squashing these:

    commit bf52ce20f684def3db9f7cdbb384f6f22fa4ff92
    Merge: 44bc7c1 7f6c410
    Author: Will <[email protected]>
    Date:   Tue Mar 22 23:51:21 2016 +0000

        Merge branch 'php7' of https://github.com/WillSkates/TinCanPHP into php7

    commit 44bc7c11b5a05870660d86eda888bdbabee6045e
    Author: Will <[email protected]>
    Date:   Wed Mar 9 22:04:28 2016 +0000

        Attempting to fix incorrect class filenames.

    commit 03e22df0a315e871d850fe98d87004cae5bb7641
    Author: Will <[email protected]>
    Date:   Wed Mar 9 21:53:11 2016 +0000

        Added consistency changes for JSONParseErrorException, moved to using json_last_error_message and enforcing php 5.5+.

    commit c150b2835ba48be476707956c650337fbb0f84cd
    Author: Will <[email protected]>
    Date:   Mon Dec 21 19:20:10 2015 +0000

        adding a fix for php 5.4 not having json_last_error_msg(). Please read the comment there.

    commit 30079a3e12731f3d8776dd491680f4196afb97e3
    Author: Will <[email protected]>
    Date:   Mon Dec 21 19:07:16 2015 +0000

        Testing the multiple ways in which the exception message is written by php5 and php 7.

    commit 1e6d85203d493dd5d90a4977de65336a8eab5641
    Author: Will <[email protected]>
    Date:   Mon Dec 21 18:49:20 2015 +0000

        Now that we have a passing set of tests lets test against the other php versions as well.

    commit 1e83b63e86104cca3d7893e5d5db81eb69f07856
    Author: Will <[email protected]>
    Date:   Mon Dec 21 18:39:14 2015 +0000

        Correcting where I didn't see the word 'exception' being in one place and not the other.

    commit 60743f9bb1d8c761d46df25f61037936be4b4961
    Author: Will <[email protected]>
    Date:   Mon Dec 21 18:35:20 2015 +0000

        Rewording the exception message to be inline with the message that get's outputted.

    commit aa0356a9cd23f978e767a2a2380537bd8ecbce10
    Author: Will <[email protected]>
    Date:   Mon Dec 21 18:30:09 2015 +0000

        dumping reason to see what actually comes out.

    commit 85981410d5c653cffdf46321c3c9d18ae11d7c43
    Author: Will <[email protected]>
    Date:   Mon Dec 21 18:29:28 2015 +0000

        Readding the fix as it seems we don't always get the response code in the headers.

    commit 5f9c3ad8c0e09c7823b00673868d8eef43687224
    Author: Will <[email protected]>
    Date:   Mon Dec 21 18:26:19 2015 +0000

        Removing the fix that uses curl_getinfo as we shouldn't need it now.

    commit bb7109bd827c0c01b9f66a4267c7e9450f8096c5
    Author: Will <[email protected]>
    Date:   Mon Dec 21 18:25:29 2015 +0000

        Response headers now contain all the available information that we need.

    commit d7491ad163af1d2d7ce146cf976f6eabbfbfe9c8
    Author: Will <[email protected]>
    Date:   Mon Dec 21 18:18:35 2015 +0000

        adding fix for the fact that you can no longer turn safe upload off.

    commit a32d43b4abc6f4dd54cbac735722d08b27635988
    Author: Will <[email protected]>
    Date:   Mon Dec 21 18:15:21 2015 +0000

        Undoing safe_upload as it's true by default as of 5.6 and dumping response headers to see that all are in there.

    commit 48bb72afb7462b54262eb1471de01d114966443e
    Author: Will <[email protected]>
    Date:   Mon Dec 21 18:09:28 2015 +0000

        Using the http status code from curl_getinfo if available and not null. Also trying to get the response header lines via an anonymous callback.

    commit b1d6b8a29c199bae59ee1036c53f8e5a24ae2e2e
    Author: Will <[email protected]>
    Date:   Mon Dec 21 17:57:38 2015 +0000

        The remote service isn't returning a response code. checking to see whether it's to do with FOLLOWLOCATION being turned off.

    commit dd11fba2d30f654f9a47a03217c5791b6f62de17
    Author: William Skates <[email protected]>
    Date:   Mon Dec 21 17:21:51 2015 +0000

        For now only updating if a second part is available.

    commit 5431ca5b39935572ba1c58cf6763926e1d553f1a
    Author: William Skates <[email protected]>
    Date:   Mon Dec 21 17:15:37 2015 +0000

        Correcting curl referencing and now looking at the header list alone as it looks like everything is present in the response string.

    commit d8401c651ba8bf6d8adc56b38dc1b1292932ddfc
    Author: William Skates <[email protected]>
    Date:   Mon Dec 21 17:12:02 2015 +0000

        Lets take a look at the raw response and see what's going on as we don't always get all of the headers returned that we need.

    commit 3e98045c7da4e731bbe6c20c80643be1e8b3b0e4
    Author: William Skates <[email protected]>
    Date:   Mon Dec 21 16:48:23 2015 +0000

        dump to check the value of .

    commit 50c4b281c0b3c1e494f975564b06dcb6f3805c9d
    Author: William Skates <[email protected]>
    Date:   Mon Dec 21 16:46:22 2015 +0000

        Correcting namespaced path to Exception.

    commit 31f0e488fe55c0e8e334de8e014f478d6d20a2e9
    Author: William Skates <[email protected]>
    Date:   Mon Dec 21 16:44:39 2015 +0000

        Correcting a variable name.

    commit 3fe0401dd17946b1baa8485bdc5d1ac9f8562de2
    Author: William Skates <[email protected]>
    Date:   Mon Dec 21 16:40:57 2015 +0000

        Removing incorrect variable.

    commit 808e75e5b8a25e7b58ff59d53bf4fe703b0a8299
    Author: William Skates <[email protected]>
    Date:   Mon Dec 21 16:36:40 2015 +0000

        Removing function for parsing response headers and correcting the curl options.

    commit 344a46f288ebb531f0dce1a9ad87479c8c474afb
    Author: William Skates <[email protected]>
    Date:   Mon Dec 21 15:56:31 2015 +0000

        Removing dump.

    commit 5efd95f190adebfc59c8e05ffe95d9949f5c0fc6
    Author: William Skates <[email protected]>
    Date:   Mon Dec 21 15:55:39 2015 +0000

        Dumping out header list to see the format and reworking so that headers come from a function.

    commit 078f2738b780b3f5d3a33f83b04698e8a1ca8549
    Author: William Skates <[email protected]>
    Date:   Mon Dec 21 15:47:59 2015 +0000

        Turning off the verbose output instead.

    commit 0c22e643d54f55287ca93d455670da9b8a8b3751
    Author: William Skates <[email protected]>
    Date:   Mon Dec 21 15:47:05 2015 +0000

        removing outputbuffer as console output remains unaffected.

    commit 1cac7c667a9d9689d451101268082bc6446b2154
    Author: William Skates <[email protected]>
    Date:   Mon Dec 21 15:45:57 2015 +0000

        Checking that content exists seperately.

    commit 66a538913f7188718672cc271c83d46e51684bdb
    Author: William Skates <[email protected]>
    Date:   Mon Dec 21 14:32:55 2015 +0000

        wrapping curl request in an output buffer so that we don't have debug info crowding the phpunit output.

    commit d7c7caecc13af2c9f1297ba6cae1b8307081fe01
    Author: William Skates <[email protected]>
    Date:   Mon Dec 21 14:23:03 2015 +0000

        Converting the header list from the response into an array of header information.

    commit 668ec0192e014fee82603e0499ec5b4b5727784e
    Author: William Skates <[email protected]>
    Date:   Mon Dec 21 14:12:32 2015 +0000

        swapping out the fp stream logic for libcurl.

    commit 688d8abe1b48e2cfbb378c79cec521d4e3180ca0
    Author: William Skates <[email protected]>
    Date:   Mon Dec 21 12:54:01 2015 +0000

        Taking a look at Travis's php7 environment to see what's there/missing.

    commit 8f119de8e5b499e2b0e48077a05432171ebe84f0
    Author: Will <[email protected]>
    Date:   Sat Dec 19 16:58:35 2015 +0000

        reverting changes to travis-ci config from my local version.

    commit f963b9ad2d81c89b3ecefe8da61cc665e22ba610
    Author: Will <[email protected]>
    Date:   Sat Dec 19 16:56:46 2015 +0000

        Unable to resolve why the calls to fopen aren't working as Content-type is being supplied and it still doesn't find it. I'm unable to reproduce this so i'm going to revert and leave it for now.

    commit 76cceb2c098731749fdaa4c6f96831c7d842a2cf
    Author: Will <[email protected]>
    Date:   Sat Dec 19 16:10:17 2015 +0000

        removing hotfix for --with-curlwrappers.

    commit 34e4de26e49652650aaa0d0e34996f18046aba56
    Author: Will <[email protected]>
    Date:   Sat Dec 19 15:57:17 2015 +0000

        Attempting to fix Content-type not being used. I may be missing something else but it looks like you can't use an array of headers if php hasn't been compiled with --curl-wrappers.

    commit 7f6c410
    Author: Will <[email protected]>
    Date:   Wed Mar 9 22:04:28 2016 +0000

        Attempting to fix incorrect class filenames.

    commit 53f6ab4
    Author: Will <[email protected]>
    Date:   Wed Mar 9 21:53:11 2016 +0000

        Added consistency changes for JSONParseErrorException, moved to using json_last_error_message and enforcing php 5.5+.

commit aa3981a
Author: Will <[email protected]>
Date:   Mon Dec 21 19:20:10 2015 +0000

    adding a fix for php 5.4 not having json_last_error_msg(). Please read the comment there.

commit 8517930
Author: Will <[email protected]>
Date:   Mon Dec 21 19:07:16 2015 +0000

    Testing the multiple ways in which the exception message is written by php5 and php 7.

commit a852a8b
Author: Will <[email protected]>
Date:   Mon Dec 21 18:49:20 2015 +0000

    Now that we have a passing set of tests lets test against the other php versions as well.

commit c89464c
Author: Will <[email protected]>
Date:   Mon Dec 21 18:39:14 2015 +0000

    Correcting where I didn't see the word 'exception' being in one place and not the other.

commit 2148266
Author: Will <[email protected]>
Date:   Mon Dec 21 18:35:20 2015 +0000

    Rewording the exception message to be inline with the message that get's outputted.

commit 3ba6785
Author: Will <[email protected]>
Date:   Mon Dec 21 18:30:09 2015 +0000

    dumping reason to see what actually comes out.

commit e832458
Author: Will <[email protected]>
Date:   Mon Dec 21 18:29:28 2015 +0000

    Readding the fix as it seems we don't always get the response code in the headers.

commit 59d067f
Author: Will <[email protected]>
Date:   Mon Dec 21 18:26:19 2015 +0000

    Removing the fix that uses curl_getinfo as we shouldn't need it now.

commit 3a6c3b0
Author: Will <[email protected]>
Date:   Mon Dec 21 18:25:29 2015 +0000

    Response headers now contain all the available information that we need.

commit 50c51a8
Author: Will <[email protected]>
Date:   Mon Dec 21 18:18:35 2015 +0000

    adding fix for the fact that you can no longer turn safe upload off.

commit caefc8d
Author: Will <[email protected]>
Date:   Mon Dec 21 18:15:21 2015 +0000

    Undoing safe_upload as it's true by default as of 5.6 and dumping response headers to see that all are in there.

commit 8ae4606
Author: Will <[email protected]>
Date:   Mon Dec 21 18:09:28 2015 +0000

    Using the http status code from curl_getinfo if available and not null. Also trying to get the response header lines via an anonymous callback.

commit 7ba91a7
Author: Will <[email protected]>
Date:   Mon Dec 21 17:57:38 2015 +0000

    The remote service isn't returning a response code. checking to see whether it's to do with FOLLOWLOCATION being turned off.

commit 515842b
Author: William Skates <[email protected]>
Date:   Mon Dec 21 17:21:51 2015 +0000

    For now only updating if a second part is available.

commit 25f53e0
Author: William Skates <[email protected]>
Date:   Mon Dec 21 17:15:37 2015 +0000

    Correcting curl referencing and now looking at the header list alone as it looks like everything is present in the response string.

commit fd1c64d
Author: William Skates <[email protected]>
Date:   Mon Dec 21 17:12:02 2015 +0000

    Lets take a look at the raw response and see what's going on as we don't always get all of the headers returned that we need.

commit 3785196
Author: William Skates <[email protected]>
Date:   Mon Dec 21 16:48:23 2015 +0000

    dump to check the value of .

commit 4080d8b
Author: William Skates <[email protected]>
Date:   Mon Dec 21 16:46:22 2015 +0000

    Correcting namespaced path to Exception.

commit 08375a2
Author: William Skates <[email protected]>
Date:   Mon Dec 21 16:44:39 2015 +0000

    Correcting a variable name.

commit f4d8430
Author: William Skates <[email protected]>
Date:   Mon Dec 21 16:40:57 2015 +0000

    Removing incorrect variable.

commit ee2e48a
Author: William Skates <[email protected]>
Date:   Mon Dec 21 16:36:40 2015 +0000

    Removing function for parsing response headers and correcting the curl options.

commit ffcc091
Author: William Skates <[email protected]>
Date:   Mon Dec 21 15:56:31 2015 +0000

    Removing dump.

commit ffc3463
Author: William Skates <[email protected]>
Date:   Mon Dec 21 15:55:39 2015 +0000

    Dumping out header list to see the format and reworking so that headers come from a function.

commit d629bbb
Author: William Skates <[email protected]>
Date:   Mon Dec 21 15:47:59 2015 +0000

    Turning off the verbose output instead.

commit e4aec89
Author: William Skates <[email protected]>
Date:   Mon Dec 21 15:47:05 2015 +0000

    removing outputbuffer as console output remains unaffected.

commit 0c32bc7
Author: William Skates <[email protected]>
Date:   Mon Dec 21 15:45:57 2015 +0000

    Checking that content exists seperately.

commit a5d5696
Author: William Skates <[email protected]>
Date:   Mon Dec 21 14:32:55 2015 +0000

    wrapping curl request in an output buffer so that we don't have debug info crowding the phpunit output.

commit ae9b660
Author: William Skates <[email protected]>
Date:   Mon Dec 21 14:23:03 2015 +0000

    Converting the header list from the response into an array of header information.

commit 8493adc
Author: William Skates <[email protected]>
Date:   Mon Dec 21 14:12:32 2015 +0000

    swapping out the fp stream logic for libcurl.

commit 1406a84
Author: William Skates <[email protected]>
Date:   Mon Dec 21 12:54:01 2015 +0000

    Taking a look at Travis's php7 environment to see what's there/missing.

commit 903491a
Author: Will <[email protected]>
Date:   Sat Dec 19 16:58:35 2015 +0000

    reverting changes to travis-ci config from my local version.

commit 2b23149
Author: Will <[email protected]>
Date:   Sat Dec 19 16:56:46 2015 +0000

    Unable to resolve why the calls to fopen aren't working as Content-type is being supplied and it still doesn't find it. I'm unable to reproduce this so i'm going to revert and leave it for now.

commit 939f712
Author: Will <[email protected]>
Date:   Sat Dec 19 16:10:17 2015 +0000

    removing hotfix for --with-curlwrappers.

commit 0de5207
Author: Will <[email protected]>
Date:   Sat Dec 19 16:06:12 2015 +0000

    Having a look to see if it's simply a typo in the calling code for the function where Content-Type should be Content-type.

commit 48368df
Author: Will <[email protected]>
Date:   Sat Dec 19 15:57:17 2015 +0000

    Attempting to fix Content-type not being used. I may be missing something else but it looks like you can't use an array of headers if php hasn't been compiled with --curl-wrappers.

commit 4455330
Author: Will <[email protected]>
Date:   Sat Dec 19 15:42:27 2015 +0000

    Misspelled Content-type.

commit 86176c5
Author: Will <[email protected]>
Date:   Sat Dec 19 15:39:07 2015 +0000

    Missed a variable name correction.

commit bb0d98e
Author: Will <[email protected]>
Date:   Sat Dec 19 15:37:56 2015 +0000

    Missed some context stuff, trying an alternative way of merging headers.

commit 7471d98
Author: Will <[email protected]>
Date:   Sat Dec 19 15:31:43 2015 +0000

    adding content type to the list of headers if it hasn't been provided.

commit edc02c9
Author: Will <[email protected]>
Date:   Sat Dec 19 15:18:45 2015 +0000

    Missed a space character :(.

commit 6011346
Author: Will <[email protected]>
Date:   Sat Dec 19 15:15:22 2015 +0000

    Adding the new exception into the mix.

commit c0f7147
Author: Will <[email protected]>
Date:   Sat Dec 19 15:06:59 2015 +0000

    Using our new exception to test againt when providing malformed json input. We don't need to test whether the output is meaningful because this is tested in the tests for the exception itself. We don't need to check how json_encode behaves with different types of input because this has been done for us see : https://github.com/php/php-src/tree/88f71d921e649a81cd9fb5c93e689e28ade2dfe4/ext/json/tests

commit e6827db
Author: William Skates <[email protected]>
Date:   Wed Dec 16 11:31:11 2015 +0000

    chaning composer requirements to allow php7.

commit 5b74764
Author: William Skates <[email protected]>
Date:   Wed Dec 16 11:22:17 2015 +0000

    only testing against 7 for now.

commit a9e7ec9
Author: William Skates <[email protected]>
Date:   Wed Dec 16 11:21:08 2015 +0000

    Keeping composer up to date.

commit e668e32
Author: William Skates <[email protected]>
Date:   Wed Dec 16 11:18:27 2015 +0000

    Adding php7 to the build config.

commit ea499db
Author: Will <[email protected]>
Date:   Sat Dec 19 15:01:23 2015 +0000

    Adding a JsonParseErrorException that gives us a much more meaningful message back than we are getting currently.

Merging changes from upstream master

…it binary that is installed with composer.

…it binary that is installed with composer.

… is failing under hhvm so i'll have a look to figure out the better way of writing that.