Params Added

[Balamir]

No description provided.

[GrahamCampbell]

Please could you rebase and force push to avoid the merge commit?

[GrahamCampbell]

Ping @notifymehq/owners for review.

[Balamir]

For future?

[GrahamCampbell]

For future?

What do you mean?

[jbrooksuk]

What do you mean?

Huh?

[jbrooksuk]

Also a 👍 for me.

[GrahamCampbell]

[Balamir]

(; Haha, funny.

I'm using Github for Windows and I couldn't find that option. So, totally it's fault.

(; Yes, a 👍 for you, @jbrooksuk

[GrahamCampbell]

Now there are even more merge commits. ;(

[GrahamCampbell]

Just open the cli and run the git commands manually. GitHub for windows doesn't have a way to force push.

[Balamir]

Ok, I'll try.

[Balamir]

I tried but it's says "everything up-to-date". I guess I'm doing something wrong. Sorry :(

So, I couldn't figured out.

[GrahamCampbell]

You need to git pull --rebase upstream master first.

[GrahamCampbell]

If it says that doesn't exist, run git remote add upstream https://github.com/notifymehq/notifyme.

[Balamir]

Thats the result:

[GrahamCampbell]

Why the guzzle change?

[Balamir]

The new version of guzzlehttp is doesn't pass the 'body' option for the request. It's deprecated and changed to 'form_params'. When I try, it's give an error:

Passing in the "body" request option as an array to send a POST request
has been deprecated. Please use the "form_params" request option to send
a application/x-www-form-urlencoded request, or a the "multipart"
request option to send a multipart/form-data request.

So, I changed it.

[GrahamCampbell]

We need to support both versions of guzzle.

[joecohens]

if (version_compare(ClientInterface::VERSION, '6') === 1) {
    $request['form_params'] = $params;      
} else {
    $request['body'] = $params;
}

/cc @Balamir

[GrahamCampbell]

There might be cases in the other adapters too.

[Balamir]

Could we use like that:

    // GuzzleHttp Version < 6
    $param_querystring = 'body';
    // GuzzleHttp Version = 6
    if ( version_compare( ClientInterface::VERSION, '6' )  === 1 ) {
        $param_querystring = 'form_params';      
    }

/cc @joecohens

This should be apply to Pushover, Twilio, Yo adapters too.

[joecohens]

@Balamir maybe it's simpler

$requestBodyKey = (version_compare( ClientInterface::VERSION, '6' ) === 1) ? 'form_params' : 'body';

Also can you squash please?

[Balamir]

Also can you squash please?

@joecohens What do you mean?

[jbrooksuk]

@joecohens What do you mean?

Make it into one commit :)