fix merge issues for #850

mevdschee · May 28, 2022 · db421b2 · db421b2
1 parent f302a1c
commit db421b2
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/api.include.php b/api.include.php
@@ -9114,6 +9114,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
     use Psr\Http\Message\ServerRequestInterface;
     use Psr\Http\Server\RequestHandlerInterface;
     use Tqdev\PhpCrudApi\Column\ReflectionService;
+    use Tqdev\PhpCrudApi\Config;
     use Tqdev\PhpCrudApi\Controller\Responder;
     use Tqdev\PhpCrudApi\Middleware\Base\Middleware;
     use Tqdev\PhpCrudApi\Middleware\Router\Router;
@@ -9123,9 +9124,9 @@ class TextSearchMiddleware extends Middleware
     {
         private $reflection;
 
-        public function __construct(Router $router, Responder $responder, array $properties, ReflectionService $reflection)
+        public function __construct(Router $router, Responder $responder, Config $config, string $middleware, ReflectionService $reflection)
         {
-            parent::__construct($router, $responder, $properties);
+            parent::__construct($router, $responder, $config, $middleware);
             $this->reflection = $reflection;
         }
 
@@ -11697,7 +11698,7 @@ public function __construct(Config $config)
                         new CustomizationMiddleware($router, $responder, $config, $middleware, $reflection);
                         break;
                     case 'textSearch':
-                        new TextSearchMiddleware($router, $responder, $properties, $reflection);
+                        new TextSearchMiddleware($router, $responder, $config, $middleware, $reflection);
                         break;
                     case 'xml':
                         new XmlMiddleware($router, $responder, $config, $middleware, $reflection);

diff --git a/api.php b/api.php
@@ -9114,6 +9114,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
     use Psr\Http\Message\ServerRequestInterface;
     use Psr\Http\Server\RequestHandlerInterface;
     use Tqdev\PhpCrudApi\Column\ReflectionService;
+    use Tqdev\PhpCrudApi\Config;
     use Tqdev\PhpCrudApi\Controller\Responder;
     use Tqdev\PhpCrudApi\Middleware\Base\Middleware;
     use Tqdev\PhpCrudApi\Middleware\Router\Router;
@@ -9123,9 +9124,9 @@ class TextSearchMiddleware extends Middleware
     {
         private $reflection;
 
-        public function __construct(Router $router, Responder $responder, array $properties, ReflectionService $reflection)
+        public function __construct(Router $router, Responder $responder, Config $config, string $middleware, ReflectionService $reflection)
         {
-            parent::__construct($router, $responder, $properties);
+            parent::__construct($router, $responder, $config, $middleware);
             $this->reflection = $reflection;
         }
 
@@ -11697,7 +11698,7 @@ public function __construct(Config $config)
                         new CustomizationMiddleware($router, $responder, $config, $middleware, $reflection);
                         break;
                     case 'textSearch':
-                        new TextSearchMiddleware($router, $responder, $properties, $reflection);
+                        new TextSearchMiddleware($router, $responder, $config, $middleware, $reflection);
                         break;
                     case 'xml':
                         new XmlMiddleware($router, $responder, $config, $middleware, $reflection);

diff --git a/src/Tqdev/PhpCrudApi/Api.php b/src/Tqdev/PhpCrudApi/Api.php
@@ -123,7 +123,7 @@ public function __construct(Config $config)
                     new CustomizationMiddleware($router, $responder, $config, $middleware, $reflection);
                     break;
                 case 'textSearch':
-                    new TextSearchMiddleware($router, $responder, $properties, $reflection);
+                    new TextSearchMiddleware($router, $responder, $config, $middleware, $reflection);
                     break;
                 case 'xml':
                     new XmlMiddleware($router, $responder, $config, $middleware, $reflection);

diff --git a/src/Tqdev/PhpCrudApi/Middleware/TextSearchMiddleware.php b/src/Tqdev/PhpCrudApi/Middleware/TextSearchMiddleware.php
@@ -6,6 +6,7 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 use Tqdev\PhpCrudApi\Column\ReflectionService;
+use Tqdev\PhpCrudApi\Config;
 use Tqdev\PhpCrudApi\Controller\Responder;
 use Tqdev\PhpCrudApi\Middleware\Base\Middleware;
 use Tqdev\PhpCrudApi\Middleware\Router\Router;
@@ -15,9 +16,9 @@ class TextSearchMiddleware extends Middleware
 {
     private $reflection;
 
-    public function __construct(Router $router, Responder $responder, array $properties, ReflectionService $reflection)
+    public function __construct(Router $router, Responder $responder, Config $config, string $middleware, ReflectionService $reflection)
     {
-        parent::__construct($router, $responder, $properties);
+        parent::__construct($router, $responder, $config, $middleware);
         $this->reflection = $reflection;
     }