Merge branch '3.4' into 4.4

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

Author: nicolas-grekas

Definition.php

@@ -52,7 +52,7 @@ public function __construct(array $places, array $transitions, $initialPlaces =
      */
     public function getInitialPlace(): ?string
     {
-        @trigger_error(sprintf('Calling %s::getInitialPlace() is deprecated since Symfony 4.3. Call getInitialPlaces() instead.', __CLASS__), E_USER_DEPRECATED);
+        @trigger_error(sprintf('Calling %s::getInitialPlace() is deprecated since Symfony 4.3. Call getInitialPlaces() instead.', __CLASS__), \E_USER_DEPRECATED);
 
         if (!$this->initialPlaces) {
             return null;

DefinitionBuilder.php

@@ -69,7 +69,7 @@ public function clear()
      */
     public function setInitialPlace($place)
     {
-        @trigger_error(sprintf('Calling %s::setInitialPlace() is deprecated since Symfony 4.3. Call setInitialPlaces() instead.', __CLASS__), E_USER_DEPRECATED);
+        @trigger_error(sprintf('Calling %s::setInitialPlace() is deprecated since Symfony 4.3. Call setInitialPlaces() instead.', __CLASS__), \E_USER_DEPRECATED);
 
         $this->initialPlaces = $place;
 
@@ -159,7 +159,7 @@ public function setMetadataStore(MetadataStoreInterface $metadataStore)
      */
     public function reset()
     {
-        @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.1, use the "clear()" method instead.', __METHOD__), E_USER_DEPRECATED);
+        @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.1, use the "clear()" method instead.', __METHOD__), \E_USER_DEPRECATED);
 
         return $this->clear();
     }

Dumper/PlantUmlDumper.php

@@ -128,20 +128,20 @@ private function isWorkflowTransitionType(): bool
 
     private function startPuml(array $options): string
     {
-        $start = '@startuml'.PHP_EOL;
-        $start .= 'allow_mixing'.PHP_EOL;
+        $start = '@startuml'.\PHP_EOL;
+        $start .= 'allow_mixing'.\PHP_EOL;
 
         return $start;
     }
 
     private function endPuml(array $options): string
     {
-        return PHP_EOL.'@enduml';
+        return \PHP_EOL.'@enduml';
     }
 
     private function getLines(array $code): string
     {
-        return implode(PHP_EOL, $code);
+        return implode(\PHP_EOL, $code);
     }
 
     private function initialize(array $options, Definition $definition): array
@@ -210,7 +210,7 @@ private function getState(string $place, Definition $definition, Marking $markin
         $description = $workflowMetadata->getMetadata('description', $place);
         if (null !== $description) {
             $output .= ' as '.$place.
-                PHP_EOL.
+                \PHP_EOL.
                 $place.' : '.$description;
         }
 

Event/Event.php

@@ -37,10 +37,10 @@ public function __construct($subject, Marking $marking, Transition $transition =
         $this->marking = $marking;
         $this->transition = $transition;
         if (null === $workflow) {
-            @trigger_error(sprintf('Passing only three parameters to "%s" is deprecated since Symfony 4.1. Pass a %s instance as fourth parameter instead.', __METHOD__, WorkflowInterface::class), E_USER_DEPRECATED);
+            @trigger_error(sprintf('Passing only three parameters to "%s" is deprecated since Symfony 4.1. Pass a %s instance as fourth parameter instead.', __METHOD__, WorkflowInterface::class), \E_USER_DEPRECATED);
             $this->workflowName = 'unnamed';
         } elseif (\is_string($workflow)) {
-            @trigger_error(sprintf('Passing a string as the 4th parameter of "%s()" is deprecated since Symfony 4.1. Pass a %s instance instead.', __METHOD__, WorkflowInterface::class), E_USER_DEPRECATED);
+            @trigger_error(sprintf('Passing a string as the 4th parameter of "%s()" is deprecated since Symfony 4.1. Pass a %s instance instead.', __METHOD__, WorkflowInterface::class), \E_USER_DEPRECATED);
             $this->workflowName = $workflow;
         } elseif ($workflow instanceof WorkflowInterface) {
             $this->workflow = $workflow;

EventListener/GuardListener.php

@@ -38,7 +38,7 @@ class GuardListener
     public function __construct(array $configuration, ExpressionLanguage $expressionLanguage, TokenStorageInterface $tokenStorage, AuthorizationCheckerInterface $authorizationChecker, AuthenticationTrustResolverInterface $trustResolver, RoleHierarchyInterface $roleHierarchy = null, ValidatorInterface $validator = null)
     {
         if (null !== $roleHierarchy && !method_exists($roleHierarchy, 'getReachableRoleNames')) {
-            @trigger_error(sprintf('Not implementing the "%s::getReachableRoleNames()" method in "%s" is deprecated since Symfony 4.3.', RoleHierarchyInterface::class, \get_class($roleHierarchy)), E_USER_DEPRECATED);
+            @trigger_error(sprintf('Not implementing the "%s::getReachableRoleNames()" method in "%s" is deprecated since Symfony 4.3.', RoleHierarchyInterface::class, \get_class($roleHierarchy)), \E_USER_DEPRECATED);
         }
 
         $this->configuration = $configuration;
@@ -90,7 +90,7 @@ private function getVariables(GuardEvent $event): array
             $roleNames = $token->getRoleNames();
             $roles = array_map(function (string $role) { return new Role($role, false); }, $roleNames);
         } else {
-            @trigger_error(sprintf('Not implementing the "%s::getRoleNames()" method in "%s" is deprecated since Symfony 4.3.', TokenInterface::class, \get_class($token)), E_USER_DEPRECATED);
+            @trigger_error(sprintf('Not implementing the "%s::getRoleNames()" method in "%s" is deprecated since Symfony 4.3.', TokenInterface::class, \get_class($token)), \E_USER_DEPRECATED);
 
             $roles = $token->getRoles(false);
             $roleNames = array_map(function (Role $role) { return $role->getRole(); }, $roles);

MarkingStore/MultipleStateMarkingStore.php

@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Workflow\MarkingStore;
 
-@trigger_error(sprintf('"%s" is deprecated since Symfony 4.3, use "%s" instead.', MultipleStateMarkingStore::class, MethodMarkingStore::class), E_USER_DEPRECATED);
+@trigger_error(sprintf('"%s" is deprecated since Symfony 4.3, use "%s" instead.', MultipleStateMarkingStore::class, MethodMarkingStore::class), \E_USER_DEPRECATED);
 
 use Symfony\Component\PropertyAccess\PropertyAccess;
 use Symfony\Component\PropertyAccess\PropertyAccessorInterface;

MarkingStore/SingleStateMarkingStore.php

@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Workflow\MarkingStore;
 
-@trigger_error(sprintf('"%s" is deprecated since Symfony 4.3, use "%s" instead.', SingleStateMarkingStore::class, MethodMarkingStore::class), E_USER_DEPRECATED);
+@trigger_error(sprintf('"%s" is deprecated since Symfony 4.3, use "%s" instead.', SingleStateMarkingStore::class, MethodMarkingStore::class), \E_USER_DEPRECATED);
 
 use Symfony\Component\PropertyAccess\PropertyAccess;
 use Symfony\Component\PropertyAccess\PropertyAccessorInterface;

Registry.php

@@ -30,7 +30,7 @@ class Registry
      */
     public function add(Workflow $workflow, $supportStrategy)
     {
-        @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.1. Use addWorkflow() instead.', __METHOD__), E_USER_DEPRECATED);
+        @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.1. Use addWorkflow() instead.', __METHOD__), \E_USER_DEPRECATED);
         $this->workflows[] = [$workflow, $supportStrategy];
     }
 

SupportStrategy/ClassInstanceSupportStrategy.php

@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\Workflow\SupportStrategy;
 
-@trigger_error(sprintf('"%s" is deprecated since Symfony 4.1. Use "%s" instead.', ClassInstanceSupportStrategy::class, InstanceOfSupportStrategy::class), E_USER_DEPRECATED);
+@trigger_error(sprintf('"%s" is deprecated since Symfony 4.1. Use "%s" instead.', ClassInstanceSupportStrategy::class, InstanceOfSupportStrategy::class), \E_USER_DEPRECATED);
 
 use Symfony\Component\Workflow\Workflow;
 

Tests/Dumper/PlantUmlDumperTest.php

@@ -27,7 +27,7 @@ public function testDumpWorkflowWithoutMarking($definition, $marking, $expectedF
         $dumper = new PlantUmlDumper(PlantUmlDumper::WORKFLOW_TRANSITION);
         $dump = $dumper->dump($definition, $marking, ['title' => $title]);
         // handle windows, and avoid to create more fixtures
-        $dump = str_replace(PHP_EOL, "\n", $dump.PHP_EOL);
+        $dump = str_replace(\PHP_EOL, "\n", $dump.\PHP_EOL);
         $file = $this->getFixturePath($expectedFileName, PlantUmlDumper::WORKFLOW_TRANSITION);
         $this->assertStringEqualsFile($file, $dump);
     }
@@ -50,7 +50,7 @@ public function testDumpStateMachineWithoutMarking($definition, $marking, $expec
         $dumper = new PlantUmlDumper(PlantUmlDumper::STATEMACHINE_TRANSITION);
         $dump = $dumper->dump($definition, $marking, ['title' => $title]);
         // handle windows, and avoid to create more fixtures
-        $dump = str_replace(PHP_EOL, "\n", $dump.PHP_EOL);
+        $dump = str_replace(\PHP_EOL, "\n", $dump.\PHP_EOL);
         $file = $this->getFixturePath($expectedFileName, PlantUmlDumper::STATEMACHINE_TRANSITION);
         $this->assertStringEqualsFile($file, $dump);
     }