Merge pull request #21 from zfegg/develop

php 8.3 support, and update deps.
zfegg · Aug 22, 2024 · 4c9fb62 · 4c9fb62
2 parents 64fc677 + 704f9ff
commit 4c9fb62
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 13 deletions.
diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml
@@ -12,7 +12,7 @@ jobs:
       fail-fast: false
       matrix:
         operating-system: [ubuntu-latest]
-        php-versions: ['7.4', '8.0', '8.1', '8.2']
+        php-versions: ['7.4', '8.0', '8.1', '8.2', '8.3']
     steps:
       - name: Checkout
         uses: actions/checkout@v2

diff --git a/composer.json b/composer.json
@@ -21,11 +21,12 @@
         "ext-pdo": "*",
         "doctrine/annotations": "^1.13",
         "doctrine/cache": "^1.11",
-        "doctrine/orm": "^2.9",
-        "laminas/laminas-diactoros": "^2.5",
+        "doctrine/orm": "^2.9 || ^3.0",
+        "laminas/laminas-diactoros": "^2.0 || ^3.3.1",
         "laminas/laminas-eventmanager": "^3.0",
         "laminas/laminas-filter": "^2.11",
-        "laminas/laminas-servicemanager": "^3.7",
+        "laminas/laminas-servicemanager": "^3.7 || ^4.0",
+        "laminas/laminas-validator": "^2.0",
         "mezzio/mezzio-router": "^3.0",
         "phpspec/prophecy-phpunit": "^2.0",
         "phpunit/phpunit": "9.5.16",

diff --git a/src/ContentValidationMiddleware.php b/src/ContentValidationMiddleware.php
@@ -83,7 +83,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
         }
 
         $data = Helper::toJSON($data);
-        $result = $this->validator->validate($data, $schema);
+        $result = $this->validator->validate($data, $schema, $request->getAttributes());
 
         if (! $result->isValid()) {
             return ($this->invalidHandler)(

diff --git a/src/Opis/Filter/DbalRecordExistsFilter.php b/src/Opis/Filter/DbalRecordExistsFilter.php
@@ -35,8 +35,7 @@ public function validate(ValidationContext $context, Schema $schema, array $args
         }
 
         $exists = $args['exists'] ?? false;
-        $sth = $db->prepare($sql);
-        $row = $sth->executeQuery([$context->currentData()])->fetchNumeric();
+        $row = $db->executeQuery($sql, [$context->currentData()])->fetchNumeric();
 
         return $row[0] == $exists;
     }

diff --git a/src/Opis/Keyword/TransformerKeyword.php b/src/Opis/Keyword/TransformerKeyword.php
@@ -42,12 +42,9 @@ public function validate(ValidationContext $context, Schema $schema): ?Validatio
             }
 
             $func = $filter->types[$type];
-
+            $args = [];
             if ($filter->args) {
                 $args = (array)$filter->args->resolve($context->rootData(), $context->currentDataPath());
-                $args += $context->globals();
-            } else {
-                $args = $context->globals();
             }
 
             if ($func instanceof TransformerInterface) {

diff --git a/src/Opis/Transformer/LaminasTransformer.php b/src/Opis/Transformer/LaminasTransformer.php
@@ -22,7 +22,7 @@ public function __construct(FilterPluginManager $filterManager, string $name)
     /**
      * @inheritDoc
      */
-    public function transform($data, ValidationContext $context, SchemaInfo $info, array $args)
+    public function transform($data, ValidationContext $context, SchemaInfo $info, array $args = [])
     {
         return $this->filters->get($this->name, $args)->filter($data);
     }

diff --git a/src/Opis/Transformer/TransformerInterface.php b/src/Opis/Transformer/TransformerInterface.php
@@ -13,5 +13,5 @@ interface TransformerInterface
      * @param mixed $data
      * @return mixed
      */
-    public function transform($data, ValidationContext $context, SchemaInfo $info, array $args);
+    public function transform($data, ValidationContext $context, SchemaInfo $info, array $args = []);
 }