feature: Support PHP ^8.0 (#69)

* feature: Support PHP ^8.0 * feature: Support PHP ^8.0
dvsa · Apr 25, 2024 · 8e62453 · 8e62453
1 parent fa56bc7
commit 8e62453
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 5 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -9,7 +9,7 @@ jobs:
   security:
     uses: dvsa/.github/.github/workflows/php-library-security.yml@main
     with:
-      php-versions: '["8.0"]'
+      php-versions: '["8.0","8.1","8.2","8.3"]'
     secrets:
       SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
 
@@ -21,5 +21,5 @@ jobs:
   tests:
     uses: dvsa/.github/.github/workflows/php-library-tests.yml@main
     with:
-      php-versions: '["8.0"]'
+      php-versions: '["8.0","8.1","8.2","8.3"]'
       fail-fast: false
diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "olcs/olcs-transfer",
     "description": "OLCS Transfer",
     "require": {
-        "php": "~8.0.0",
+        "php": "^8.0",
         "ext-openssl": "*",
         "laminas/laminas-stdlib": "^3.0",
         "laminas/laminas-filter": "^2.30",
@@ -59,7 +59,7 @@
             "bamarni/composer-bin-plugin": true
         },
         "platform": {
-            "ext-redis": "4.3"
+            "ext-redis": "5.0.2"
         }
     }
 }
diff --git a/src/Util/StructuredInput.php b/src/Util/StructuredInput.php
@@ -495,7 +495,7 @@ public function getMessages()
      *
      * @return int
      */
-    public function count()
+    public function count(): int
     {
         return count($this->inputs);
     }

diff --git a/src/Validators/Order.php b/src/Validators/Order.php
@@ -17,6 +17,11 @@ class Order extends \Laminas\Validator\AbstractValidator
 
     public function isValid($value)
     {
+        if (!is_string($value)) {
+            $this->error(self::NOT_ASC_OR_DESC);
+            return false;
+        }
+
         $values = explode(',', $value);
         foreach ($values as $order) {
             $order = trim(strtoupper($order));

diff --git a/src/Validators/Sort.php b/src/Validators/Sort.php
@@ -12,6 +12,11 @@ class Sort extends \Laminas\Validator\AbstractValidator
 
     public function isValid($value)
     {
+        if (!is_string($value)) {
+            $this->error(self::INVALID_SORT);
+            return false;
+        }
+
         if (preg_match('/[^a-zA-Z0-9 \.\-_,]/', $value) !== 0) {
             $this->error(self::INVALID_SORT);
             return false;