Merge branch '4.4' into 5.2

derrabus · derrabus · commit 83a77c4fb4cb · 2021-07-18T18:25:43.000+02:00
* 4.4:
  Simplify some code with null coalesce operator
diff --git a/ContainerAwareEventManager.php b/ContainerAwareEventManager.php
@@ -54,7 +54,7 @@ public function dispatchEvent($eventName, EventArgs $eventArgs = null)
             return;
         }
 
-        $eventArgs = null === $eventArgs ? EventArgs::getEmptyInstance() : $eventArgs;
+        $eventArgs = $eventArgs ?? EventArgs::getEmptyInstance();
 
         if (!isset($this->initialized[$eventName])) {
             $this->initializeListeners($eventName);
diff --git a/Validator/Constraints/UniqueEntityValidator.php b/Validator/Constraints/UniqueEntityValidator.php
@@ -165,7 +165,7 @@ public function validate($entity, Constraint $constraint)
             return;
         }
 
-        $errorPath = null !== $constraint->errorPath ? $constraint->errorPath : $fields[0];
+        $errorPath = $constraint->errorPath ?? $fields[0];
         $invalidValue = $criteria[$errorPath] ?? $criteria[$fields[0]];
 
         $this->context->buildViolation($constraint->message)

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public function dispatchEvent($eventName, EventArgs $eventArgs = null)`
`54`	`54`	`return;`
`55`	`55`	`}`
`56`	`56`
`57`		`- $eventArgs = null === $eventArgs ? EventArgs::getEmptyInstance() : $eventArgs;`
	`57`	`+ $eventArgs = $eventArgs ?? EventArgs::getEmptyInstance();`
`58`	`58`
`59`	`59`	`if (!isset($this->initialized[$eventName])) {`
`60`	`60`	`$this->initializeListeners($eventName);`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ public function validate($entity, Constraint $constraint)`
`165`	`165`	`return;`
`166`	`166`	`}`
`167`	`167`
`168`		`- $errorPath = null !== $constraint->errorPath ? $constraint->errorPath : $fields[0];`
	`168`	`+ $errorPath = $constraint->errorPath ?? $fields[0];`
`169`	`169`	`$invalidValue = $criteria[$errorPath] ?? $criteria[$fields[0]];`
`170`	`170`
`171`	`171`	`$this->context->buildViolation($constraint->message)`