Merge branch '4.2' into 4.3

fabpot · fabpot · commit 5cef148ca891 · 2019-06-13T13:01:17.000+02:00
* 4.2:
  fixed CS
  fixed CS
  [HttpKernel] Remove TestEventDispatcher.
diff --git a/CacheWarmer/AnnotationsCacheWarmer.php b/CacheWarmer/AnnotationsCacheWarmer.php
@@ -40,7 +40,7 @@ public function __construct(Reader $annotationReader, string $phpArrayFile, $exc
         if ($excludeRegexp instanceof CacheItemPoolInterface) {
             @trigger_error(sprintf('The CacheItemPoolInterface $fallbackPool argument of "%s()" is deprecated since Symfony 4.2, you should not pass it anymore.', __METHOD__), E_USER_DEPRECATED);
             $excludeRegexp = $debug;
-            $debug = 4 < \func_num_args() && \func_get_arg(4);
+            $debug = 4 < \func_num_args() && func_get_arg(4);
         }
         parent::__construct($phpArrayFile);
         $this->annotationReader = $annotationReader;
diff --git a/CacheWarmer/SerializerCacheWarmer.php b/CacheWarmer/SerializerCacheWarmer.php
@@ -36,7 +36,7 @@ class SerializerCacheWarmer extends AbstractPhpFileCacheWarmer
      */
     public function __construct(array $loaders, string $phpArrayFile)
     {
-        if (2 < \func_num_args() && \func_get_arg(2) instanceof CacheItemPoolInterface) {
+        if (2 < \func_num_args() && func_get_arg(2) instanceof CacheItemPoolInterface) {
             @trigger_error(sprintf('The CacheItemPoolInterface $fallbackPool argument of "%s()" is deprecated since Symfony 4.2, you should not pass it anymore.', __METHOD__), E_USER_DEPRECATED);
         }
         parent::__construct($phpArrayFile);
diff --git a/CacheWarmer/ValidatorCacheWarmer.php b/CacheWarmer/ValidatorCacheWarmer.php
@@ -37,7 +37,7 @@ class ValidatorCacheWarmer extends AbstractPhpFileCacheWarmer
      */
     public function __construct(ValidatorBuilderInterface $validatorBuilder, string $phpArrayFile)
     {
-        if (2 < \func_num_args() && \func_get_arg(2) instanceof CacheItemPoolInterface) {
+        if (2 < \func_num_args() && func_get_arg(2) instanceof CacheItemPoolInterface) {
             @trigger_error(sprintf('The CacheItemPoolInterface $fallbackPool argument of "%s()" is deprecated since Symfony 4.2, you should not pass it anymore.', __METHOD__), E_USER_DEPRECATED);
         }
         parent::__construct($phpArrayFile);

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public function __construct(Reader $annotationReader, string $phpArrayFile, $exc`
`40`	`40`	`if ($excludeRegexp instanceof CacheItemPoolInterface) {`
`41`	`41`	`@trigger_error(sprintf('The CacheItemPoolInterface $fallbackPool argument of "%s()" is deprecated since Symfony 4.2, you should not pass it anymore.', __METHOD__), E_USER_DEPRECATED);`
`42`	`42`	`$excludeRegexp = $debug;`
`43`		`- $debug = 4 < \func_num_args() && \func_get_arg(4);`
	`43`	`+ $debug = 4 < \func_num_args() && func_get_arg(4);`
`44`	`44`	`}`
`45`	`45`	`parent::__construct($phpArrayFile);`
`46`	`46`	`$this->annotationReader = $annotationReader;`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ class SerializerCacheWarmer extends AbstractPhpFileCacheWarmer`
`36`	`36`	`*/`
`37`	`37`	`public function __construct(array $loaders, string $phpArrayFile)`
`38`	`38`	`{`
`39`		`- if (2 < \func_num_args() && \func_get_arg(2) instanceof CacheItemPoolInterface) {`
	`39`	`+ if (2 < \func_num_args() && func_get_arg(2) instanceof CacheItemPoolInterface) {`
`40`	`40`	`@trigger_error(sprintf('The CacheItemPoolInterface $fallbackPool argument of "%s()" is deprecated since Symfony 4.2, you should not pass it anymore.', __METHOD__), E_USER_DEPRECATED);`
`41`	`41`	`}`
`42`	`42`	`parent::__construct($phpArrayFile);`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ class ValidatorCacheWarmer extends AbstractPhpFileCacheWarmer`
`37`	`37`	`*/`
`38`	`38`	`public function __construct(ValidatorBuilderInterface $validatorBuilder, string $phpArrayFile)`
`39`	`39`	`{`
`40`		`- if (2 < \func_num_args() && \func_get_arg(2) instanceof CacheItemPoolInterface) {`
	`40`	`+ if (2 < \func_num_args() && func_get_arg(2) instanceof CacheItemPoolInterface) {`
`41`	`41`	`@trigger_error(sprintf('The CacheItemPoolInterface $fallbackPool argument of "%s()" is deprecated since Symfony 4.2, you should not pass it anymore.', __METHOD__), E_USER_DEPRECATED);`
`42`	`42`	`}`
`43`	`43`	`parent::__construct($phpArrayFile);`