PHP 8.3

jack-worman · Dec 15, 2023 · b4499e1 · b4499e1
1 parent 9ff20ae
commit b4499e1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -16,6 +16,7 @@ jobs:
         php:
           - "8.1"
           - "8.2"
+          - "8.3"
 
     env:
       MYSQL_USER: "zftest"

diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
     "description": "Monorepo for zf1s (Zend Framework 1) packages",
     "license": "BSD-3-Clause",
     "require": {
-        "php": "^8.1 || ^8.2",
+        "php": "^8.1 || ^8.2 || ^8.3",
         "ext-ctype": "*",
         "ext-dom": "*",
         "ext-gd": "*",

diff --git a/packages/zend-form/library/Zend/Form.php b/packages/zend-form/library/Zend/Form.php
@@ -2260,13 +2260,12 @@ protected function _array_replace_recursive(array $into)
     /**
      * Validate the form
      *
-     * @param  array $data
-     * @throws Zend_Form_Exception
+     * @param  array $value
      * @return bool
      */
-    public function isValid($data)
+    public function isValid($value)
     {
-        if (!is_array($data)) {
+        if (!is_array($value)) {
             // require_once 'Zend/Form/Exception.php';
             throw new Zend_Form_Exception(__METHOD__ . ' expects an array');
         }
@@ -2276,24 +2275,24 @@ public function isValid($data)
 
         if ($this->isArray()) {
             $eBelongTo = $this->getElementsBelongTo();
-            $data = $this->_dissolveArrayValue($data, $eBelongTo);
+            $value = $this->_dissolveArrayValue($value, $eBelongTo);
         }
-        $context = $data;
+        $context = $value;
         /** @var Zend_Form_Element $element */
         foreach ($this->getElements() as $key => $element) {
             if (null !== $translator && $this->hasTranslator()
                     && !$element->hasTranslator()) {
                 $element->setTranslator($translator);
             }
-            $check = $data;
+            $check = $value;
             if (($belongsTo = $element->getBelongsTo()) !== $eBelongTo) {
-                $check = $this->_dissolveArrayValue($data, $belongsTo);
+                $check = $this->_dissolveArrayValue($value, $belongsTo);
             }
             if (!isset($check[$key])) {
                 $valid = $element->isValid(null, $context) && $valid;
             } else {
                 $valid = $element->isValid($check[$key], $context) && $valid;
-                $data = $this->_dissolveArrayUnsetKey($data, $belongsTo, $key);
+                $value = $this->_dissolveArrayUnsetKey($value, $belongsTo, $key);
             }
         }
         /** @var Zend_Form_SubForm $form */
@@ -2302,10 +2301,10 @@ public function isValid($data)
                     && !$form->hasTranslator()) {
                 $form->setTranslator($translator);
             }
-            if (isset($data[$key]) && !$form->isArray()) {
-                $valid = $form->isValid($data[$key]) && $valid;
+            if (isset($value[$key]) && !$form->isArray()) {
+                $valid = $form->isValid($value[$key]) && $valid;
             } else {
-                $valid = $form->isValid($data) && $valid;
+                $valid = $form->isValid($value) && $valid;
             }
         }