Merge branch '3.4' into 4.2

nicolas-grekas · nicolas-grekas · commit 48fcd7482d3a · 2019-01-30T18:51:38.000+01:00
* 3.4:
  [DI] Fix dumping Doctrine-like service graphs
  fix serialization workaround in CustomUserMessageAuthenticationException
  PHPUnit Bridge: Rollback to traditional array syntax.
  [Form] fix some docblocks and type checks
diff --git a/AbstractType.php b/AbstractType.php
@@ -52,7 +52,7 @@ public function configureOptions(OptionsResolver $resolver)
      */
     public function getBlockPrefix()
     {
-        return StringUtil::fqcnToBlockPrefix(\get_class($this));
+        return StringUtil::fqcnToBlockPrefix(\get_class($this)) ?: '';
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public function configureOptions(OptionsResolver $resolver)`
`52`	`52`	`*/`
`53`	`53`	`public function getBlockPrefix()`
`54`	`54`	`{`
`55`		`- return StringUtil::fqcnToBlockPrefix(\get_class($this));`
	`55`	`+ return StringUtil::fqcnToBlockPrefix(\get_class($this)) ?: '';`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`/**`