Merge branch '3.2'

nicolas-grekas · nicolas-grekas · commit 8c7f78262012 · 2017-01-12T21:17:32.000+01:00
* 3.2:
  Fix test
diff --git a/Tests/Fixtures/Validation/Category.php b/Tests/Fixtures/Validation/Category.php
@@ -11,7 +11,7 @@ class Category
     public $id;
 
     /**
-     * @Assert\Type(Category::NAME_PATTERN)
+     * @Assert\Type("string")
      */
     public $name;
 }
diff --git a/Tests/Fixtures/Validation/SubCategory.php b/Tests/Fixtures/Validation/SubCategory.php
@@ -7,7 +7,7 @@
 class SubCategory extends Category
 {
     /**
-     * @Assert\Type(Category::class)
+     * @Assert\Type("string")
      */
     public $main;
 }

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ class Category`
`11`	`11`	`public $id;`
`12`	`12`
`13`	`13`	`/**`
`14`		`- * @Assert\Type(Category::NAME_PATTERN)`
	`14`	`+ * @Assert\Type("string")`
`15`	`15`	`*/`
`16`	`16`	`public $name;`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`class SubCategory extends Category`
`8`	`8`	`{`
`9`	`9`	`/**`
`10`		`- * @Assert\Type(Category::class)`
	`10`	`+ * @Assert\Type("string")`
`11`	`11`	`*/`
`12`	`12`	`public $main;`
`13`	`13`	`}`