new process

pluf · Mar 8, 2021 · 04a5285 · 04a5285
1 parent 7ba242e
commit 04a5285
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/Process/Http/IfPathAndMethodIs.php b/src/Process/Http/IfPathAndMethodIs.php
@@ -24,18 +24,23 @@
 class IfPathAndMethodIs
 {
 
-    private string $regex;
+    private array $regex;
 
     private array $methods;
 
     private bool $removePrefix = true;
 
-    public function __construct(string $regex, array $methods = [
+    public function __construct(string|array $regex, array $methods = [
         'GET',
         'POST',
         'DELETE'
     ], bool $removePrefix = true)
     {
+        if (is_string($regex)) {
+            $regex = [
+                $regex
+            ];
+        }
         $this->regex = $regex;
         $this->methods = $methods;
         $this->removePrefix = $removePrefix;
@@ -47,7 +52,14 @@ public function __invoke(RequestInterface $request, UnitTrackerInterface $unitTr
         $requestPath = $uri->getPath();
         $method = $request->getMethod();
         $match = [];
-        if (! in_array($method, $this->methods) || ! preg_match($this->regex, $requestPath, $match)) {
+        $matched = false;
+        foreach ($this->regex as $regex){
+            if(preg_match($regex, $requestPath, $match)){
+                $matched  = true;
+                break;
+            }
+        }
+        if (! in_array($method, $this->methods) || ! $matched) {
             return $unitTracker->jump();
         }
         if ($this->removePrefix) {

diff --git a/src/Process/Http/RequestToEntityQuery.php b/src/Process/Http/RequestToEntityQuery.php
@@ -23,7 +23,6 @@ public function __invoke(ServerRequestInterface $request, EntityManager $entityM
         $collectionQuery = $objectMapperArray->readValue($request->getQueryParams(), CollectionQuery::class);
 
         // TODO: maso, 2021: validate the collection query
-
         $query = $entityManager->query()
             ->limit($collectionQuery->count, $collectionQuery->start);