Only count on arrays or countables to avoid warnings in PHP 7.2

wouterj · wouterj · commit 94253e8a23ec · 2016-12-10T19:18:03.000+01:00
diff --git a/src/Symfony/Component/Form/Form.php b/src/Symfony/Component/Form/Form.php
@@ -748,7 +748,7 @@ public function isEmpty()
 
         return FormUtil::isEmpty($this->modelData) ||
             // arrays, countables
-            0 === count($this->modelData) ||
+            ((is_array($this->modelData) || $this->modelData instanceof \Countable) && 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
`@@ -748,7 +748,7 @@ public function isEmpty()`
`748`	`748`
`749`	`749`	`return FormUtil::isEmpty($this->modelData) \|\|`
`750`	`750`	`// arrays, countables`
`751`		`- 0 === count($this->modelData) \|\|`
	`751`	`+ ((is_array($this->modelData) \|\| $this->modelData instanceof \Countable) && 0 === count($this->modelData)) \|\|`
`752`	`752`	`// traversables that are not countable`
`753`	`753`	`($this->modelData instanceof \Traversable && 0 === iterator_count($this->modelData));`
`754`	`754`	`}`