bump dependencies and tweak docs

schnittstabil · Apr 4, 2016 · c75f2cd · c75f2cd
1 parent 2599b0e
commit c75f2cd
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 12 deletions.
diff --git a/composer.json b/composer.json
@@ -41,8 +41,8 @@
     "require": {
         "php": ">=5.6.0",
         "psr/http-message": "^1.0",
-        "schnittstabil/csrf-tokenservice": "^1.0",
-        "schnittstabil/psr7-middleware-stack": "^2.0",
+        "schnittstabil/csrf-tokenservice": "^2.0",
+        "schnittstabil/psr7-middleware-stack": "^3.0",
         "schnittstabil/get": "^2.0"
     },
     "suggest": {

diff --git a/readme.md b/readme.md
@@ -2,7 +2,7 @@
 
 [![SensioLabsInsight](https://insight.sensiolabs.com/projects/189bdd73-5c9b-489f-bdd9-a4d139250502/big.png)](https://insight.sensiolabs.com/projects/189bdd73-5c9b-489f-bdd9-a4d139250502)
 
-> Stateless PSR-7 CSRF (Cross-Site Request Forgery) protection middleware - simple Slim Framework 3 integration.
+> Stateless PSR-7 CSRF (Cross-Site Request Forgery) protection middleware :lock_with_ink_pen:
 
 
 ## Install
@@ -43,7 +43,9 @@ $csrfMiddleware = CsrfMiddlewareBuilder::create($key)
 ```
 
 
-### Slim Example
+### Slim v3 Example
+
+* See [csrf-twig-helpers/examples](https://github.com/schnittstabil/csrf-twig-helpers) for a complete Slim-Twig Example.
 
 ```php
 <?php

diff --git a/src/Middleware.php b/src/Middleware.php
@@ -2,23 +2,24 @@
 
 namespace Schnittstabil\Psr7\Csrf;
 
-use Schnittstabil\Csrf\TokenService;
-use Schnittstabil\Csrf\TokenServiceInterface;
+use Schnittstabil\Csrf\TokenService\TokenService;
+use Schnittstabil\Csrf\TokenService\TokenServiceInterface;
 use Schnittstabil\Psr7\Csrf\Middlewares\AcceptHeaderToken;
 use Schnittstabil\Psr7\Csrf\Middlewares\AcceptMethods;
 use Schnittstabil\Psr7\Csrf\Middlewares\AcceptParsedBodyToken;
 use Schnittstabil\Psr7\Csrf\Middlewares\Guard;
 use Schnittstabil\Psr7\Csrf\Middlewares\GuardInterface;
 use Schnittstabil\Psr7\Csrf\Middlewares\RespondWithCookieToken;
 use Schnittstabil\Psr7\Csrf\Middlewares\RespondWithHeaderToken;
-use Schnittstabil\Psr7\Middleware\CallableStackTrait;
+use Schnittstabil\Psr7\MiddlewareStack\CallableMiddlewareStackTrait;
+use Schnittstabil\Psr7\MiddlewareStack\MiddlewareStackInterface;
 
 /**
  * CSRF protection middleware.
  */
-class Middleware implements \Schnittstabil\Psr7\Middleware\StackInterface
+class Middleware implements MiddlewareStackInterface
 {
-    use CallableStackTrait;
+    use CallableMiddlewareStackTrait;
 
     protected $isGuarded;
     protected $tokenService;

diff --git a/src/MiddlewareBuilder.php b/src/MiddlewareBuilder.php
@@ -2,8 +2,8 @@
 
 namespace Schnittstabil\Psr7\Csrf;
 
-use Schnittstabil\Csrf\TokenService;
-use Schnittstabil\Csrf\TokenServiceInterface;
+use Schnittstabil\Csrf\TokenService\TokenService;
+use Schnittstabil\Csrf\TokenService\TokenServiceInterface;
 
 /**
  * CSRF protection middleware builder.

diff --git a/tests/MiddlewareTest.php b/tests/MiddlewareTest.php
@@ -2,7 +2,7 @@
 
 namespace Schnittstabil\Psr7\Csrf;
 
-use Schnittstabil\Csrf\TokenServiceInterface;
+use Schnittstabil\Csrf\TokenService\TokenServiceInterface;
 use Schnittstabil\Psr7\Csrf\Middlewares\GuardInterface;
 
 /**