From 4dce426be17e4bbc7a7a7695707db2266949473f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 16 Jan 2020 08:33:25 +0100 Subject: [PATCH 1/2] Allow phpunit7 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a74efb71..0cd76f37 100644 --- a/composer.json +++ b/composer.json @@ -51,7 +51,7 @@ "laminas/laminas-text": "^2.6", "laminas/laminas-validator": "^2.6", "laminas/laminas-view": "^2.6.2", - "phpunit/phpunit": "^5.7.23 || ^6.5.3" + "phpunit/phpunit": "^5.7.23 || ^6.5.3 || ^7.5" }, "suggest": { "laminas/laminas-captcha": "^2.7.1, required for using CAPTCHA form elements", From 0a5e011d6aeb98f45533e428ebb5a0e07d8db3bc Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 16 Jan 2020 08:34:01 +0100 Subject: [PATCH 2/2] fix Using array_key_exists() on objects is deprecated --- src/Fieldset.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Fieldset.php b/src/Fieldset.php index f26a56dc..74ad2cbb 100644 --- a/src/Fieldset.php +++ b/src/Fieldset.php @@ -391,7 +391,7 @@ public function populateValues($data) } foreach ($this->iterator as $name => $elementOrFieldset) { - $valueExists = array_key_exists($name, $data); + $valueExists = isset($data[$name]); if ($elementOrFieldset instanceof FieldsetInterface) { if ($valueExists && (is_array($data[$name]) || $data[$name] instanceof Traversable)) {