Merge branch '4.2' into 4.3

fabpot · fabpot · commit 40762ead607c · 2019-06-13T13:01:17.000+02:00
* 4.2:
  fixed CS
  fixed CS
  [HttpKernel] Remove TestEventDispatcher.
diff --git a/OptionsResolver.php b/OptionsResolver.php
@@ -846,7 +846,7 @@ public function offsetGet($option/*, bool $triggerDeprecation = true*/)
             throw new AccessException('Array access is only supported within closures of lazy options and normalizers.');
         }
 
-        $triggerDeprecation = 1 === \func_num_args() || \func_get_arg(1);
+        $triggerDeprecation = 1 === \func_num_args() || func_get_arg(1);
 
         // Shortcut for resolved options
         if (isset($this->resolved[$option]) || \array_key_exists($option, $this->resolved)) {

Original file line number	Diff line number	Diff line change
`@@ -846,7 +846,7 @@ public function offsetGet($option/, bool $triggerDeprecation = true/)`
`846`	`846`	`throw new AccessException('Array access is only supported within closures of lazy options and normalizers.');`
`847`	`847`	`}`
`848`	`848`
`849`		`- $triggerDeprecation = 1 === \func_num_args() \|\| \func_get_arg(1);`
	`849`	`+ $triggerDeprecation = 1 === \func_num_args() \|\| func_get_arg(1);`
`850`	`850`
`851`	`851`	`// Shortcut for resolved options`
`852`	`852`	`if (isset($this->resolved[$option]) \|\| \array_key_exists($option, $this->resolved)) {`