Merge branch '4.4'

nicolas-grekas · nicolas-grekas · commit 9f4dad31e2be · 2019-06-06T18:44:19.000+02:00
* 4.4:
  fix typo
diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php
@@ -39,7 +39,7 @@ class ValidatorCacheWarmer extends AbstractPhpFileCacheWarmer
      */
     public function __construct($validatorBuilder, string $phpArrayFile)
     {
-        if (!$validatorBuilder instanceof ValidatorBuilder || !$validatorBuilder instanceof ValidatorBuilderInterface) {
+        if (!$validatorBuilder instanceof ValidatorBuilder && !$validatorBuilder instanceof ValidatorBuilderInterface) {
             throw new \TypeError(sprintf('Argument 1 passed to %s() must be an instance of %s, %s given.', __METHOD__, ValidatorBuilder::class, \is_object($validatorBuilder) ? \get_class($validatorBuilder) : \gettype($validatorBuilder)));
         }
         if (2 < \func_num_args() && \func_get_arg(2) instanceof CacheItemPoolInterface) {

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ class ValidatorCacheWarmer extends AbstractPhpFileCacheWarmer`
`39`	`39`	`*/`
`40`	`40`	`public function __construct($validatorBuilder, string $phpArrayFile)`
`41`	`41`	`{`
`42`		`- if (!$validatorBuilder instanceof ValidatorBuilder \|\| !$validatorBuilder instanceof ValidatorBuilderInterface) {`
	`42`	`+ if (!$validatorBuilder instanceof ValidatorBuilder && !$validatorBuilder instanceof ValidatorBuilderInterface) {`
`43`	`43`	`throw new \TypeError(sprintf('Argument 1 passed to %s() must be an instance of %s, %s given.', __METHOD__, ValidatorBuilder::class, \is_object($validatorBuilder) ? \get_class($validatorBuilder) : \gettype($validatorBuilder)));`
`44`	`44`	`}`
`45`	`45`	`if (2 < \func_num_args() && \func_get_arg(2) instanceof CacheItemPoolInterface) {`