Merge pull request #3 from zfegg/develop

1. Fix default invalidHandler. 2. Add set psr attribute
zfegg · Jan 17, 2017 · 1f629c5 · 1f629c5
2 parents d377109 + 68bf16b
commit 1f629c5
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 4 deletions.
diff --git a/src/ContentValidationListenerFactory.php b/src/ContentValidationListenerFactory.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Zfegg\ContentValidation;
+
+use Interop\Container\ContainerInterface;
+
+/**
+ * Class ContentValidatioinListenerFactory
+ * @package Zfegg\ContentValidation
+ */
+class ContentValidationListenerFactory
+{
+
+    public function __invoke(ContainerInterface $container)
+    {
+        $listener = new ContentValidationListener();
+        $listener->setInputFilterManager($container->get('InputFilterManager'));
+
+        return $listener;
+    }
+}
diff --git a/src/ContentValidationMiddleware.php b/src/ContentValidationMiddleware.php
@@ -13,11 +13,33 @@
  */
 class ContentValidationMiddleware
 {
-    const INPUT_FILTER_NAME = 'Zfegg\ContentValidation\InputFilter';
     use ContentValidationTrait;
 
+    const INPUT_FILTER_NAME = 'Zfegg\ContentValidation\InputFilter';
+    const INPUT_FILTER = 'input_filter';
+
     protected $inputFilter;
 
+    protected $requestInputFilterKeyName = self::INPUT_FILTER;
+
+    /**
+     * @return string
+     */
+    public function getRequestInputFilterKeyName()
+    {
+        return $this->requestInputFilterKeyName;
+    }
+
+    /**
+     * @param string $requestInputFilterKeyName
+     * @return $this
+     */
+    public function setRequestInputFilterKeyName($requestInputFilterKeyName)
+    {
+        $this->requestInputFilterKeyName = $requestInputFilterKeyName;
+        return $this;
+    }
+
     /**
      * @return InputFilterInterface
      */
@@ -39,8 +61,8 @@ public function setInputFilter(InputFilterInterface $inputFilter)
     public function __construct(InputFilterPluginManager $inputFilters = null, callable $invalidHandler = null)
     {
         $defaultInvalidHandler = function ($self, $request, ResponseInterface $response, $next) {
-            $response->withStatus(422);
-            $response->withHeader('Content-Type', 'application/json');
+            $response = $response->withStatus(422);
+            $response = $response->withHeader('Content-Type', 'application/json');
             $response->getBody()->write(json_encode([
                 'status' => 422,
                 'detail' => 'Failed Validation',
@@ -73,6 +95,7 @@ public function __invoke(ServerRequestInterface $request, ResponseInterface $res
         $inputFilter = $inputFilters->get($inputFilterName);
 
         $this->setInputFilter($inputFilter);
+        $request = $request->withAttribute(self::INPUT_FILTER, $inputFilter);
 
         if ($request->getMethod() == 'GET') {
             $data = $request->getQueryParams();

diff --git a/test/ContentValidationMiddlewareTest.php b/test/ContentValidationMiddlewareTest.php
@@ -65,7 +65,10 @@ public function testInvoke($inputFilterName, ServerRequest $request, $responseBo
         $request = $request->withAttribute(ContentValidationMiddleware::INPUT_FILTER_NAME, $inputFilterName);
 
         $this->initInputFilters($middleware->getInputFilterManager());
-        $response = $middleware($request, $response, function ($request, Response $response) {
+        $response = $middleware($request, $response, function (ServerRequestInterface $request, Response $response)
+ use ($middleware) {
+            $inputFilter = $request->getAttribute(ContentValidationMiddleware::INPUT_FILTER);
+            $this->assertEquals($middleware->getInputFilter(), $inputFilter);
             $this->assertInstanceOf(ServerRequestInterface::class, $request);
             $this->assertInstanceOf(ResponseInterface::class, $response);