Avoid warning in PHP 7.2 because of non-countable data

wouterj · wouterj · commit cb8112268b44 · 2016-12-10T18:05:24.000+01:00
diff --git a/src/Symfony/Component/Form/Form.php b/src/Symfony/Component/Form/Form.php
@@ -746,9 +746,12 @@ public function isEmpty()
             }
         }
 
-        return FormUtil::isEmpty($this->modelData) ||
-            // arrays, countables
-            0 === count($this->modelData) ||
+        if (FormUtil::isEmpty($this->modelData)) {
+            return true;
+        }
+
+        // arrays, countables
+        return 0 === count($this->modelData) ||
             // traversables that are not countable
             ($this->modelData instanceof \Traversable && 0 === iterator_count($this->modelData));
     }

Original file line number	Diff line number	Diff line change
`@@ -746,9 +746,12 @@ public function isEmpty()`
`746`	`746`	`}`
`747`	`747`	`}`
`748`	`748`
`749`		`- return FormUtil::isEmpty($this->modelData) \|\|`
`750`		`- // arrays, countables`
`751`		`- 0 === count($this->modelData) \|\|`
	`749`	`+ if (FormUtil::isEmpty($this->modelData)) {`
	`750`	`+ return true;`
	`751`	`+ }`
	`752`	`+`
	`753`	`+ // arrays, countables`
	`754`	`+ return 0 === count($this->modelData) \|\|`
`752`	`755`	`// traversables that are not countable`
`753`	`756`	`($this->modelData instanceof \Traversable && 0 === iterator_count($this->modelData));`
`754`	`757`	`}`