Merge branch '3.4' into 4.4

* 3.4:
  Enable "native_constant_invocation" CS rule
  Make AbstractPhpFileCacheWarmer public

Author: nicolas-grekas

OptionsResolver.php

@@ -854,7 +854,7 @@ public function offsetGet($option/*, bool $triggerDeprecation = true*/)
         // Shortcut for resolved options
         if (isset($this->resolved[$option]) || \array_key_exists($option, $this->resolved)) {
             if ($triggerDeprecation && isset($this->deprecated[$option]) && (isset($this->given[$option]) || $this->calling) && \is_string($this->deprecated[$option])) {
-                @trigger_error(strtr($this->deprecated[$option], ['%name%' => $option]), E_USER_DEPRECATED);
+                @trigger_error(strtr($this->deprecated[$option], ['%name%' => $option]), \E_USER_DEPRECATED);
             }
 
             return $this->resolved[$option];
@@ -1013,7 +1013,7 @@ public function offsetGet($option/*, bool $triggerDeprecation = true*/)
             }
 
             if ('' !== $deprecationMessage) {
-                @trigger_error(strtr($deprecationMessage, ['%name%' => $option]), E_USER_DEPRECATED);
+                @trigger_error(strtr($deprecationMessage, ['%name%' => $option]), \E_USER_DEPRECATED);
             }
         }
 

Tests/OptionsResolverTest.php

@@ -549,7 +549,7 @@ function (OptionsResolver $resolver) {
             },
             ['foo' => 'baz'],
             [
-                'type' => E_USER_DEPRECATED,
+                'type' => \E_USER_DEPRECATED,
                 'message' => 'The option "foo" is deprecated.',
             ],
             1,
@@ -567,7 +567,7 @@ function (OptionsResolver $resolver) {
             },
             ['foo' => 'baz'],
             [
-                'type' => E_USER_DEPRECATED,
+                'type' => \E_USER_DEPRECATED,
                 'message' => 'The option "foo" is deprecated, use "bar" option instead.',
             ],
             2,
@@ -587,7 +587,7 @@ function (OptionsResolver $resolver) {
             },
             [],
             [
-                'type' => E_USER_DEPRECATED,
+                'type' => \E_USER_DEPRECATED,
                 'message' => 'The option "foo" is deprecated.',
             ],
             1,
@@ -609,7 +609,7 @@ function (OptionsResolver $resolver) {
             },
             ['foo' => new \stdClass()],
             [
-                'type' => E_USER_DEPRECATED,
+                'type' => \E_USER_DEPRECATED,
                 'message' => 'Passing an instance of "stdClass" to option "foo" is deprecated, pass its FQCN instead.',
             ],
             1,
@@ -645,7 +645,7 @@ function (OptionsResolver $resolver) {
             },
             ['foo' => null], // It triggers a deprecation
             [
-                'type' => E_USER_DEPRECATED,
+                'type' => \E_USER_DEPRECATED,
                 'message' => 'Passing a value different than true or false is deprecated.',
             ],
             1,
@@ -681,7 +681,7 @@ function (OptionsResolver $resolver) {
             },
             ['widget' => 'single_text', 'date_format' => 2],
             [
-                'type' => E_USER_DEPRECATED,
+                'type' => \E_USER_DEPRECATED,
                 'message' => 'Using the "date_format" option when the "widget" option is set to "single_text" is deprecated.',
             ],
             1,
@@ -707,7 +707,7 @@ function (OptionsResolver $resolver) {
             },
             ['foo' => 'baz'], // It triggers a deprecation
             [
-                'type' => E_USER_DEPRECATED,
+                'type' => \E_USER_DEPRECATED,
                 'message' => 'The option "foo" is deprecated.',
             ],
             4,