PSR-15 Support

[l0gicgate]

Closes #102

[l0gicgate]

@adriansuter sorry, this is a big PR. Had to literally rewrite everything..

[adriansuter]

Wonderful. Some comments.

[l0gicgate]

@adriansuter great review. Will fix all of it and re-request approval. Thank you for your attention to detail 😂

[adriansuter]

Readme review.

[adriansuter]

phpstan gives the following output. Should we tackle those?

 ------ -------------------------------------------------------------------------------------------------------
  Line   Guard.php
 ------ -------------------------------------------------------------------------------------------------------
  135    Variable $_SESSION in isset() always exists and is not nullable.
  156    Property Slim\Csrf\Guard::$failureHandler (callable) does not accept (callable)|null.
  285    Parameter #1 $var of function count expects array|Countable, array|ArrayAccess given.
  424    Elseif condition is always true.
  426    Parameter #2 $pair of method Slim\Csrf\Guard::appendTokenToRequest() expects array, array|null given.

[adriansuter]

Appreciate your work. Thanks. I still have some minor comments.

[l0gicgate]

@adriansuter there's only a couple PHPStan errors to fix but I think this is fine honestly:

------ -------------------------------------------------------------------------------------------------------
  Line   Guard.php
 ------ -------------------------------------------------------------------------------------------------------
  135    Variable $_SESSION in isset() always exists and is not nullable.
  285    Parameter #1 $var of function count expects array|Countable, array|ArrayAccess given.
  426    Parameter #2 $pair of method Slim\Csrf\Guard::appendTokenToRequest() expects array, array|null given.

Variable $_SESSION in isset() always exists and is not nullable.

That's actually not true, if session_start() hasn't been called, isset($_SESSION) returns false

Parameter #1 $var of function count expects array|Countable, array|ArrayAccess given.

Not sure if we can do a workaround for this, it's because we use count($this->storage). Can we figure out how to make this work for both objects/arrays?

Parameter #2 $pair of method Slim\Csrf\Guard::appendTokenToRequest() expects array,

PHPStan sucks, that's all I can say. It doesn't parse the condition.

[adriansuter]

That's actually not true, if session_start() hasn't been called, isset($_SESSION) returns false

While you are right, there is a scenario where $_SESSION might be set but the session does not exist. For example if the session was started and later on destroyed. In this case we should maybe rather use

        if (session_status() !== PHP_SESSION_ACTIVE) {

Not sure if we can do a workaround for this, it's because we use count($this->storage). Can we figure out how to make this work for both objects/arrays?

How about

        if (is_array($this->storage) && empty($this->storage)) {
            return null;
        }
        if ($this->storage instanceof ArrayAccess) {
            if (!($this->storage instanceof Countable)) {
                throw new RuntimeException('The Csrf storage is not countable.');
            }
            if (count($this->storage) < 1) {
                return null;
            }
        }

[l0gicgate]

@adriansuter instead of this:

        if ($this->storage instanceof ArrayAccess) {
            if (!($this->storage instanceof Countable)) {
                throw new RuntimeException('The Csrf storage is not countable.');
            }
            if (count($this->storage) < 1) {
                return null;
            }
        }

I went with making ArrayAccess, Iterator and Countable mandatory. I don't even know why we're going through these hoops, it should just be a mandatory array.. It's adding so much complexity for no reason with little added flexibility.

This is what the getLastKeyPair() logic looks like instead..

        if (
            (is_array($this->storage) && empty($this->storage))
            || ($this->storage instanceof Countable && count($this->storage) < 1)
        ) {
            return null;
        }

[adriansuter]

Great work!!