Attach token name and value to request when persist mode is on

[ivandokov]

PR #60 introduced persist mode for the token, but there is a BC break. When the persist mode is turned on the token name and value are not attached to the request. This fixes the issue.

PS: @akrabat please add Style CI or something else to format the code in PSR2 because PhpStorm automatically does some whitespace changes and stuff on save and I know from my previous PR that you don't like these.

[geggleto]

I would prefer if this if-block was changed as it is not very easy to read.

if ($this->persistentTokenMode === false) {
     $request = $this->generateNewToken($request);
} else {
   $pair = $this->loadLastKeyPair() ? $this->keyPair : $this->generateToken();
   $request = $this->attachRequestAttributes($request, $pair);
}

[geggleto]

/cc @akrabat

[ivandokov]

Indeed it's not really easy to read, but I don't see a prettier way to put it right. Any suggestions?

[geggleto]

See above comments.

[alexweissman]

Oh, interesting - I didn't think about the fact that generateNewToken was attaching the token to the request. I guess since I always retrieve them through the getTokenName and getTokenValue methods, I didn't notice this BC.

Good call on adding unit tests for updating the request object, too. This is a great example of the importance of unit testing.

[akrabat]

The fork has gone away?

[ivandokov]

I accidentally deleted it while cleaning my old repos. I don't think it's a problem unless changes are required. In this case I will re-fork it and make a new PR @akrabat

[geggleto]

@akrabat this looks okay to merge; but I cannot :D

[akrabat]

Sorry, I missed your reply @ivandokov

I get this:

rob@swiftsure ~/Projects/slim-framework/Slim-Csrf  (master)$ hub checkout https://github.com/slimphp/Slim-Csrf/pull/67
Error: that fork is not available anymore

So I think that a branch is needed.

[ivandokov]

@akrabat I re-created the PR so you can merge it now. I'm sorry for the trouble.