summaryrefslogtreecommitdiffstats
path: root/php-zendframework-zend-validator-pr190.patch
blob: 1d4693391871239166422e1a64b67c313dd8aa5c (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
From 61969df070bbfa3e889b253738828064b8ff211b Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 4 Aug 2017 09:59:14 +0200
Subject: [PATCH] fix for PHP 7.2, count(): Parameter must be an array or an
 object that implements Countable

---
 src/File/Upload.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/File/Upload.php b/src/File/Upload.php
index 55025f63..b03dc4a6 100644
--- a/src/File/Upload.php
+++ b/src/File/Upload.php
@@ -109,10 +109,10 @@ public function getFiles($file = null)
      */
     public function setFiles($files = [])
     {
-        if (count($files) === 0) {
-            $this->options['files'] = $_FILES;
-        } else {
+        if (is_array($files) && count($files) > 0) {
             $this->options['files'] = $files;
+        } else {
+            $this->options['files'] = $_FILES;
         }
 
         if ($this->options['files'] === null) {