Merge pull request #178 from vitaliytv/patch-2

j0k3r · web-flow · commit 93a70fe40afd · 2018-03-10T16:37:59.000+01:00
Fix counting of non-countable var for PHP 7.2
diff --git a/lib/form/sfFormField.class.php b/lib/form/sfFormField.class.php
@@ -324,6 +324,10 @@ public function getError()
    */
   public function hasError()
   {
-    return null !== $this->error && count($this->error);
+    if ($this->error instanceof sfValidatorErrorSchema) {
+      return $this->error->count() > 0;
+    }
+    
+    return $this->error !== null;
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -324,6 +324,10 @@ public function getError()`
`324`	`324`	`*/`
`325`	`325`	`public function hasError()`
`326`	`326`	`{`
`327`		`- return null !== $this->error && count($this->error);`
	`327`	`+ if ($this->error instanceof sfValidatorErrorSchema) {`
	`328`	`+ return $this->error->count() > 0;`
	`329`	`+ }`
	`330`	`+`
	`331`	`+ return $this->error !== null;`
`328`	`332`	`}`
`329`	`333`	`}`